[SCM] live-manual branch, upstream, updated. upstream/3.0_a11-1-g25fc414
Daniel Baumann
daniel at debian.org
Mon Jun 4 10:27:24 UTC 2012
The following commit has been merged in the upstream branch:
commit 25fc414ddd01a5f6a02d3bc35af75593e6d48a60
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Jun 4 12:27:16 2012 +0200
Adding upstream version 3.0~a12.
diff --git a/Makefile b/Makefile
index 7a4c188..9a313e5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,13 @@
# Makefile
+## live-manual(7) - Documentation
+## Copyright (C) 2006-2012 Debian Live Project <debian-live at lists.debian.org>
+##
+## live-manual comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
+
+
SHELL := sh -e
LANGUAGES = en $(shell cd manual/po && ls)
@@ -51,10 +59,8 @@ build: clean
done; \
-autobuild: build
-
+autobuild: build
cd build/manual && rm -rf manifest toc.html; \
-
set +e; for LANGUAGE in $(LANGUAGES); \
do \
FROMDIR=$(CURDIR)/manual/$${LANGUAGE}; \
@@ -65,7 +71,7 @@ autobuild: build
$${TODIR}/index.html.in > $${TODIR}/index.$${LANGUAGE}.html; \
rm $${TODIR}/index.html.in; \
done
-
+
commit: tidy test
$(MAKE) -C manual rebuild
@@ -84,13 +90,12 @@ commit: tidy test
@echo " * git push "
install:
- FROMDIR=$(CURDIR)/build/manual; \
- TODIR=$(DESTDIR)/usr/share/doc/live-manual; \
- cd $${FROMDIR} && rm -rf manifest index.html toc.html; \
- mkdir -p $${TODIR}; \
- cp -a $(CURDIR)/build/manual/* $(DESTDIR)/usr/share/doc/live-manual
-
+ rm -rf $(CURDIR)/build/manual/manifest
+ rm -f $(CURDIR)/build/manual/index.html
+ rm -f $(CURDIR)/build/manual/toc.html
+ mkdir -p $(DESTDIR)/usr/share/doc/live-manual
+ cp -a COPYING $(CURDIR)/build/manual/* $(DESTDIR)/usr/share/doc/live-manual
uninstall:
rm -rf $(DESTDIR)/usr/share/doc/live-manual
@@ -111,4 +116,3 @@ translate:
else \
echo "There are no fuzzy strings to translate." ; \
fi
-
diff --git a/VERSION b/VERSION
index 2e25043..98a95e9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a11
+3.0~a12-1
diff --git a/docs/TODO b/docs/TODO
deleted file mode 100644
index e1557ec..0000000
--- a/docs/TODO
+++ /dev/null
@@ -1,4 +0,0 @@
-* review and update everything, drop pre squeeze stuff.
-* use common style:
- - names of debian packages: /{foo}/
- - names of commands: #{foo}#
diff --git a/manual/bin/find-fuzzy.sh b/manual/bin/find-fuzzy.sh
index b459e29..475b27d 100755
--- a/manual/bin/find-fuzzy.sh
+++ b/manual/bin/find-fuzzy.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+set -e
+
# Script to assist translators in finding and fixing fuzzy strings in live-manual.
echo ""
@@ -9,105 +11,95 @@ echo "Type: de, es, fr, it, pt_BR or ro ['a' to see all]['q' to quit]"
# Editor defaults to vim unless otherwise specified in preferences.
-EDITOR=${EDITOR:-vim}
+EDITOR="${EDITOR:-vim}"
# Creating the function. Searches 'fuzzy' and offers to open editor to fix them.
-find_fuzzy()
-
+find_fuzzy ()
{
- echo ""
- echo "There are $(grep -w 'fuzzy' manual/po/$ANSWER/* | wc -l) fuzzy strings in your language."
- echo ""
+ echo ""
+ echo "There are $(grep -w 'fuzzy' manual/po/$ANSWER/* | wc -l) fuzzy strings in your language."
+ echo ""
- grep -w 'fuzzy' manual/po/$ANSWER/*
-
- if [ "$(grep -w 'fuzzy' manual/po/$ANSWER/* | wc -l)" = "0" ]
- then
- echo "You may now proceed...please do:"
+ if [ "$(grep -w 'fuzzy' manual/po/$ANSWER/* | wc -l)" -eq "0" ]
+ then
+ echo "You may now proceed... please do:"
echo ""
echo " * git add ."
echo " * git commit -a -m \"Your commit message.\""
echo " * git push "
echo ""
+
exit 0
else
+ grep -w 'fuzzy' manual/po/$ANSWER/*
+
echo ""
echo "Do you want to launch your text editor to start fixing them? [yes/no]"
- read OPENEDITOR
- case "$OPENEDITOR" in
+ read OPENEDITOR
- y*|Y*) $EDITOR $(grep -w 'fuzzy' manual/po/$ANSWER/* | uniq | sed 's|:#, fuzzy.*||')
+ case "$OPENEDITOR" in
+ y*|Y*)
+ $EDITOR $(grep -w 'fuzzy' manual/po/$ANSWER/* | uniq | sed 's|:#, fuzzy.*||')
;;
- n*|N*) exit 0
+ n*|N*)
+ exit 0
;;
- *) echo "You didn't type 'yes'. Exiting..."
- exit 0
-
- esac
-
+ *) echo "You didn't type 'yes'. Exiting..."
+ exit 0
+ ;;
+ esac
fi
+
exit 0
}
# Languages menu.
-read ANSWER
-case "$ANSWER" in
-
- de) find_fuzzy
- ;;
+read ANSWER
- en) echo "Nothing to be done, really."
+case "$ANSWER" in
+ en)
+ echo "Nothing to be done, really."
echo "Translation English-English not implemented yet!"
;;
- es) find_fuzzy
- ;;
-
- fr) find_fuzzy
+ de|es|fr|it|pt_BR|ro)
+ find_fuzzy
;;
- it) find_fuzzy
- ;;
-
- pt_BR) find_fuzzy
- ;;
-
- ro) find_fuzzy
- ;;
-
- a) grep -w 'fuzzy' manual/po/*/*
+ a)
+ grep -w 'fuzzy' manual/po/*/*
echo ""
echo "Do you want to launch your text editor to start fixing them? [yes/no]"
- read OPENEDITOR
- case "$OPENEDITOR" in
+ read OPENEDITOR
- y*|Y*) $EDITOR $(grep -w 'fuzzy' manual/po/*/* | uniq | sed 's|:#, fuzzy.*||')
+ case "$OPENEDITOR" in
+ y*|Y*)
+ $EDITOR $(grep -w 'fuzzy' manual/po/*/* | uniq | sed 's|:#, fuzzy.*||')
;;
- n*|N*) exit 0
+ n*|N*)
+ exit 0
;;
- *) echo "You didn't type 'yes'. Exiting..."
- exit 0
-
- esac
-
+ *)
+ echo "You didn't type 'yes'. Exiting..."
+ exit 0
+ ;;
+ esac
;;
- q) exit
+ q)
+ exit 0
;;
- *) echo "No language chosen. Exiting..."
-
+ *)
+ echo "No language chosen. Exiting..."
+ ;;
esac
-
-
-
-
diff --git a/manual/bin/fix-sisu-html.rb b/manual/bin/fix-sisu-html.rb
index bf123ef..a704ace 100755
--- a/manual/bin/fix-sisu-html.rb
+++ b/manual/bin/fix-sisu-html.rb
@@ -7,13 +7,13 @@ input_file=output_file+"~"
File.rename(output_file,input_file)
File.open(output_file,"w") do |o|
- doc=Nokogiri::HTML(open input_file)
- # CSS3 selectors don't support regexes, so we take a shotgun approach,
- # removing all tables with summaries (OK for current sisu output).
- # Change to use a custom pseudo class if anything more refined is needed.
- doc.css(%[table[summary]]).remove
- toc=doc.css(%[h2,h4[class$="toc"]]).each do |node|
- node.remove if node.inner_text.match(/Metadata|Manifest|SiSU/)
- end
- o.puts doc.to_html
+ doc=Nokogiri::HTML(open input_file)
+ # CSS3 selectors don't support regexes, so we take a shotgun approach,
+ # removing all tables with summaries (OK for current sisu output).
+ # Change to use a custom pseudo class if anything more refined is needed.
+ doc.css(%[table[summary]]).remove
+ toc=doc.css(%[h2,h4[class$="toc"]]).each do |node|
+ node.remove if node.inner_text.match(/Metadata|Manifest|SiSU/)
+ end
+ o.puts doc.to_html
end
diff --git a/manual/bin/update-version.sh b/manual/bin/update-version.sh
index 262ac5c..d2ca23a 100755
--- a/manual/bin/update-version.sh
+++ b/manual/bin/update-version.sh
@@ -2,11 +2,30 @@
set -e
-DATE="$(LC_ALL=C date +%Y-%m-%d)"
VERSION="$(cat ../VERSION)"
+
+DAY="$(LC_ALL=C date +%d)"
+MONTH="$(LC_ALL=C date +%m)"
YEAR="$(LC_ALL=C date +%Y)"
echo "Updating version information..."
-sed -i -e "s|^ :published:.*$| :published: ${DATE}|" \
+sed -i -e "s|^ :published:.*$| :published: ${YEAR}-${MONTH}-${DAY}|" \
-e "s|(C) 2006-.*|(C) 2006-${YEAR} Debian Live Project|" \
en/live-manual.ssm
+
+# European date format
+for _LANGUAGE in de es fr it ro
+do
+ if [ -e po/${_LANGUAGE}/live-manual.ssm.po ]
+ then
+ sed -i -e "s|:published: .*.${YEAR}|:published: ${DAY}.${MONTH}.${YEAR}|" \
+ po/${_LANGUAGE}/live-manual.ssm.po
+ fi
+done
+
+# Brazilian date format
+if [ -e po/pt_BR/live-manual.ssm.po ]
+then
+ sed -i -e "s|:published: .*-${YEAR}|:published: ${DAY}-${MONTH}-${YEAR}|" \
+ po/pt_BR/live-manual.ssm.po
+fi
diff --git a/manual/de/about_manual.ssi b/manual/de/about_manual.ssi
index 1f4bd26..bed7b17 100644
--- a/manual/de/about_manual.ssi
+++ b/manual/de/about_manual.ssi
@@ -1,47 +1,55 @@
-:B~ About this manual
-
-1~about-manual About this manual
-
-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 7.0 "Wheezy" 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
-using #{sudo}#. To distinguish between commands which may be executed by an
-unprivileged user and those requiring superuser privileges, commands are
-prepended by #{$}# or #{#}# respectively. This symbol is not a part of the
-command.
-
-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 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
+:B~ Über dieses Handbuch
+
+1~about-manual Über dieses Handbuch
+
+Dieses Handbuch dient als zentraler Einstiegspunkt für die gesamte
+Dokumentation des Debian Live Projekts, insbesondere zur Software die für
+Debian 7.0 "wheezy" erstellt wurde. Eine aktualisierte Version dieses
+Handbuches befindet sich auf http://live.debian.net/.
+
+Obwohl live-manual primär das Ziel hat beim Bau eines Live Systems zu helfen
+und nicht Anwenderfragen zu beantworten, können Benutzer einige nützliche
+Informationen in den folgenden Abschnitten finden: {Die
+Grundlagen}#the-basics deckt das Vorbereiten von Images um von Medien oder
+über das Netzwerk gestartet zu werden und {Anpassung des
+Laufzeitverhalten}#customizing-run-time-behaviours beschreibt einige
+Optionen welche als Startparameter benutzt werden können, z.B. die Auswahl
+des Tastaturlayouts und der Systemsprache oder Persistenz.
+
+Einige der erwähnten Befehle im Text müssen als Superuser ausgeführt
+werden. Dies kann entweder dadurch erreicht werden, indem zuerst auf den
+root Benutzer gewechselt wird mittels #{su}# oder durch die Benutzung von
+#{sudo}#. Um die Befehle welche als unprivilegierter Benutzer ausgeführt
+werden können und diesen welche Superuser Rechte benötigen, sind den
+Befehlen #{$}# respektive #{#}# vorangestellt. Dieses Symbol ist nicht Teil
+des Befehls.
+
+Für die Ungeduldigen
+
+Obowhl wir denken dass alles in diesem Handbuch mehr oder weniger für die
+einen oder anderen Benutzer wichtig ist, sind wir uns bewusst, dass es sich
+um viel Material handelt. Für ein schnelles Erfolgserlebnis in der Anwendung
+dieser Software schlagen wir die folgende Reihenfolge vor, bevor sie sich
+mit den Details befassen:
+
+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.
+tutorials, you will have a taste of what can be done with Debian Live.
-2~terms Terms
+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 Begriffe
_* *{Live system}*: An operating system that can boot without installation
to a hard drive. Live systems do not alter local operating system(s) or
@@ -62,14 +70,15 @@ _* *{Host system}*: The environment used to create the live system.
_* *{Target system}*: The environment used to run the live system.
_* *{live-boot}*: A collection of scripts used to boot live
-systems. live-boot was formerly a part of live-initramfs.
+systems. live-boot was formerly a part of /{live-initramfs}/.
_* *{live-build}*: A collection of scripts used to build customized Debian
-Live systems. live-build was formerly known as live-helper, and even earlier
-known as live-package.
+Live systems. live-build was formerly known as /{live-helper}/, and even
+earlier known as /{live-package}/.
_* *{live-config}*: A collection of scripts used to configure a live system
-during the boot process. live-config was formerly a part of live-initramfs.
+during the boot process. live-config was formerly a part of
+/{live-initramfs}/.
_* *{live-manual}*: This document is maintained in a package called
live-manual.
@@ -80,7 +89,7 @@ Debian distribution.
_* *{Boot parameters}*: Parameters that can be entered at the bootloader
prompt to influence the kernel or live-config.
-_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run
+_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run
different instances of the GNU/Linux environment on a single system
simultaneously without rebooting.
@@ -90,24 +99,19 @@ or binary.img.
_* *{Target distribution}*: The distribution upon which your live system
will be based. This can differ from the distribution of your host system.
-_* *{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.
-
-The *{stable}* distribution contains the latest officially released
-distribution of Debian. The *{testing}* distribution is the staging area for
-the next *{stable}* release. A major advantage of using this distribution is
-that it has more recent versions of software relative to the *{stable}*
-release. The *{unstable}* distribution is where active development of Debian
-occurs. Generally, this distribution is run by developers and those who like
-to live on the edge.
+_* *{stable/testing/unstable}*: The *{stable}* distribution contains the
+latest officially released distribution of Debian. The *{testing}*
+distribution is the staging area for the next *{stable}* release. A major
+advantage of using this distribution is that it has more recent versions of
+software relative to the *{stable}* release. The *{unstable}* distribution
+is where active development of Debian occurs. Generally, this distribution
+is run by developers and those who like to live on the edge. Throughout the
+manual, we tend to use codenames for the releases, such as wheezy or sid, as
+that is what is supported by the tools themselves.
-2~ Authors
+2~ Autoren
-A list of authors (in alphabetical order):
+Liste der Autoren (in alphabetischer Reihenfolge):
_* Ben Armstrong
@@ -243,28 +247,15 @@ 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
-translation files:
-
-code{
-
- $ make commit
-
-}code
-
-_* Then
-
-code{
-
- $ git add .
-
-}code
+_* Do not use #{make commit}# unless you are updating translations in this
+commit, and in that case, do not mix changes to the English manual and
+translations in the same commit, but use separate commits for each. See the
+{Translation}#translation section for more details.
-_* 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.
+_* Write commit messages that consist of complete, meaningful 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{
@@ -286,9 +277,9 @@ 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.
+/{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.
_* Once the new language is added, you can randomly start translating all po
files in #{manual/po/}#.
diff --git a/manual/de/about_project.ssi b/manual/de/about_project.ssi
index d48f58d..861a4e5 100644
--- a/manual/de/about_project.ssi
+++ b/manual/de/about_project.ssi
@@ -37,7 +37,7 @@ Debian is the Universal Operating System: Debian has a live system to show
around and to accurately represent the Debian system with the following main
advantages:
-_* It would be a subproject of Debian.
+_* It is a subproject of Debian.
_* It reflects the (current) state of one distribution.
@@ -74,16 +74,15 @@ are after a regular installation of Debian.
Whenever we need a different default configuration, we will do that in
coordination with its package maintainer in Debian.
-A system for configuring packages is provided using debconf in #{lb config}#
-(use --preseed FILE) allowing custom configured packages to be installed in
-your custom produced Debian Live images, but for official live images only
-default configuration will be used. For more information, please see
-{Customization overview}#customization-overview.
+A system for configuring packages is provided using debconf allowing custom
+configured packages to be installed in your custom produced Debian Live
+images, but for official live images only default configuration will be
+used. For more information, please see {Customization
+overview}#customization-overview.
Exception: There are a few essential changes needed to bring a live system
-to life (e.g. configuring pam to allow empty passwords). These essential
-changes have to be kept as minimal as possible and should be merged within
-the Debian repository if possible.
+to life. These essential changes have to be kept as minimal as possible and
+should be merged within the Debian repository if possible.
2~contact Contact
@@ -97,7 +96,7 @@ channel on irc.debian.org (OFTC). When asking a question on IRC, please be
patient for an answer. If no answer is forthcoming, please email the mailing
list.
-_* *{BTS}*: The Debian Bug Tracking System (BTS) contains details of bugs
-reported by users and developers. Each bug is given a number, and is kept on
-file until it is marked as having been dealt with. For more information,
-please see {Reporting bugs}#bugs.
+_* *{BTS}*: The {Debian Bug Tracking System}http://www.debian.org/Bugs/
+(BTS) contains details of bugs reported by users and developers. Each bug is
+given a number, and is kept on file until it is marked as having been dealt
+with. For more information, please see {Reporting bugs}#bugs.
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index 5b93915..5fb6f2b 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,13 +9,13 @@
:license: Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäss Version 3 der Lizenz oder (nach Ihrer Option) jeder späteren Version.<br><br>Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, dass es Ihnen von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.<br><br>Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem Programm erhalten haben. Falls nicht, siehe <http://www.gnu.org/licenses/>.<br><br>Der komplette Text der GNU General Public License kann in der Datei /usr/share/common-licenses/GPL-3 gefunden werden.
@date:
- :published: 2012-04-03
+ :published: 04.06.2012
@publisher: Debian Live Projekt <debian-live at lists.debian.org>
@make:
- :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/
- :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/
+ :bold: /squeeze|wheezy|sid/
+ :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
@@ -61,6 +61,6 @@
<< user_examples.ssi
-:B~ Appendix
+:B~ Anhang
<< style_guide.ssi
diff --git a/manual/de/project_bugs.ssi b/manual/de/project_bugs.ssi
index b0c34fc..a051509 100644
--- a/manual/de/project_bugs.ssi
+++ b/manual/de/project_bugs.ssi
@@ -71,7 +71,7 @@ _* Version of live-boot on the live system
_* Version of live-config on the live system
-_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system
+_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system
_* Architecture of the live system
@@ -122,8 +122,8 @@ Where does the bug appear?
3~ At build time whilst bootstrapping
-live-build first bootstraps a basic Debian system with #{debootstrap}# or
-#{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian
+live-build first bootstraps a basic Debian system with /{debootstrap}/ or
+/{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian
distribution it is bootstrapping, it may fail. If a bug appears here, check
if the error is related to a specific Debian package (most likely), or if it
is related to bootstrapping tool itself.
@@ -140,7 +140,7 @@ can fail. If a bug appears here, check if the error is also reproducible on
a normal system.
If this is the case, this is not a bug in Debian Live, but rather in Debian
-- please report it against the failing package. Running #{debootstrap}#
+- please report it against the failing package. Running /{debootstrap}/
separately from the Live system build or running #{lb bootstrap --debug}#
will give you more information.
diff --git a/manual/de/project_coding-style.ssi b/manual/de/project_coding-style.ssi
index 7ec54b5..6005704 100644
--- a/manual/de/project_coding-style.ssi
+++ b/manual/de/project_coding-style.ssi
@@ -13,6 +13,8 @@ _* Only use the POSIX subset - for example, use $(foo) over `foo`.
_* You can check your scripts with 'sh -n' and 'checkbashisms'.
+_* Make sure all shell code runs with 'set -e'.
+
2~ Indenting
_* Always use tabs over spaces.
@@ -50,7 +52,7 @@ Bad:
code{
- foo () {
+ Foo () {
bar
}
@@ -60,7 +62,7 @@ Good:
code{
- foo ()
+ Foo ()
{
bar
}
@@ -142,3 +144,6 @@ _* Don't use the #{test}# command for comparisons or tests, use "#{[}#"
_* Use #{case}# wherever possible over #{test}#, as it's easier to read and
faster in execution.
+
+_* Use capitalized names for functions to limit messing with the users
+environment.
diff --git a/manual/de/project_procedures.ssi b/manual/de/project_procedures.ssi
index 552749e..309da3c 100644
--- a/manual/de/project_procedures.ssi
+++ b/manual/de/project_procedures.ssi
@@ -37,13 +37,20 @@ _* Images are built and mirrored on cdimage.debian.org.
2~ Point Releases
-_* Again, we need updated mirror of debian, debian-security and
+_* Again, we need updated mirrors of debian, debian-security and
debian-volatile.
_* Images are built and mirrored on cdimage.debian.org.
_* Send announcement mail.
+3~ Last Point Release of a Debian Release
+
+Remember to adjust both chroot and binary mirrors when building the last set
+of images for a Debian release after it has been moved away from
+ftp.debian.org to archive.debian.org. That way, old prebuilt live images are
+still useful without user modifications.
+
3~ Point release announcement template
An annoucement mail for point releases can be generated using the template
diff --git a/manual/de/style_guide.ssi b/manual/de/style_guide.ssi
index 8b01cc3..f3fafb2 100644
--- a/manual/de/style_guide.ssi
+++ b/manual/de/style_guide.ssi
@@ -1,4 +1,4 @@
-:B~ Appendix
+:B~ Anhang
1~style-guide Style guide
@@ -342,11 +342,11 @@ intervention if the code changes.
Leave the code blocks empty (they will be automatically added then) if you
want to make your translation easier to maintain.
-_* /{New lines}/
+_* /{Newlines}/
-The translated texts need to have the exact same new lines as the original
+The translated texts need to have the exact same newlines as the original
texts. Be careful to press the "Enter" key or type *{\n}* if they appear in
-the original files. These new lines often appear, for instance, in the code
+the original files. These newlines often appear, for instance, in the code
blocks.
Make no mistake, this does not mean that the translated text needs to have
@@ -362,9 +362,7 @@ Translators should never translate:
- The commands given as examples
- - Metadata (often between colons *{:metadata:}*) especially the date in
- /{live-manual.ssm.po}/ because it changes every time live-manual is
- updated.
+ - Metadata (often between colons *{:metadata:}*)
- Links
diff --git a/manual/de/user_basics.ssi b/manual/de/user_basics.ssi
index 2eee04a..05401eb 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -87,7 +87,7 @@ code{
}code
This process can take a while, depending on the speed of your network
-connection. When it is complete, there should be a #{binary-hybrid.iso}#
+connection. When it is complete, there should be a #{binary.hybrid.iso}#
image file, ready to use, in the current directory.
2~using-iso-hybrid Using an ISO hybrid live image
@@ -106,7 +106,7 @@ code{
# apt-get install wodim
- $ wodim binary-hybrid.iso
+ $ wodim binary.hybrid.iso
}code
@@ -127,7 +127,7 @@ any previous contents on your stick!}*
code{
- $ dd if=binary-hybrid.iso of=${USBSTICK}
+ $ dd if=binary.hybrid.iso of=${USBSTICK}
}code
@@ -146,8 +146,8 @@ normal boot device.
Once you've booted the media, you are presented with a boot menu. If you
just press enter here, the system will boot using the default entry,
#{Live}# and default options. For more information about boot options, see
-the "help" entry in the menu and also the #{live-boot}# and #{live-config}#
-man pages found within the live system.
+the "help" entry in the menu and also the live-boot and live-config man
+pages found within the live system.
Assuming you've selected #{Live}# and booted a default desktop live image,
after the boot messages scroll by, you should be automatically logged into
@@ -179,12 +179,12 @@ software and choose one that is suitable for your needs.
3~testing-iso-with-qemu Testing an ISO image with QEMU
The most versatile VM in Debian is QEMU. If your processor has hardware
-support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}#
+support for virtualization, use the /{qemu-kvm}/ package; the /{qemu-kvm}/
package description briefly lists the requirements.
-First, install #{qemu-kvm}# if your processor supports it. If not, install
-#{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in
-the following examples. The #{qemu-utils}# package is also valuable for
+First, install /{qemu-kvm}/ if your processor supports it. If not, install
+/{qemu}/, in which case the program name is #{qemu}# instead of #{kvm}# in
+the following examples. The /{qemu-utils}/ package is also valuable for
creating virtual disk images with #{qemu-img}#.
code{
@@ -197,7 +197,7 @@ Booting an ISO image is simple:
code{
- $ kvm -cdrom binary-hybrid.iso
+ $ kvm -cdrom binary.hybrid.iso
}code
@@ -205,7 +205,7 @@ See the man pages for more details.
3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
-In order to test the ISO with #{virtualbox-ose}#:
+In order to test the ISO with /{virtualbox-ose}/:
code{
@@ -216,12 +216,9 @@ code{
}code
Create a new virtual machine, change the storage settings to use
-#{binary-hybrid.iso}# as the CD/DVD device, and start the machine.
+#{binary.hybrid.iso}# as the CD/DVD device, and start the machine.
-Note: For live systems containing X.org that you want to test with
-#{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver
-package, #{virtualbox-ose-guest-x11}#, in your live-build
-configuration. Otherwise, the resolution is limited to 800x600.
+*{Note:}* For live systems containing X.org that you want to test with /{virtualbox-ose}/, you may wish to include the VirtualBox X.org driver package, /{virtualbox-ose-guest-x11}/, in your live-build configuration. Otherwise, the resolution is limited to 800x600.
code{
@@ -240,9 +237,7 @@ which does not handle hybrid images properly, or want to use the remaining
space on the media for some purpose, such as a persistence partition, you
need an HDD image.
-Note: if you created an ISO hybrid image with the previous example, you will
-need to clean up your working directory with the #{lb clean}# command (see
-{The lb clean command}#lb-clean):
+*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):
code{
@@ -276,11 +271,11 @@ The generated binary image contains a VFAT partition and the syslinux
bootloader, ready to be directly written on a USB stick. Since using an HDD
image is just like using an ISO hybrid image on USB, follow the instructions
in {Using an ISO hybrid live image}#using-iso-hybrid, except use the
-filename #{binary.img}# instead of #{binary-hybrid.iso}#.
+filename #{binary.img}# instead of #{binary.hybrid.iso}#.
3~testing-hdd-with-qemu Testing an HDD image with Qemu
-First, install QEMU as described above in {Testing an ISO image with
+First, install /{qemu}/ as described above in {Testing an ISO image with
QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on
which version your host system needs, specifying #{binary.img}# as the first
hard drive.
@@ -294,7 +289,7 @@ code{
3~using-usb-extra-space Using the space left on a USB stick
To use the remaining free space after copying #{binary.img}# to a USB stick,
-use a partitioning tool such as #{gparted}# or #{parted}# to create a new
+use a partitioning tool such as /{gparted}/ or /{parted}/ to create a new
partition on the stick. The first partition will be used by the Debian Live
system.
@@ -314,10 +309,7 @@ code{
}code
-Note: If you want to use the extra space with Windows, apparently that OS
-cannot normally access any partitions but the first. Some solutions to this
-problem have been discussed on our {mailing list}#contact, but it seems
-there are no easy answers.
+*{Note:}* If you want to use the extra space with Windows, apparently that OS cannot normally access any partitions but the first. Some solutions to this problem have been discussed on our {mailing list}#contact, but it seems there are no easy answers.
*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image, so back up your extra partition first to restore again after updating the live image.}*
@@ -327,8 +319,7 @@ The following sequence of commands will create a basic netboot image
containing the Debian standard system without X.org. It is suitable for
booting over the network.
-Note: if you performed any previous examples, you will need to clean up your
-working directory with the #{lb clean}# command:
+*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:
code{
@@ -410,9 +401,10 @@ code{
This serves the kernel and initial ramdisk to the system at run time.
-You should install the tftpd-hpa package. It can serve all files contained
-inside a root directory, usually #{/srv/tftp}#. To let it serve files inside
-#{/srv/debian-live/tftpboot}#, run as root the following command:
+You should install the /{tftpd-hpa}/ package. It can serve all files
+contained inside a root directory, usually #{/srv/tftp}#. To let it serve
+files inside #{/srv/debian-live/tftpboot}#, run as root the following
+command:
code{
@@ -428,7 +420,7 @@ Once the guest computer has downloaded and booted a Linux kernel and loaded
its initrd, it will try to mount the Live filesystem image through a NFS
server.
-You need to install the #{nfs-kernel-server}# package.
+You need to install the /{nfs-kernel-server}/ package.
Then, make the filesystem image available through NFS by adding a line like
the following to #{/etc/exports}#:
@@ -463,7 +455,7 @@ To make our life easier, we can use virtualization. There are two solutions.
3~ Qemu
-_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#.
+_* Install /{qemu}/, /{bridge-utils}/, /{sudo}/.
Edit #{/etc/qemu-ifup}#:
diff --git a/manual/de/user_customization-binary.ssi b/manual/de/user_customization-binary.ssi
index 73cfb15..c83563a 100644
--- a/manual/de/user_customization-binary.ssi
+++ b/manual/de/user_customization-binary.ssi
@@ -47,7 +47,7 @@ code{
include menu.cfg
default vesamenu.c32
prompt 0
- timeout 5
+ timeout 50
}code
@@ -59,7 +59,7 @@ code{
#!/bin/sh
- sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg
+ sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg
}code
diff --git a/manual/de/user_customization-contents.ssi b/manual/de/user_customization-contents.ssi
index 4d67a3c..e6237cf 100644
--- a/manual/de/user_customization-contents.ssi
+++ b/manual/de/user_customization-contents.ssi
@@ -43,7 +43,7 @@ see {Live/chroot local hooks}#live-chroot-local-hooks if processing is
needed.
To include files, simply add them to your #{config/includes.chroot}#
-directory. This directory corresponds to the root directory (#{/}#) of the
+directory. This directory corresponds to the root directory #{/}# of the
live system. For example, to add a file #{/var/www/index.html}# in the live
system, use:
@@ -151,5 +151,5 @@ followed by the stage (#{.chroot}# or #{.binary}#) are considered to be
debconf preseed files and are installed by live-build using
#{debconf-set-selections}# during the corresponding stage.
-For more information about debconf, please see debconf(7) in the #{debconf}#
-package.
+For more information about debconf, please see #{debconf(7)}# in the
+/{debconf}/ package.
diff --git a/manual/de/user_customization-installer.ssi b/manual/de/user_customization-installer.ssi
index a41a62d..65f9860 100644
--- a/manual/de/user_customization-installer.ssi
+++ b/manual/de/user_customization-installer.ssi
@@ -18,7 +18,7 @@ The three main types of installer are:
*{"Regular" Debian Installer}*: This is a normal Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as "combined images".
On such images, Debian is installed by fetching and installing .deb packages
-using #{debootstrap}# or #{cdebootstrap}#, from the local media or some
+using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some
network-based network, resulting in a standard Debian system being installed
to the hard disk.
@@ -31,16 +31,14 @@ the image and enable it for you.
Installation will proceed in an identical fashion to the "Regular"
installation described above, but at the actual package installation stage,
-instead of using #{debootstrap}# to fetch and install packages, the live
+instead of using /{debootstrap}/ to fetch and install packages, the live
filesystem image is copied to the target. This is achieved with a special
udeb called live-installer.
After this stage, the Debian Installer continues as normal, installing and
configuring items such as bootloaders and local users, etc.
-Note: to support both normal and live installer entries in the bootloader of
-the same live media, you must disable live-installer by preseeding
-#{live-installer/enable=false}#.
+*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.
*{"Desktop" Debian Installer}*: Regardless of the type of Debian Installer included, #{d-i}# can be launched from the Desktop by clicking on an icon. This is user friendlier in some situations. In order to make use of this, the debian-installer-launcher package needs to be included.
@@ -86,4 +84,4 @@ built #{d-i}# component udeb packages. Place these in
replacement files and directories may be included in the installer initrd as
well, in a similar fashion to {Live/chroot local
includes}#live-chroot-local-includes, by placing the material in
-#{config/binary_debian-installer-includes/}#.
+#{config/includes.binary_debian-installer/}#.
diff --git a/manual/de/user_customization-overview.ssi b/manual/de/user_customization-overview.ssi
index 137e322..0e2fec2 100644
--- a/manual/de/user_customization-overview.ssi
+++ b/manual/de/user_customization-overview.ssi
@@ -55,7 +55,7 @@ in place.
2~ Supplement lb config with files
-Although #{lb config}# does create a skeletal configuration in the config/
+Although #{lb config}# creates a skeletal configuration in the config/
directory, to accomplish your goals, you may need to provide additional
files in subdirectories of config/. Depending on where the files are stored
in the configuration, they may be copied into the live system's filesystem
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index 4542f38..eb3724f 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -11,12 +11,12 @@ areas. To ensure decent download speeds, you should choose a nearby
distribution mirror. You can also add your own repositories for backports,
experimental or custom packages, or include packages directly as files. You
can define your own lists of packages to include, use live-build's
-predefined lists, use #{tasksel}# tasks, or a combination of all
-three. Finally, a number of options give some control over apt, or if you
-prefer, aptitude, at build time when packages are installed. You may find
-these handy if you use a proxy, want to disable installation of recommended
-packages to save space, or need to control which versions of packages are
-installed via APT pinning, to name a few possibilities.
+predefined lists, use /{tasksel}/ tasks, or a combination of all
+three. Finally, a number of options give some control over /{apt}/, or if
+you prefer, /{aptitude}/, at build time when packages are installed. You may
+find these handy if you use a proxy, want to disable installation of
+recommended packages to save space, or need to control which versions of
+packages are installed via APT pinning, to name a few possibilities.
2~ Package sources
@@ -24,12 +24,12 @@ installed via APT pinning, to name a few possibilities.
The distribution you choose has the broadest impact on which packages are
available to include in your live image. Specify the codename, which
-defaults to #{wheezy}# for the Wheezy version of live-build. Any current
+defaults to wheezy for the wheezy version of live-build. Any current
distribution carried in the Debian archive may be specified by its codename
here. (See {Terms}#terms for more details.) The #{--distribution}# option
not only influences the source of packages within the archive, but also
-instructs #{live-build}# to behave as needed to build each supported
-distribution. For example, to build against the *{unstable}* release, Sid,
+instructs live-build to behave as needed to build each supported
+distribution. For example, to build against the *{unstable}* release, sid,
specify:
code{
@@ -65,10 +65,10 @@ the world so that people in each region can choose a nearby mirror for best
download speed. Each of the #{--mirror-*}# options governs which
distribution mirror is used at various stages of the build. Recall from
{Stages of the build}#stages-of-the-build that the *{bootstrap}* stage is
-when the chroot is initially populated by debootstrap with a minimal system,
-and the *{chroot}* stage is when the chroot used to construct the live
-system's filesystem is built. Thus, the corresponding mirror switches are
-used for those stages, and later, in the *{binary}* stage, the
+when the chroot is initially populated by /{debootstrap}/ with a minimal
+system, and the *{chroot}* stage is when the chroot used to construct the
+live system's filesystem is built. Thus, the corresponding mirror switches
+are used for those stages, and later, in the *{binary}* stage, the
#{--mirror-binary}# and #{--mirror-binary-security}# values are used,
superceding any mirrors used in an earlier stage.
@@ -209,8 +209,8 @@ includes. Refer to these in the #{/usr/share/live/build/package-lists/}#
directory, as they serve as good examples of how to write your own lists.
For example, to make a list that includes the predefined #{gnome}# list plus
-iceweasel, create #{config/package-lists/my.list.chroot}# with the following
-contents:
+/{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the
+following contents:
code{
@@ -240,7 +240,7 @@ code{
}code
You may test for any one of a number of values, e.g. to install
-#{memtest86+}# if either #{--architectures i386}# or #{--architectures
+/{memtest86+}/ if either #{--architectures i386}# or #{--architectures
amd64}# is specified:
code{
@@ -252,7 +252,7 @@ code{
}code
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
+e.g. to install /{vrms}/ if either #{contrib}# or #{non-free}# is specified
via #{--archive-areas}#:
code{
@@ -294,7 +294,7 @@ code{
The primary tasks available in the Debian Installer can be listed with
#{tasksel --list-tasks}# in the live system. The contents of any task,
-including ones not included in this list, may be examined with #{tasksel
+including the ones not included in this list, may be examined with #{tasksel
--task-packages}#.
3~desktop-and-language-tasks Desktop and language tasks
@@ -427,7 +427,7 @@ man page.
3~choosing-apt-or-aptitude Choosing apt or aptitude
-You can elect to use either #{apt}# or #{aptitude}# when installing packages
+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
to #{lb config}#. Choose the method implementing the preferred behaviour for
package installation, the notable difference being how missing packages are
@@ -466,11 +466,11 @@ code{
}code
-This will not influence the entries in /etc/apt/sources.list, but merely
-whether /var/lib/apt contains the indices files or not. The tradeoff is that
-APT needs those indices in order to operate in the live system, so before
-performing #{apt-cache search}# or #{apt-get install}#, for instance, the
-user must #{apt-get update}# first to create those indices.
+This will not influence the entries in #{/etc/apt/sources.list}#, but merely
+whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is
+that APT needs those indices in order to operate in the live system, so
+before performing #{apt-cache search}# or #{apt-get install}#, for instance,
+the user must #{apt-get update}# first to create those indices.
If you find the installation of recommended packages bloats your image too
much, you may disable that default option of APT with:
@@ -507,11 +507,11 @@ 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/includes.chroot/etc/apt/preferences}#.
-Let's say you are building a Wheezy 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
+Let's say you are building a wheezy 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, Wheezy. The following will
+taken from the target system distribution, wheezy. The following will
accomplish this:
code{
@@ -529,7 +529,7 @@ code{
}code
-*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with Wheezy using:
+*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:
code{
@@ -541,9 +541,9 @@ 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
package. Suppose you are building an LXDE image using #{--package-lists
lxde}# option, but don't want the user prompted to store wifi passwords in
-the keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in
-turn recommends #{gnome-keyring}#. So you want to omit the recommended
-#{gnome-keyring}# package. This can be done by adding the following stanza
+the keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in
+turn recommends /{gnome-keyring}/. So you want to omit the recommended
+/{gnome-keyring}/ package. This can be done by adding the following stanza
to #{config/chroot_apt/preferences}#:
code{
diff --git a/manual/de/user_customization-runtime.ssi b/manual/de/user_customization-runtime.ssi
index bd4c0fe..a5dc96b 100644
--- a/manual/de/user_customization-runtime.ssi
+++ b/manual/de/user_customization-runtime.ssi
@@ -130,7 +130,7 @@ other media in addition to CDs; but still, in its default behaviour, it
should be considered read-only and all the run-time evolutions of the system
are lost at shutdown.
-Persistence is a common name for different kinds of solutions for saving
+'Persistence' is a common name for different kinds of solutions for saving
across reboots some, or all, of this run-time evolution of the system. To
understand how it could work it could be handy to know that even if the
system is booted and run from read-only media, modification to the files and
@@ -141,11 +141,12 @@ The data stored on this ramdisk should be saved on a writable persistent
medium like local storage media, a network share or even a session of a
multisession (re)writable CD/DVD. All these media are supported in Debian
Live in different ways, and all but the last one require a special boot
-parameter to be specified at boot time: #{persistent}#.
+parameter to be specified at boot time: #{persistence}#.
-If the boot parameter #{persistent}# is set (and #{nopersistent}# is not
+If the boot parameter #{persistence}# is set (and #{nopersistence}# is not
set), local storage media (e.g. hard disks, USB drives) will be probed for
-persistent volumes during boot. A persistent volume is any of the following:
+persistence volumes during boot. A persistence volume is any of the
+following:
_* a partition, identified by its GPT name.
@@ -154,14 +155,14 @@ _* a filesystem, identified by its filesystem label.
_* an image/archive file located on the root of any readable filesystem
(even an NTFS partition of a foreign OS), identified by its file name. In
this case the file name must also use the containing filesystem as the file
-extension, e.g. "<label>.ext3".
+extension, e.g. "<label>.ext4".
-It is possible to restrict which types of persistent volumes to use by
+It is possible to restrict which types of persistence volumes to use by
specifying certain boot parameters described in the live-boot(7) man
page. The "identifying labels" referred to above can be any of the
following:
-_* #{full-ov}# for full persistent overlays.
+_* #{full-ov}# for full persistence overlays.
_* #{custom-ov}# for custom overlays.
@@ -169,17 +170,17 @@ _* #{live-sn}# for full system snapshots.
_* #{home-sn}# for /home snapshots.
-3~ Full persistent overlays
+3~ Full persistence overlays
By 'full persistence' it is meant that instead of using a tmpfs for storing
modifications to the read-only media (with the copy-on-write, COW, system) a
-persistent volume is used. For this type of persistence the volume label
-must be #{full-ov}#. This could, for instance, be an ext2 partition on a
+persistence volume is used. For this type of persistence the volume label
+must be #{full-ov}#. This could, for instance, be an ext4 partition on a
hard disk or on a usb key created with, e.g.:
code{
- # mkfs.ext2 -L full-ov /dev/sdb1
+ # mkfs.ext4 -L full-ov /dev/sdb1
}code
@@ -194,13 +195,13 @@ code{
}code
-Here's an example of how to create an ext2-based image file used for full
+Here's an example of how to create an ext4-based image file used for full
persistence:
code{
$ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file
- $ /sbin/mkfs.ext2 -F full-ov
+ $ /sbin/mkfs.ext4 -F full-ov
}code
@@ -210,52 +211,53 @@ reboot.
3~ Custom overlays
A volume with the label #{custom-ov}# can be configured to make arbitrary
-directories persistent. The file #{live.persist}#, located on the volume's
-filesystem root, controls which directories it makes persistent, and in
-which way.
+directories persistent. The file #{live-persistence.conf}#, located on the
+volume's filesystem root, controls which directories it makes persistent,
+and in which way.
How custom overlay mounts are configured is described in full detail in the
-live.persist(5) man page, but a simple example should be sufficient for most
-uses. Let's say we want to make our home directory and APT cache persistent
-in an ext3 filesystem on the /dev/sdb1 partition:
+live-persistence.conf(5) man page, but a simple example should be sufficient
+for most uses. Let's say we want to make our home directory and APT cache
+persistent in an ext4 filesystem on the /dev/sdb1 partition:
code{
- $ mkfs.ext3 -L custom-ov /dev/sdb1
- $ mount -t ext3 /dev/sdb1 /mnt
- $ echo "/home" >> /mnt/live.persist
- $ echo "/var/cache/apt" >> /mnt/live.persist
+ $ mkfs.ext4 -L custom-ov /dev/sdb1
+ $ mount -t ext4 /dev/sdb1 /mnt
+ $ echo "/home" >> /mnt/live-persistence.conf
+ $ echo "/var/cache/apt" >> /mnt/live-persistence.conf
}code
-Then we reboot. During the first boot the contents of /home and
-/var/cache/apt will be copied into the persistent volume, and from then on
-all changes to these directories will live in the persistent volume. Please
-note that any paths listed in the #{live.persist}# file cannot contain white
-spaces or the special "." and ".." path components. Also, neither "/live"
-(or any of its sub-directories) nor "/" can be made persistent using custom
-mounts (for the latter, use the #{full-ov}# type persistence described
-above).
-
-Several different custom overlay volumes (with their own #{live.persist}#
-files) can be used at the same time, but if several volumes make the same
-directory persistent, only one of them will be used. If any two mounts are
-"nested" (i.e. one is a sub-directory of the other) the parent will be
-mounted before the child so no mount will be hidden by the other. Nested
-custom mounts are problematic if they are listed in the same
-#{live.persist}# file. See the live.persist(5) man page for how to handle
-that case if you really need it (hint: you usually don't).
+Then we reboot. During the first boot the contents of #{/home}# and
+#{/var/cache/apt}# will be copied into the persistence volume, and from then
+on all changes to these directories will live in the persistence
+volume. Please note that any paths listed in the #{live-persistence.conf}#
+file cannot contain white spaces or the special #{.}# and #{..}# path
+components. Also, neither #{/live}# (or any of its sub-directories) nor
+#{/}# can be made persistent using custom mounts (for the latter, use the
+#{full-ov}# type persistence described above).
+
+Several different custom overlay volumes (with their own
+#{live-persistence.conf}# files) can be used at the same time, but if
+several volumes make the same directory persistent, only one of them will be
+used. If any two mounts are "nested" (i.e. one is a sub-directory of the
+other) the parent will be mounted before the child so no mount will be
+hidden by the other. Nested custom mounts are problematic if they are listed
+in the same #{live-persistence.conf}# file. See the live-persistence.conf(5)
+man page for how to handle that case if you really need it (hint: you
+usually don't).
3~ Snapshots
Snapshots are collections of files and directories which are not mounted
-while running but which are copied from a persistent volume to the system
+while running but which are copied from a persistence volume to the system
(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The
volume must be labeled #{live-sn}#, and it defaults to a simple cpio archive
named #{live-sn.cpio.gz}#. A power interruption during run time could lead
to data loss, hence, if you have important changes, invoke #{live-snapshot
--refresh}# as often as needed. This type of persistence, since it does not
-write continuously to the persistent media, is the most flash-based device
+write continuously to the persistence media, is the most flash-based device
friendly and the fastest of all the persistence systems, but it occupies as
much RAM as the size of the uncompressed snapshot.
@@ -264,15 +266,15 @@ works the same as the main snapshot but it is only applied to /home.
Snapshots cannot currently handle file deletion.
-3~ Persistent SubText
+3~ Persistence SubText
-If a user would need multiple persistent storage of the same type for
+If a user would need multiple persistence storage of the same type for
different locations or testing, such as #{full-ov-nonwork}# and
-#{full-ov-work}#, the boot parameter #{persistent-subtext}# used in
-conjunction with the boot parameter #{persistent}# will allow for multiple
-but unique persistent media. An example would be if a user wanted to use a
-persistent partition labeled #{live-sn-subText}# they would use the boot
-parameters of: #{persistent}# #{persistent-subtext=subText}#.
+#{full-ov-work}#, the boot parameter #{persistence-subtext}# used in
+conjunction with the boot parameter #{persistence}# will allow for multiple
+but unique persistence media. An example would be if a user wanted to use a
+persistence partition labeled #{live-sn-subText}# they would use the boot
+parameters of: #{persistence}# #{persistence-subtext=subText}#.
3~ Partial remastering
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
index a87a36f..2b724dc 100644
--- a/manual/de/user_examples.ssi
+++ b/manual/de/user_examples.ssi
@@ -60,7 +60,7 @@ code{
}code
Assuming all goes well, after a while, the current directory will contain
-#{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a
+#{binary.hybrid.iso}#. This ISO hybrid image can be booted directly in a
virtual machine as described in {Testing an ISO image with
Qemu}#testing-iso-with-qemu and {Testing an ISO image with
virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical
@@ -149,9 +149,9 @@ code{
First, #{--architectures i386}# ensures that on our #{amd64}# build system,
we build a 32-bit version suitable for use on most machines. Second, we use
#{--linux-flavours 686-pae}# because we don't anticipate using this image on
-much older systems. Third, we've chosen the #{lxde}# package list to give us
+much older systems. Third, we've chosen the /{lxde}/ package list to give us
a minimal desktop. And finally, we have added two initial favourite
-packages: #{iceweasel}# and #{xchat}#.
+packages: /{iceweasel}/ and /{xchat}/.
Now, build the image:
@@ -179,7 +179,7 @@ code{
3~ Second revision
In this revision, we're going to clean up from the first build, add the
-#{vlc}# package to our configuration, rebuild, test and commit.
+/{vlc}/ package to our configuration, rebuild, test and commit.
The #{lb clean}# command will clean up all generated files from the previous
build except for the cache, which saves having to re-download packages. This
@@ -192,7 +192,7 @@ code{
}code
-Now append the #{vlc}# package to our local package list in
+Now append the /{vlc}/ package to our local package list in
#{config/package-lists/my.list.chroot}#:
code{
@@ -235,8 +235,8 @@ cases drawn from the collected experiences of users of Debian Live.
*{Use case:}* Create an image with live-build to boot directly to a VNC server.
Make a build directory and create a skeletal configuration in it built
-around the standard-x11 list, including #{gdm3}#, #{metacity}# and
-#{xvnc4viewer}#, disabling recommends to make a minimal system:
+around the standard-x11 list, including /{gdm3}/, /{metacity}/ and
+/{xvnc4viewer}/, disabling recommends to make a minimal system:
code{
@@ -249,8 +249,8 @@ code{
}code
Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for
-the default user that will launch metacity and start xvncviewer, connecting
-to port #{5901}# on a server at #{192.168.1.2}#:
+the default user that will launch /{metacity}/ and start /{xvncviewer}/,
+connecting to port #{5901}# on a server at #{192.168.1.2}#:
code{
@@ -285,9 +285,9 @@ the tradeoffs you are making between size and functionality. In this
example, we trim only so much as to make room for additional material within
a 128M media size, but without doing anything to destroy integrity of the
packages contained within, such as the purging of locale data via the
-#{localepurge}# package, or other such "intrusive" optimizations. Of
+/{localepurge}/ package, or other such "intrusive" optimizations. Of
particular note, you should not use #{--bootstrap-flavour minimal}# unless
-you really know what you're doing, as omitting priority #{important}#
+you really know what you're doing, as omitting priority *{important}*
packages will most likely produce a broken live system.
code{
@@ -318,7 +318,7 @@ system. Choosing the #{minimal}# package list leaves out the large
#{locales}# package and associated utilities. Dropping recommended packages
with #{--apt-recommends false}# saves some additional space, at the expense
of omitting some packages you might otherwise expect to be there, such as
-#{firmware-linux-free}# which may be needed to support certain hardware. The
+/{firmware-linux-free}/ which may be needed to support certain hardware. The
remaining options shave off additional small amounts of space. It's up to
you to decide if the functionality that is sacrificed with each optimization
is worth the loss in functionality.
@@ -385,7 +385,7 @@ code{
}code
-Note that we have included the #{debian-installer-launcher}# package to
-launch the installer from the live desktop, and have also specified the 486
-flavour kernel, as it is currently necessary to make the installer and live
-system kernels match for the launcher to work properly.
+Note that we have included the debian-installer-launcher package to launch
+the installer from the live desktop, and have also specified the 486 flavour
+kernel, as it is currently necessary to make the installer and live system
+kernels match for the launcher to work properly.
diff --git a/manual/de/user_installation.ssi b/manual/de/user_installation.ssi
index 1949e3d..c5aa801 100644
--- a/manual/de/user_installation.ssi
+++ b/manual/de/user_installation.ssi
@@ -132,12 +132,12 @@ if that is your reason for building these packages from source.
_* Build live-boot and live-config .deb files
You must build either on your target distribution or in a chroot containing
-your target platform: this means if your target is Wheezy then you should
-build against Wheezy.
+your target platform: this means if your target is wheezy then you should
+build against wheezy.
Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to
-build #{live-boot}# for a target distribution that differs from your build
-system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy
+build live-boot for a target distribution that differs from your build
+system. For example, for wheezy live images, build live-boot in a wheezy
chroot. If your target distribution happens to match your build system
distribution, you may build directly on the build system using
#{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
diff --git a/manual/de/user_managing_a_configuration.ssi b/manual/de/user_managing_a_configuration.ssi
index 7df1d34..8f6089a 100644
--- a/manual/de/user_managing_a_configuration.ssi
+++ b/manual/de/user_managing_a_configuration.ssi
@@ -34,7 +34,7 @@ options, and an auto/clean that removes the files containing configuration
variable values, and each time you run #{lb config}# and #{lb clean}#, these
files will be executed. This will ensure that your configuration is kept
internally consistent from one revision to the next and from one live-build
-release to the next (though you will still have to take care and read the
+release to the next (Although you will still have to take care and read the
documentation when you upgrade live-build and make adjustments as needed).
2~ Example auto scripts
diff --git a/manual/de/user_overview.ssi b/manual/de/user_overview.ssi
index beda6d4..c0e59b5 100644
--- a/manual/de/user_overview.ssi
+++ b/manual/de/user_overview.ssi
@@ -14,11 +14,11 @@ The idea behind live-build is to be a framework that uses a configuration
directory to completely automate and customize all aspects of building a
Live image.
-Many concepts are similar to those in the debhelper Debian package tools
+Many concepts are similar to those in the /{debhelper}/ Debian package tools
written by Joey Hess:
_* The scripts have a central location for configuring their operation. In
-debhelper, this is the #{debian/}# subdirectory of a package tree. For
+/{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For
example, dh_install will look, amongst others, for a file called
#{debian/install}# to determine which files should exist in a particular
binary package. In much the same way, live-build stores its configuration
@@ -27,9 +27,9 @@ entirely under a #{config/}# subdirectory.
_* The scripts are independent - that is to say, it is always safe to run
each command.
-Unlike debhelper, live-build contains a tool to generate a skeleton
+Unlike /{debhelper}/, live-build contains a tool to generate a skeleton
configuration directory, #{lb config}#. This could be considered to be
-similar to tools such as #{dh-make}#. For more information about #{lb
+similar to tools such as /{dh-make}/. For more information about #{lb
config}#, please see {The lb config command}#lb-config.
The remainder of this section discusses the three most important commands:
diff --git a/manual/en/about_manual.ssi b/manual/en/about_manual.ssi
index 02d8c25..a8bf5c9 100644
--- a/manual/en/about_manual.ssi
+++ b/manual/en/about_manual.ssi
@@ -2,13 +2,19 @@
1~about-manual About this manual
-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 7.0 "Wheezy" 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.
+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 7.0 "wheezy" release. An up-to-date version can always be found at http://live.debian.net/
+
+While live-manual 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 using #{sudo}#. To distinguish between commands which may be executed by an unprivileged user and those requiring superuser privileges, commands are prepended by #{$}# or #{#}# respectively. This symbol is not a part of the command.
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 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 ski
pping {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.
+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 Terms
@@ -22,11 +28,11 @@ _* *{Host system}*: The environment used to create the live system.
_* *{Target system}*: The environment used to run the live system.
-_* *{live-boot}*: A collection of scripts used to boot live systems. live-boot was formerly a part of live-initramfs.
+_* *{live-boot}*: A collection of scripts used to boot live systems. live-boot was formerly a part of /{live-initramfs}/.
-_* *{live-build}*: A collection of scripts used to build customized Debian Live systems. live-build was formerly known as live-helper, and even earlier known as live-package.
+_* *{live-build}*: A collection of scripts used to build customized Debian Live systems. live-build was formerly known as /{live-helper}/, and even earlier known as /{live-package}/.
-_* *{live-config}*: A collection of scripts used to configure a live system during the boot process. live-config was formerly a part of live-initramfs.
+_* *{live-config}*: A collection of scripts used to configure a live system during the boot process. live-config was formerly a part of /{live-initramfs}/.
_* *{live-manual}*: This document is maintained in a package called live-manual.
@@ -34,15 +40,13 @@ _* *{Debian Installer (d-i)}*: The official installation system for the Debian d
_* *{Boot parameters}*: Parameters that can be entered at the bootloader prompt to influence the kernel or live-config.
-_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run different instances of the GNU/Linux environment on a single system simultaneously without rebooting.
+_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run different instances of the GNU/Linux environment on a single system simultaneously without rebooting.
_* *{Binary image}*: A file containing the live system, such as binary.iso or binary.img.
_* *{Target distribution}*: The distribution upon which your live system will be based. This can differ from the distribution of your host system.
-_* *{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.
-
-The *{stable}* distribution contains the latest officially released distribution of Debian. The *{testing}* distribution is the staging area for the next *{stable}* release. A major advantage of using this distribution is that it has more recent versions of software relative to the *{stable}* release. The *{unstable}* distribution is where active development of Debian occurs. Generally, this distribution is run by developers and those who like to live on the edge.
+_* *{stable/testing/unstable}*: The *{stable}* distribution contains the latest officially released distribution of Debian. The *{testing}* distribution is the staging area for the next *{stable}* release. A major advantage of using this distribution is that it has more recent versions of software relative to the *{stable}* release. The *{unstable}* distribution is where active development of Debian occurs. Generally, this distribution is run by developers and those who like to live on the edge. Throughout the manual, we tend to use codenames for the releases, such as wheezy or sid, as that is what is supported by the tools themselves.
2~ Authors
@@ -167,23 +171,9 @@ 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 translation files:
-
-code{
-
- $ make commit
-
-}code
-
-_* Then
-
-code{
-
- $ git add .
-
-}code
+_* Do not use #{make commit}# unless you are updating translations in this commit, and in that case, do not mix changes to the English manual and translations in the same commit, but use separate commits for each. See the {Translation}#translation section for more details.
-_* 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.
+_* Write commit messages that consist of complete, meaningful 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{
@@ -203,7 +193,7 @@ code{
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.
+_* 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.
_* Once the new language is added, you can randomly start translating all po files in #{manual/po/}#.
diff --git a/manual/en/about_project.ssi b/manual/en/about_project.ssi
index f47290f..2f552b3 100644
--- a/manual/en/about_project.ssi
+++ b/manual/en/about_project.ssi
@@ -28,7 +28,7 @@ _* They are not available in different flavours, e.g. CDs, DVDs, USB-stick and n
Debian is the Universal Operating System: Debian has a live system to show around and to accurately represent the Debian system with the following main advantages:
-_* It would be a subproject of Debian.
+_* It is a subproject of Debian.
_* It reflects the (current) state of one distribution.
@@ -56,9 +56,9 @@ In this phase we will not ship or install sample or alternative configurations.
Whenever we need a different default configuration, we will do that in coordination with its package maintainer in Debian.
-A system for configuring packages is provided using debconf in #{lb config}# (use --preseed FILE) allowing custom configured packages to be installed in your custom produced Debian Live images, but for official live images only default configuration will be used. For more information, please see {Customization overview}#customization-overview.
+A system for configuring packages is provided using debconf allowing custom configured packages to be installed in your custom produced Debian Live images, but for official live images only default configuration will be used. For more information, please see {Customization overview}#customization-overview.
-Exception: There are a few essential changes needed to bring a live system to life (e.g. configuring pam to allow empty passwords). These essential changes have to be kept as minimal as possible and should be merged within the Debian repository if possible.
+Exception: There are a few essential changes needed to bring a live system to life. These essential changes have to be kept as minimal as possible and should be merged within the Debian repository if possible.
2~contact Contact
@@ -66,4 +66,4 @@ _* *{Mailing list}*: The primary contact for the project is the mailing list at
_* *{IRC}*: A number of users and developers are present in the #debian-live channel on irc.debian.org (OFTC). When asking a question on IRC, please be patient for an answer. If no answer is forthcoming, please email the mailing list.
-_* *{BTS}*: The Debian Bug Tracking System (BTS) contains details of bugs reported by users and developers. Each bug is given a number, and is kept on file until it is marked as having been dealt with. For more information, please see {Reporting bugs}#bugs.
+_* *{BTS}*: The {Debian Bug Tracking System}http://www.debian.org/Bugs/ (BTS) contains details of bugs reported by users and developers. Each bug is given a number, and is kept on file until it is marked as having been dealt with. For more information, please see {Reporting bugs}#bugs.
diff --git a/manual/en/index.html.in b/manual/en/index.html.in
index 212e00e..44e335f 100644
--- a/manual/en/index.html.in
+++ b/manual/en/index.html.in
@@ -14,7 +14,7 @@
<p>
- Please report errors, omissions, patches and suggestions to our mailinglist at <a href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a> and read about <a href="html/live-manual.en.html#how-to-contribute">how to contribute</a> to the manual.
+ Please report errors, omissions, patches and suggestions to our mailing list at <a href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a> and read about <a href="html/live-manual.en.html#how-to-contribute">how to contribute</a> to the manual.
</p>
<h3>Available Formats</h3>
@@ -35,7 +35,7 @@
<h3>Source</h3>
<p>
- The sources for this manual is available in a <a href="http://git.or.cz/">Git</a> repository at live.debian.net.
+ The sources for this manual are available in a <a href="http://git.or.cz/">Git</a> repository at live.debian.net.
</p>
<ul>
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 43736ce..a74e408 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -9,13 +9,13 @@
: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>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2012-04-03
+ :published: 2012-06-04
@publisher: Debian Live Project <debian-live at lists.debian.org>
@make:
- :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/
- :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/
+ :bold: /squeeze|wheezy|sid/
+ :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
diff --git a/manual/en/project_bugs.ssi b/manual/en/project_bugs.ssi
index 765508e..e5b5edc 100644
--- a/manual/en/project_bugs.ssi
+++ b/manual/en/project_bugs.ssi
@@ -46,7 +46,7 @@ _* Version of live-boot on the live system
_* Version of live-config on the live system
-_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system
+_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system
_* Architecture of the live system
@@ -78,7 +78,7 @@ Where does the bug appear?
3~ At build time whilst bootstrapping
-live-build first bootstraps a basic Debian system with #{debootstrap}# or #{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian distribution it is bootstrapping, it may fail. If a bug appears here, check if the error is related to a specific Debian package (most likely), or if it is related to bootstrapping tool itself.
+live-build first bootstraps a basic Debian system with /{debootstrap}/ or /{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian distribution it is bootstrapping, it may fail. If a bug appears here, check if the error is related to a specific Debian package (most likely), or if it is related to bootstrapping tool itself.
In both cases, this is not a bug in Debian Live, but rather in Debian itself which we can not fix this directly. Please report such a bug against the bootstrapping tool or the failing package.
@@ -86,7 +86,7 @@ In both cases, this is not a bug in Debian Live, but rather in Debian itself whi
live-build installs additional packages from the Debian archive and depending on the Debian distribution used and the daily archive state, it can fail. If a bug appears here, check if the error is also reproducible on a normal system.
-If this is the case, this is not a bug in Debian Live, but rather in Debian - please report it against the failing package. Running #{debootstrap}# separately from the Live system build or running #{lb bootstrap --debug}# will give you more information.
+If this is the case, this is not a bug in Debian Live, but rather in Debian - please report it against the failing package. Running /{debootstrap}/ separately from the Live system build or running #{lb bootstrap --debug}# will give you more information.
Also, if you are using a local mirror and/or any of sort of proxy and you are experiencing a problem, please always reproduce it first by bootstrapping from an official mirror.
diff --git a/manual/en/project_coding-style.ssi b/manual/en/project_coding-style.ssi
index f3d9f90..a1bbd5d 100644
--- a/manual/en/project_coding-style.ssi
+++ b/manual/en/project_coding-style.ssi
@@ -12,6 +12,8 @@ _* Only use the POSIX subset - for example, use $(foo) over `foo`.
_* You can check your scripts with 'sh -n' and 'checkbashisms'.
+_* Make sure all shell code runs with 'set -e'.
+
2~ Indenting
_* Always use tabs over spaces.
@@ -49,7 +51,7 @@ Bad:
code{
- foo () {
+ Foo () {
bar
}
@@ -59,7 +61,7 @@ Good:
code{
- foo ()
+ Foo ()
{
bar
}
@@ -133,3 +135,5 @@ _* Use "#{|}#" (without the surround quotes) as a separator in calls to sed, e.g
_* Don't use the #{test}# command for comparisons or tests, use "#{[}#" "#{]}#" (without ""); e.g. "#{if [ -x /bin/foo ]; ...}#" and not "#{if test -x /bin/foo; ...}#".
_* Use #{case}# wherever possible over #{test}#, as it's easier to read and faster in execution.
+
+_* Use capitalized names for functions to limit messing with the users environment.
diff --git a/manual/en/project_procedures.ssi b/manual/en/project_procedures.ssi
index 16260bb..b5bf7e4 100644
--- a/manual/en/project_procedures.ssi
+++ b/manual/en/project_procedures.ssi
@@ -32,12 +32,19 @@ _* Images are built and mirrored on cdimage.debian.org.
2~ Point Releases
-_* Again, we need updated mirror of debian, debian-security and debian-volatile.
+_* Again, we need updated mirrors of debian, debian-security and debian-volatile.
_* Images are built and mirrored on cdimage.debian.org.
_* Send announcement mail.
+3~ Last Point Release of a Debian Release
+
+Remember to adjust both chroot and binary mirrors when building the last set of
+images for a Debian release after it has been moved away from ftp.debian.org to
+archive.debian.org. That way, old prebuilt live images are still useful without
+user modifications.
+
3~ Point release announcement template
An annoucement mail for point releases can be generated using the template below and the following command:
diff --git a/manual/en/style_guide.ssi b/manual/en/style_guide.ssi
index 9958459..b7b4092 100644
--- a/manual/en/style_guide.ssi
+++ b/manual/en/style_guide.ssi
@@ -224,9 +224,9 @@ On the other hand some translators prefer to leave the code blocks "untranslated
Leave the code blocks empty (they will be automatically added then) if you want to make your translation easier to maintain.
-_* /{New lines}/
+_* /{Newlines}/
-The translated texts need to have the exact same new lines as the original texts. Be careful to press the "Enter" key or type *{\n}* if they appear in the original files. These new lines often appear, for instance, in the code blocks.
+The translated texts need to have the exact same newlines as the original texts. Be careful to press the "Enter" key or type *{\n}* if they appear in the original files. These newlines often appear, for instance, in the code blocks.
Make no mistake, this does not mean that the translated text needs to have the same length as the English version. That is nearly impossible.
@@ -240,7 +240,7 @@ Translators should never translate:
- The commands given as examples
- - Metadata (often between colons *{:metadata:}*) especially the date in /{live-manual.ssm.po}/ because it changes every time live-manual is updated.
+ - Metadata (often between colons *{:metadata:}*)
- Links
diff --git a/manual/en/user_basics.ssi b/manual/en/user_basics.ssi
index e835b61..3ff6ab0 100644
--- a/manual/en/user_basics.ssi
+++ b/manual/en/user_basics.ssi
@@ -44,7 +44,7 @@ code{
}code
-This process can take a while, depending on the speed of your network connection. When it is complete, there should be a #{binary-hybrid.iso}# image file, ready to use, in the current directory.
+This process can take a while, depending on the speed of your network connection. When it is complete, there should be a #{binary.hybrid.iso}# image file, ready to use, in the current directory.
2~using-iso-hybrid Using an ISO hybrid live image
@@ -58,7 +58,7 @@ code{
# apt-get install wodim
- $ wodim binary-hybrid.iso
+ $ wodim binary.hybrid.iso
}code
@@ -71,7 +71,7 @@ Once you are certain you have the correct device name, use the #{dd}# command to
code{
- $ dd if=binary-hybrid.iso of=${USBSTICK}
+ $ dd if=binary.hybrid.iso of=${USBSTICK}
}code
@@ -80,7 +80,7 @@ code{
The first time you boot your live media, whether CD, DVD, USB key, or PXE boot, some setup in your computer's BIOS may be needed first. Since BIOSes vary greatly in features and key bindings, we cannot get into the topic in depth here. Some BIOSes provide a key to bring up a menu of boot devices at boot time, which is the easiest way if it is available on your system. Otherwise, you need to enter the BIOS configuration menu and change the boot order to place the boot device for the live system before your normal boot device.
-Once you've booted the media, you are presented with a boot menu. If you just press enter here, the system will boot using the default entry, #{Live}# and default options. For more information about boot options, see the "help" entry in the menu and also the #{live-boot}# and #{live-config}# man pages found within the live system.
+Once you've booted the media, you are presented with a boot menu. If you just press enter here, the system will boot using the default entry, #{Live}# and default options. For more information about boot options, see the "help" entry in the menu and also the live-boot and live-config man pages found within the live system.
Assuming you've selected #{Live}# and booted a default desktop live image, after the boot messages scroll by, you should be automatically logged into the #{user}# account and see a desktop, ready to use. If you've booted a console-only image, such as #{standard}# or #{rescue}# flavour prebuilt images, you should be automatically logged in on the console to the #{user}# account and see a shell prompt, ready to use.
@@ -100,9 +100,9 @@ Provided you can work within these constraints, survey the available VM software
3~testing-iso-with-qemu Testing an ISO image with QEMU
-The most versatile VM in Debian is QEMU. If your processor has hardware support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# package description briefly lists the requirements.
+The most versatile VM in Debian is QEMU. If your processor has hardware support for virtualization, use the /{qemu-kvm}/ package; the /{qemu-kvm}/ package description briefly lists the requirements.
-First, install #{qemu-kvm}# if your processor supports it. If not, install #{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in the following examples. The #{qemu-utils}# package is also valuable for creating virtual disk images with #{qemu-img}#.
+First, install /{qemu-kvm}/ if your processor supports it. If not, install /{qemu}/, in which case the program name is #{qemu}# instead of #{kvm}# in the following examples. The /{qemu-utils}/ package is also valuable for creating virtual disk images with #{qemu-img}#.
code{
@@ -114,7 +114,7 @@ Booting an ISO image is simple:
code{
- $ kvm -cdrom binary-hybrid.iso
+ $ kvm -cdrom binary.hybrid.iso
}code
@@ -122,7 +122,7 @@ See the man pages for more details.
3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
-In order to test the ISO with #{virtualbox-ose}#:
+In order to test the ISO with /{virtualbox-ose}/:
code{
@@ -132,9 +132,9 @@ code{
}code
-Create a new virtual machine, change the storage settings to use #{binary-hybrid.iso}# as the CD/DVD device, and start the machine.
+Create a new virtual machine, change the storage settings to use #{binary.hybrid.iso}# as the CD/DVD device, and start the machine.
-Note: For live systems containing X.org that you want to test with #{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. Otherwise, the resolution is limited to 800x600.
+*{Note:}* For live systems containing X.org that you want to test with /{virtualbox-ose}/, you may wish to include the VirtualBox X.org driver package, /{virtualbox-ose-guest-x11}/, in your live-build configuration. Otherwise, the resolution is limited to 800x600.
code{
@@ -146,7 +146,7 @@ code{
Building an HDD image is similar to ISO hybrid in all respects except you specify #{-b hdd}# and the resulting filename is #{binary.img}# which cannot be burnt to optical media. It is suitable for booting from USB sticks, USB hard drives, and various other portable storage devices. Normally, an ISO hybrid image can be used for this purpose instead, but if you have a BIOS which does not handle hybrid images properly, or want to use the remaining space on the media for some purpose, such as a persistence partition, you need an HDD image.
-Note: if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):
+*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):
code{
@@ -174,11 +174,11 @@ When the build finishes, a #{binary.img}# file should be present in the current
2~using-hdd-image Using an HDD image
-The generated binary image contains a VFAT partition and the syslinux bootloader, ready to be directly written on a USB stick. Since using an HDD image is just like using an ISO hybrid image on USB, follow the instructions in {Using an ISO hybrid live image}#using-iso-hybrid, except use the filename #{binary.img}# instead of #{binary-hybrid.iso}#.
+The generated binary image contains a VFAT partition and the syslinux bootloader, ready to be directly written on a USB stick. Since using an HDD image is just like using an ISO hybrid image on USB, follow the instructions in {Using an ISO hybrid live image}#using-iso-hybrid, except use the filename #{binary.img}# instead of #{binary.hybrid.iso}#.
3~testing-hdd-with-qemu Testing an HDD image with Qemu
-First, install QEMU as described above in {Testing an ISO image with QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which version your host system needs, specifying #{binary.img}# as the first hard drive.
+First, install /{qemu}/ as described above in {Testing an ISO image with QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which version your host system needs, specifying #{binary.img}# as the first hard drive.
code{
@@ -188,7 +188,7 @@ code{
3~using-usb-extra-space Using the space left on a USB stick
-To use the remaining free space after copying #{binary.img}# to a USB stick, use a partitioning tool such as #{gparted}# or #{parted}# to create a new partition on the stick. The first partition will be used by the Debian Live system.
+To use the remaining free space after copying #{binary.img}# to a USB stick, use a partitioning tool such as /{gparted}/ or /{parted}/ to create a new partition on the stick. The first partition will be used by the Debian Live system.
code{
@@ -204,7 +204,7 @@ code{
}code
-Note: If you want to use the extra space with Windows, apparently that OS cannot normally access any partitions but the first. Some solutions to this problem have been discussed on our {mailing list}#contact, but it seems there are no easy answers.
+*{Note:}* If you want to use the extra space with Windows, apparently that OS cannot normally access any partitions but the first. Some solutions to this problem have been discussed on our {mailing list}#contact, but it seems there are no easy answers.
*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image, so back up your extra partition first to restore again after updating the live image.}*
@@ -212,7 +212,7 @@ Note: If you want to use the extra space with Windows, apparently that OS cannot
The following sequence of commands will create a basic netboot image containing the Debian standard system without X.org. It is suitable for booting over the network.
-Note: if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:
+*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:
code{
@@ -276,7 +276,7 @@ code{
This serves the kernel and initial ramdisk to the system at run time.
-You should install the tftpd-hpa package. It can serve all files contained inside a root directory, usually #{/srv/tftp}#. To let it serve files inside #{/srv/debian-live/tftpboot}#, run as root the following command:
+You should install the /{tftpd-hpa}/ package. It can serve all files contained inside a root directory, usually #{/srv/tftp}#. To let it serve files inside #{/srv/debian-live/tftpboot}#, run as root the following command:
code{
@@ -290,7 +290,7 @@ and fill in the new tftp server directory when being asked about it.
Once the guest computer has downloaded and booted a Linux kernel and loaded its initrd, it will try to mount the Live filesystem image through a NFS server.
-You need to install the #{nfs-kernel-server}# package.
+You need to install the /{nfs-kernel-server}/ package.
Then, make the filesystem image available through NFS by adding a line like the following to #{/etc/exports}#:
@@ -318,7 +318,7 @@ To make our life easier, we can use virtualization. There are two solutions.
3~ Qemu
-_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#.
+_* Install /{qemu}/, /{bridge-utils}/, /{sudo}/.
Edit #{/etc/qemu-ifup}#:
diff --git a/manual/en/user_customization-binary.ssi b/manual/en/user_customization-binary.ssi
index fb05339..3d3d75b 100644
--- a/manual/en/user_customization-binary.ssi
+++ b/manual/en/user_customization-binary.ssi
@@ -29,7 +29,7 @@ code{
include menu.cfg
default vesamenu.c32
prompt 0
- timeout 5
+ timeout 50
}code
@@ -39,7 +39,7 @@ code{
#!/bin/sh
- sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg
+ sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg
}code
diff --git a/manual/en/user_customization-contents.ssi b/manual/en/user_customization-contents.ssi
index 4c00e5a..0b4546c 100644
--- a/manual/en/user_customization-contents.ssi
+++ b/manual/en/user_customization-contents.ssi
@@ -20,7 +20,7 @@ Please see {Terms}#terms for more information about the distinction between the
Chroot local includes can be used to add or replace files in the chroot/Live filesystem so that they may be used in the Live system. A typical use is to populate the skeleton user directory (#{/etc/skel}#) used by the Live system to create the live user's home directory. Another is to supply configuration files that can be simply added or replaced in the image without processing; see {Live/chroot local hooks}#live-chroot-local-hooks if processing is needed.
-To include files, simply add them to your #{config/includes.chroot}# directory. This directory corresponds to the root directory (#{/}#) of the live system. For example, to add a file #{/var/www/index.html}# in the live system, use:
+To include files, simply add them to your #{config/includes.chroot}# directory. This directory corresponds to the root directory #{/}# of the live system. For example, to add a file #{/var/www/index.html}# in the live system, use:
code{
@@ -90,4 +90,4 @@ To run commands in the binary stage, create a hook script with a #{.binary}# suf
Files in the #{config/preseed/}# directory suffixed with #{.preseed}# followed by the stage (#{.chroot}# or #{.binary}#) are considered to be debconf preseed files and are installed by live-build using #{debconf-set-selections}# during the corresponding stage.
-For more information about debconf, please see debconf(7) in the #{debconf}# package.
+For more information about debconf, please see #{debconf(7)}# in the /{debconf}/ package.
diff --git a/manual/en/user_customization-installer.ssi b/manual/en/user_customization-installer.ssi
index f524781..602a0aa 100644
--- a/manual/en/user_customization-installer.ssi
+++ b/manual/en/user_customization-installer.ssi
@@ -12,17 +12,17 @@ The three main types of installer are:
*{"Regular" Debian Installer}*: This is a normal Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as "combined images".
-On such images, Debian is installed by fetching and installing .deb packages using #{debootstrap}# or #{cdebootstrap}#, from the local media or some network-based network, resulting in a standard Debian system being installed to the hard disk.
+On such images, Debian is installed by fetching and installing .deb packages using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some network-based network, resulting in a standard Debian system being installed to the hard disk.
This whole process can be preseeded and customized in a number of ways; see the relevant pages in the Debian Installer manual for more information. Once you have a working preseeding file, live-build can automatically put it in the image and enable it for you.
*{"Live" Debian Installer}*: This is a Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into an instance of the Debian Installer.
-Installation will proceed in an identical fashion to the "Regular" installation described above, but at the actual package installation stage, instead of using #{debootstrap}# to fetch and install packages, the live filesystem image is copied to the target. This is achieved with a special udeb called live-installer.
+Installation will proceed in an identical fashion to the "Regular" installation described above, but at the actual package installation stage, instead of using /{debootstrap}/ to fetch and install packages, the live filesystem image is copied to the target. This is achieved with a special udeb called live-installer.
After this stage, the Debian Installer continues as normal, installing and configuring items such as bootloaders and local users, etc.
-Note: to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.
+*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.
*{"Desktop" Debian Installer}*: Regardless of the type of Debian Installer included, #{d-i}# can be launched from the Desktop by clicking on an icon. This is user friendlier in some situations. In order to make use of this, the debian-installer-launcher package needs to be included.
@@ -49,4 +49,4 @@ code{
2~ Customizing Debian Installer content
-For experimental or debugging purposes, you might want to include locally built #{d-i}# component udeb packages. Place these in #{config/packages.binary/}# to include them in the image. Additional or replacement files and directories may be included in the installer initrd as well, in a similar fashion to {Live/chroot local includes}#live-chroot-local-includes, by placing the material in #{config/binary_debian-installer-includes/}#.
+For experimental or debugging purposes, you might want to include locally built #{d-i}# component udeb packages. Place these in #{config/packages.binary/}# to include them in the image. Additional or replacement files and directories may be included in the installer initrd as well, in a similar fashion to {Live/chroot local includes}#live-chroot-local-includes, by placing the material in #{config/includes.binary_debian-installer/}#.
diff --git a/manual/en/user_customization-overview.ssi b/manual/en/user_customization-overview.ssi
index ee85e0e..87005fb 100644
--- a/manual/en/user_customization-overview.ssi
+++ b/manual/en/user_customization-overview.ssi
@@ -18,7 +18,7 @@ Within each of these stages, there is a particular sequence in which commands ar
2~ Supplement lb config with files
-Although #{lb config}# does create a skeletal configuration in the config/ directory, to accomplish your goals, you may need to provide additional files in subdirectories of config/. Depending on where the files are stored in the configuration, they may be copied into the live system's filesystem or into the binary image filesystem, or may provide build-time configurations of the system that would be cumbersome to pass as command-line options. You may include things such as custom lists of packages, custom artwork, or hook scripts to run either at build time or at boot time, boosting the already considerable flexibility of debian-live with code of your own.
+Although #{lb config}# creates a skeletal configuration in the config/ directory, to accomplish your goals, you may need to provide additional files in subdirectories of config/. Depending on where the files are stored in the configuration, they may be copied into the live system's filesystem or into the binary image filesystem, or may provide build-time configurations of the system that would be cumbersome to pass as command-line options. You may include things such as custom lists of packages, custom artwork, or hook scripts to run either at build time or at boot time, boosting the already considerable flexibility of debian-live with code of your own.
2~ Customization tasks
diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index a93062b..5f30eea 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -2,13 +2,13 @@
1~customizing-package-installation Customizing package installation
-Perhaps the most basic customization of a Debian live system is the selection of packages to be included in the image. This chapter guides you through the various build-time options to customize live-build's installation of packages. The broadest choices influencing which packages are available to install in the image are the distribution and archive areas. To ensure decent download speeds, you should choose a nearby distribution mirror. You can also add your own repositories for backports, experimental or custom packages, or include packages directly as files. You can define your own lists of packages to include, use live-build's predefined lists, use #{tasksel}# tasks, or a combination of all three. Finally, a number of options give some control over apt, or if you prefer, aptitude, at build time when packages are installed. You may find these handy if you use a proxy, want to disable installation of recommended packages to save space, or need to control which versions of
packages are installed via APT pinning, to name a few possibilities.
+Perhaps the most basic customization of a Debian live system is the selection of packages to be included in the image. This chapter guides you through the various build-time options to customize live-build's installation of packages. The broadest choices influencing which packages are available to install in the image are the distribution and archive areas. To ensure decent download speeds, you should choose a nearby distribution mirror. You can also add your own repositories for backports, experimental or custom packages, or include packages directly as files. You can define your own lists of packages to include, use live-build's predefined lists, use /{tasksel}/ tasks, or a combination of all three. Finally, a number of options give some control over /{apt}/, or if you prefer, /{aptitude}/, at build time when packages are installed. You may find these handy if you use a proxy, want to disable installation of recommended packages to save space, or need to control which vers
ions of packages are installed via APT pinning, to name a few possibilities.
2~ Package sources
3~ Distribution, archive areas and mode
-The distribution you choose has the broadest impact on which packages are available to include in your live image. Specify the codename, which defaults to #{wheezy}# for the Wheezy version of live-build. Any current distribution carried in the Debian archive may be specified by its codename here. (See {Terms}#terms for more details.) The #{--distribution}# option not only influences the source of packages within the archive, but also instructs #{live-build}# to behave as needed to build each supported distribution. For example, to build against the *{unstable}* release, Sid, specify:
+The distribution you choose has the broadest impact on which packages are available to include in your live image. Specify the codename, which defaults to wheezy for the wheezy version of live-build. Any current distribution carried in the Debian archive may be specified by its codename here. (See {Terms}#terms for more details.) The #{--distribution}# option not only influences the source of packages within the archive, but also instructs live-build to behave as needed to build each supported distribution. For example, to build against the *{unstable}* release, sid, specify:
code{
@@ -30,7 +30,7 @@ Experimental support is available for some Debian derivatives through a #{--mode
3~ Distribution mirrors
-The Debian archive is replicated across a large network of mirrors around the world so that people in each region can choose a nearby mirror for best download speed. Each of the #{--mirror-*}# options governs which distribution mirror is used at various stages of the build. Recall from {Stages of the build}#stages-of-the-build that the *{bootstrap}* stage is when the chroot is initially populated by debootstrap with a minimal system, and the *{chroot}* stage is when the chroot used to construct the live system's filesystem is built. Thus, the corresponding mirror switches are used for those stages, and later, in the *{binary}* stage, the #{--mirror-binary}# and #{--mirror-binary-security}# values are used, superceding any mirrors used in an earlier stage.
+The Debian archive is replicated across a large network of mirrors around the world so that people in each region can choose a nearby mirror for best download speed. Each of the #{--mirror-*}# options governs which distribution mirror is used at various stages of the build. Recall from {Stages of the build}#stages-of-the-build that the *{bootstrap}* stage is when the chroot is initially populated by /{debootstrap}/ with a minimal system, and the *{chroot}* stage is when the chroot used to construct the live system's filesystem is built. Thus, the corresponding mirror switches are used for those stages, and later, in the *{binary}* stage, the #{--mirror-binary}# and #{--mirror-binary-security}# values are used, superceding any mirrors used in an earlier stage.
3~distribution-mirrors-build-time Distribution mirrors used at build time
@@ -121,7 +121,7 @@ To make a binary stage list, place a file suffixed with #{.list.binary}# in #{co
The package lists that are included with live-build make extensive use of includes. Refer to these in the #{/usr/share/live/build/package-lists/}# directory, as they serve as good examples of how to write your own lists.
-For example, to make a list that includes the predefined #{gnome}# list plus iceweasel, create #{config/package-lists/my.list.chroot}# with the following contents:
+For example, to make a list that includes the predefined #{gnome}# list plus /{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the following contents:
code{
@@ -144,7 +144,7 @@ code{
}code
-You may test for any one of a number of values, e.g. to install #{memtest86+}# if either #{--architectures i386}# or #{--architectures amd64}# is specified:
+You may test for any one of a number of values, e.g. to install /{memtest86+}/ if either #{--architectures i386}# or #{--architectures amd64}# is specified:
code{
@@ -154,7 +154,7 @@ code{
}code
-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 via #{--archive-areas}#:
+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 via #{--archive-areas}#:
code{
@@ -187,7 +187,7 @@ code{
}code
-The primary tasks available in the Debian Installer can be listed with #{tasksel --list-tasks}# in the live system. The contents of any task, including ones not included in this list, may be examined with #{tasksel --task-packages}#.
+The primary tasks available in the Debian Installer can be listed with #{tasksel --list-tasks}# in the live system. The contents of any task, including the ones not included in this list, may be examined with #{tasksel --task-packages}#.
3~desktop-and-language-tasks Desktop and language tasks
@@ -262,7 +262,7 @@ You can configure APT through a number of options applied only at build time. (A
3~choosing-apt-or-aptitude Choosing apt or aptitude
-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 to #{lb config}#. Choose the method implementing the preferred behaviour for package installation, the notable difference being how missing packages are handled.
+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 to #{lb config}#. Choose the method implementing the preferred behaviour for package installation, the notable difference being how missing packages are handled.
_* #{apt}#: With this method, if a missing package is specified, the package installation will fail. This is the default setting.
@@ -290,7 +290,7 @@ code{
}code
-This will not influence the entries in /etc/apt/sources.list, but merely whether /var/lib/apt contains the indices files or not. The tradeoff is that APT needs those indices in order to operate in the live system, so before performing #{apt-cache search}# or #{apt-get install}#, for instance, the user must #{apt-get update}# first to create those indices.
+This will not influence the entries in #{/etc/apt/sources.list}#, but merely whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is that APT needs those indices in order to operate in the live system, so before performing #{apt-cache search}# or #{apt-get install}#, for instance, the user must #{apt-get update}# first to create those indices.
If you find the installation of recommended packages bloats your image too much, you may disable that default option of APT with:
@@ -310,7 +310,7 @@ If there is not a #{lb config}# option to alter APT's behaviour in the way you n
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/includes.chroot/etc/apt/preferences}#.
-Let's say you are building a Wheezy 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, Wheezy. The following will accomplish this:
+Let's say you are building a wheezy 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, wheezy. The following will accomplish this:
code{
@@ -327,7 +327,7 @@ code{
}code
-*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with Wheezy using:
+*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:
code{
@@ -335,7 +335,7 @@ $ lb config --distribution wheezy
}code
-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 package. Suppose you are building an LXDE image using #{--package-lists lxde}# option, but don't want the user prompted to store wifi passwords in the keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in turn recommends #{gnome-keyring}#. So you want to omit the recommended #{gnome-keyring}# package. This can be done by adding the following stanza to #{config/chroot_apt/preferences}#:
+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 package. Suppose you are building an LXDE image using #{--package-lists lxde}# option, but don't want the user prompted to store wifi passwords in the keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in turn recommends /{gnome-keyring}/. So you want to omit the recommended /{gnome-keyring}/ package. This can be done by adding the following stanza to #{config/chroot_apt/preferences}#:
code{
diff --git a/manual/en/user_customization-runtime.ssi b/manual/en/user_customization-runtime.ssi
index 6eac0d5..7e455f1 100644
--- a/manual/en/user_customization-runtime.ssi
+++ b/manual/en/user_customization-runtime.ssi
@@ -92,21 +92,21 @@ A live cd paradigm is a pre-installed system which runs from read-only media, li
A Debian Live system is a generalization of this paradigm and thus supports other media in addition to CDs; but still, in its default behaviour, it should be considered read-only and all the run-time evolutions of the system are lost at shutdown.
-Persistence is a common name for different kinds of solutions for saving across reboots some, or all, of this run-time evolution of the system. To understand how it could work it could be handy to know that even if the system is booted and run from read-only media, modification to the files and directories are written on writable media, typically a ram disk (tmpfs) and ram disks' data do not survive reboots.
+'Persistence' is a common name for different kinds of solutions for saving across reboots some, or all, of this run-time evolution of the system. To understand how it could work it could be handy to know that even if the system is booted and run from read-only media, modification to the files and directories are written on writable media, typically a ram disk (tmpfs) and ram disks' data do not survive reboots.
-The data stored on this ramdisk should be saved on a writable persistent medium like local storage media, a network share or even a session of a multisession (re)writable CD/DVD. All these media are supported in Debian Live in different ways, and all but the last one require a special boot parameter to be specified at boot time: #{persistent}#.
+The data stored on this ramdisk should be saved on a writable persistent medium like local storage media, a network share or even a session of a multisession (re)writable CD/DVD. All these media are supported in Debian Live in different ways, and all but the last one require a special boot parameter to be specified at boot time: #{persistence}#.
-If the boot parameter #{persistent}# is set (and #{nopersistent}# is not set), local storage media (e.g. hard disks, USB drives) will be probed for persistent volumes during boot. A persistent volume is any of the following:
+If the boot parameter #{persistence}# is set (and #{nopersistence}# is not set), local storage media (e.g. hard disks, USB drives) will be probed for persistence volumes during boot. A persistence volume is any of the following:
_* a partition, identified by its GPT name.
_* a filesystem, identified by its filesystem label.
-_* an image/archive file located on the root of any readable filesystem (even an NTFS partition of a foreign OS), identified by its file name. In this case the file name must also use the containing filesystem as the file extension, e.g. "<label>.ext3".
+_* an image/archive file located on the root of any readable filesystem (even an NTFS partition of a foreign OS), identified by its file name. In this case the file name must also use the containing filesystem as the file extension, e.g. "<label>.ext4".
-It is possible to restrict which types of persistent volumes to use by specifying certain boot parameters described in the live-boot(7) man page. The "identifying labels" referred to above can be any of the following:
+It is possible to restrict which types of persistence volumes to use by specifying certain boot parameters described in the live-boot(7) man page. The "identifying labels" referred to above can be any of the following:
-_* #{full-ov}# for full persistent overlays.
+_* #{full-ov}# for full persistence overlays.
_* #{custom-ov}# for custom overlays.
@@ -114,13 +114,13 @@ _* #{live-sn}# for full system snapshots.
_* #{home-sn}# for /home snapshots.
-3~ Full persistent overlays
+3~ Full persistence overlays
-By 'full persistence' it is meant that instead of using a tmpfs for storing modifications to the read-only media (with the copy-on-write, COW, system) a persistent volume is used. For this type of persistence the volume label must be #{full-ov}#. This could, for instance, be an ext2 partition on a hard disk or on a usb key created with, e.g.:
+By 'full persistence' it is meant that instead of using a tmpfs for storing modifications to the read-only media (with the copy-on-write, COW, system) a persistence volume is used. For this type of persistence the volume label must be #{full-ov}#. This could, for instance, be an ext4 partition on a hard disk or on a usb key created with, e.g.:
code{
- # mkfs.ext2 -L full-ov /dev/sdb1
+ # mkfs.ext4 -L full-ov /dev/sdb1
}code
@@ -134,12 +134,12 @@ code{
}code
-Here's an example of how to create an ext2-based image file used for full persistence:
+Here's an example of how to create an ext4-based image file used for full persistence:
code{
$ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file
- $ /sbin/mkfs.ext2 -F full-ov
+ $ /sbin/mkfs.ext4 -F full-ov
}code
@@ -147,34 +147,34 @@ Then copy the #{full-ov}# file to the root of a writable partition and reboot.
3~ Custom overlays
-A volume with the label #{custom-ov}# can be configured to make arbitrary directories persistent. The file #{live.persist}#, located on the volume's filesystem root, controls which directories it makes persistent, and in which way.
+A volume with the label #{custom-ov}# can be configured to make arbitrary directories persistent. The file #{live-persistence.conf}#, located on the volume's filesystem root, controls which directories it makes persistent, and in which way.
-How custom overlay mounts are configured is described in full detail in the live.persist(5) man page, but a simple example should be sufficient for most uses. Let's say we want to make our home directory and APT cache persistent in an ext3 filesystem on the /dev/sdb1 partition:
+How custom overlay mounts are configured is described in full detail in the live-persistence.conf(5) man page, but a simple example should be sufficient for most uses. Let's say we want to make our home directory and APT cache persistent in an ext4 filesystem on the /dev/sdb1 partition:
code{
- $ mkfs.ext3 -L custom-ov /dev/sdb1
- $ mount -t ext3 /dev/sdb1 /mnt
- $ echo "/home" >> /mnt/live.persist
- $ echo "/var/cache/apt" >> /mnt/live.persist
+ $ mkfs.ext4 -L custom-ov /dev/sdb1
+ $ mount -t ext4 /dev/sdb1 /mnt
+ $ echo "/home" >> /mnt/live-persistence.conf
+ $ echo "/var/cache/apt" >> /mnt/live-persistence.conf
}code
-Then we reboot. During the first boot the contents of /home and /var/cache/apt will be copied into the persistent volume, and from then on all changes to these directories will live in the persistent volume. Please note that any paths listed in the #{live.persist}# file cannot contain white spaces or the special "." and ".." path components. Also, neither "/live" (or any of its sub-directories) nor "/" can be made persistent using custom mounts (for the latter, use the #{full-ov}# type persistence described above).
+Then we reboot. During the first boot the contents of #{/home}# and #{/var/cache/apt}# will be copied into the persistence volume, and from then on all changes to these directories will live in the persistence volume. Please note that any paths listed in the #{live-persistence.conf}# file cannot contain white spaces or the special #{.}# and #{..}# path components. Also, neither #{/live}# (or any of its sub-directories) nor #{/}# can be made persistent using custom mounts (for the latter, use the #{full-ov}# type persistence described above).
-Several different custom overlay volumes (with their own #{live.persist}# files) can be used at the same time, but if several volumes make the same directory persistent, only one of them will be used. If any two mounts are "nested" (i.e. one is a sub-directory of the other) the parent will be mounted before the child so no mount will be hidden by the other. Nested custom mounts are problematic if they are listed in the same #{live.persist}# file. See the live.persist(5) man page for how to handle that case if you really need it (hint: you usually don't).
+Several different custom overlay volumes (with their own #{live-persistence.conf}# files) can be used at the same time, but if several volumes make the same directory persistent, only one of them will be used. If any two mounts are "nested" (i.e. one is a sub-directory of the other) the parent will be mounted before the child so no mount will be hidden by the other. Nested custom mounts are problematic if they are listed in the same #{live-persistence.conf}# file. See the live-persistence.conf(5) man page for how to handle that case if you really need it (hint: you usually don't).
3~ Snapshots
-Snapshots are collections of files and directories which are not mounted while running but which are copied from a persistent volume to the system (tmpfs) at boot and which are resynced at reboot/shutdown of the system. The volume must be labeled #{live-sn}#, and it defaults to a simple cpio archive named #{live-sn.cpio.gz}#. A power interruption during run time could lead to data loss, hence, if you have important changes, invoke #{live-snapshot --refresh}# as often as needed. This type of persistence, since it does not write continuously to the persistent media, is the most flash-based device friendly and the fastest of all the persistence systems, but it occupies as much RAM as the size of the uncompressed snapshot.
+Snapshots are collections of files and directories which are not mounted while running but which are copied from a persistence volume to the system (tmpfs) at boot and which are resynced at reboot/shutdown of the system. The volume must be labeled #{live-sn}#, and it defaults to a simple cpio archive named #{live-sn.cpio.gz}#. A power interruption during run time could lead to data loss, hence, if you have important changes, invoke #{live-snapshot --refresh}# as often as needed. This type of persistence, since it does not write continuously to the persistence media, is the most flash-based device friendly and the fastest of all the persistence systems, but it occupies as much RAM as the size of the uncompressed snapshot.
A /home version of snapshot exists too and its label is #{home-sn.*}#; it works the same as the main snapshot but it is only applied to /home.
Snapshots cannot currently handle file deletion.
-3~ Persistent SubText
+3~ Persistence SubText
-If a user would need multiple persistent storage of the same type for different locations or testing, such as #{full-ov-nonwork}# and #{full-ov-work}#, the boot parameter #{persistent-subtext}# used in conjunction with the boot parameter #{persistent}# will allow for multiple but unique persistent media. An example would be if a user wanted to use a persistent partition labeled #{live-sn-subText}# they would use the boot parameters of: #{persistent}# #{persistent-subtext=subText}#.
+If a user would need multiple persistence storage of the same type for different locations or testing, such as #{full-ov-nonwork}# and #{full-ov-work}#, the boot parameter #{persistence-subtext}# used in conjunction with the boot parameter #{persistence}# will allow for multiple but unique persistence media. An example would be if a user wanted to use a persistence partition labeled #{live-sn-subText}# they would use the boot parameters of: #{persistence}# #{persistence-subtext=subText}#.
3~ Partial remastering
diff --git a/manual/en/user_examples.ssi b/manual/en/user_examples.ssi
index 17835e8..c063620 100644
--- a/manual/en/user_examples.ssi
+++ b/manual/en/user_examples.ssi
@@ -42,7 +42,7 @@ code{
}code
-Assuming all goes well, after a while, the current directory will contain #{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical media or a USB flash device as described in {Burning an ISO image to a physical medium}#burning-iso-image and {Copying an ISO hybrid image to a USB stick}#copying-iso-hybrid-to-usb, respectively.
+Assuming all goes well, after a while, the current directory will contain #{binary.hybrid.iso}#. This ISO hybrid image can be booted directly in a virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical media or a USB flash device as described in {Burning an ISO image to a physical medium}#burning-iso-image and {Copying an ISO hybrid image to a USB stick}#copying-iso-hybrid-to-usb, respectively.
2~tutorial-2 Tutorial 2: A web browser utility
@@ -109,7 +109,7 @@ code{
}code
-First, #{--architectures i386}# ensures that on our #{amd64}# build system, we build a 32-bit version suitable for use on most machines. Second, we use #{--linux-flavours 686-pae}# because we don't anticipate using this image on much older systems. Third, we've chosen the #{lxde}# package list to give us a minimal desktop. And finally, we have added two initial favourite packages: #{iceweasel}# and #{xchat}#.
+First, #{--architectures i386}# ensures that on our #{amd64}# build system, we build a 32-bit version suitable for use on most machines. Second, we use #{--linux-flavours 686-pae}# because we don't anticipate using this image on much older systems. Third, we've chosen the /{lxde}/ package list to give us a minimal desktop. And finally, we have added two initial favourite packages: /{iceweasel}/ and /{xchat}/.
Now, build the image:
@@ -133,7 +133,7 @@ code{
3~ Second revision
-In this revision, we're going to clean up from the first build, add the #{vlc}# package to our configuration, rebuild, test and commit.
+In this revision, we're going to clean up from the first build, add the /{vlc}/ package to our configuration, rebuild, test and commit.
The #{lb clean}# command will clean up all generated files from the previous build except for the cache, which saves having to re-download packages. This ensures that the subsequent #{lb build}# will re-run all stages to regenerate the files from our new configuration.
@@ -143,7 +143,7 @@ code{
}code
-Now append the #{vlc}# package to our local package list in #{config/package-lists/my.list.chroot}#:
+Now append the /{vlc}/ package to our local package list in #{config/package-lists/my.list.chroot}#:
code{
@@ -175,7 +175,7 @@ We've come to the end of our tutorial series. While many more kinds of customiza
*{Use case:}* Create an image with live-build to boot directly to a VNC server.
-Make a build directory and create a skeletal configuration in it built around the standard-x11 list, including #{gdm3}#, #{metacity}# and #{xvnc4viewer}#, disabling recommends to make a minimal system:
+Make a build directory and create a skeletal configuration in it built around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /{xvnc4viewer}/, disabling recommends to make a minimal system:
code{
@@ -187,7 +187,7 @@ code{
}code
-Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for the default user that will launch metacity and start xvncviewer, connecting to port #{5901}# on a server at #{192.168.1.2}#:
+Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for the default user that will launch /{metacity}/ and start /{xvncviewer}/, connecting to port #{5901}# on a server at #{192.168.1.2}#:
code{
@@ -217,7 +217,7 @@ Enjoy.
*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.
-When optimizing an image to fit a certain media size, you need to understand the tradeoffs you are making between size and functionality. In this example, we trim only so much as to make room for additional material within a 128M media size, but without doing anything to destroy integrity of the packages contained within, such as the purging of locale data via the #{localepurge}# package, or other such "intrusive" optimizations. Of particular note, you should not use #{--bootstrap-flavour minimal}# unless you really know what you're doing, as omitting priority #{important}# packages will most likely produce a broken live system.
+When optimizing an image to fit a certain media size, you need to understand the tradeoffs you are making between size and functionality. In this example, we trim only so much as to make room for additional material within a 128M media size, but without doing anything to destroy integrity of the packages contained within, such as the purging of locale data via the /{localepurge}/ package, or other such "intrusive" optimizations. Of particular note, you should not use #{--bootstrap-flavour minimal}# unless you really know what you're doing, as omitting priority *{important}* packages will most likely produce a broken live system.
code{
@@ -236,7 +236,7 @@ code{
On the author's system at time of writing, the above configuration produced a 78Mbyte image. This compares favourably with the 166Mbyte image produced by the default configuration in {Tutorial 1}#tutorial-1.
-The biggest space-saver here, compared to building a standard image on an #{i386}# architecture system, is to select only the #{486}# kernel flavour instead of the default #{-k "486 686-pae"}#. Leaving off APT's indices with #{--apt-indices false}# also saves a fair amount of space, the tradeoff being that you need to #{apt-get update}# before using apt in the live system. Choosing the #{minimal}# package list leaves out the large #{locales}# package and associated utilities. Dropping recommended packages with #{--apt-recommends false}# saves some additional space, at the expense of omitting some packages you might otherwise expect to be there, such as #{firmware-linux-free}# which may be needed to support certain hardware. The remaining options shave off additional small amounts of space. It's up to you to decide if the functionality that is sacrificed with each optimization is worth the loss in functionality.
+The biggest space-saver here, compared to building a standard image on an #{i386}# architecture system, is to select only the #{486}# kernel flavour instead of the default #{-k "486 686-pae"}#. Leaving off APT's indices with #{--apt-indices false}# also saves a fair amount of space, the tradeoff being that you need to #{apt-get update}# before using apt in the live system. Choosing the #{minimal}# package list leaves out the large #{locales}# package and associated utilities. Dropping recommended packages with #{--apt-recommends false}# saves some additional space, at the expense of omitting some packages you might otherwise expect to be there, such as /{firmware-linux-free}/ which may be needed to support certain hardware. The remaining options shave off additional small amounts of space. It's up to you to decide if the functionality that is sacrificed with each optimization is worth the loss in functionality.
2~ A localized KDE desktop and installer
@@ -289,4 +289,4 @@ code{
}code
-Note that we have included the #{debian-installer-launcher}# package to launch the installer from the live desktop, and have also specified the 486 flavour kernel, as it is currently necessary to make the installer and live system kernels match for the launcher to work properly.
+Note that we have included the debian-installer-launcher package to launch the installer from the live desktop, and have also specified the 486 flavour kernel, as it is currently necessary to make the installer and live system kernels match for the launcher to work properly.
diff --git a/manual/en/user_installation.ssi b/manual/en/user_installation.ssi
index 4c92140..15be916 100644
--- a/manual/en/user_installation.ssi
+++ b/manual/en/user_installation.ssi
@@ -121,9 +121,9 @@ Consult the live-boot and live-config man pages for details on customizing if th
_* Build live-boot and live-config .deb files
-You must build either on your target distribution or in a chroot containing your target platform: this means if your target is Wheezy then you should build against Wheezy.
+You must build either on your target distribution or in a chroot containing your target platform: this means if your target is wheezy then you should build against wheezy.
-Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to build #{live-boot}# for a target distribution that differs from your build system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy chroot. If your target distribution happens to match your build system distribution, you may build directly on the build system using #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
+Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to build live-boot for a target distribution that differs from your build system. For example, for wheezy live images, build live-boot in a wheezy chroot. If your target distribution happens to match your build system distribution, you may build directly on the build system using #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
code{
diff --git a/manual/en/user_managing_a_configuration.ssi b/manual/en/user_managing_a_configuration.ssi
index aad6304..7342877 100644
--- a/manual/en/user_managing_a_configuration.ssi
+++ b/manual/en/user_managing_a_configuration.ssi
@@ -12,7 +12,7 @@ For example, when the distribution is first set, many 'dependent' variables are
A second, related problem is that if you run #{lb config}# and then upgrade to a new version of live-build that has changed one of the variable names, you will discover this only by manual review of the variables in your #{config/*}# files, which you will then need to use to set the appropriate option again.
-All of this would be a terrible nuisance if it weren't for auto/* scripts, simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands that are designed to help you manage your configuration. Simply create an auto/config script containing #{lb config}# command with all desired options, and an auto/clean that removes the files containing configuration variable values, and each time you run #{lb config}# and #{lb clean}#, these files will be executed. This will ensure that your configuration is kept internally consistent from one revision to the next and from one live-build release to the next (though you will still have to take care and read the documentation when you upgrade live-build and make adjustments as needed).
+All of this would be a terrible nuisance if it weren't for auto/* scripts, simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands that are designed to help you manage your configuration. Simply create an auto/config script containing #{lb config}# command with all desired options, and an auto/clean that removes the files containing configuration variable values, and each time you run #{lb config}# and #{lb clean}#, these files will be executed. This will ensure that your configuration is kept internally consistent from one revision to the next and from one live-build release to the next (Although you will still have to take care and read the documentation when you upgrade live-build and make adjustments as needed).
2~ Example auto scripts
diff --git a/manual/en/user_overview.ssi b/manual/en/user_overview.ssi
index ff22e63..df8abb4 100644
--- a/manual/en/user_overview.ssi
+++ b/manual/en/user_overview.ssi
@@ -10,13 +10,13 @@ live-build is a collection of scripts to build Debian Live systems. These script
The idea behind live-build is to be a framework that uses a configuration directory to completely automate and customize all aspects of building a Live image.
-Many concepts are similar to those in the debhelper Debian package tools written by Joey Hess:
+Many concepts are similar to those in the /{debhelper}/ Debian package tools written by Joey Hess:
-_* The scripts have a central location for configuring their operation. In debhelper, this is the #{debian/}# subdirectory of a package tree. For example, dh_install will look, amongst others, for a file called #{debian/install}# to determine which files should exist in a particular binary package. In much the same way, live-build stores its configuration entirely under a #{config/}# subdirectory.
+_* The scripts have a central location for configuring their operation. In /{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For example, dh_install will look, amongst others, for a file called #{debian/install}# to determine which files should exist in a particular binary package. In much the same way, live-build stores its configuration entirely under a #{config/}# subdirectory.
_* The scripts are independent - that is to say, it is always safe to run each command.
-Unlike debhelper, live-build contains a tool to generate a skeleton configuration directory, #{lb config}#. This could be considered to be similar to tools such as #{dh-make}#. For more information about #{lb config}#, please see {The lb config command}#lb-config.
+Unlike /{debhelper}/, live-build contains a tool to generate a skeleton configuration directory, #{lb config}#. This could be considered to be similar to tools such as /{dh-make}/. For more information about #{lb config}#, please see {The lb config command}#lb-config.
The remainder of this section discusses the three most important commands:
diff --git a/manual/es/about_manual.ssi b/manual/es/about_manual.ssi
index 3543ad2..8162bb7 100644
--- a/manual/es/about_manual.ssi
+++ b/manual/es/about_manual.ssi
@@ -4,16 +4,19 @@
El objetivo principal de este manual es servir como único punto de acceso a
toda la documentación referente al projecto Debian Live y en particular al
-sofware que el proyecto crea para Debian 7.0 "Wheezy". Está principalmente
-enfocado a ayudar en la creación de un sistema en vivo y no está dirigido al
-usuario final de estos sistemas. Un usuario final puede encontrar
-información útil en las siguentes secciones: {Conceptos básicos}#the-basics
-que cubre la preparación de las imágenes para arrancar un sistema desde un
-medio de almacenamiento o desde una red local. {Personalización del
-comportamiento en tiempo de ejecución}#customizing-run-time-behaviours que
-describe algunas de las opciones que pueden especificarse en el indicador de
-arranque, como pueden ser la selección de la distribución del teclado, las
-variantes locales o la persistencia.
+sofware que el proyecto crea para Debian 7.0 "wheezy". Se puede encontrar
+siempre una versión actualizada en http://live.debian.net/
+
+live-manual está principalmente enfocado a ayudar en la creación de un
+sistema en vivo y no está dirigido al usuario final de estos sistemas. Un
+usuario final puede encontrar información útil en las siguentes secciones:
+{Conceptos básicos}#the-basics que cubre la preparación de las imágenes para
+arrancar un sistema desde un medio de almacenamiento o desde una red
+local. {Personalización del comportamiento en tiempo de
+ejecución}#customizing-run-time-behaviours que describe algunas de las
+opciones que pueden especificarse en el indicador de arranque, como pueden
+ser la selección de la distribución del teclado, las variantes locales o la
+persistencia.
Algunos de los comandos mencionados en el texto deben ser ejecutados con
privilegios de superusuario, que pueden ser obtenidos accediendo a la cuenta
@@ -29,24 +32,27 @@ Aunque se cree que todo lo descrito en este manual es importante para la
mayoría de los usuarios, es cierto que hay mucho material a interiorizar y
que los usuarios desean experimentar con las herramientas de forma rápida y
satisfactoria antes de entrar en detalles. Por lo tanto, se sugiere leer
-siguiendo el siguiente orden. Primero leer el capítulo {Acerca de este
-manual}#about-manual, desde el principio y terminando en la sección
-{Términos}#terms. Después saltar hasta los tres tutoriales que están al
-principio de la sección {Ejemplos}#examples pensados para aprender a
-configurar y construir imágenes de sistemas en vivo de forma básica. Se
-deberá leer primero {Uso de los ejemplos}#using-the-examples, seguido de
-{Tutorial 1: Una imagen estándar}#tutorial-1 y {Tutorial 2: Una utilidad de
-navegador web}#tutorial-2, para finalizar con {Tutorial 3: Una imagen
+siguiendo el siguiente orden.
+
+Primero leer el capítulo {Acerca de este manual}#about-manual, desde el
+principio y terminando en la sección {Términos}#terms. Después saltar hasta
+los tres tutoriales que están al principio de la sección {Ejemplos}#examples
+pensados para aprender a configurar y construir imágenes de sistemas en vivo
+de forma básica. Se deberá leer primero {Uso de los
+ejemplos}#using-the-examples, seguido de {Tutorial 1: Una imagen
+estándar}#tutorial-1 y {Tutorial 2: Una utilidad de navegador
+web}#tutorial-2, para finalizar con {Tutorial 3: Una imagen
personalizada}#tutorial-3. Al final de estos tutoriales, el lector tendrá
-una visión de lo que se puede hacer con Debian Live. Se anima a profundizar
-en el estudio del manual con la lectura detenida del siguiente capítulo:
-{Conceptos básicos}#the-basics, y de una manera más somera el capítulo {La
-creación de una imagen netboot}#building-netboot-image, para acabar con la
-lectura de {Descripción general de la
-personalización}#customization-overview y los capítulos que le siguen. Se
-espera que, en este punto, el lector esté lo suficientemente motivado con lo
-que se puede hacer con Debian Live para leer el resto del manual, de
-principio a fin.
+una visión de lo que se puede hacer con Debian Live.
+
+Se anima a profundizar en el estudio del manual con la lectura detenida del
+siguiente capítulo: {Conceptos básicos}#the-basics, y de una manera más
+somera el capítulo {La creación de una imagen
+netboot}#building-netboot-image, para acabar con la lectura de {Descripción
+general de la personalización}#customization-overview y los capítulos que le
+siguen. Se espera que, en este punto, el lector esté lo suficientemente
+motivado con lo que se puede hacer con Debian Live para leer el resto del
+manual, de principio a fin.
2~terms Términos
@@ -74,15 +80,15 @@ ejecutará el sistema en vivo.
_* *{live-boot}*: Es una colección de scripts que serán responsables de
arrancar el sistema en vivo. live-boot fue anteriormente una parte del
-paquete live-initramfs.
+paquete /{live-initramfs}/.
_* *{live-build}*: Es una colección de scripts utilizados para construir
sistemas Debian Live personalizados. live-build fue conocido anteriormente
-como live-helper, y en una versión anterior como live-package.
+como /{live-helper}/, y en una versión anterior como /{live-package}/.
_* *{live-config}*: Es una colección de scripts utilizados para configurar
un sistema en vivo durante el proceso de arranque. live-config fue
-anteriormente parte del paquete live-initramfs.
+anteriormente parte del paquete /{live-initramfs}/.
_* *{live-manual}*: Este documento forma parte de un paquete llamado
live-manual.
@@ -95,7 +101,7 @@ arranque (bootloader) para modificar el comportamiento del kernel o del
conjunto de scripts live-config. Son llamados también Parámetros de kernel u
Opciones de arranque.
-_* *{chroot}*: El programa chroot, #{chroot(8)}#, permite ejecutar
+_* *{chroot}*: El programa /{chroot}/, #{chroot(8)}#, permite ejecutar
diferentes instancias de un entorno GNU/Linux en un solo sistema de manera
simultánea sin necesidad de reiniciar el sistema.
@@ -106,22 +112,16 @@ _* *{Distribución objetivo}*: Es la versión de la distribución Debian en la
cual estará basado el sistema en vivo que puede diferir de la versión de la
distribución en el sistema huésped.
-_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Son los nombres clave
-de las diferentes versiones de distribución Debian. En el momento de
-escribir este documento, Squeeze es la actual versión *{stable}* o estable,
-Wheezy es la actual versión *{testing}* o en pruebas. Sid es y será siempre
-sinónimo de versión *{unstable}* o inestable. A lo largo de todo el manual
-se usan los nombres en clave de las versiones ya que las herramientas
-también los usan.
-
-La distribución *{stable}* contiene la última distribución Debian
-oficialmente publicada. La distribución *{testing}* está en la rampa de
-salida para ser la próxima distribución *{stable}*. La principal ventaja de
-utilizar esta distribución es que tiene versiones de programas más recientes
-si se compara con la versión *{stable}*. La distribución *{unstable}* es
-dónde se realiza el desarrollo de Debian. Generalmente esta distribución es
-usada por los desarrolladores y aquellos que les gusta vivir al filo de lo
-imposible.
+_* *{stable/testing/unstable}*: La distribución *{stable}* contiene la
+última distribución Debian oficialmente publicada. La distribución
+*{testing}* está en la rampa de salida para ser la próxima distribución
+*{stable}*. La principal ventaja de utilizar esta distribución es que tiene
+versiones de programas más recientes si se compara con la versión
+*{stable}*. La distribución *{unstable}* es dónde se realiza el desarrollo
+de Debian. Generalmente esta distribución es usada por los desarrolladores y
+aquellos que les gusta vivir al filo de lo imposible. A lo largo del manual,
+se usan sus nombres en clave, como por ejemplo wheezy o sid, ya que es lo
+que las mismas herramientas reconocen.
2~ Autores
@@ -272,31 +272,15 @@ code{
_* Asegurarse de enviar los cambios a la rama debian-next y no a la rama
Debian.
-_* Después de editar los ficheros que se deseen en #{manual/en/}#, ejecutar
-«make commit» en el directorio superior para sanear los ficheros y
-actualizar los ficheros de traducciones:
-
-
-code{
-
- $ make commit
-
-}code
-
-_* Entonces
-
-code{
-
- $ git add .
-
-}code
-
-_* Una vez se han saneado y se han añadido los ficheros, se deberán entregar
-los cambios. Hay que escribir un mensaje de entrega que consistirá en una o
-varias frases en ingles, comenzando con una letra mayúscula y acabando con
-un punto final. Es habitual comenzar estas frases con la forma
-'Fixing/Adding/Removing/Correcting/Translating', por ejemplo:
+_* No ejecutar #{make commit}# a menos de que se actualicen las traducciones
+al mismo tiempo, y en ese caso, no mezclar los cambios del manual en inglés
+con las traducciones en el mismo commit, sino en commits separados. Ver la
+sección {Tranducción}#translation para más detalles.
+_* Hay que escribir un mensaje de entrega que consistirá en una o varias
+frases en ingles con significado completo, comenzando con una letra
+mayúscula y acabando con un punto final. Es habitual comenzar estas frases
+con la forma 'Fixing/Adding/Removing/Correcting/Translating', por ejemplo:
code{
@@ -320,9 +304,9 @@ siguientes pasos:
_* Traducir los ficheros about_manual.ssi.pot, about_project.ssi.pot e
index.html.in.pot al idioma deseado con cualquier editor (como puede ser
-poedit) y enviarlos a la lista de correos. Una vez hayan sido revisados, el
-idioma será añadido al manual, (añadiendo los ficheros .po) y se activará en
-el autobuild.
+/{poedit}/) y enviarlos a la lista de correos. Una vez hayan sido revisados,
+el idioma será añadido al manual, (añadiendo los ficheros .po) y se activará
+en el autobuild.
_* Una vez que el nuevo idioma haya sido añadido, se puede comenzar la
traducción de todos los ficheros .po exisitentes en #{manual/po/}# de manera
diff --git a/manual/es/about_project.ssi b/manual/es/about_project.ssi
index 56b0073..532ee66 100644
--- a/manual/es/about_project.ssi
+++ b/manual/es/about_project.ssi
@@ -39,7 +39,7 @@ Debian es el Sistema Operativo Universal: Debian tiene un Sistema Live para
mostrar y representar el auténtico y verdadero Debian con las siguientes
ventajas fundamentales:
-_* Sería un subproyecto de Debian.
+_* Es un subproyecto de Debian.
_* Refleja el estado (actual) de una versión Debian.
@@ -80,14 +80,12 @@ Siempre que se necesite una configuración diferente a la de por defecto, se
hará en coodinación con el mantenedor del paquete Debian correspondiente.
En #{lb config}# se emplea un sistema para configurar paquetes que utiliza
-debconf (mediante el uso de la opción --preseed FICHERO), permitiendo la
-personalización de la configuración de los paquetes que van a ser instalados
-en la imagen Debian Live que se genere, pero las imágenes Live oficiales
-solamente utilizarán la configuración por defecto.
+debconf, permitiendo la personalización de la configuración de los paquetes
+que van a ser instalados en la imagen Debian Live que se genere, pero las
+imágenes Live oficiales solamente utilizarán la configuración por defecto.
Excepción: Es esencial realizar unos pocos cambios para que un sistema pueda
-funcionar en vivo (como por ejemplo configurar pam para permitir
-contraseñas vacias). Estos cambios esenciales se deben mantener tan pequeños
+funcionar en vivo. Estos cambios esenciales se deben mantener tan pequeños
como sea posible y deberán ser mezclados en el repositorio Debian siempre
que exista la posibilidad.
@@ -104,7 +102,8 @@ presente en el canal #debian-live de irc.debian.org (OFTC). Por favor, se
debe ser paciente cuando se espera una respuesta en el IRC. Si la respuesta
no llega, se puede enviar la pregunta a la lista de correos.
-_* *{BTS}*: El sistema de gestión de errores de Debian (BTS) contiene
-detalles de problemas enviados por usuarios y desarrolladores. Los errores
-están numerados y se mantiene un registro hasta que son reparados. Si se
-desea más información ver {Informes de errores}#bugs.
+_* *{BTS}*: El {sistema de gestión de errores de
+Debian}http://www.debian.org/Bugs/ (BTS) contiene detalles de problemas
+enviados por usuarios y desarrolladores. Los errores están numerados y se
+mantiene un registro hasta que son reparados. Si se desea más información
+ver {Informes de errores}#bugs.
diff --git a/manual/es/live-manual.ssm b/manual/es/live-manual.ssm
index daa6409..a047bff 100644
--- a/manual/es/live-manual.ssm
+++ b/manual/es/live-manual.ssm
@@ -2,20 +2,20 @@
@title: Manual Debian Live
- at creator: Debian Live Project <debian-live at lists.debian.org>
+ at creator: Proyecto Debian Live <debian-live at lists.debian.org>
@rights:
:copyright: Copyright (C) 2006-2012 Debian Live Project
:license: Este programa es software libre: puede ser redistribuido y/o modificado bajo los términos de la GNU General Public License publicada por la Free Software Foundation, bien de la versión 3 de la Licencia, o (a su elección) cualquier versión posterior. <br><br> Este programa se distribuye con la esperanza de que sea útil, pero SIN NINGUNA GARANTÍA, incluso sin la garantía implícita de COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la GNU General Public License para más detalles. <br><br> Debería haber recibido una copia de la General Public License GNU junto con este programa. Si no, vea http://www.gnu.org/licenses/. <br><br> El texto completo de la GNU Licencia Pública General se pueden encontrar en /usr/share/common-licenses/GPL-3
@date:
- :published: 2012-04-03
+ :published: 04.06.2012
- at publisher: Debian Live Project <debian-live at lists.debian.org>
+ at publisher: Proyecto Debian Live <debian-live at lists.debian.org>
@make:
- :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/
- :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/
+ :bold: /squeeze|wheezy|sid/
+ :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
diff --git a/manual/es/project_bugs.ssi b/manual/es/project_bugs.ssi
index 6fdea3a..f2f0c46 100644
--- a/manual/es/project_bugs.ssi
+++ b/manual/es/project_bugs.ssi
@@ -76,7 +76,7 @@ _* Versión de live-boot en el sistema en vivo.
_* Versión de live-config en el sistema en vivo.
-_* Versión de #{debootstrap}# y/o #{cdebootstrap}# en el sistema anfitrión.
+_* Versión de /{debootstrap}/ y/o /{cdebootstrap}/ en el sistema anfitrión.
_* Arquitectura del sistema en vivo.
@@ -130,8 +130,8 @@ más pequeños.
3~ En la preinstalación (bootstrap) en tiempo de creación.
-live-build arranca primero un sistema Debian básico con #{debootstrap}# o
-#{cdebootstrap}#. Puede fallar dependiendo de la herramienta usada en la
+live-build arranca primero un sistema Debian básico con /{debootstrap}/ o
+/{cdebootstrap}/. Puede fallar dependiendo de la herramienta usada en la
preinstalación y de la distribución Debian empleada. Si un error aparece en
este momento, se debe comprobar si está relacionado con un paquete
específico de Debian (es lo más probable), o si está relacionado con la
@@ -151,7 +151,7 @@ sistema Debian normal, si el fallo aparece en esta etapa.
Si este es el caso, esto no es un error de Debian Live, sino de Debian - se
debe informar sobre el paquete que falla. Se puede obtener más información
-ejecutando #{debootstrap}# de forma separada del sistema de creación en vivo
+ejecutando /{debootstrap}/ de forma separada del sistema de creación en vivo
o ejecutando #{lb bootstrap --debug}#.
Además, si se está utilizando una réplica local y/o cualquier tipo de proxy
diff --git a/manual/es/project_coding-style.ssi b/manual/es/project_coding-style.ssi
index 371f5cc..eed2813 100644
--- a/manual/es/project_coding-style.ssi
+++ b/manual/es/project_coding-style.ssi
@@ -16,6 +16,8 @@ lugar de `foo`.
_* Se puede comprobar las secuencias de comandos con 'sh -n' y
'checkbashisms'.
+_* Asegurarse de que el código funcione con 'set -e'.
+
2~ Sangrado
_* Utilizar siempre los tabuladores en lugar de espacios.
@@ -53,7 +55,7 @@ Mal:
code{
- foo () {
+ Foo () {
bar
}
@@ -63,7 +65,7 @@ Bien:
code{
- foo ()
+ Foo ()
{
bar
}
@@ -148,3 +150,6 @@ en lugar de "#{if test -x /bin/foo; ...}#".
_* Se debe utilizar #{case}# siempre que sea posible en lugar de #{test}#,
ya que es más fácil de leer y más rápido en la ejecución.
+
+_* Usar mayúsculas en los nombres de las funciones para evitar confusiones
+con el entorno de los usuarios.
diff --git a/manual/es/project_procedures.ssi b/manual/es/project_procedures.ssi
index aa915d0..b9e5cbd 100644
--- a/manual/es/project_procedures.ssi
+++ b/manual/es/project_procedures.ssi
@@ -50,6 +50,14 @@ _* Las imágenes se crean y se almacenan en cdimage.debian.org.
_* Correo para enviar anuncios.
+3~ Última actualización de una versión Debian
+
+Recordar que se deben ajustar tanto las réplicas de chroot como las de
+binary cuando se construye la última serie de imágenes para una versión de
+Debian después de haber sido trasladada de ftp.debian.org a
+archive.debian.org. De esta manera, las viejas imágenes preconstruidas
+siguen siendo útiles, sin modificaciones de los usuarios.
+
3~ Plantilla para anunciar nuevas versiones.
Se puede generar un anuncio de nuevas versiones usando la siguiente
diff --git a/manual/es/style_guide.ssi b/manual/es/style_guide.ssi
index 31a364a..554c1b3 100644
--- a/manual/es/style_guide.ssi
+++ b/manual/es/style_guide.ssi
@@ -342,11 +342,11 @@ intervention if the code changes.
Leave the code blocks empty (they will be automatically added then) if you
want to make your translation easier to maintain.
-_* /{New lines}/
+_* /{Newlines}/
-The translated texts need to have the exact same new lines as the original
+The translated texts need to have the exact same newlines as the original
texts. Be careful to press the "Enter" key or type *{\n}* if they appear in
-the original files. These new lines often appear, for instance, in the code
+the original files. These newlines often appear, for instance, in the code
blocks.
Make no mistake, this does not mean that the translated text needs to have
@@ -362,9 +362,7 @@ Translators should never translate:
- The commands given as examples
- - Metadata (often between colons *{:metadata:}*) especially the date in
- /{live-manual.ssm.po}/ because it changes every time live-manual is
- updated.
+ - Metadata (often between colons *{:metadata:}*)
- Links
diff --git a/manual/es/user_basics.ssi b/manual/es/user_basics.ssi
index 3970e2f..df8728f 100644
--- a/manual/es/user_basics.ssi
+++ b/manual/es/user_basics.ssi
@@ -99,7 +99,7 @@ code{
Este proceso puede llevar un tiempo, dependiendo de la velocidad de la
conexión de red. Cuando haya terminado, debería haber un fichero
-#{binary-hybrid.iso}# listo para ser usado en el directorio actual.
+#{binary.hybrid.iso}# listo para ser usado en el directorio actual.
2~using-iso-hybrid Usar una imagen ISO híbrida
@@ -117,7 +117,7 @@ code{
# apt-get install wodim
- $ wodim binary-hybrid.iso
+ $ wodim binary.hybrid.iso
}code
@@ -141,7 +141,7 @@ definitiva cualquier contenido previo en la llave!}*
code{
- $ dd if=binary-hybrid.iso of=${USBSTICK}
+ $ dd if=binary.hybrid.iso of=${USBSTICK}
}code
@@ -161,7 +161,7 @@ se accede a un menú de arranque. Si se pulsa la tecla «enter», el sistema
arrancará usando el modo por defecto #{Live}# y las opciones
predeterminadas. Para obtener más información acerca de las opciones de
arranque, ver la opción «help» del menú y también las páginas del manual de
-#{live-boot}# y #{live-config}# que se encuentran en el sistema en vivo.
+live-boot y live-config que se encuentran en el sistema en vivo.
Suponiendo que se ha seleccionado #{Live}# y arrancado una imagen en vivo
por defecto con escritorio gráfico, después de que los mensajes de arranque
@@ -199,13 +199,13 @@ necesidades.
3~testing-iso-with-qemu Probar una imagen ISO con QEMU
La máquina virtual más versátil en Debian es QEMU. Si el procesador tiene
-soporte de hardware para virtualización, utilizar el paquete #{qemu-kvm}# en
-la descripción del paquete #{qemu-kvm}# se enumera brevemente la lista de
+soporte de hardware para virtualización, utilizar el paquete /{qemu-kvm}/ en
+la descripción del paquete /{qemu-kvm}/ se enumera brevemente la lista de
requisitos.
En primer lugar, instalar #{qemu-kvm}# si el procesador lo soporta. Si no es
así, instalar #{qemu}#, en cuyo caso el nombre del programa será #{qemu}# en
-vez de #{kvm}# en los siguientes ejemplos. El paquete #{qemu-utils}# también
+vez de #{kvm}# en los siguientes ejemplos. El paquete /{qemu-utils}/ también
es útil para la creación de imágenes virtuales de disco con #{qemu-img}#.
code{
@@ -218,7 +218,7 @@ Arrancar una imagen ISO es sencillo:
code{
- $ kvm -cdrom binary-hybrid.iso
+ $ kvm -cdrom binary.hybrid.iso
}code
@@ -226,7 +226,7 @@ Consultar las páginas del manual para más detalles.
3~testing-iso-with-virtualbox Probar una imagen ISO con virtualbox-ose
-Para probar una imagen ISO con #{virtualbox-ose}#:
+Para probar una imagen ISO con /{virtualbox-ose}/:
code{
@@ -237,14 +237,10 @@ code{
}code
Crear una nueva máquina virtual, cambiar la configuración de almacenamiento
-para utilizar #{binary-hybrid.iso}# como dispositivo CD/DVD y arrancar la
+para utilizar #{binary.hybrid.iso}# como dispositivo CD/DVD y arrancar la
máquina.
-Nota: Para probar los sistemas en vivo con soporte X.org en virtualbox-ose,
-se puede incluir el paquete del driver de VirtualBox X.org,
-#{virtualbox-ose-guest-x11}#, en la configuración de live-build. De lo
-contrario, la resolución se limita a 800x600
-
+*{Nota:}* Para probar los sistemas en vivo con soporte X.org en /{virtualbox-ose}/, se puede incluir el paquete del driver de VirtualBox X.org, /{virtualbox-ose-guest-x11}/, en la configuración de live-build. De lo contrario, la resolución se limita a 800x600
code{
$ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot
@@ -263,10 +259,7 @@ BIOS no maneje adecuadamente las imágenes híbridas. También es interesante
una imagen HDD si se desea utilizar el espacio restante en los medios de
almacenamiento para una partición con persistencia.
-Nota: si se ha creado una imagen ISO híbrida con el ejemplo anterior, se
-tendrá que limpiar el directorio de trabajo con el comando #{lb clean}# (ver
-{El comando lb clean}#lb-clean):
-
+*{Nota:}* si se ha creado una imagen ISO híbrida con el ejemplo anterior, se tendrá que limpiar el directorio de trabajo con el comando #{lb clean}# (ver {El comando lb clean}#lb-clean):
code{
# lb clean --binary
@@ -300,14 +293,14 @@ arranque syslinux, lista para ser copiada directamente en un dispositivo
USB. Dado que utilizar una imagen HDD es igual a usar una imagen ISO híbrida
en un USB, seguir las instrucciones de {Usar una imagen ISO
híbrida}#using-iso-hybrid con la diferencia de usar el nombre #{binary.img}#
-en lugar de #{binary-hybrid.iso}#.
+en lugar de #{binary.hybrid.iso}#.
3~testing-hdd-with-qemu Probar una imágen HDD con Qemu
-En primer lugar, instalar QEMU como se describe más arriba en {Probar una
-imágen ISO con QEMU}#testing-iso-with-qemu A continuación, ejecutar #{kvm}#
-o #{qemu}#, según qué versión necesita el sistema anfitrión y especificando
-#{binary.img}# como primer disco duro.
+En primer lugar, instalar /{qemu}/ como se describe más arriba en {Probar
+una imágen ISO con QEMU}#testing-iso-with-qemu A continuación, ejecutar
+#{kvm}# o #{qemu}#, según qué versión necesita el sistema anfitrión y
+especificando #{binary.img}# como primer disco duro.
code{
@@ -319,7 +312,7 @@ code{
Si se desea usar el espacio libre después de haber instalado la imagen
#{binary.img}# en una llave USB, se puede usar un programa de particionado
-como #{gparted}# o #{parted}# para crear una partición nueva en el
+como /{gparted}/ o /{parted}/ para crear una partición nueva en el
dispositivo. La primera partición será usada por el sistema Debian en vivo.
code{
@@ -338,11 +331,7 @@ code{
}code
-Nota: Si se desea usar el espacio extra con Windows, segun parece, ese
-sistema operativo no puede acceder normalmente a otra partición más que a la
-primera. Se han comentado algunas soluciones a este problema en nuestra
-{lista de correo}#contact pero según parece no hay una solución fácil.
-
+{Nota:}* Si se desea usar el espacio extra con Windows, segun parece, ese sistema operativo no puede acceder normalmente a otra partición más que a la primera. Se han comentado algunas soluciones a este problema en nuestra {lista de correo}#contact pero según parece no hay una solución fácil.
*{Recordar: Cada vez que se instale una nueva binary.img en el dispositivo, todos los datos del dispositivo se perderán debido a que la tabla de particiones se sobrescribe con el contenido de la imagen, así pues, realizar primero una copia de seguridad de la partición para poder restaurarla trás actualizar la imagen en vivo.}*
2~building-netboot-image Creación de una imagen de arranque en red
@@ -351,9 +340,7 @@ La siguiente secuencia de comandos creará una imagen de arranque en red
básica que contendrá el sistema estándar de Debian sin X.org. Se puede usar
para el arranque en red.
-Nota: si se ha seguido algúno de los ejemplos anteriores, se tendrá que
-limpiar el directorio de trabajo con el comando #{lb clean}#:
-
+*{Nota:}* si se ha seguido algúno de los ejemplos anteriores, se tendrá que limpiar el directorio de trabajo con el comando #{lb clean}#:
code{
# lb clean --binary
@@ -437,8 +424,8 @@ code{
Se encarga de suministrar el kernel y el Disco RAM inicial para el sistema.
-Se debe instalar el paquete tftpd-hpa. Este servidor podrá suministrar todos
-los ficheros contenidos de un directorio raíz, normalmente
+Se debe instalar el paquete /{tftpd-hpa}/. Este servidor podrá suministrar
+todos los ficheros contenidos de un directorio raíz, normalmente
#{/srv/tftp}#. Para permitirle que pueda servir los ficheros de
#{/srv/debian-live/tftpboot}#, se debe ejecutar el siguiente comando con
privilegios de superusuario:
@@ -457,7 +444,7 @@ Una vez el equipo cliente ha descargado y arrancado el kernel de Linux junto
a su initrd, intentará montar el sistema de archivos de la imagen en vivo a
través de un servidor NFS.
-Se debe instalar el paquete #{nfs-kernel-server}#.
+Se debe instalar el paquete /{nfs-kernel-server}/.
Entonces, se debe hacer que la imagen del sistema de archivos esté
disponible a través de NFS añadiendo una línea como la siguiente para
@@ -497,7 +484,7 @@ dos soluciones.
3~ Qemu
-_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#.
+_* Instalar /{qemu}/, /{bridge-utils}/, /{sudo}/.
Se debe editar el fichero #{/etc/qemu-ifup}#:
diff --git a/manual/es/user_customization-binary.ssi b/manual/es/user_customization-binary.ssi
index 1b8ccb7..080b51d 100644
--- a/manual/es/user_customization-binary.ssi
+++ b/manual/es/user_customization-binary.ssi
@@ -49,7 +49,7 @@ code{
include menu.cfg
default vesamenu.c32
prompt 0
- timeout 5
+ timeout 50
}code
@@ -61,7 +61,7 @@ code{
#!/bin/sh
- sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg
+ sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg
}code
diff --git a/manual/es/user_customization-contents.ssi b/manual/es/user_customization-contents.ssi
index 2fb96fa..85f5320 100644
--- a/manual/es/user_customization-contents.ssi
+++ b/manual/es/user_customization-contents.ssi
@@ -51,8 +51,8 @@ gancho locales en Live/chroot}#live-chroot-local-hooks
Para incluir ficheros solamente hace falta añadirlos al directorio de
configuración #{config/includes.chroot}#. Habrá una relación directa entre
-este directorio y el directorio raiz (#{/}#) del sistema en vivo. Por
-ejemplo, si se desea añadir un fichero para que sea el fichero
+este directorio y el directorio raiz #{/}# del sistema en vivo. Por ejemplo,
+si se desea añadir un fichero para que sea el fichero
#{/var/www/index.html}# del sistema en vivo se puede hacer lo siguiente:
code{
@@ -176,5 +176,5 @@ seguido por la etapa (#{.chroot}# o #{.binary}#) son ficheros de
preconfiguración para debconf. live-build instalará estos ficheros mediante
#{debconf-set-selections}# durante la etapa correspondiente.
-Ver debconf(7) en el paquete #{debconf}# para obtener más información acerca
-de debconf.
+Ver #{debconf(7)}# en el paquete /{debconf}/ para obtener más información
+acerca de debconf.
diff --git a/manual/es/user_customization-installer.ssi b/manual/es/user_customization-installer.ssi
index cbdd8a7..cd27cdd 100644
--- a/manual/es/user_customization-installer.ssi
+++ b/manual/es/user_customization-installer.ssi
@@ -18,7 +18,7 @@ Principalmente existen tres tipos de imágenes según el instalador:
*{Imágenes con Instalador Debian «official»}*: Esta imagen de Debian Live se puede considerar como la imagen habitual. Dispone de un kernel y un initrd diferenciados que, al ser seleccionados desde el gestor de arranque, ejecuta un Instalador de Debian estándar, de la misma manera que lo haría si se arrancase desde una imagen de CD descargada desde el sitio oficial de Debian. Las imágenes que contienen un sistema en vivo con otro instalador independiente se suelen llamar «imágenes combinadas».
En estas imágenes, el sistema operativo Debian se instala mediante la
-herramienta #{debootstrap}# o #{cdebootstrap}# que descarga paquetes .deb,
+herramienta /{debootstrap}/ o /{cdebootstrap}/ que descarga paquetes .deb,
desde medios locales o por red local, y los instala de forma tradicional. El
resultado final es un sistema Debian estándar instalado en el disco duro.
@@ -31,7 +31,7 @@ encargarse de depositarlo en la imagen y activarlo de forma automática.
*{Imágenes con Instalador Debian «Live»}*: Estas imágenes de Debian Live también disponen de un kernel y un initrd diferenciados que, al ser seleccionados desde el gestor de arranque, ejecutan un Instalador de Debian algo diferente.
El procedimiento de instalación es idéntico al realizado por las imagenes
-«Regulares» pero, en lugar de utilizar #{debootstrap}# para obtener e
+«Regulares» pero, en lugar de utilizar /{debootstrap}/ para obtener e
instalar paquetes .deb, lo que hace es copiar al disco duro la imagen del
sistema de ficheros que se había preparado para lanzar el sistema en
vivo. Esto se logra mediante un .udeb especial llamado live-installer.
@@ -40,10 +40,7 @@ Una vez finalizada esta etapa, el Instalador de Debian continua normalmente,
instalando y configurando los siguientes elementos como pueden ser gestor de
arranque, creación de usuarios locales, etc.
-Nota: Para poder arrancar los dos tipos de imágenes, Regular y Live, en el
-mismo medio, el gestor de arranque debe poder deshabilitar
-live-installer. Esto se hace utilizando la variable de preconfiguración
-(preseed) #{live-installer/enable=false}#.
+*{Nota:}* Para poder arrancar los dos tipos de imágenes, Regular y Live, en el mismo medio, el gestor de arranque debe poder deshabilitar live-installer. Esto se hace utilizando la variable de preconfiguración (preseed) #{live-installer/enable=false}#.
*{Instalador Debian «del escritorio»}*: Una vez el sistema en vivo está ejecutandose, se puede lanzar el Instalador de Debian haciendo clic en el icono correspondiente, sin importar el tipo de Instalador Debian utilizado en el arranque. Esta manera de instalar Debian es más sencilla para el usuario y aconsejable en algunas situaciones. Para poder realizar esta acción se debe instalar el paquete debian-installer-launcher.
@@ -92,4 +89,4 @@ directorio de configuración #{config/packages.binary/}#. También pueden
incluirse o reemplazarse ficheros y directorios en el initrd del instalador
de una manera similar a la que se describe en {Includes locales en
Live/chroot}#live-chroot-local-includes, depositando el material en el
-directorio #{config/binary_debian-installer-includes/}#.
+directorio #{config/includes.binary_debian-installer/}#.
diff --git a/manual/es/user_customization-overview.ssi b/manual/es/user_customization-overview.ssi
index b507c7b..e17dba0 100644
--- a/manual/es/user_customization-overview.ssi
+++ b/manual/es/user_customization-overview.ssi
@@ -35,8 +35,7 @@ instalados en el sistema huésped, que se utiliza para crear la imagen del
sistema en vivo, con el fin de facilitar la referencia cuando se trabaja en
una configuración. No hay ningún problema en hacerlo, ya que ninguno de los
scripts que contiene el sistema huésped será ejecutado, a menos que se
-configure el sistema huésped como sistema en vivo, cosa que no tiene
-sentido.
+configure el sistema huésped como sistema en vivo.
2~stages-of-the-build Etapas de la creación
diff --git a/manual/es/user_customization-packages.ssi b/manual/es/user_customization-packages.ssi
index 54a7a7c..81d9c09 100644
--- a/manual/es/user_customization-packages.ssi
+++ b/manual/es/user_customization-packages.ssi
@@ -14,14 +14,14 @@ velocidad de descarga de paquetes, se debería elegir el repositorio Debian
más cercano. Se pueden añadir repositorios para backports, experimentales,
paquetes personalizados o incluir ficheros de paquetes directamente. Se
pueden definir listas de paquetes personalizadas, utilizar listas
-predefinidas en live-build, seleccionar tareas de #{tasksel}# o una
+predefinidas en live-build, seleccionar tareas de /{tasksel}/ o una
combinación de los tres métodos. Por último existen varias opciones que dan
algún control sobre cuando son instalados los paquetes por la herramienta
-apt o la herramienta aptitude, según sea la elegida. Estas opciones pueden
-ser útiles si se utiliza un proxy, se quiere desactivar la instalación de
-paquetes recomendados para ahorrar espacio o se necesita controlar las
-versiones de los paquetes a instalar mediante APT pinning, por nombrar
-algunas posibilidades.
+/{apt}/ o la herramienta /{aptitude}/, según sea la elegida. Estas opciones
+pueden ser útiles si se utiliza un proxy, se quiere desactivar la
+instalación de paquetes recomendados para ahorrar espacio o se necesita
+controlar las versiones de los paquetes a instalar mediante APT pinning, por
+nombrar algunas posibilidades.
2~ Origen de los paquetes
@@ -29,14 +29,14 @@ algunas posibilidades.
La distribución seleccionada tiene gran impacto en qué paquetes están
disponibles para incluir en la imagen. Se debe indicar el nombre en clave de
-la distribución, que por defecto es #{wheezy}# para la versión Wheezy de
+la distribución, que por defecto es wheezy para la versión wheezy de
live-build. Se puede especificar cualquier nombre de distribución disponible
en los repositorios Debian indicando su nombre en clave. (Para más detalles
ver {Términos}#terms). La opción #{--distribution}# no solamente influencia
la fuente de los paquetes dentro del archivo Debian, sino que instruye a
-#{live-build}# a comportarse tal y como se necesita para construir cada una
-de las distribuciones. Por ejemplo, para construir contra la versión
-*{inestable}*, Sid, se debe indicar:
+live-build a comportarse tal y como se necesita para construir cada una de
+las distribuciones. Por ejemplo, para construir contra la versión
+*{inestable}*, sid, se debe indicar:
code{
@@ -76,8 +76,8 @@ de obtener la mejor velocidad de descarga. Cada una de las opciones
diferentes etapas de creación. Si se recuerda de {Etapas de la
creación}#stages-of-the-build, en la etapa de preinstalación (bootstrap) es
cuando se crea el directorio chroot y se rellena con un sistema mínimo
-mediante la herramienta debootstrap, y en la etapa *{chroot}* es cuando el
-directorio chroot es completado con los paquetes necesarios para crear el
+mediante la herramienta /{debootstrap}/, y en la etapa *{chroot}* es cuando
+el directorio chroot es completado con los paquetes necesarios para crear el
sistema de ficheros que será utilizado en el sistema en vivo. A cada una de
estas etapas le corresponde su propia opción #{--mirror-*}#. Posteriormente,
en la etapa *{binary}* se utilizarán las réplicas Debian indicadas en los
@@ -235,9 +235,9 @@ las directivas «includes». Los ficheros existentes en el directorio
como escribir listas de paquetes.
Por ejemplo, para hacer una lista de paquetes que incluya la lista de
-paquetes predefinida #{gnome}# y añadir el paquete iceweasel se puede crear
-un fichero llamado #{config/package-lists/my.list.chroot}# con el siguiente
-contenido:
+paquetes predefinida #{gnome}# y añadir el paquete /{iceweasel}/ se puede
+crear un fichero llamado #{config/package-lists/my.list.chroot}# con el
+siguiente contenido:
code{
@@ -269,7 +269,7 @@ code{
}code
En la expresión condicional pueden utilizarse varios valores. Por ejemplo
-para instalar el paquete #{memtest86+}# si la arquitectura es i386
+para instalar el paquete /{memtest86+}/ si la arquitectura es i386
(#{--architectures i386}#) o es amd64 (#{--architectures amd64}#) se puede
especificar:
@@ -282,7 +282,7 @@ code{
}code
En la expresión condicional también pueden utilizarse variables que pueden
-contener más de un valor. Por ejemplo para instalar #{vrms}# si se utilizan
+contener más de un valor. Por ejemplo para instalar /{vrms}/ si se utilizan
las áreas del archivo #{contrib}# o #{non-free}# mediante la opción
#{--archive-areas}# se puede indicar:
@@ -470,7 +470,7 @@ aquellas opciones que comienzan con #{apt}#.
3~choosing-apt-or-aptitude Utilizar apt o aptitude
Se puede seleccionar qué herramienta se utilizará para instalar paquetes,
-#{apt}# o #{aptitude}#, en el momento de crear la imagen mediante la opción
+/{apt}/ o /{aptitude}/, en el momento de crear la imagen mediante la opción
#{--apt}# de #{lb config}#. Esta selección definirá el comportamiento
preferido en la instalación de paquetes, siendo la mayor diferencia la
manera de tratar los paquetes no disponibles.
@@ -509,8 +509,8 @@ code{
}code
Esto no modificará el comportamiento de las entradas definidas en
-/etc/apt/sources.list, sino que solo afecta a si exitirán o no ficheros de
-índice en el directorio /var/lib/apt. El compromiso viene de que APT
+#{/etc/apt/sources.list}#, sino que solo afecta a si exitirán o no ficheros
+de índice en el directorio #{/var/lib/apt}#. El compromiso viene de que APT
necesita estos ficheros índices para funcionar en el sistema en vivo, así
que, si no existen, el usuario deberá ejecutar la orden #{apt-get update}#
para crear estos índices antes de poder ejecutar una orden del tipo
@@ -555,12 +555,12 @@ creación de la imagen, creando el fichero #{config/chroot_apt/preferences}#
o en tiempo de ejecución del sistema en vivo creando el fichero
#{config/includes.chroot/etc/apt/preferences}#.
-Supongamos que se está creando un sistema en vivo basado en Wheezy pero se
+Supongamos que se está creando un sistema en vivo basado en wheezy pero se
necesita instalar todos los paquetes "live" que terminan instalados en la
-imagen binaria final desde la versión inestable «Sid» en el momento de crear
-la imagen. Se deberá añadir Sid a los orígenes (sources) de APT y fijarlo
-(pin) de manera que solamente los paquetes fijados sean instalados desde Sid
-mientras que el resto será obtenido desde la distribución base, Wheezy. Esto
+imagen binaria final desde la versión inestable «sid» en el momento de crear
+la imagen. Se deberá añadir sid a los orígenes (sources) de APT y fijarlo
+(pin) de manera que solamente los paquetes fijados sean instalados desde sid
+mientras que el resto será obtenido desde la distribución base, wheezy. Esto
se puede realizar de la siguiente forma:
code{
@@ -578,7 +578,7 @@ code{
}code
-*{Nota:}* Se pueden usar comodines en los nombres de los paquetes a fijar (p.ej. *{Package: live-*}*) si se usa una versión de apt igual o superior a 0.8.14. Esto significa que funciona con Wheezy usando:
+*{Nota:}* Se pueden usar comodines en los nombres de los paquetes a fijar (p.ej. *{Package: live-*}*) si se usa una versión de apt igual o superior a 0.8.14. Esto significa que funciona con wheezy usando:
code{
@@ -591,9 +591,9 @@ ser el caso de que no se desee que un paquete recomendado por otro sea
instalado al instalar el primero. Supongamos que se está creando una imagen
LXDE mediante la opción #{--package-lists lxde}#, pero no se desea preguntar
al usuario si desea almacenar las claves wifi en el almacen de claves. La
-lista lxde incluye #{gdm}#, la cual depende de #{gksu}# que a su vez
-recomienda #{gnome-keyring}#. Así que el objetivo es omitir la instalación
-del paquete #{gnome-keyring}#, que puede conseguirse añadiendo un fichero
+lista lxde incluye /{gdm}/, la cual depende de /{gksu}/ que a su vez
+recomienda /{gnome-keyring}/. Así que el objetivo es omitir la instalación
+del paquete /{gnome-keyring}/, que puede conseguirse añadiendo un fichero
con el siguiente contenido a #{config/chroot_apt/preferences}#:
code{
diff --git a/manual/es/user_customization-runtime.ssi b/manual/es/user_customization-runtime.ssi
index 1d302ea..a0d312c 100644
--- a/manual/es/user_customization-runtime.ssi
+++ b/manual/es/user_customization-runtime.ssi
@@ -142,7 +142,7 @@ su comportamiento predeterminado, se debe considerar un sistema de sólo
lectura y todos los cambios en tiempo de ejecución del sistema se pierden al
apagar el equipo.
-La persistencia es un nombre común que se dá a los diferentes tipos de
+La «persistencia» es un nombre común que se da a los diferentes tipos de
soluciones para guardar algunos o todos los cambios realizados durante la
ejecución tras reiniciar el sistema. Para entender cómo funciona es útil
saber que incluso si el sistema se inicia y se ejecuta desde los medios de
@@ -151,14 +151,14 @@ directorios se escriben en medios de escritura, por lo general en la memoria
ram (tmpfs) y los datos guardados en la ram no se guardan tras reiniciar.
Los datos almacenados en esta memoria ram se pueden guardar en un soporte
-grabable como un medio de almacenamiento local, un recurso compartido en red
-o incluso en una sesión de un CD/DVD regrabable en multisesión. Todos estos
-medios son compatibles con Debian Live de diferentes maneras, y todos menos
-el último requieren un parámetro de arranque especial que se especificará en
-el momento del arranque: #{persistent}#.
-
-Si se usa el parámetro de arranque #{persistent}# (y no se usa la opción
-#{nopersistent}#), se busca en los medios de almacenamiento locales
+grabable, como un medio de almacenamiento local, un recurso compartido en
+red o incluso en una sesión de un CD/DVD regrabable en multisesión. Todos
+estos medios son compatibles con Debian Live de diferentes maneras y todos,
+menos el último, requieren un parámetro de arranque especial que se
+especificará en el momento del arranque: #{persistence}#.
+
+Si se usa el parámetro de arranque #{persistence}# (y no se usa la opción
+#{nopersistence}#), se busca en los medios de almacenamiento locales
(p.ej. discos duros, llaves USB) volúmenes con persistencia durante el
arranque. Un volumen persistente es cualquiera de los siguientes:
@@ -171,7 +171,7 @@ _* una fichero imagen/archivo situado en el sistema raiz de cualquier
sistema de ficheros que pueda ser leido (incluso una partición NTFS de otro
sistema operativo), identificado por su nombre de fichero. En este caso el
nombre del fichero debe contener el nombre el sistema de ficheros como
-extensión, p.ej. "<label>.ext3".
+extensión, p.ej. "<label>.ext4".
Es posible restringir qué tipos de volúmenes persistentes se pueden usar
especificando ciertos parámetros de arranque descritos en la página del
@@ -193,12 +193,12 @@ escritura en lugar de usar un tmpfs (sistema de ficheros temporal) para
guardar los cambios realizados en los medios de sólo lectura (con el sistema
copiar-al-escribir o COW «copy-on-write» N. del T.). Para utilizar este tipo
de persistencia la etiqueta del volumen debe ser #{full-ov}#. Esta podría
-ser, por ejemplo, una partición ext2 o un disco duro o una llave usb creada
+ser, por ejemplo, una partición ext4 o un disco duro o una llave usb creada
con. p.ej:
code{
- # mkfs.ext2 -L full-ov /dev/sdb1
+ # mkfs.ext4 -L full-ov /dev/sdb1
}code
@@ -213,13 +213,13 @@ code{
}code
-Un ejemplo de cómo crear un fichero imagen basado en ext2 usando
+Un ejemplo de cómo crear un fichero imagen basado en ext4 usando
persistencia total.
code{
$ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file
- $ /sbin/mkfs.ext2 -F full-ov
+ $ /sbin/mkfs.ext4 -F full-ov
}code
@@ -229,44 +229,44 @@ reiniciar el sistema.
3~ Capas personalizadas
Un volumen con la etiqueta #{custom-ov}# puede ser personalizado para crear
-arbitrariamente directorios persistentes. El fichero #{live.persist}#,
-situado en el sistema de ficheros raiz del volumen, controla que directorios
-hace persistentes y también de que manera.
+arbitrariamente directorios persistentes. El fichero
+#{live-persistence.conf}#, situado en el sistema de ficheros raiz del
+volumen, controla que directorios hace persistentes y también de que manera.
-En la página de manual de live.persist(5) se explica en detalle cómo se
-configura el montaje de las capas, pero un sencillo ejemplo es suficiente
-para la mayoría de los casos. Supongamos que queremos crear nuestro
-directorio home y APT cache persistentes en un sistema de ficheros ext3 en
-la partición /dev/sdb1:
+En la página de manual de live-persistence.conf(5) se explica en detalle
+cómo se configura el montaje de las capas, pero un sencillo ejemplo es
+suficiente para la mayoría de los casos. Supongamos que queremos crear
+nuestro directorio home y APT cache persistentes en un sistema de ficheros
+ext4 en la partición /dev/sdb1:
code{
- $ mkfs.ext3 -L custom-ov /dev/sdb1
- $ mount -t ext3 /dev/sdb1 /mnt
- $ echo "/home" >> /mnt/live.persist
- $ echo "/var/cache/apt" >> /mnt/live.persist
+ $ mkfs.ext4 -L custom-ov /dev/sdb1
+ $ mount -t ext4 /dev/sdb1 /mnt
+ $ echo "/home" >> /mnt/live-persistence.conf
+ $ echo "/var/cache/apt" >> /mnt/live-persistence.conf
}code
-Entonces reiniciamos. Durante el primer arranque los contenidos de /home y
-/var/cache/apt se copiarán en el volumen persistente y a partir de ese
+Entonces reiniciamos. Durante el primer arranque los contenidos de #{/home}#
+y #{/var/cache/apt}# se copiarán en el volumen persistente y a partir de ese
momento todos los cambios en esos directorios se guardarán allí. Tener en
-cuenta que los rutas listadas en el fichero #{live.persist}# no pueden
-contener espacios en blanco o los componentes especiales "." y "..". Además
-ni "/live" (o ninguno de sus sub-directorios) ni "/" pueden hacerse
-persistentes montándolos de forma personalizada. Para este último, usar el
-tipo de persistencia #{full-ov}# descrito anteriormente.
+cuenta que las rutas listadas en el fichero #{live-persistence.conf}# no
+pueden contener espacios en blanco ni los componentes especiales #{.}# y
+#{..}#. Además, ni #{/live}# (o ninguno de sus sub-directorios) ni #{/}#
+pueden hacerse persistentes montándolos de forma personalizada. Para esto
+último, usar el tipo de persistencia #{full-ov}# descrito anteriormente.
Se puede usar diferentes volúmenes de capas personalizados al mismo tiempo
-(con sus propios ficheros #{live.persist}#) pero si varios volúmenes hacen
-que un mismo directorio sea persistente, sólo uno de ellos será usado. Si
-dos unidades montadas están "anidadas" (es decir, una es un sub-directorio
-de la otra) el directorio superior será montado antes que el inferior de
-este modo no quedará uno escondido por el otro. La personalización de los
-montajes anidadados es problemática si están listados en el mismo fichero
-#{live.persist}#. Consultar la página de manual de live.persist(5) para ver
-como manejar ese caso si realmente es necesario. (aclaración: normalmente no
-lo es).
+(con sus propios ficheros #{live-persistence.conf}#) pero si varios
+volúmenes hacen que un mismo directorio sea persistente, sólo uno de ellos
+será usado. Si dos unidades montadas están "anidadas" (es decir, una es un
+sub-directorio de la otra) el directorio superior será montado antes que el
+inferior de este modo no quedará uno escondido por el otro. La
+personalización de los montajes anidadados es problemática si están listados
+en el mismo fichero #{live-persistence.conf}#. Consultar la página de manual
+de live-persistence.conf(5) para ver como manejar ese caso si realmente es
+necesario. (aclaración: normalmente no lo es).
3~ Instantáneas
@@ -293,12 +293,12 @@ Las instantáneas no pueden manejar el borrado de ficheros.
Si un usuario necesita un almacenamiento persistente múltiple del mismo tipo
para diferentes lugares o pruebas, tales como #{full-ov-nonwork}# y
-#{full-ov-work}#, el parámetro de arranque #{persistent-subtext}# usado
-junto con el parámetro de arranque #{persistent}# permitirá medios de
+#{full-ov-work}#, el parámetro de arranque #{persistence-subtext}# usado
+junto con el parámetro de arranque #{persistence}# permitirá medios de
almacenamiento persistentes múltiples pero únicos. Un ejemplo sería, si un
usuario desea utilizar una partición persistente etiquetada
-#{live-sn-subText}# usaría los parámetros de arranque: #{persistent}#
-#{persistent-subtext=subText}#.
+#{live-sn-subText}# usaría los parámetros de arranque: #{persistence}#
+#{persistence-subtext=subText}#.
3~ Remasterización parcial
diff --git a/manual/es/user_examples.ssi b/manual/es/user_examples.ssi
index b02d079..28d711a 100644
--- a/manual/es/user_examples.ssi
+++ b/manual/es/user_examples.ssi
@@ -67,7 +67,7 @@ code{
}code
Suponiendo que todo va bien, después de un rato, el directorio actual
-contendrá #{binary-hybrid.iso}#. Esta imagen ISO híbrida se puede arrancar
+contendrá #{binary.hybrid.iso}#. Esta imagen ISO híbrida se puede arrancar
directamente en una máquina virtual como se describe en {Probar una imagen
ISO con Qemu}#testing-iso-with-qemu y en {Probar una imagen ISO con
virtualbox-ose}#testing-iso-with-virtualbox o bien ser copiada a un medio
@@ -161,8 +161,8 @@ sistema de creación #{amd64}# se crea una versión de 32-bits adecuada para
ser usada en la mayoría de máquinas. En segundo lugar, se usa
#{--linux-flavours 686-pae}# porque no se espera usar esta imagen en
sistemas mucho más viejos. En tercer lugar se elige la lista de paquetes
-#{lxde}# para proporcionar un escritorio mínimo. Y, por último, se añaden
-dos paquetes iniciales favoritos: #{iceweasel}# y #{xchat}#.
+/{lxde}/ para proporcionar un escritorio mínimo. Y, por último, se añaden
+dos paquetes iniciales favoritos: /{iceweasel}/ y /{xchat}/.
Ahora, crear la imagen:
@@ -192,7 +192,7 @@ code{
3~ Segunda revisión
En esta revisión, vamos a limpiar desde la primera creación, agregar el
-paquete #{vlc}# a nuestra configuración, crear de nuevo, probar y enviar los
+paquete /{vlc}/ a nuestra configuración, crear de nuevo, probar y enviar los
cambios al git.
El comando #{lb clean}# limpiará todos los ficheros generados en las
@@ -207,7 +207,7 @@ code{
}code
-Añadir ahora el paquete #{vlc}# a nuestra lista de paquetes local en
+Añadir ahora el paquete /{vlc}/ a nuestra lista de paquetes local en
#{config/package-lists/my.list.chroot}#:
code{
@@ -251,7 +251,7 @@ experiencias recogidas de los usuarios de Debian Live.
*{Caso Práctico:}* Crear una imagen con live-build para arrancar directamente un servidor VNC.
Hacer un directorio de creación y crear una configuración en esqueleto según
-la lista estándar-x11, incluyendo #{gdm3}#, #{metacity}# y #{xvnc4viewer}#,
+la lista estándar-x11, incluyendo /{gdm3}/, /{metacity}/ y /{xvnc4viewer}/,
desactivando los paquetes recomendados para conseguir un sistema mínimo:
code{
@@ -265,8 +265,8 @@ code{
}code
Crear el directorio #{/etc/skel}# y poner un fichero #{.xsession}#
-personalizado para el usuario que por defecto ejecutará metacity e iniciará
-el xvncviewer, conectándo al puerto #{5901}# de un servidor en
+personalizado para el usuario que por defecto ejecutará /{metacity}/ e
+iniciará el /{xvncviewer}/, conectándo al puerto #{5901}# de un servidor en
#{192.168.1.2}#:
code{
@@ -302,10 +302,10 @@ almacenamiento, es necesario comprender el equilibrio que se está haciendo
entre tamaño y funcionalidad. En este ejemplo, se recorta tanto sólo para
dar cabida a material adicional dentro de un tamaño de 128M, pero sin hacer
nada para destruir la integridad de los paquetes que contiene, tales como la
-depuración de las variantes locales a través del paquete #{localepurge}# u
+depuración de las variantes locales a través del paquete /{localepurge}/ u
otro tipo de optimizaciones «intrusivas». Cabe destacar que no se debe usar
#{--bootstrap-flavour minimal}# a menos de que realmente se sepa lo que se
-está haciendo, ya que al omitir paquetes de prioridad #{importante}# lo más
+está haciendo, ya que al omitir paquetes de prioridad *{importante}* lo más
probable es que se produzca un sistema roto.
code{
@@ -338,7 +338,7 @@ vivo. Elegir la lista del paquete #{minimal}# deja fuera el gran paquete de
#{locales}# y sus utilidades asociadas. Dejando los paquetes recomendados
con #{--apt-recommends false}# se ahorra un poco de espacio adicional a
costa de omitir algunos paquetes que de otro modo podría esperarse que
-estuvieran alli, tal como #{firmware-linux-free}# que puede ser necesario
+estuvieran alli, tal como /{firmware-linux-free}/ que puede ser necesario
para el soporte de cierto hardware. Las opciones restantes recortan pequeñas
cantidades adicionales de espacio. Es necesario decidir si vale la pena la
funcionalidad que se sacrifica con cada optimización.
@@ -406,8 +406,8 @@ code{
}code
-Tener en cuenta que se ha incluido el paquete #{debian-installer-launcher}#
-para lanzar el instalador desde el escritorio en vivo, y que también se ha
+Tener en cuenta que se ha incluido el paquete debian-installer-launcher para
+lanzar el instalador desde el escritorio en vivo, y que también se ha
especificado el kernel 486, ya que actualmente es necesario que el
instalador y el kernel del sistema en vivo coincidan para que el lanzador
funcione correctamente.
diff --git a/manual/es/user_installation.ssi b/manual/es/user_installation.ssi
index 72abc83..22b998a 100644
--- a/manual/es/user_installation.ssi
+++ b/manual/es/user_installation.ssi
@@ -138,14 +138,14 @@ de live-boot y live-config.
_* Creación de los paquetes .deb de live-boot y live-config
Se debe crear ya sea en la distribución de destino o en un entorno chroot
-que contenga la plataforma de destino: es decir, si el objetivo es Wheezy
-entonces se debe crear usando Wheezy.
+que contenga la plataforma de destino: es decir, si el objetivo es wheezy
+entonces se debe crear usando wheezy.
Utilizar un programa creador personal como /{pbuilder}/ o /{sbuild}/ si se
-necesita crear #{live-boot}# para una distribución de destino diferente del
-sistema de creación. Por ejemplo, para las imágenes en vivo de Wheezy, crear
-#{live-boot}# en un entorno chroot. Si la distribución de destino coincide
-con la distribución actual, se puede crear directamente sobre el sistema de
+necesita crear live-boot para una distribución de destino diferente del
+sistema de creación. Por ejemplo, para las imágenes en vivo de wheezy, crear
+live-boot en un entorno chroot. Si la distribución de destino coincide con
+la distribución actual, se puede crear directamente sobre el sistema de
creación con #{dpkg-buildpackage}# (proporcionada por el paquete
/{dpkg-dev}/ ):
diff --git a/manual/es/user_overview.ssi b/manual/es/user_overview.ssi
index fbab7e2..b61b0d1 100644
--- a/manual/es/user_overview.ssi
+++ b/manual/es/user_overview.ssi
@@ -16,10 +16,10 @@ directorio de configuración para automatizar completamente y personalizar
todos los aspectos de la creación de una imagen de un sistema en vivo.
Muchos conceptos son similares a los del paquete de herramientas de Debian
-debhelper escrito por Joey Hess:
+/{debhelper}/ escrito por Joey Hess:
_* Los scripts tienen una ubicación central para la configuración de su
-funcionamiento. En debhelper, éste es el subdirectorio #{debian/}# de un
+funcionamiento. En /{debhelper}/, éste es el subdirectorio #{debian/}# de un
árbol de paquetes. Por ejemplo, dh_install buscará, entre otros, un fichero
llamado #{debian/install}# para determinar qué ficheros deben existir en un
paquete binario en particular. De la misma manera, live-build almacena toda
@@ -28,11 +28,11 @@ su configuración bajo un subdirectorio #{config/}#.
_* Los scripts son independientes - es decir, siempre es seguro ejecutar
cada comando.
-A diferencia de debhelper, live-build contiene una herramienta para crear un
-directorio de configuración en esqueleto, #{lb config}#. Ésto podría ser
-considerado como similar a herramientas tales como #{dh-make}#. Para obtener
-más información sobre #{lb config}#, consultar {El comando lb config
-}#lb-config
+A diferencia de /{debhelper}/, live-build contiene una herramienta para
+crear un directorio de configuración en esqueleto, #{lb config}#. Ésto
+podría ser considerado como similar a herramientas tales como
+/{dh-make}/. Para obtener más información sobre #{lb config}#, consultar {El
+comando lb config }#lb-config
El resto de esta sección describe los tres comandos más importantes:
diff --git a/manual/fr/about_manual.ssi b/manual/fr/about_manual.ssi
index ffa488c..d5816d1 100644
--- a/manual/fr/about_manual.ssi
+++ b/manual/fr/about_manual.ssi
@@ -4,21 +4,23 @@
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 7.0 "Wheezy". 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 sur les supports ou sur 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.
+produits par le projet pour Debian 7.0 "wheezy". Une version mise à jour
+peut toujours être trouvée à http://live.debian.net/
+
+Tandis ce manuel 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 sur
+les supports ou sur 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 persistance.
Certaines commandes mentionnées dans le texte doivent être exécutées avec
les privilèges de super-utilisateur, qui peuvent être obtenus en devenant
super-utilisateur à l'aide de #{su}# ou en utilisant #{sudo}#. Afin de
distinguer les commandes qui peuvent être exécutées par un utilisateur sans
-privilèges de celles nécessitant les privilèges super-utilisateur, les
+privilèges de celles nécessitant les privilèges de super-utilisateur, les
commandes sont précédées respectivement par #{$}# ou #{#}#. Ce symbole ne
fait pas partie de la commande.
@@ -28,28 +30,32 @@ 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
+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
+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 soyez
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
_* *{Système Live}*: Un système d'exploitation pouvant être démarré sans
-installation préalable sur disque dur. Les Systèmes Live ne modifient pas le
-système d'exploitation local ou les fichiers installés sur le disque dur
+installation préalable sur un disque dur. Les Systèmes Live ne modifient pas
+le système d'exploitation local ou les fichiers installés sur le disque dur
sans qu'on leur en donne explicitement l'instruction. D'habitude, les
systèmes Live sont démarrés à partir des supports tels que des CD, DVD, ou
des clés USB. Certains systèmes peuvent également être démarrés sur le
@@ -60,24 +66,24 @@ live-boot, live-build, live-config, et live-manual.
_* *{Système Debian Live}*: Un système live qui utilise les logiciels du
système d'exploitation Debian et qui peut être démarré sur CD, DVD, clé USB,
-en réseau (à l'aide des images netboot), et à partir d'Internet (à l'aide du
-paramètre de démarrage #{fetch=URL}#).
+sur le réseau (à l'aide des images netboot), et à partir d'Internet (à
+l'aide du paramètre de démarrage #{fetch=URL}#).
_* *{Système hôte}*: L'environnement utilisé pour créer le système live.
-_* *{Système de destination}*: L'environnement utilisé pour faire tourner le
+_* *{Système objectif}*: L'environnement utilisé pour faire fonctionner le
système live.
_* *{live-boot}*: Une collection de scripts utilisés pour lancer des
-systèmes live. live-boot faisait initialement partie de live-initramfs.
+systèmes live. live-boot faisait initialement partie de /{live-initramfs}/.
_* *{live-build}*: Une collection de scripts utilisés pour personnaliser les
-systèmes Debian Live. live-build était initialement nommé live-package, puis
-live-helper.
+systèmes Debian Live. live-build était initialement nommé /{live-package}/,
+puis /{live-helper}/.
_* *{live-config}*: Une collection de scripts utilisés pour configurer un
-système live durant le processus d'amorçage. live-config faisait
-initialement partie de live-initramfs.
+système live pendant le processus d'amorçage. live-config faisait
+initialement partie de /{live-initramfs}/.
_* *{live-manual}*: Ce document est maintenu dans un paquet nommé
live-manual.
@@ -85,34 +91,30 @@ live-manual.
_* *{Debian Installer (d-i)}*: Le système d'installation officiel pour la
distribution Debian.
-_* *{Paramètres d'amorçage}*: Les paramètres pouvant être entrés à l'invite
-de démarrage afin de modifier le noyau ou live-config.
+_* *{Paramètres d'amorçage}*: Les paramètres qui peuvent être entrés à
+l'invite de démarrage afin de modifier le noyau ou live-config.
-_* *{chroot}*: Le programme chroot, #{chroot(8)}#, nous permet de faire
-tourner plusieurs instances concurrentes de l'environnement GNU/Linux sur un
-système sans redémarrage.
+_* *{chroot}*: Le logiciel /{chroot}/, #{chroot(8)}#, nous permet d'exécuter
+plusieurs instances concurrentes de l'environnement GNU/Linux sur un système
+sans redémarrage.
_* *{Image binaire}*: Un fichier contenant le système live, tel que
binary.iso ou binary.img.
-_* *{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 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
-les paquets suffisamment matures peuvent entrer. Un avantage de cette
-distribution est qu'elle contient des logiciels de versions plus récentes
-que la version *{stable}*. La distribution *{unstable}* est en constante
-évolution. En général cette distribution est utilisée par les développeurs
-et ceux qui aiment le risque.
+_* *{Distribution objectif}*: La distribution sur laquelle votre système
+live sera basée. Ceci peut être diffèrent de la distribution de votre
+système hôte.
+
+_* *{stable/testing/unstable}*: La distribution *{stable}* contient la
+dernière version officielle de Debian. La distribution *{testing}* est la
+prochaine version stable où seulement les paquets suffisamment matures
+peuvent entrer. Un avantage de cette distribution est qu'elle contient des
+logiciels de versions plus récentes que la version *{stable}*. La
+distribution *{unstable}* est en constante évolution. En général cette
+distribution est utilisée par les développeurs et ceux qui aiment le
+risque. Tout au long du manuel, nous avons tendance à utiliser les noms de
+code pour les évolutions majeures, tels que wheezy ou sid, car c'est ce qui
+est soutenu par les outils eux-mêmes.
2~ Auteurs
@@ -250,32 +252,18 @@ code{
}code
-_* Notez que vous devez livrer des changements sur la branche debian-next,
+_* Notez que vous devez livrer les changements sur la branche debian-next,
pas sur la branche debian.
-_* Après édition des fichiers dans #{manual/en/}#, veuillez appeler 'commit'
-dans le répertoire de niveau supérieur du dépôt afin de nettoyer les fichier
-et de mettre à jour les fichiers de traduction:
-
-code{
-
- $ make commit
-
-}code
-
-_* Alors
-
-code{
-
- $ git add .
-
-}code
+_* Ne pas utiliser #{make commit}# à moins que vous mettez à jour les
+traductions dans le commit, et dans ce cas, ne pas mélanger les
+modifications apportées au manuel en anglais et les traductions dans la même
+livraison, mais utiliser commits séparées. Voir la section
+{Traduction}#translation pour plus de détails.
-_* 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 avec la forme 'Fixing/Adding/Removing/Correcting/Translating', par
-exemple
+_* Veuillez écrire les commentaires du commit à l'aide de phrases complètes,
+en commençant par une majuscule et en terminant par un point, et avec la
+forme 'Fixing/Adding/Removing/Correcting/Translating', par exemple
code{
@@ -298,9 +286,9 @@ Pour soumettre une traduction pour une nouvelle langue, suivez ces trois
_* 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.
+/{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.
_* Une fois la nouvelle langue est ajoutée, vous pouvez commencer à traduire
de façon aléatoire tous les fichiers po dans #{manual/po/}#.
@@ -310,4 +298,4 @@ 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.
+*{Remarque:}* S'il vous plaît soyez conscients 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/fr/about_project.ssi b/manual/fr/about_project.ssi
index a2c87df..150f6a6 100644
--- a/manual/fr/about_project.ssi
+++ b/manual/fr/about_project.ssi
@@ -6,21 +6,21 @@
3~ Quel est le problème avec les systèmes live actuels
-Lorsque Debian Live a été lancé, il y avait déjà plusieurs systèmes live
-basés sur debian et ils faisaient un excellent travail. Du point de vue de
+Lorsque Debian Live était lancé, il y avait déjà plusieurs systèmes live
+basés sur debian et ils faisaient un excellent travail. Du point de vue de
Debian la plupart d'entre eux ont un ou plusieurs des inconvénients
suivants:
_* Ils ne sont pas des projets de Debian, et donc ils manquent de soutien au
sein de Debian.
-_* Ils mélangent les différentes distributions p. ex *{testing}* et
+_* Ils mélangent des distributions différentes p. ex *{testing}* et
*{unstable}*.
-_* Ils supportent seulement i386.
+_* Ils soutiennent seulement i386.
_* Ils modifient le comportement et/ou l'apparence des paquets en les
-dépouillant pour économiser l'espace.
+dépouillant pour économiser de l'espace.
_* Ils comprennent des paquets provenant en dehors de l'archive Debian.
@@ -39,7 +39,7 @@ Debian est le système d'exploitation universel: Debian a un système live
pour montrer autour et pour représenter le vrai, seul et unique système
Debian avec les principaux avantages suivants:
-_* Ce serait un sous-projet de Debian.
+_* Il est un sous-projet de Debian.
_* Il reflète l'état (actuel) d'une distribution.
@@ -74,19 +74,17 @@ Dans cette phase, nous n'offerons configurations alternatives. Tous les
paquets sont utilisés dans leur configuration par défaut comme ils sont
après une installation standard de Debian.
-Chaque fois que nous avons besoin d'une configuration par défaut différent,
+Chaque fois que nous avons besoin d'une configuration par défaut différente,
nous le ferons en coordination avec le responsable du paquet dans Debian.
-Un système de configuration des paquets est fourni avec debconf dans #{lb
-config}# (utiliser --preseed FICHIER) permettant la personnalisation des
-paquets installés sur votre image Debian Live, mais pour les images
-officielles seulement sera utilisé une configuration par défaut. Pour plus
-d'informations, s'il vous plaît voir {Vue d'ensemble de la
-personnalisation}#customization-overview.
+Un système de configuration des paquets est fourni avec debconf permettant
+la personnalisation des paquets installés sur votre image Debian Live, mais
+pour les images officielles seulement une configuration par défaut sera
+utilisée . Pour plus d'informations, s'il vous plaît voir {Vue d'ensemble de
+la personnalisation}#customization-overview.
Exception: Il y a quelques changements essentiels nécessaires pour mettre un
-système live en marche (par exemple la configuration de pam pour permettre
-des mots de passe vide). Ces changements essentiels doivent être maintenus
+système live en marche. Ces changements essentiels doivent être maintenus
aussi minimes que possible et devraient être fusionnées au sein du dépôt
Debian s'il est possible.
@@ -98,14 +96,14 @@ courriel à la liste directement en adressant votre courrier à
debian-live at lists.debian.org. Les archives de la liste sont disponibles à
http://lists.debian.org/debian-live/.
-_* *{IRC}*: Un certain nombre d'utilisateurs et les développeurs sont
+_* *{IRC}*: Un certain nombre d'utilisateurs et de développeurs sont
présents dans le canal #debian-live sur irc.debian.org (OFTC). Quand vous
posez une question sur IRC, s'il vous plaît soyez patient en attendant une
réponse. Si aucune réponse n'est donnée, s'il vous plaît envoyez un courriel
à la liste de diffusion.
-_* *{BTS}*: Le Debian Bug Tracking System (BTS) contient les détails des
-bogues rapportés par les utilisateurs et les développeurs. Chaque bogue
-reçoit un numéro, et il est conservé jusqu'à ce qu'il soit marqué comme
-traité. Pour plus d'informations, s'il vous plaît voir {Rapporter des
-bogues}#bugs.
+_* *{BTS}*: Le {Debian Bug Tracking System}http://www.debian.org/Bugs/ (BTS)
+contient les détails des bogues rapportés par les utilisateurs et les
+développeurs. Chaque bogue reçoit un numéro, et il est conservé jusqu'à ce
+qu'il est marqué comme traité. Pour plus d'informations, s'il vous plaît
+voir {Rapporter des bogues}#bugs.
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index 21f51d2..813fea9 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -9,13 +9,13 @@
:license: Ce programme est un logiciel libre; vous pouvez le redistribuer ou le modifier suivant les termes de la Licence Générale Publique GNU telle que publiée par la Free Software Foundation: soit la version 3 de cette licence, soit (à votre gré) toute version ultérieure.<br><br>Ce programme est distribué dans l’espoir qu’il vous sera utile, mais SANS AUCUNE GARANTIE: sans même la garantie implicite de COMMERCIALISABILITÉ ni d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez la Licence Générale Publique GNU pour plus de détails.<br><br>Vous devriez avoir reçu une copie de la Licence Générale Publique GNU avec ce programme ; si ce n’est pas le cas, consultez http://www.gnu.org/licenses/. <br><br>Le texte complet de la Licence Générale Publique GNU peut être trouvé dans le fichier / usr/share/common-licenses/GPL-3
@date:
- :published: 2012-04-03
+ :published: 04.06.2012
@publisher: Debian Live Project <debian-live at lists.debian.org>
@make:
- :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/
- :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/
+ :bold: /squeeze|wheezy|sid/
+ :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
diff --git a/manual/fr/project_bugs.ssi b/manual/fr/project_bugs.ssi
index 05eddc8..d377565 100644
--- a/manual/fr/project_bugs.ssi
+++ b/manual/fr/project_bugs.ssi
@@ -15,7 +15,7 @@ l'image sur notre page d'accueil http://live.debian.net/ pour voir les
problèmes connus.
_* Toujours essayer de reproduire le bogue avec *{les versions les plus
-récents}* de live-build, live-boot, et live-config avant de présenter un
+récentes}* de live-build, live-boot, et live-config avant de présenter un
rapport de bogue.
_* Essayez de donner des informations aussi précises que possible sur le
@@ -26,8 +26,8 @@ construisez.
2~ Problèmes connus
Parce que les distributions Debian *{testing}* et Debian *{unstable}* sont
-une cible mouvante, quand vous les spécifiez comme la distribution du
-système cible, une construction avec succès n'est pas toujours possible.
+une cible mouvante, quand vous les spécifiez comme les distributions du
+système objectif, une construction avec succès n'est pas toujours possible.
% FIXME:
@@ -41,8 +41,8 @@ http://live.debian.net/.
Il est hors cadre de ce manuel vous former correctement à identifier et
corriger les problèmes dans les paquets des distributions de développement,
cependant, il y a deux choses que vous pouvez toujours essayer: Si une
-construction échoue lorsque la distribution cible est *{testing}*, essayez
-*{unstable}*. Si *{unstable}* ne fonctionne pas non plus, revenir à
+construction échoue lorsque la distribution objectif est *{testing}*,
+essayez *{unstable}*. Si *{unstable}* ne fonctionne pas non plus, revenir à
*{testing}* et fixer la nouvelle version du paquet qui échoue de
*{unstable}* (voir {APT pinning}#apt-pinning pour plus de détails).
@@ -52,12 +52,12 @@ Afin de s'assurer que un bogue en particulier n'est pas causé par un système
construit malpropre, s'il vous plaît toujours reconstruire l'ensemble du
système live à partir de zéro pour voir si le bogue est reproductible.
-2~ Utilisez paquets mises à jour
+2~ Utilisez paquets mis à jour
L'utilisation de paquets obsolètes peut causer des problèmes importants en
essayant de reproduire (et finalement régler) votre problème. Assurez-vous
que votre système de construction est mis à jour et tous les paquets inclus
-dans votre image sont mises à jour aussi.
+dans votre image sont mis à jour aussi.
2~collect-information Recueillir l'information
@@ -78,7 +78,7 @@ _* Version de live-boot sur le système live
_* Version de live-config sur le système live
-_* Version de #{debootstrap}# et/ou #{cdebootstrap}# sur le système hôte
+_* Version de /{debootstrap}/ et/ou /{cdebootstrap}/ sur le système hôte
_* L'architecture du système live
@@ -109,7 +109,7 @@ pouvez utiliser la sortie de #{lb config --dump}# qui produit un résumé de
votre arbre de config (c'est-à-dire les listes des fichiers dans les
sous-répertoires de #{config/}# mais ne les inclut pas).
-N'oubliez pas d'envoyer tous les journaux qui ont été produites avec le
+N'oubliez pas d'envoyer tous les journaux qui ont été produits avec le
paramètre régionaux anglais, par exemple exécuter vos commandes live-build
précédées par #{LC_ALL=C}# ou #{LC_ALL=en_US}#.
@@ -118,13 +118,13 @@ précédées par #{LC_ALL=C}# ou #{LC_ALL=en_US}#.
Si possible, isoler le cas qui échoue au plus petit changement possible. Il
n'est pas toujours facile de faire cela, donc si vous ne pouvez pas le gérer
pour votre rapport, ne vous inquiétez pas. Toutefois, si vous planifiez
-votre cycle de développement bien, en utilisant petits ensembles de changes
-par itération, vous pourriez être capable d'isoler le problème en
-construisant une configuration simple «base» qui correspond étroitement à la
-configuration réelle avec seulement le changement cassé ajouté. Si il est
-difficile de trier vos modifications que cassent, il est possible que vous y
-compris trop dans chaque ensemble de modifications et devraient se
-développer en petits incréments.
+votre cycle de développement bien, en utilisant petits ensembles de
+changements par itération, vous pourriez être capable d'isoler le problème
+en construisant une configuration simple «base» qui correspond étroitement à
+la configuration réelle avec seulement le changement cassé ajouté. Si il est
+difficile de trier vos modifications qui cassent, il est possible que vous y
+compris trop dans chaque ensemble de modifications et vous devriez
+developper en petits incréments.
2~ Utilisez le paquet adéquat pour rapporter le bogue
@@ -132,10 +132,10 @@ Où est-ce que le bogue apparaît?
3~ Au moment de la construction tandis l'amorçage
-live-build amorce d'abord un système Debian de base avec #{debootstrap}# ou
-#{cdebootstrap}#. Selon l'outil d'amorçage utilisé et de la distribution
+live-build amorce d'abord un système Debian de base avec /{debootstrap}/ ou
+/{cdebootstrap}/. Selon l'outil d'amorçage utilisé et de la distribution
Debian il peut échouer. Si un bogue apparaît ici, vérifiez si l'erreur est
-liée à un paquet Debian spécifique (plus probable), ou si il est liée à
+liée à un paquet Debian spécifique (plus probable), ou si elle est liée à
l'outil d'amorçage lui-même.
Dans les deux cas, ce n'est pas un bogue dans Debian Live, mais plutôt dans
@@ -151,13 +151,13 @@ est également reproductible sur un système normal.
Si c'est le cas, ce n'est pas un bogue dans Debian Live, mais plutôt dans
Debian - s'il vous plaît faire le rapport sur le paquet
-défaillant. L'exécution de #{debootstrap}# séparément du système de
+défaillant. L'exécution de /{debootstrap}/ séparément du système de
construction ou l'exécution de #{lb bootstrap --debug}# vous donnera plus
d'informations.
Aussi, si vous utilisez un miroir local et/ou un proxy et vous rencontrez un
-problème, s'il vous plaît toujours le reproduire d'abord en amorçant sur un
-miroir officiel.
+problème, s'il vous plaît toujours le reproduire d'abord bootstrapping sur
+un miroir officiel.
3~ Au moment du démarrage
@@ -167,7 +167,7 @@ l'information}#collect-information. Ne pas oublier de mentionner,
comment/quand l'image a échoué, dans Qemu, VirtualBox, VMWare ou matériel
réel. Si vous utilisez une technologie de virtualisation d'aucune sorte,
s'il vous plaît toujours tester sur matériel réel avant de rapporter un
-bug. Fournir une copie d'écran de l'échec est également très utile.
+bogue. Fournir une copie d'écran de l'échec est également très utile.
3~ Au moment de l'exécution
@@ -176,7 +176,7 @@ système Live, c'est probablement un bogue dans Debian Live. Cependant,
2~ Faire les recherches
-Avant de présenter le bogue, s'il vous plaît recherchez sur le web pour le
+Avant de présenter le bogue, s'il vous plaît recherchez sur le web le
message d'erreur ou un symptôme particulier que vous obtenez. Comme il est
hautement improbable que vous êtes la seule personne qui expérience un
problème particulier, il y a toujours une chance qu'il a été discuté
@@ -190,7 +190,7 @@ inclure les références au sein de vos rapport de bogues.
En outre, vous devriez vérifier les listes de bogues en cours de live-build,
live-boot, et live-config pour voir si quelque chose de semblable n'a été
-déjà signalé.
+déjà signalée.
2~ Où rapporter les bogues
@@ -200,12 +200,12 @@ d'utiliser le système, s'il vous plaît voir http://bugs.debian.org/. Vous
pouvez également soumettre les bogues en utilisant la commande #{reportbug}#
du paquet du même nom.
-En général, vous devez signaler des erreurs de construction contre le paquet
-live-build, des erreurs en temps de démarrage contre live-boot, et erreurs
-d'exécution contre live-config. Si vous n'êtes pas sûr de quel paquet est
-approprié ou avez besoin d'aide avant de soumettre un rapport de bogue, s'il
-vous plaît envoyez un message à la liste de diffusion et nous vous aiderons
-à décider.
+En général, vous devez signaler les erreurs de construction contre le paquet
+live-build, les erreurs en temps de démarrage contre live-boot, et les
+erreurs d'exécution contre live-config. Si vous n'êtes pas sûr de quel
+paquet est approprié ou avez besoin d'aide avant de soumettre un rapport de
+bogue, s'il vous plaît envoyez un message à la liste de diffusion et nous
+vous aiderons à décider.
S'il vous plaît notez que les bogues trouvés dans les distributions dérivées
de Debian (comme Ubuntu et autres) *{ne}* doivent *{pas}* être rapportés au
diff --git a/manual/fr/project_coding-style.ssi b/manual/fr/project_coding-style.ssi
index 8dd38b9..e96d2b3 100644
--- a/manual/fr/project_coding-style.ssi
+++ b/manual/fr/project_coding-style.ssi
@@ -6,7 +6,7 @@ Ce chapitre documente le style du code utilisé en live-boot et autres.
2~ Compatibilité
-_* Ne pas utiliser la syntaxe ou la sémantique qui sont uniques à le shell
+_* Ne pas utiliser une syntaxe ou sémantique qui soit unique à le shell
Bash. Par exemple, l'utilisation d'arrays.
_* N'utiliser que le sous-ensemble POSIX - par exemple, utiliser $(foo) au
@@ -14,6 +14,8 @@ lieu de `foo`.
_* Vous pouvez vérifier vos scripts avec 'sh -n' et 'checkbashisms'.
+_* Assurez-vous que tout le code fonctionne avec 'set-e '.
+
2~ Indentation
_* Toujours utiliser des tabulations en lieu des espaces.
@@ -51,7 +53,7 @@ Mal:
code{
- foo () {
+ Foo () {
bar
}
@@ -61,7 +63,7 @@ Bien:
code{
- foo ()
+ Foo ()
{
bar
}
@@ -75,15 +77,15 @@ _* Les variables sont toujours en lettres majuscules.
_* Les variables utilisées dans #{lb config}# commencent toujours par le
préfixe #{LB_}#.
-_* Les variables temporaires internes en live-build devraient commencer avec
-le préfixe #{\_LB_}#.
+_* Les variables temporaires internes dans live-build devraient commencer
+avec le préfixe #{\_LB_}#.
_* Les variables locales commencent avec le préfixe #{\_\_LB_}#.
-_* Les variables en relation avec un paramètre de démarrage en live-config
+_* Les variables en relation avec un paramètre de démarrage dans live-config
commencent par #{LIVE_}#.
-_* Toutes les autres variables en live-config commencent par le préfixe
+_* Toutes les autres variables dans live-config commencent par le préfixe
#{_}#.
_* Utilisez des accolades autour des variables; par exemple écrire
@@ -138,12 +140,15 @@ code{
2~ Autres
-_* Utilisez "#{|}#" (sans les guillemets autour) comme un séparateur dans
-les appels à sed, par exemple "#{sed -e 's|foo|bar|'}#" (sans" ").
+_* Utilisez "#{|}#" (sans les guillemets autour) comme séparateur dans les
+appels à sed, par exemple "#{sed -e 's|foo|bar|'}#" (sans" ").
_* Ne pas utiliser la commande #{test}# pour des comparaisons ou des tests,
utilisez "#{[}#" "#{]}#" (sans ""); par exemple "#{if [ -x /bin/foo ];
...}#" et non pas "#{if test -x /bin/foo; ...}#".
_* Utiliser #{case}# dans la mesure du possible en lieu de #{test}#, parce
-qu'il est plus facile à lire et plus rapide dans l'exécution.
+qu'il est plus facile à lire et plus rapide en l'exécution.
+
+_* Utilisez noms en majuscule pour les fonctions pour éviter toute
+interférence avec l'environnement des utilisateurs.
diff --git a/manual/fr/project_procedures.ssi b/manual/fr/project_procedures.ssi
index dd926d0..395e94e 100644
--- a/manual/fr/project_procedures.ssi
+++ b/manual/fr/project_procedures.ssi
@@ -3,8 +3,8 @@ B~ Procédures
1~procedures Procédures
Ce chapitre documente les procédures au sein du projet Debian Live pour
-différentes tâches qui ont besoin de la coopération avec d'autres équipes
-dans Debian.
+différentes tâches qui ont besoin de coopération avec d'autres équipes dans
+Debian.
2~ Télécharger Udebs
@@ -19,12 +19,12 @@ code{
2~ Évolutions majeures
La libération d'une nouvelle version stable majeur de Debian inclut beaucoup
-de différentes équipes travaillant ensemble. À un certain point, l'équipe
-Live arrive et construit des images du système live. Les conditions pour ce
+de équipes différentes travaillant ensemble. À un certain point, l'équipe
+Live arrive et construit images des systèmes live. Les conditions pour ce
faire sont les suivantes:
-_* Un miroir contenant les versions publiées pour les référentiels Debian,
-debian-security et debian-volatile auxquels debian-live buildd peut avoir
+_* Un miroir contenant les versions publiées des dépôts Debian,
+debian-security et debian-volatile auxquels le debian-live buildd peut avoir
accès.
_* Les noms de l'image doivent être connus (par exemple
@@ -42,16 +42,24 @@ _* Les images sont construites et mises en miroir sur cdimage.debian.org.
2~ Èvolutions mineures
-_* Encore une fois, nous avons besoin d'un miroir mise à jour de Debian,
+_* Encore une fois, nous avons besoin de miroirs mis à jour de Debian,
Debian-security et debian-volatile.
_* Les images sont construites et mises en miroir sur cdimage.debian.org.
-_* Envoyer un courrier d'annonce.
+_* Envoyer un courriel d'annonce.
+
+3~ Dernière évolution mineure d'une version Debian
+
+N'oubliez pas de régler à la fois les miroirs pour chroot et binary lors de
+la construction de la dernière série d'images pour une version de Debian
+après qu'elle a été déplacé de ftp.debian.org à archive.debian.org. De cette
+façon, les vieilles images live précompilées sont encore utiles, sans
+modifications des utilisateurs.
3~ Modèle pour l'annonce d'une évolution mineure
-Un courrier pour l'annonce d'une évolutioun mineure peut être généré en
+Un courriel pour l'annonce d'une évolutioun mineure peut être généré en
utilisant le modèle ci-dessous et la commande suivante:
code{
@@ -64,7 +72,7 @@ code{
}code
-S'il vous plaît vérifiez le courrier avant l'envoi et le passer à d'autres
+S'il vous plaît vérifiez le courriel avant l'envoi et le passer à d'autres
pour la relecture.
code{
@@ -100,7 +108,7 @@ code{
<http://cdimage.debian.org/cdimage/release/current-live/>
- Projet Debian Live Homepage:
+ Debian Live project homepage:
<http://live.debian.net/>
diff --git a/manual/fr/style_guide.ssi b/manual/fr/style_guide.ssi
index 8b01cc3..edd8e20 100644
--- a/manual/fr/style_guide.ssi
+++ b/manual/fr/style_guide.ssi
@@ -342,11 +342,11 @@ intervention if the code changes.
Leave the code blocks empty (they will be automatically added then) if you
want to make your translation easier to maintain.
-_* /{New lines}/
+_* /{Newlines}/
-The translated texts need to have the exact same new lines as the original
+The translated texts need to have the exact same newlines as the original
texts. Be careful to press the "Enter" key or type *{\n}* if they appear in
-the original files. These new lines often appear, for instance, in the code
+the original files. These newlines often appear, for instance, in the code
blocks.
Make no mistake, this does not mean that the translated text needs to have
@@ -362,9 +362,7 @@ Translators should never translate:
- The commands given as examples
- - Metadata (often between colons *{:metadata:}*) especially the date in
- /{live-manual.ssm.po}/ because it changes every time live-manual is
- updated.
+ - Metadata (often between colons *{:metadata:}*)
- Links
diff --git a/manual/fr/user_basics.ssi b/manual/fr/user_basics.ssi
index 0bea152..f9b4232 100644
--- a/manual/fr/user_basics.ssi
+++ b/manual/fr/user_basics.ssi
@@ -11,8 +11,8 @@ de la persistance, le type #{hdd}# peut être plus approprié pour les
périphériques USB. Le chapitre se termine avec des instructions pour la
construction et l'utilisation d'une image #{net}# , qui est un peu plus
compliqué en raison de la configuration requise sur le serveur. C'est un
-sujet un peu avancée pour tous ceux qui ne connaissent pas déjà le démarrage
-par le réseau, mais est inclus ici car une fois la configuration est
+sujet un peu avancé pour tous ceux qui ne connaissent pas déjà le démarrage
+sur le réseau, mais est inclus ici car une fois la configuration est
terminée, il est un moyen très pratique pour tester et déployer des images
pour le démarrage sur le réseau local sans le tracas des supports de
l'image.
@@ -24,58 +24,58 @@ image précompilée les noms de fichiers peuvent varier.
2~what-is-live Qu'est-ce c'est un système live?
Un système live signifie généralement un système d'exploitation démarré sur
-un ordinateur à partir d'un support amovible, tel qu'un CD-ROM ou une clé
-USB, ou d'un réseau prêt à l'emploi sans aucune installation sur le disque
-habituel(s), avec auto-configuration fait lors de l'exécution (voir
+un ordinateur à partir d'un support amovible, tel qu'un CD-ROM, une clé USB
+ou d'un réseau, prêt à l'emploi sans aucune installation sur le disque
+habituel, avec auto-configuration fait lors de l'exécution (voir
{Termes}#terms).
Avec Debian Live, c'est un système Debian GNU/Linux, construit pour une des
architectures supportées (actuellement amd64, i386, PowerPC et SPARC). Il
est fait à partir des éléments suivants:
-_* *{Linux kernel image}*, d'habitude appelé #{vmlinuz*}#
+_* *{Image du noyau Linux}*, d'habitude appelé #{vmlinuz*}#
-_* *{Initial RAM disk image (initrd)}*: Un disque virtuel RAM configuré pour
-le démarrage de Linux, contenant possiblement des modules nécessaires pour
-monter l'image du système et certains scripts pour le faire.
+_* *{Image du RAM-disque initial (initrd)}*: Un disque virtuel RAM configuré
+pour le démarrage de Linux, contenant possiblement des modules nécessaires
+pour monter l'image du système et certains scripts pour le faire.
-_* *{System image}*: L'image du système de fichiers du système
+_* *{Image du système}*: L'image du système de fichiers du système
d'exploitation. Habituellement, un système de fichiers SquashFS comprimé est
utilisé pour réduire au minimum la taille de l'image Debian Live. Notez
qu'il est en lecture seulement. Ainsi, lors du démarrage du système Debian
Live nous allons utiliser un disque RAM et un mécanisme "union" pour
permettre l'écriture de fichiers dans le système en marche. Cependant,
toutes les modifications seront perdues lors de l'arrêt à moins que l'option
-persistance est utilisée (voir {Persistance}#persistence).
+«persistance» soit utilisée (voir {Persistance}#persistence).
-_* *{Bootloader}*: Un petit morceau de code conçu pour démarrer à partir du
-support choisi, il peut présenter un menu rapide ou permettre la sélection
-des options/configuration. Il charge le kernel Linux et son initrd pour
-fonctionner avec un système de fichiers associé. Différentes solutions
+_* *{Chargeur d'amorçage}*: Un petit morceau de code conçu pour démarrer à
+partir du support choisi, il peut présenter un menu rapide ou permettre la
+sélection des options/configurations. Il charge le noyau Linux et son initrd
+pour fonctionner avec un système de fichiers associé. Différentes solutions
peuvent être utilisées, selon le support de destination et le format du
système de fichiers contenant les composants mentionnés précédemment:
isolinux pour démarrer à partir d'un CD ou DVD au format ISO9660, syslinux
-pour démarrer le disque dur ou clé USB à partir d'une partition VFAT,
-extlinux pour ext2/3/4 et partitions btrfs, pxelinux pour netboot PXE, GRUB
-pour ext2/3/4 partitions, etc.
+pour démarrer un disque dur ou une clé USB à partir d'une partition VFAT,
+extlinux pour partitions ext2/3/4 et btrfs, pxelinux pour netboot PXE, GRUB
+pour partitions ext2/3/4, etc.
Vous pouvez utiliser live-build pour construire l'image du système à partir
-de vos spécifications, configurer un kernel Linux, son initrd, et un
-chargeur de démarrage pour les exécuter, tout dans un format en fonction du
-support (image ISO9660, disque image, etc.)
+de vos spécifications, configurer un noyau Linux, son initrd, et un chargeur
+d'amorçage pour les exécuter, tout dans un format en fonction du support
+(image ISO9660, image disque, etc.)
2~building-iso-hybrid Premières étapes: la construction d'une image ISO
hybride
Quel que soit le type d'image, vous devrez effectuer les mêmes étapes de
base pour créer une image chaque fois. Comme premier exemple, exécuter la
-séquence suivante de commandes live-build pour créer une image ISO hybride
+séquence suivante de commandes live-build pour créer une image ISO hybride
de base contenant tout le système Debian standard sans X.org. Elle est
appropriée pour être gravée sur CD ou DVD, et également peut être copiée sur
une clé USB.
Tout d'abord, exécutez la commande #{lb config}#. Cela va créer une
-hiérarchie "config /" dans le répertoire courant pour l'utilisation par
+hiérarchie "config/" dans le répertoire courant pour l'utilisation par
d'autres commandes:
code{
@@ -88,7 +88,7 @@ Aucun paramètre n'est passé à #{lb config}#, donc défauts seront utilisés
pour l'ensemble de ses diverses options. Voir {La commande lb
config}#lb-config pour plus de détails.
-Maintenant que la hiérarchie "config /" existe, créez l'image avec la
+Maintenant que la hiérarchie "config/" existe, créez l'image avec la
commande #{lb build}# :
code{
@@ -99,14 +99,14 @@ code{
Ce processus peut prendre un certain temps, en fonction de la vitesse de
votre connexion réseau. Quand il est complet, il devrait y avoir un fichier
-image #{binary-hybrid.iso}# prêt à l'emploi, dans le répertoire courant.
+image #{binary.hybrid.iso}# prêt à l'emploi, dans le répertoire courant.
2~using-iso-hybrid Utilisation d'une image ISO hybride live
Après la construction ou le téléchargement d'une image ISO hybride, qui peut
-être obtenue à http://www.debian.org/CD/live/, l'étape suivante est
-d'habitude préparer votre support pour le démarrage, soit sur CD-R(W) ou DVD
--R(W) des supports optiques ou une clé USB.
+être obtenue sur http://www.debian.org/CD/live/, l'étape suivante est
+d'habitude préparer votre support pour le démarrage, soit sur CD-R(W) ou
+DVD-R(W), des supports optiques ou une clé USB.
3~burning-iso-image Graver une image ISO sur un support physique
@@ -117,7 +117,7 @@ code{
# apt-get install wodim
- $ wodim binary-hybrid.iso
+ $ wodim binary.hybrid.iso
}code
@@ -125,9 +125,9 @@ code{
Les images ISO préparées avec la commande #{isohybrid}# comme les images
#{iso-hybrid}# produites par défaut, peuvent être simplement copiées sur une
-clé USB avec #{dd}# ou un programme équivalent. Brancher une clé USB avec
-une capacité suffisamment grande pour votre fichier image et déterminez quel
-dispositif il est, que nous appellons ci-dessous #{${USBSTICK}}#. C'est le
+clé USB avec #{dd}# ou un logiciel équivalent. Brancher une clé USB avec une
+capacité suffisamment grande pour votre fichier image et déterminez quel
+dispositif elle est, que nous appellons ci-dessous #{${USBSTICK}}#. C'est le
fichier de périphérique de votre clé, tel que #{/dev/sdb}#, pas une
partition, tel que #{/dev/sdb1}#! Vous pouvez trouver le nom du périphérique
en regardant la sortie de #{dmesg}# après avoir branché le dispositif, ou
@@ -139,7 +139,7 @@ déjà existant sur votre clé!}*
code{
- $ dd if=binary-hybrid.iso of=${USBSTICK}
+ $ dd if=binary.hybrid.iso of=${USBSTICK}
}code
@@ -147,7 +147,7 @@ code{
3~booting-live-media Démarrer le support live
La première fois que vous démarrez votre support live, qu'il s'agisse de CD,
-DVD, clé USB, ou le démarrage par PXE, une certaine configuration dans le
+DVD, clé USB, ou du démarrage par PXE, une certaine configuration dans le
BIOS de votre ordinateur peut être d'abord nécessaire. Puisque les BIOS
varient grandement en fonctionnalités et raccourcis clavier, on ne peut pas
pénétrer dans le sujet en profondeur ici. Certains BIOS fournissent une
@@ -161,14 +161,13 @@ Une fois que vous avez démarré le support, vous êtes présenté avec un menu
de démarrage. Si vous appuyez simplement sur enter ici, le système va
démarrer en utilisant l'entrée par défaut, #{Live}# Pour plus d'informations
sur les options de démarrage, consultez l'entrée «Help» dans le menu et
-aussi les pages de manuel de #{live-boot}# et #{live-config}# dans le
-système live.
+aussi les pages de manuel de live-boot et live-config dans le système live.
En supposant que vous avez sélectionné #{Live}# et démarré une image de
bureau live par défaut, après les messages de démarrage défilent, vous
devriez être automatiquement connecté au compte #{user}# et voir un bureau,
prêt à l'emploi. Si vous avez démarré une image de la console uniquement,
-tels que saveurs #{standard}# ou #{sauvetage}# des images prédéfinies, vous
+tels que saveurs #{standard}# ou #{rescue}# des images précompilées, vous
devriez être automatiquement connecté à la console pour le compte #{user}#
et voir une invite du shell, prêt à l'emploi.
@@ -181,7 +180,7 @@ sans ses avertissements:
_* L'exécution d'une VM demande assez de RAM pour l'OS client et l'hôte et
un CPU avec support matériel pour la virtualisation est recommandée.
-_* Il ya quelques limitations inhérentes à l'exécution sur une VM, par
+_* Il y a quelques limitations inhérentes à l'exécution sur une VM, par
exemple performance de vidéo médiocre, ou choix limité de matériel émulé.
_* Lors du développement d'un matériel spécifique, il n'existe aucun
@@ -197,13 +196,13 @@ logiciels VM disponibles et choisissez celui qui convient à vos besoins.
3~testing-iso-with-qemu Test d'une image ISO avec QEMU
La VM la plus polyvalente de Debian est QEMU. Si votre processeur possède un
-support matériel pour la virtualisation, vouz pouvez utiliser le paquet
-#{qemu-kvm}#; La description du paquet #{qemu-kvm}# énumère brièvement les
+support matériel pour la virtualisation, vous pouvez utiliser le paquet
+/{qemu-kvm}/; La description du paquet /{qemu-kvm}/ énumère brièvement les
exigences.
-Tout d'abord, installez #{qemu-kvm}# si votre processeur le soutient. Sinon,
-installez #{qemu}#, dans ce cas, le nom du programme est #{qemu}# au lieu de
-#{kvm}# dans les exemples suivants. Le paquet #{qemu-utils}# est également
+Tout d'abord, installez /{qemu-kvm}/ si votre processeur le soutient. Sinon,
+installez /{qemu}/, dans ce cas, le nom du programme est #{qemu}# au lieu de
+#{kvm}# dans les exemples suivants. Le paquet /{qemu-utils}/ est également
valuable pour créer des images disque virtuels avec #{qemu-img}#.
code{
@@ -216,7 +215,7 @@ Démarrer une image ISO est simple:
code{
- $ kvm -cdrom binary-hybrid.iso
+ $ kvm -cdrom binary.hybrid.iso
}code
@@ -224,7 +223,7 @@ Voir les pages de manuel pour plus de détails.
3~testing-iso-with-virtualbox Test d'une image ISO avec virtualbox-ose
-Afin de tester l'ISO avec #{virtualbox-ose}#:
+Afin de tester l'ISO avec /{virtualbox-ose}/:
code{
@@ -235,14 +234,10 @@ code{
}code
Créer une nouvelle machine virtuelle, modifiez les paramètres de stockage
-pour utiliser #{binary-hybrid.iso}# comme le périphérique CD/DVD et démarrer
+pour utiliser #{binary.hybrid.iso}# comme le périphérique CD/DVD et démarrer
la machine.
-Remarque: Pour les systèmes live contenant X.org que vous voulez essayer
-avec #{virtualbox-ose}#, vous pouvez inclure le paquet des pilotes
-VirtualBox X.org, #{virtualbox-ose-guest-x11}#, dans votre configuration de
-live-build. Sinon, la résolution est limitée à 800x600.
-
+*{Remarque:}* Pour les systèmes live contenant X.org que vous voulez essayer avec /{virtualbox-ose}/, vous pouvez inclure le paquet des pilotes VirtualBox X.org, /{virtualbox-ose-guest-x11}/, dans votre configuration de live-build. Sinon, la résolution est limitée à 800x600.
code{
$ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot
@@ -256,15 +251,12 @@ régards, sauf que vous spécifiez #{-b hdd}# et le nom du fichier résultant
est #{binary.img}# qui ne peut être brûlé sur des supports optiques. Il
convient pour le démarrage à partir de clés USB, disques durs USB, et divers
autres dispositifs de stockage portables. Normalement, une image ISO hybride
-peut être utilisé à cette fin au lieu, mais si vous avez un BIOS qui ne gère
-pas correctement des images hybrides, ou si vous voulez utiliser l'espace
-disponible sur le support à certaines fins, tel que la persistance d'une
-partition, vous devez utiliser une image HDD.
-
-Remarque: si vous avez créé une image ISO hybride avec l'exemple précédent,
-vous devrez nettoyer votre répertoire de travail avec la commande #{lb
-clean}# (voir {La commande lb clean}#lb-clean):
+peut être utilisée à cette fin au lieu, mais si vous avez un BIOS qui ne
+gère pas correctement les images hybrides, ou si vous voulez utiliser
+l'espace disponible sur le support à certaines fins, tel que la persistance
+d'une partition, vous devez utiliser une image HDD.
+*{Remarque:}* si vous avez créé une image ISO hybride avec l'exemple précédent, vous devrez nettoyer votre répertoire de travail avec la commande #{lb clean}# (voir {La commande lb clean}#lb-clean):
code{
# lb clean --binary
@@ -298,13 +290,13 @@ démarrage syslinux, prêtes à être écrites directement sur une clé USB. Com
l'utilisation d'une image HDD est juste comme l'utilisation d'une image ISO
hybride sur USB, suivez les instructions {Utiliser une image live ISO
hybride}#using-iso-hybrid, à l'exception du nom de fichier #{binary.img}# en
-lieu de #{binary-hybrid.iso}#.
+lieu de #{binary.hybrid.iso}#.
3~testing-hdd-with-qemu Test d'une image HDD avec Qemu
-D'abord, installer QEMU comme décrit ci-dessus dans {Test d'une image ISO
-avec QEMU}#testing-iso-with-qemu. Ensuite, exécutez #{kvm}# ou #{qemu}#,
-selon la version de vos besoins du système hôte, précisant #{binary.img}#
+D'abord, installer /{qemu}/ comme décrit ci-dessus dans {Test d'une image
+ISO avec QEMU}#testing-iso-with-qemu. Ensuite, exécutez #{kvm}# ou #{qemu}#,
+selon la version que votre système hôte a besoin, précisant #{binary.img}#
comme le premier disque dur.
code{
@@ -316,8 +308,8 @@ code{
3~using-usb-extra-space Utilisation de l'espace disponible sur une clé USB
Pour utiliser l'espace libre restant après avoir copié #{binary.img}# sur
-une clé USB, utilisez un outil de partitionnement tels que #{gparted}# ou
-#{parted}# afin de créer une nouvelle partition sur la clé. La première
+une clé USB, utilisez un outil de partitionnement tel que /{gparted}/ ou
+/{parted}/ afin de créer une nouvelle partition sur la clé. La première
partition sera utilisée par le système Debian Live.
code{
@@ -336,13 +328,8 @@ code{
}code
-Remarque: Si vous voulez utiliser l'espace supplémentaire avec Windows,
-apparemment cet OS ne peut normalement pas accéder à n'importe quel
-partition, mais la première. Certaines solutions à ce problème ont été
-discutés sur notre {liste de diffusion}#contact, mais il semble qu'il n'y a
-pas de réponses faciles.
-
-*{Rappelez-vous: Chaque fois que vous installez une nouvelle binary.img sur la clé, toutes les données sur la clé seront perdues parce que la table de partition est écrasé par le contenu de l'image, vous devez sauvegarder votre partition supplémentaire d'abord la restaurer à nouveau après la mise à jour du live image.}*
+*{Remarque:}* Si vous voulez utiliser l'espace supplémentaire avec Windows, apparemment cet OS ne peut normalement pas accéder à n'importe quelle partition, mais la première. Certaines solutions à ce problème ont été discutées sur notre {liste de diffusion}#contact, mais il semble qu'il n'y a pas de réponses faciles.
+*{Rappelez-vous: Chaque fois que vous installez une nouvelle binary.img sur la clé, toutes les données sur la clé seront perdues parce que la table de partition est écrasée par le contenu de l'image, vous devez sauvegarder votre partition supplémentaire d'abord la restaurer à nouveau après la mise à jour de l'image live.}*
2~building-netboot-image Construction d'une image netboot
@@ -350,10 +337,7 @@ La séquence de commandes suivante va créer une image NetBoot de base
contenant le système Debian standard sans X.org. Elle peut être démarrée sur
le réseau.
-Remarque: Si vous avez réalisé tous les exemples précédents, vous aurez
-besoin de nettoyer votre répertoire de travail avec la commande #{lb
-clean}#:
-
+*{Remarque:}* Si vous avez réalisé quelque des exemples précédents, vous aurez besoin de nettoyer votre répertoire de travail avec la commande #{lb clean}#:
code{
# lb clean --binary
@@ -373,9 +357,9 @@ Contrairement à les images ISO et HDD le démarrage sur le réseau ne serve
pas l'image du système de fichiers pour le client, afin que les fichiers
doivent être servis via NFS. Les options #{--net-root-path}# et
#{--net-root-server}# spécifien l'emplacement et le serveur, respectivement,
-du serveur NFS sur lequel l'image système de fichiers sera situé au moment
-du démarrage. Assurez-vous que ce sont mis à des valeurs appropriées pour
-votre réseau et serveur.
+du serveur NFS sur lequel l'image du système de fichiers sera située au
+moment du démarrage. Assurez-vous que ceux-ci sont fixées à des valeurs
+appropriées pour votre réseau et serveur.
Maintenant construire l'image avec la commande #{lb build}#
@@ -389,14 +373,14 @@ Dans un démarrage réseau, le client exécute un petit morceau de logiciel qui
réside habituellement sur l'EPROM de la carte Ethernet. Ce programme envoie
une requête DHCP pour obtenir une adresse IP et les informations sur ce
qu'il faut faire ensuite. Typiquement, la prochaine étape est obtenir un
-chargeur de démarrage de niveau supérieur via le protocole TFTP. Cela
-pourrait être pxelinux, GRUB, ou démarrer directement à un système
-d'exploitation comme Linux.
+chargeur d'amorçage de niveau supérieur via le protocole TFTP. Cela pourrait
+être pxelinux, GRUB, ou démarrer directement à un système d'exploitation
+comme Linux.
Par exemple, si vous décompressez le fichier généré #{binary-net.tar.gz}#
dans le répertoire #{/srv/debian-live}#, vous trouverez l'image du système
-de fichiers dans #{live/filesystem.squashfs}# et le kernel, initrd et le
-chargeur de démarrage pxelinux dans #{tftpboot/debian-live/i386}#.
+de fichiers dans #{live/filesystem.squashfs}# et le noyau, initrd et le
+chargeur d'amorçage pxelinux dans #{tftpboot/debian-live/i386}#.
Nous devons maintenant configurer trois services sur le serveur pour activer
le démarrage sur le réseau: le serveur DHCP, serveur TFTP et le serveur NFS.
@@ -405,7 +389,7 @@ le démarrage sur le réseau: le serveur DHCP, serveur TFTP et le serveur NFS.
Nous devons configurer le serveur DHCP de notre réseau pour être sûr de
donner une adresse IP au client du système du démarrage sur le réseau, et
-pour annoncer l'emplacement du chargeur de démarrage PXE.
+pour annoncer l'emplacement du chargeur d'amorçage PXE.
Voici un exemple source d'inspiration, écrit pour le serveur ISC DHCP
#{isc-dhcp-server}# dans le fichier de configuration
@@ -435,12 +419,12 @@ code{
3~ Serveur TFTP
-Cela sert le kernel et le ramdisk initial pour le système au moment de
+Cela sert le noyau et le ramdisk initial pour le système au moment de
l'exécution.
-Vous devriez installer le paquet tftpd-hpa. Il peut servir tous les fichiers
-contenus dans un répertoire racine, d'habitude #{/srv/tftp}#. Pour le
-laisser servir des fichiers dans #{/srv/debian-live/tftpboot}#, exécuter
+Vous devriez installer le paquet /{tftpd-hpa}/. Il peut servir tous les
+fichiers contenus dans un répertoire racine, d'habitude #{/srv/tftp}#. Pour
+le laisser servir des fichiers dans #{/srv/debian-live/tftpboot}#, exécuter
comme utilisateur root la commande suivante:
code{
@@ -453,11 +437,11 @@ et remplissez le nuveau répertoire du serveur tftp
3~ Serveur NFS
-Une fois l'ordinateur hôte a téléchargé et démarré un kernel Linux et chargé
+Une fois l'ordinateur hôte a téléchargé et démarré un noyau Linux et chargé
son initrd, il va essayer de monter l'image du système de fichiers live via
un serveur NFS.
-Vous devez installer le paquet #{nfs-kernel-server}#.
+Vous devez installer le paquet /{nfs-kernel-server}/.
Ensuite, rendre l'image du système de fichiers disponible via NFS en
ajoutant une ligne comme la suivante #{/etc/exports}#:
@@ -468,7 +452,7 @@ code{
}code
-et dire au serveur NFS sur cette exportation avec la commande suivante:
+et indiquer au serveur NFS sur cette exportation avec la commande suivante:
code{
@@ -476,9 +460,9 @@ code{
}code
-Mise en place ces trois services peut être un peu délicat. Vous pourriez
-avoir besoin de patience pour obtenir que tous travaillent ensemble. Pour
-plus d'informations, consultez le wiki syslinux à
+La configuation de ces trois services peut être un peu dificile. Vous
+pourriez avoir besoin de patience pour obtenir que tous travaillent
+ensemble. Pour plus d'informations, consultez le wiki syslinux à
http://syslinux.zytor.com/wiki/index.php/PXELINUX ou la section Debian
Installer Manual's TFTP Net Booting à
http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html. Ils pourraient
@@ -495,7 +479,7 @@ virtualisation. Il y a deux solutions.
3~ Qemu
-_* Installer #{qemu}#, #{bridge-utils}#, #{sudo}#.
+_* Installer /{qemu}/, /{bridge-utils}/, /{sudo}/.
Èditer #{/etc/qemu-ifup}#:
diff --git a/manual/fr/user_customization-binary.ssi b/manual/fr/user_customization-binary.ssi
index 170dc39..1e110a0 100644
--- a/manual/fr/user_customization-binary.ssi
+++ b/manual/fr/user_customization-binary.ssi
@@ -7,9 +7,9 @@ B~ Personnalisation de l'image binaire
live-build utilise /{syslinux}/ et certains de ses dérivés (selon le type
d'image) comme chargeurs d'amorçage par défaut. Vous pouvez facilement les
personnaliser de différentes façons qui vont de fournir un thème complet à
-changer le délai de démarrage ou tout simplement ajouter une image de
-démarrage personnalisée. Certains des exemples de personnalisation suivants
-utilisent méthodes différentes, comme {includes}#includes ou {hooks}#hooks.
+changer le délai de démarrage ou tout simplement ajouter une image splash
+personnalisée. Certains des exemples de personnalisation suivants utilisent
+méthodes différentes, comme {includes}#includes ou {hooks}#hooks.
Si vous souhaitez utiliser un thème complet, vous pouvez spécifier l'option
#{--syslinux-theme}# (voir man #{lb_config}#). live-build téléchargera le
@@ -47,7 +47,7 @@ code{
include menu.cfg
default vesamenu.c32
prompt 0
- timeout 5
+ timeout 50
}code
@@ -59,7 +59,7 @@ code{
#!/bin/sh
- sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg
+ sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg
}code
@@ -75,20 +75,20 @@ image. Cela peut vous aider à facilement identifier la version ou la
configuration d'une image sans la démarrer.
_* #{LB_ISO_APPLICATION/--iso-application NAME}#: Cela devrait décrire
-l'application qui sera sur l'image. La longueur maximale de ce champ est de
-128 caractères.
+l'application qui sera sur l'image. Le nombre maximum de caractères pour ce
+champ est 128.
_* #{LB_ISO_PREPARER/--iso-preparer NAME}#: Cela devrait décrire le
préparateur de l'image, généralement avec certains détails de contact. Le
défaut de cette option est la version de live-build que vous utilisez, ce
-qui peut faciliter le débogage plus tard. La longueur maximale de ce champ
-est de 128 caractères.
+qui peut faciliter le débogage plus tard. Le nombre maximum de caractères
+pour ce champ est 128.
_* #{LB_ISO_PUBLISHER/--iso-publisher NAME}#: Ce doit décrire l'éditeur de
-l'image, généralement avec certains détails de contact. La longueur maximale
-de ce champ est de 128 caractères.
+l'image, généralement avec certains détails de contact. Le nombre maximum de
+caractères pour ce champ est 128.
_* #{LB_ISO_VOLUME/--iso-volume NAME}#: Cela devrait spécifier l'ID de
volume de l'image. Il est utilisé comme une étiquette visible par
-l'utilisateur sur certaines plateformes comme Windows et Apple Mac OS. La
-longueur maximale de ce champ est de 128 caractères.
+l'utilisateur sur certaines plateformes comme Windows et Apple Mac OS. Le
+nombre maximum de caractères pour ce champ est 128.
diff --git a/manual/fr/user_customization-contents.ssi b/manual/fr/user_customization-contents.ssi
index 2094e14..f470586 100644
--- a/manual/fr/user_customization-contents.ssi
+++ b/manual/fr/user_customization-contents.ssi
@@ -2,21 +2,21 @@
1~customizing-contents Personnalisation des contenus
-Ce chapitre aborde affiner la personnalisation du contenu du système live
+Ce chapitre aborde affiner la personnalisation des contenus du système live
delà du simple choix des paquets à inclure. Les includes vous permettent
-d'ajouter ou de remplacer des fichiers arbitraires à votre image Debian
-Live, les hooks vous permettent d'exécuter des commandes arbitraires à
+d'ajouter ou de remplacer des fichiers arbitraires dans votre image Debian
+Live, les hooks vous permettent d'exécuter des commandes arbitraires dans
différentes étapes de la construction et au démarrage, et la
préconfiguration (preseeding) vous permet de configurer les paquets quand
-ils sont installés en fournissant des réponses aux questions debconf .
+ils sont installés en fournissant des réponses aux questions debconf.
2~includes Includes
-Bien qu'idéalement un système Debian Live comprendrait les fichiers
+Bien qu'idéalement un système Debian Live comprendrait des fichiers
entièrement fournis par les paquets Debian non modifiés, on convient parfois
de fournir ou de modifier certains contenus par le biais de fichiers. Avec
les includes, il est possible d'ajouter (ou remplacer) des fichiers
-arbitraires à votre image live de Debian. live-build prévoit trois
+arbitraires dans votre image live de Debian. live-build prévoit trois
mécanismes pour leur utilisation:
_* Chroot local includes: Ils vous permettent d'ajouter ou remplacer des
@@ -29,7 +29,7 @@ fichiers dans l'image binaire. S'il vous plaît voir {Binary local
includes}#binary-local-includes pour plus d'informations.
_* Binary includes: Ils vous permettent d'ajouter ou remplacer des fichiers
-spécifiques de Debian dans l'image binaire, comme les modèles et les
+spécifiques de Debian dans l'image binaire, comme des modèles et des
répertoires d'outils. S'il vous plaît voir {Binary includes}#binary-includes
pour plus d'informations.
@@ -38,18 +38,18 @@ distinction entre les images "Live" et "binary".
3~live-chroot-local-includes Live/chroot local includes
-Chroot local includes peuvent être utilisés pour ajouter ou remplacer des
-fichiers dans le système de fichiers chroot/Live afin qu'ils puissent être
-utilisés dans le système Live. Une utilisation typique est de peupler le
-répertoire squelette de l'utilisateur (#{/etc/skel}#) utilisé par le système
-live pour créer le répertoire home de l'utilisateur Live. Une autre est de
-fournir des fichiers de configuration qui peuvent être simplement ajoutés ou
-remplacés à l'image sans traitement, voir {Live/chroot local
+Les chroot local includes peuvent être utilisés pour ajouter ou remplacer
+des fichiers dans le système de fichiers chroot/Live afin qu'ils puissent
+être utilisés dans le système Live. Une utilisation typique est de peupler
+l'arborescence du répertoir de l'utilisateur (#{/etc/skel}#) utilisé par le
+système live pour créer le répertoire home de l'utilisateur Live. Une autre
+est de fournir des fichiers de configuration qui peuvent être simplement
+ajoutés ou remplacés à l'image sans traitement, voir {Live/chroot local
hooks}#live-chroot-local-hooks si le traitement est nécessaire.
Pour inclure des fichiers, il suffit de les ajouter à votre répertoire
#{config/includes.chroot}#. Ce répertoire correspond au répertoire racine
-(#{/}#) du système live. Par exemple, pour ajouter un fichier
+#{/}# du système live. Par exemple, pour ajouter un fichier
#{/var/www/index.html}# dans le système live, utilisez:
code{
@@ -74,19 +74,19 @@ code{
}code
-Chroot local includes sont installés après l'installation de paquets de
-sorte que les fichiers installés par les paquets sont écrasés.
+Les chroot local includes sont installés après l'installation de paquets de
+sorte que les fichiers installés par les paquets sont remplacés.
3~binary-local-includes Binary local includes
Pour inclure des matériels tels que des documents ou des vidéos sur le
système de fichiers des supports, afin qu'ils soient accessibles dès
-l'insertion du support sans avoir à démarrer le système live, vous pouvez
-utiliser binary local includes. Cela fonctionne de façon similaire aux
-chroot local includes. Par exemple, supposons que les fichiers
-#{~/video_demo.*}# sont des vidéos de démonstration du système live décrits
-par et liés par une page d'index HTML. Copiez simplement le matériel dans
-#{config/includes.binary/}# comme suit:
+l'insertion du support sans démarrer le système live, vous pouvez utiliser
+binary local includes. Cela fonctionne de façon similaire aux chroot local
+includes. Par exemple, supposons que les fichiers #{~/video_demo.*}# sont
+des vidéos de démonstration du système live décrits par et liés par une page
+d'index HTML. Copiez simplement le matériel dans #{config/includes.binary/}#
+comme suit:
code{
@@ -115,8 +115,8 @@ un autre chemin d'accès avec #{--includes}#.
2~hooks Hooks
-Les hooks permettent à les commandes être exécutées dans les étapes chroot
-et binary de la construction afin de personnaliser l'image.
+Les hooks permettent à les commandes être exécutées dans les étapes de la
+construction chroot et binary afin de personnaliser l'image.
3~live-chroot-local-hooks Live/chroot local hooks
@@ -136,17 +136,17 @@ Pour exécuter des commandes au moment du démarrage, vous pouvez fournir
live-config hooks comme expliqué dans la section "Personnalisation" de sa
page de manuel. Examiner les hooks de live-config fournis dans
#{/lib/live/config/}#, en notant les numéros de séquence. Puis fournir votre
-propre hook préfixée avec un numéro de séquence appropriée, soit comme un
-chroot local include dans #{config/includes.chroot/lib/live/config/}#, ou
-comme un paquet personnalisé tel que discuté dans {Installation des paquets
-modifiés ou de tiers}#installing-modified-or-third-party-packages.
+propre hook précédé d'un numéro de séquence appropriée, soit comme un chroot
+local include dans #{config/includes.chroot/lib/live/config/}#, ou comme un
+paquet personnalisé tel que discuté dans {Installation des paquets modifiés
+ou de tiers}#installing-modified-or-third-party-packages.
3~ Binary local hooks
Pour exécuter des commandes à l'étape binaire, créer un script hook avec le
suffixe #{.binary}# contenant les commandes dans le répertoire
#{config/hooks/}#. Le hook sera exécuté après toutes les autres commandes
-binaires sont exécutées, mais avant binary_checksums, la dernière commande
+binaires soient exécutées, mais avant binary_checksums, la dernière commande
binaire. Les commandes de votre hook ne s'exécutent pas dans le chroot,
afin de prendre soin de ne pas modifier les fichiers en dehors de l'arbre de
construction, ou vous pourriez endommager votre système de construction!
@@ -162,5 +162,5 @@ Les fichiers dans le répertoire #{config/preseed/}# avec le suffixe
comme des fichiers de préconfiguration debconf et sont installés par
live-build en utilisant #{debconf-set-selections}#.
-Pour plus d'informations sur debconf, s'il vous plaît voir debconf(7) dans
-le paquet #{debconf}#.
+Pour plus d'informations sur debconf, s'il vous plaît voir #{debconf(7)}#
+dans le paquet /{debconf}/.
diff --git a/manual/fr/user_customization-installer.ssi b/manual/fr/user_customization-installer.ssi
index f169770..e4821c4 100644
--- a/manual/fr/user_customization-installer.ssi
+++ b/manual/fr/user_customization-installer.ssi
@@ -3,7 +3,7 @@
1~customizing-installer Personnalisation de l'installateur Debian
Les images du système Debian Live peuvent être intégrées avec l'installateur
-Debian. Il y a un certain nombre de différents types d'installation, variant
+Debian. Il y a un certain nombre de types d'installation différents, variant
en ce qui est inclus et comment fonctionne l'installateur.
S'il vous plaît noter l'utilisation prudente des lettres majuscules pour
@@ -15,12 +15,12 @@ pour le système Debian, pas autre chose. On le voit souvent abrégé en «d-i»
Les trois principaux types de programme d'installation sont:
-*{Installateur Debian «Régulière»}*: C'est une image de Debian Live normale avec un noyau et initrd séparés qui (lorsqu'ils sont sélectionnés à partir du chargeur d'amorçage approprié) se lancen dans une instance d'installateur Debian standard, exactement comme si vous aviez téléchargé une image CD de Debian et la auriez démarrée. Les images contenant un système live et un installateur indépendant sont souvent appelés «images combinées".
+*{Installateur Debian «Régulière»}*: C'est une image de Debian Live normale avec un noyau et initrd séparés qui (lorsqu'ils sont sélectionnés à partir du chargeur d'amorçage approprié) se lancen dans une instance d'installateur Debian standard, exactement comme si vous aviez téléchargé une image CD de Debian et la auriez démarrée. Les images contenant un système live et un installateur indépendant sont souvent appelées «images combinées».
Sur ces images, Debian est installé par l'extraction et l'installation de
-paquets .deb à l'aide de #{debootstrap}# ou #{cdebootstrap}#, à partir des
-supports locaux ou à partir du réseau, résultant en un système Debian
-standard en cours d'installation sur le disque dur.
+paquets .deb à l'aide de /{debootstrap}/ ou /{cdebootstrap}/, à partir des
+supports locaux ou sur le réseau, résultant en un système Debian standard en
+cours d'installation sur le disque dur.
Tout ce processus peut être préconfiguré et personnalisé dans un certain
nombre de façons, voir les pages correspondantes dans le manuel de
@@ -30,25 +30,22 @@ le mettre à l'image et l'activer pour vous.
*{Installateur Debian "Live" }*: C'est une image de Debian Live avec un noyau et initrd séparés qui (lorsqu'ils sont sélectionnés à partir du chargeur d'amorçage approprié) se lancen dans une instance de l'installateur Debian.
-L'installation se poursuit de manière identique à l'installation "régulière"
+L'installation continue de manière identique à l'installation «Régulière»
décrite ci-dessus, mais à l'étape de l'installation des paquets, au lieu
-d'utiliser #{debootstrap}# pour aller chercher et installer des paquets,
+d'utiliser /{debootstrap}/ pour aller chercher et installer des paquets,
l'image du système de fichiers live est copiée vers la cible. Ce résultat
-est obtenu avec un udeb spécial appelé «live-installer».
+est obtenu avec un udeb spécial appelé live-installer.
-Après cette étape, l'installateur Debian se poursuit normalement, en
-installant et configurant des éléments tels que chargeurs de démarrage et
-les utilisateurs locaux, etc
+Après cette étape, l'installateur Debian continue normalement, en installant
+et configurant des éléments tels que les chargeurs d'amorçage et les
+utilisateurs locaux, etc
-Remarque: Pour soutenir les deux options: installateur normal et live dans
-le chargeur d'amorçage du même support live, vous devez désactiver
-«live-installer» en utilisant la préconfiguration
-#{live-installer/enable=false}#.
+*{Remarque:}* Pour soutenir les deux options: installateur normal et live dans le chargeur d'amorçage du même support live, vous devez désactiver live-installer en utilisant la préconfiguration #{live-installer/enable=false}#.
*{Installateur Debian "de bureau"}*: Indépendamment du type d'installateur Debian inclus, #{d-i}# peut être lancé à partir du Bureau en cliquant sur une icône. C'est facile à utiliser dans certaines situations. Afin de faire usage de cela, le paquet debian-installer-launcher doit être inclus.
Notez que par défaut, live-build n'inclut pas les images de l'installateur
-Debian dans les images, il doit être spécifiquement activée avec #{lb
+Debian dans les images, il doit être spécifiquement activé avec #{lb
config}#. Aussi, s'il vous plaît noter que pour que l'installateur "de
bureau" fonctionne le noyau du système live doit correspondre au noyau que
#{d-i}# utilise pour l'architecture spécifiée. Par exemple:
@@ -65,11 +62,11 @@ code{
Comme décrit dans le Debian Installer Manual, Appendix B at
http://www.debian.org/releases/stable/i386/apb.html,
-"La préconfiguration est une façon de donner des réponses aux questions
-posées durant le processus d'installation, sans avoir à entrer manuellement
+«La préconfiguration est une façon de donner des réponses aux questions
+posées pendant le processus d'installation, sans avoir à entrer manuellement
les réponses alors que l'installation est en marche. Cela permet
-d'automatiser entièrement la plupart des types d'installation et propose
-même quelques fonctionnalités ne sont pas disponibles pendant les
+d'automatiser entièrement la plupart des types d'installation et elle offre
+certaines fonctionnalités que ne sont pas disponibles pendant les
installations normales ». Ce type de personnalisation se fait mieux avec
live-build en plaçant la configuration dans un fichier #{preseed.cfg}#
inclus dans #{config/binary_debian-installer/}#. Par exemple, pour
@@ -85,9 +82,9 @@ code{
2~ Personnalisation de contenu pour l'Installateur Debian
Pour des fins expérimentales ou de débogage, vous pouvez inclure paquets
-udeb #{d-i}# construits localement. Les placer dans
-#{config/packages.binary/}# pour les inclure dans l'image. Fichiers
-supplémentaires ou de remplacement et répertoires peuvent être inclus dans
-l'initrd de l'installateur ainsi, d'une manière similaire à {Live/chroot
-local includes}#live-chroot-local-includes en plaçant le matériau dans
-#{config/binary_debian-installer-includes/}#.
+udeb #{d-i}# construits localement. Et les placer dans
+#{config/packages.binary/}# pour les inclure dans l'image. Plusieurs
+fichiers supplémentaires ou de remplacement et plusieurs répertoires peuvent
+être inclus dans l'initrd de l'installateur ainsi, d'une manière similaire à
+{Live/chroot local includes}#live-chroot-local-includes en plaçant le
+matériau dans #{config/includes.binary_debian-installer/}#.
diff --git a/manual/fr/user_customization-overview.ssi b/manual/fr/user_customization-overview.ssi
index 94231eb..66a81e2 100644
--- a/manual/fr/user_customization-overview.ssi
+++ b/manual/fr/user_customization-overview.ssi
@@ -8,8 +8,8 @@ personnaliser un système Debian Live.
2~ Configuration pendant la construction vs. l'amorçage
Les options de configuration d'un système live sont divisés en options au
-moment de la construction, ces options sont appliqués pendant la création et
-des options au moment du démarrage, qui sont appliqués au moment du
+moment de la construction, ces options sont appliquées pendant la création
+et des options au moment du démarrage, qui sont appliquées au moment du
démarrage. Les options au moment du démarrage sont divisées en celles qui
surviennent au début, appliquées par le paquet live-boot, et ceux qui
arrivent plus tard, appliquées par live-config. Toute option d'amorçage peut
@@ -19,8 +19,8 @@ démarrage par défaut et alors les utilisateurs peuvent normalement démarrer
directement au système live sans spécifier aucune option lorsque toutes les
valeurs par défaut sont appropriées. En particulier, l'argument #{lb
--bootappend-live}# se compose de toutes les options de ligne de commande du
-kernel par défaut pour le système live, comme la persistance, claviers, ou
-de fuseau horaire. Voir {Personnalisation des paramètres régionaux et la
+noyau par défaut pour le système live, comme la persistance, les claviers,
+ou le fuseau horaire. Voir {Personnalisation des paramètres régionaux et la
langue}#customizing-locale-and-language, par exemple.
Les options de configuration pendant la construction sont décrites dans les
@@ -40,26 +40,27 @@ première étape à exécuter est l'étape *{bootstrap}*. C'est la phase initial
de peupler le répertoire chroot avec des paquets pour faire un système
Debian de base. Il est suivi par l'étape *{chroot}*, qui complète la
construction du répertoire chroot, le peuplant de tous les paquets listés
-dans la configuration, ainsi que tout autre matériel. La plupart de
-personnalisation de contenu se produit à ce stade. La dernière étape de la
+dans la configuration, ainsi que tout autre matériel. La plupart de la
+personnalisation du contenu se produit à ce stade. La dernière étape de la
préparation de l'image live est l'étape *{binary}*, qui construit une image
démarrable, en utilisant le contenu du répertoire chroot pour construire le
-système de fichiers racine pour le système Live, et dont l'installateur et
-tout autre matériel supplémentaire sur les supports objectif en dehors du
+système de fichiers racine pour le système Live, il comprend l'installateur
+et tout autre matériel supplémentaire sur les supports objectif en dehors du
système de fichiers du système live. Après l'image live est construite, s'il
-est activé, l'archive source est construit dans l'étape *{source}*.
+est activé, le tarball des sources est construit dans l'étape *{source}*.
Dans chacune de ces étapes, il ya une séquence particulière dans laquelle
-les commandes sont appliquées. Ce sont disposées de telle manière à assurer
-que les personnalisations peuvent être superposées de manière
-raisonnable. Par exemple, dans l'étape *{chroot}*, preseeds sont appliqués
-avant tous les paquets sont installés, les paquets sont installés avant tout
-les fichiers localement inclus ou les patches sont appliqués, et les hooks
-sont exécutés plus tard, après que tous les matériaux sont en place.
+les commandes sont appliquées. Ceux-ci sont disposées de telle manière à
+assurer que les personnalisations peuvent être superposées de manière
+raisonnable. Par exemple, dans l'étape *{chroot}*, les preseeds sont
+appliqués avant tous les paquets sont installés, les paquets sont installés
+avant tous les fichiers locaux inclus ou les correctifs soient appliqués, et
+les hooks sont exécutés plus tard, après que tous les matériaux sont en
+place.
2~ Supplément lb config avec des fichiers
-Bien que #{lb config}# crée une configuration du squelette dans le
+Bien que #{lb config}# crée une arborescence de configuration dans le
répertoire config/, pour accomplir vos objectifs, vous pourriez avoir besoin
de fournir des fichiers supplémentaires dans les sous-répertoires de
config/. Selon l'endroit où les fichiers sont stockés dans la configuration,
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index b2d619d..ccf897a 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -8,19 +8,20 @@ la sélection de paquets à inclure dans l'image. Ce chapitre vous guide tout
au long des différentes options dans certains moments de la construction
pour personnaliser l'installation des paquets avec live-build. Le plus large
choix influençant les paquets qui sont disponibles pour l'installation dans
-l'image sont les zones de distribution et archive areas. Afin de garantir
-des vitesses de téléchargement décent, vous devez choisir un miroir de
-distribution proche. Vous pouvez également ajouter vos propres dépôts pour
-les backports, paquets expérimentaux ou personnalisés, ou inclure des
-paquets directement en tant que fichiers. Vous pouvez définir vos propres
-listes de paquets à inclure, utilisez des listes prédéfinies de live-build,
-utilisez tâches #{tasksel}#, ou une combinaison des trois. Enfin, un certain
-nombre d'options donnent un certain contrôle sur apt, ou si vous préférez,
-aptitude, au moment de la construction quand les paquets sont
-installés. Vous pouvez trouver ces très pratique si vous utilisez un proxy,
-vous voulez désactiver l'installation des paquets recommandés pour
-économiser l'espace, ou avez besoin de contrôler quels versions des paquets
-sont installés via APT pinning, pour n'en nommer quelques possibilités.
+l'image sont les zones de distribution et les sections (archive areas). Afin
+de garantir des vitesses de téléchargement décentes, vous devez choisir un
+miroir de distribution proche. Vous pouvez également ajouter vos propres
+dépôts pour les backports, paquets expérimentaux ou personnalisés, ou
+inclure des paquets directement en tant que fichiers. Vous pouvez définir
+vos propres listes de paquets à inclure, utiliser des listes prédéfinies de
+live-build, utiliser tâches /{tasksel}/, ou une combinaison des
+trois. Enfin, un certain nombre d'options donnent un certain contrôle sur
+/{apt}/, ou si vous préférez, /{aptitude}/, au moment de la construction
+quand les paquets sont installés. Vous pouvez trouver ces très pratique si
+vous utilisez un proxy, vous voulez désactiver l'installation des paquets
+recommandés pour économiser l'espace, ou avez besoin de contrôler quels
+versions des paquets sont installés via APT pinning, pour n'en nommer
+quelques possibilités.
2~ Sources des paquets
@@ -28,13 +29,13 @@ sont installés via APT pinning, pour n'en nommer quelques possibilités.
La distribution que vous choisissez a le plus large impact sur les paquets
qui sont disponibles à inclure dans votre image live. Indiquez le nom de
-code, qui est par défaut #{wheezy}# pour la version de live-build dans
-Wheezy. Toute distribution actuelle dans l'archive Debian peut être spécifié
+code, qui est par défaut wheezy pour la version de live-build dans
+wheezy. Toute distribution actuelle dans l'archive Debian peut être spécifié
par son nom de code ici. (Voir {Termes}#terms pour plus de détails.)
L'option #{--distribution}# non seulement influence la source des paquets
-dans l'archive, mais aussi dit #{live-build}# comme it doit construire
-chaque distribution soutenue. Par exemple, pour construire contre
-*{unstable}*, Sid, précisez:
+dans l'archive, mais aussi dit live-build comme it doit construire chaque
+distribution soutenue. Par exemple, pour construire contre *{unstable}*,
+sid, précisez:
code{
@@ -54,7 +55,7 @@ code{
}code
-Soutien expérimental est disponible pour certains dérivés de Debian par
+Soutien expérimental est disponible pour certains dérivés de Debian grâce à
l'option #{--mode}#. L'option #{debian}# est définie par défaut, même si
vous êtes en créant sur un système non-Debian. Si vous spécifiez #{--mode
ubuntu}# ou #{--mode emdebian}#, les noms de distribution et des areas des
@@ -62,21 +63,21 @@ archives pour les dérivés spécifiés sont soutenues au lieu de ceux de
Debian. Le mode modifie également le comportement de live-build en fonction
des dérivés.
-*{Remarque:}* Les projets pour lesquels ces modes ont été ajoutés sont principalement responsables de aider les utilisateurs de ces options. Le projet Debian Live, à son tour, fournit un soutien de développement sur une base des meilleurs efforts seulement, en fonction des commentaires sur les projets dérivés que nous n'avons pas développé ou soutenu nous-mêmes.
+*{Remarque:}* Les projets pour lesquels ces modes ont été ajoutés sont principalement responsables d'aider les utilisateurs de ces options. Le projet Debian Live, à son tour, fournit un soutien de développement sur une base des meilleurs efforts seulement, en fonction des commentaires sur les projets dérivés que nous n'avons pas développé ou soutenu nous-mêmes.
3~ Miroirs de distribution
-L'archive Debian est répliqué à travers un large réseau de miroirs autour du
-monde pour que les gens dans chaque région peuvent choisir un miroir proche
+L'archive Debian est répliqué sur un grand réseau de miroirs autour du monde
+pour que les habitants dans chaque région puissent choisir un miroir proche
avec la meilleur vitesse de téléchargement. Chacune des options
-#{--mirror-*}# qui régissent quel miroir de distribution est utilisée à
+#{--mirror-*}# régissent quel miroir de distribution est utilisée à
différentes étapes de la construction. Rappelez-vous de {Étapes de la
construction}#stages-of-the-build que l'étape *{bootstrap}* c'est quand le
-chroot est initialement peuplée par debootstrap avec un système minimal, et
-l'étape *{chroot}* c'est quand le chroot utilisé pour construire le système
-de fichiers du système live est construit. Ainsi, les commutateurs des
-miroirs correspondants sont utilisées pour ces étapes, et plus tard, dans
-l'étape *{binary}* les valeurs #{--mirror-binary}# et
+chroot est initialement peuplée par /{debootstrap}/ avec un système minimal,
+et l'étape *{chroot}* c'est quand le chroot utilisé pour construire le
+système de fichiers du système live est construit. Ainsi, les commutateurs
+des miroirs correspondants sont utilisées pour ces étapes, et plus tard,
+dans l'étape *{binary}* les valeurs #{--mirror-binary}# et
#{--mirror-binary-security}# sont utilisées, remplaçant tout miroir utilisé
dans une étape antérieure.
@@ -95,7 +96,7 @@ code{
}code
-Le miroir chroot, spécifiée par #{--mirror-chroot}#, par défaut, c'est la
+Le miroir chroot, spécifié par #{--mirror-chroot}#, par défaut, c'est la
valeur #{--mirror-bootstrap}#.
3~ Miroirs de distribution utilisés au moment de l'exécution
@@ -108,8 +109,8 @@ géographiquement proche basé sur le numéro IP de l'utilisateur. C'est un
choix approprié lorsque vous ne pouvez pas prédire quel miroir sera mieux
pour tous vos utilisateurs. Ou vous pouvez spécifier vos propres valeurs,
comme indiqué dans l'exemple ci-dessous. Une image construite avec cette
-configuration seulement serait approprié pour les utilisateurs sur un réseau
-où "#{mirror}#" est accessible.
+configuration seulement serait appropriée pour les utilisateurs sur un
+réseau où "#{mirror}#" est accessible.
code{
@@ -128,7 +129,7 @@ configurer des dépôts supplémentaires, créer les fichiers
#{config/archives/your-repository.list.binary}#. Comme avec les options
#{--mirror-*}#, elles gouvernent les dépôts utilisés dans l'étape *{chroot}*
lors de la construction de l'image, et dans l'étape *{binary}*, c'est à dire
-pour une utilisation au moment de l'exécution du système live.
+pour les utiliser au moment de l'exécution du système live.
Par exemple, #{config/archives/live.list.chroot}# vous permet d'installer
les paquets du dépôt des instantanés debian live au moment de la
@@ -149,7 +150,7 @@ Si ces fichiers existent, ils seront sélectionnés automatiquement.
Vous devriez également mettre la clé GPG utilisée pour signer le dépôt dans
fichiers #{config/archives/your-repository.key.{binary,chroot}}#
-*{Remarque:}* certains dépôts de paquets préconfigurés sont disponibles pour une sélection facile grâce à l'option #{--archives}#, par exemple pour permettre des instantanés live, une simple commande suffit pour l'activer:
+*{Remarque:}* certains dépôts de paquets préconfigurés sont disponibles pour une sélection facile grâce à l'option #{--archives}#, par exemple pour activer les instantanés live, il suffit une simple commande:
code{
@@ -163,7 +164,7 @@ Il y a un certain nombre de façons de choisir quels paquets live-build va
installer dans votre image, couvrant une variété de besoins différents. Vous
pouvez tout simplement nommer les paquets individuels à installer dans une
liste de paquets. Vous pouvez également choisir grandes listes prédéfinies
-de paquets, ou utilisez des tâches APT. Et enfin, vous pouvez placer paquets
+de paquets, ou utiliser des tâches APT. Et enfin, vous pouvez placer paquets
dans votre arbre #{config/}# qui est bien adapté aux essais de nouveaux
paquets ou expérimentaux avant qu'ils ne soient disponibles sur un dépôt.
@@ -174,7 +175,7 @@ doivent être installés. La syntaxe de la liste soutient les fichiers inclus
et sections conditionnelles qui les rend facile de construire à partir
d'autres listes et de les adapter pour une utilisation dans configurations
multiples. Vous pouvez utiliser des listes de paquets prédéfinies, offrant
-une sélection modulaire de paquets provenantes de chacun des environnements
+une sélection modulaire de paquets provenants de chacun des environnements
de bureau majeurs et certaines listes de but spécial, ainsi que les autres
listes standard sont basées sur elles. Vous pouvez également fournir votre
propre liste de paquets, ou utiliser une combinaison des deux.
@@ -209,7 +210,7 @@ suffixe #{.list}# pour être traitées, puis un suffixe d'étape supplémentaire
#{.chroot}# ou #{.binary}# pour indiquer à quelle étape la liste est
destinée.
-*{Remarque:}* Si vous ne spécifiez pas le suffixe de l'étape, la liste sera utilisée pour les deux étapes. Normalement, vous voulez spécifier #{.list.chroot}# de sorte que les paquets seront seulement installés dans le système de fichiers live et ne pas avoir une copie supplémentaire des #{.deb}# placé sur le support.
+*{Remarque:}* Si vous ne spécifiez pas le suffixe de l'étape, la liste sera utilisée pour les deux étapes. Normalement, vous voulez spécifier #{.list.chroot}# de sorte que les paquets seront seulement installés dans le système de fichiers live et ne pas avoir une copie supplémentaire des #{.deb}# placée sur le support.
3~ Listes locaux de paquets binaires
@@ -218,18 +219,18 @@ Pour faire une liste pour l'étape binary, placez un fichier avec le suffixe
installés dans le système de fichiers live, mais sont inclus sur les
supports live sous #{pool/}#. Vous utiliserez généralement cette liste avec
une des variantes d'installation non-live. Comme mentionné ci-dessus, si
-vous voulez que cette liste soit le même que votre liste pour l'étape
+vous voulez que cette liste soit la même que votre liste pour l'étape
chroot, utilisez simplement le suffixe #{.list}#.
3~ Extension d'un liste de paquets fournis à l'aide de «includes»
Les listes de paquets qui sont incluses avec live-build font un grand usage
-des «includes». Reportez-vous à ceux-ci dans le répertoire
-#{/usr/share/live/build/package-lists/}#, car ils servent d'exemples pour
+des «includes». Reportez-vous à celles-ci dans le répertoire
+#{/usr/share/live/build/package-lists/}#, car elles servent d'exemples pour
savoir comment écrire vos propres listes.
Par exemple, pour faire une liste qui comprend la liste prédéfinie
-#{gnome}#, plus iceweasel, créer #{config/package-lists/my.list.chroot}#
+#{gnome}#, plus /{iceweasel}/, créer #{config/package-lists/my.list.chroot}#
avec le contenu suivant:
code{
@@ -242,15 +243,15 @@ code{
3~ Utilisant des conditionnels dans les listes de paquets
Toutes les variables de configuration de live-build stockées dans
-#{config/*}# (sans le préfixe #{LB_}#) peuvent être utilisés dans
+#{config/*}# (sans le préfixe #{LB_}#) peuvent être utilisées dans
instructions conditionnelles dans les listes de paquets. Généralement, cela
-signifie une option #{lb config}# majuscule et avec tirets changées en
+signifie une option #{lb config}# majuscule et avec tirets changés en
caractères de soulignement. Mais en pratique, c'est seulement ceux qui
influencent la sélection des paquets qui font sens, comme #{DISTRIBUTION}#,
#{ARCHITECTURES}# ou #{ARCHIVE_AREAS}#.
-Par exemple, pour installer #{ia32-libs}# si la #{--architectures amd64}#
-est spécifié:
+Par exemple, pour installer #{ia32-libs}# si #{--architectures amd64}# est
+spécifié:
code{
@@ -261,7 +262,7 @@ code{
}code
Vous pouvez tester pour un certain nombre de valeurs, par exemple pour
-installer #{memtest86+}# si #{--architectures i386}# ou #{--architectures
+installer /{memtest86+}/ si #{--architectures i386}# ou #{--architectures
amd64}# est spécifié:
code{
@@ -273,7 +274,7 @@ code{
}code
Vous pouvez également tester contre des variables qui peuvent contenir plus
-d'une valeur, par exemple pour installer #{vrms}# si #{contrib}# ou
+d'une valeur, par exemple pour installer /{vrms}/ si #{contrib}# ou
#{non-free}# est spécifié via #{--archive-areas}#:
code{
@@ -299,10 +300,10 @@ L'imbrication des conditionnels n'est pas soutenu.
3~ Tâches
L'installateur Debian offre l'utilisateur le choix d'un certain nombre de
-listes présélectionnées de paquets, chacun centré sur un type particulier de
-système ou d'une tâche pour laquelle un système peut être utilisé, comme
+listes présélectionnées de paquets, chacune centrée sur un type particulier
+de système ou d'une tâche pour laquelle un système peut être utilisé, comme
«environnement de bureau graphique», «serveur de messagerie» ou
-«portable». Ces listes sont appelés «tâches» (Tasks) et sont soutenus par
+«portable». Ces listes sont appelés «tâches» (Tasks) et sont soutenues par
APT grâce à l'option «Task:» Vous pouvez spécifier une ou plusieurs tâches à
live-build en les plaçant dans une liste dans #{config/task-lists/}#, comme
dans l'exemple ci-dessous.
@@ -315,9 +316,9 @@ code{
}code
Les tâches principales disponibles dans l'installateur Debian peuvent être
-listés avec #{tasksel --list-tasks}# dans le système live. Le contenu de
-n'importe quelle tâche, y compris ceux non inclus dans cette liste, peuvent
-être examinées avec #{tasksel --task-packages}#.
+listées avec #{tasksel --list-tasks}# dans le système live. Le contenu de
+n'importe quelle tâche, y compris celles non incluses dans cette liste,
+peuvent être examinées avec #{tasksel --task-packages}#.
3~desktop-and-language-tasks Tâches de bureau et de la langue
@@ -328,19 +329,19 @@ environnement de bureau particulier, la tâche correspondante sera
automatiquement installée. Ainsi, il y a tâches internes #{gnome-desktop}#,
#{kde-desktop}#, #{lxde-desktop}# et #{xfce-desktop}#, dont aucun n'est
offert dans le menu #{tasksel}#. De même, il n'y a pas éléments de menu pour
-les tâches de les langues, mais le choix de la langue de l'utilisateur lors
-de l'installation influence le choix des tâches de la langue correspondante.
+les tâches des langues, mais le choix de la langue de l'utilisateur lors de
+l'installation influence le choix des tâches de la langue correspondante.
Lors du développement d'une image de bureau live, l'image généralement
amorce directement à un bureau de travail, le choix du environnement de
bureau et la langue par défaut ayant été fait au moment de la construction,
non pas au moment de l'exécution comme dans le cas de l'installateur de
-Debian. Cela ne veut pas dire qu'une image live ne pouvait être construite
+Debian. Cela ne veut pas dire qu'une image live ne pourrait être construite
pour soutenir plusieurs environnements de bureau ou de plusieurs langues et
offrir à l'utilisateur un choix, mais ce n'est pas le comportement par
défaut de live-build.
-Parce qu'il n'ya pas aucune disposition faite automatiquement pour les
+Parce qu'il n'y a pas aucune disposition faite automatiquement pour les
tâches de la langue, qui comprennent des éléments tels que des polices
spécifiques de la langue et des paquets de méthodes de saisie, si vous les
voulez, vous devez les spécifier dans votre configuration. Par exemple, une
@@ -356,8 +357,8 @@ code{
}code
Comme les tâches de bureau sont des tâches «internes», pour chaque tâche de
-saveur de bureau inclus dans l'image, la valeur correspondante, si elle
-diffère de la valeur par défaut, "gnome", doit être préconfiguré dans la
+saveur de bureau incluse dans l'image, la valeur correspondante, si elle
+diffère de la valeur par défaut, "gnome", doit être préconfigurée dans la
variable debconf «tasksel/desktop", ou bien tasksel ne la reconnaîtra pas et
ne l'installera pas. Ainsi:
@@ -386,8 +387,8 @@ Cette section ne couvre pas les conseils concernant la construction ou la
maintenance des paquets modifiés. La méthode de Joachim Breitner 'How to
fork privately'
http://www.joachim-breitner.de/blog/archives/282-How-to-fork-privately.html
-peut, cependant, être d'intérêt. La création de paquets sur mesure sont
-couverts dans le Debian New Maintainers' Guide at
+peut, cependant, être d'intérêt. La création de paquets sur mesure est
+traité dans le Debian New Maintainers' Guide at
http://www.debian.org/doc/maint-guide/ et ailleurs
Il y a deux façons d'installer des paquets personnalisés modifiés:
@@ -398,7 +399,7 @@ _* Utiliser un dépôt APT personnalisé
Utilisant #{packages.chroot}# est plus simple à réaliser et utile pour les
personnalisations ponctuels mais a un certain nombre d'inconvénients, tout
-en utilisant un réferéntiel personnalisé APT est plus fastidieux à mettre en
+en utilisant un dépôt personnalisé APT est plus fastidieux à mettre en
place.
3~ Utilisant #{packages.chroot}# pour installer paquets personnalisés
@@ -425,8 +426,8 @@ contrôle de révision.
3~ Utiliser un dépôt APT pour installer des paquets personnalisés.
Contrairement à l'utilisation de #{packages.chroot}#, lorsque vous utilisez
-un réferéntiel personnalisé APT vous devez vous assurer que vous spécifiez
-les paquets ailleurs. Voir {Choisir les paquets à
+un dépôt personnalisé APT vous devez vous assurer que vous spécifiez les
+paquets ailleurs. Voir {Choisir les paquets à
installer}#choosing-packages-to-install pour plus de détails.
Si créer un dépôt APT pour installer des paquets personnalisés peut sembler
@@ -445,7 +446,7 @@ Pour cette raison, vous pouvez incrémenter le numéro de version dans les
fichiers #{debian/changelog}# de vos paquets personnalisés pour s'assurer
que votre version modifiée est installée en lieu d'une dans les dépôts
officiels Debian. Cela peut aussi être atteint en modifiant les préférences
-de pinning d'APT dans le système live - voir {APT pinning}#apt-pinning pour
+d'APT pinning dans le système live - voir {APT pinning}#apt-pinning pour
plus d'informations.
2~ Configuration d'APT au moment de la construction
@@ -459,14 +460,13 @@ options commençant par #{apt}# dans la page de manuel de #{lb_config}#.
3~choosing-apt-or-aptitude Choisir apt ou aptitude
-Vous pouvez choisir d'utiliser soit #{apt}# ou #{aptitude}# Quel logiciel
+Vous pouvez choisir d'utiliser soit /{apt}/ ou /{aptitude}/. Quel logiciel
est utilisé est régi par l'argument #{--apt}# de #{lb config}#. Choisissez
la méthode du comportement préférée pour l'installation de paquets, la
-différence notable étant la manière dont les paquets manquants sont
-traitées.
+différence notable étant la manière dont les paquets manquants sont traités.
_* #{apt}#: Avec cette méthode, si un paquet manquant est spécifié,
-l'installation va échouer. C'est le paramètre par défaut.
+l'installation va échouer. C'est le réglage par défaut.
_* #{aptitude}#: Avec cette méthode, si un paquet manquant est spécifié,
l'installation va réussir.
@@ -490,7 +490,7 @@ Vous pouvez avoir besoin d'économiser de l'espace sur les supports d'images,
auquel cas l'un ou l'autre ou les deux options suivantes peuvent être
d'intérêt.
-Si vous ne voulez pas inclure les indices de l'APT dans l'image, vous les
+Si vous ne voulez pas inclure les indices d'APT dans l'image, vous les
pouvez omettre avec:
code{
@@ -499,10 +499,10 @@ code{
}code
-Cela ne influencera les entrées dans /etc/apt/sources.list, mais simplement
-de savoir si /var/lib/apt contient les fichiers indices ou non. La
-contrepartie est que APT a besoin de ces indices afin d'opérer dans le
-système live, alors avant de procéder à #{apt-cache search}# or #{apt-get
+Cela ne influencera les entrées dans #{/etc/apt/sources.list}#, mais
+simplement de savoir si #{/var/lib/apt}# contient les fichiers indices ou
+non. La contrepartie est que APT a besoin de ces indices afin d'opérer dans
+le système live, alors avant de procéder à #{apt-cache search}# ou #{apt-get
install}#, par exemple, l'utilisateur doit faire #{apt-get update}# pour
créer ces indices.
@@ -522,8 +522,8 @@ paquets que vous avez vraiment besoin peuvent être omis. Par conséquent,
nous vous suggérons d'examiner la différence que désactiver recommends rend
à votre liste de paquets (voir le fichier #{binary.packages}# généré par
#{lb build}#) et re-incluez dans votre liste tous les paquets manquants que
-vous souhaitez toujours installées. Alternativement, si vous trouvez que
-vous voulez seulement un petit nombre de paquets recommandés exclus, laissez
+vous souhaitez toujours installés. Alternativement, si vous trouvez que vous
+voulez seulement un petit nombre de paquets recommandés exclus, laissez
recommends activé et définissez une priorité APT pin négative sur les
paquets sélectionnés pour éviter les installér, comme expliqué dans {APT
pinning}#apt-pinning.
@@ -532,24 +532,24 @@ pinning}#apt-pinning.
S'il n'y a pas une option #{lb config}# pour modifier le comportement d'APT
dans la façon dont vous avez besoin, utiliser #{--apt-options}# ou
-#{--aptitude-options}# pour passer des options grâce à votre outil APT
+#{--aptitude-options}# pour passer des options à votre outil APT
configuré. Voir les pages de manuel #{apt}# et #{aptitude}# pour plus de
détails
3~apt-pinning APT pinning
Pour le contexte, s'il vous plaît lire d'abord la page de manuel
-#{apt_preferences(5)}#. APT pinning peut être configuré soit pour le temps
-de construction, ou encore pendant l'exécution. Pour le premier, créez
-#{config/chroot_apt/preferences}#. Pour ce dernier, créez
+#{apt_preferences(5)}#. APT pinning peut être configuré soit au temps de
+construction, ou encore pendant l'exécution. Pour le premier, créez
+#{config/chroot_apt/preferences}#. Pour ce dernier, créez
#{config/includes.chroot/etc/apt/preferences}#.
-Imaginons que vous voulez construire un système live Wheezy mais il faut
-installer tous les paquets live qui finissent dans l'image binaire de Sid au
-moment de la construction. Vous devez ajouter Sid à votre APT sources et le
+Imaginons que vous voulez construire un système live wheezy mais il faut
+installer tous les paquets live qui finissent dans l'image binaire de sid au
+moment de la construction. Vous devez ajouter sid à votre APT sources et le
fixer de sorte que seulement les paquets que vous voulez sont installés au
temps de construction et tous les autres sont de la distribution du système
-cible, Wheezy. Ce qui suit devrait accomplir ça:
+objectif, wheezy. Ce qui suit devrait accomplir ça:
code{
@@ -566,7 +566,7 @@ code{
}code
-*{Remarque:}* Caractères génériques peuvent être utilisés dans les noms des paquets (par exemple *{Package: live-*}*) avec la version 0.8.14 ou supérieure d'Apt. Cela signifie qu'il fonctionne avec Wheezy en utilisant:
+*{Remarque:}* Caractères génériques peuvent être utilisés dans les noms des paquets (par exemple *{Package: live-*}*) avec la version 0.8.14 ou supérieure d'Apt. Cela signifie qu'il fonctionne avec wheezy en utilisant:
code{
@@ -579,9 +579,9 @@ vous ne voulez pas un paquet qui est recommandé par un autre
paquet. Supposons que vous construisez une image LXDE en utilisant l'option
#{--package-lists lxde}# mais ne veulez pas que l'utilisateur soit invité à
stocker les mots de passe wifi dans le trousseau de clés. Cette liste
-comprend #{gdm}#, que dépend de #{gksu}#, que à son tour recommends
-#{gnome-keyring}#. Donc, vous voulez omettre le paquet recommandé
-#{gnome-keyring}#. Cela peut être fait en ajoutant la strophe suivante à
+comprend /{gdm}/, que dépend de /{gksu}/, que à son tour recommande
+/{gnome-keyring}/. Donc, vous voulez omettre le paquet recommandé
+/{gnome-keyring}/. Cela peut être fait en ajoutant la strophe suivante à
#{config/chroot_apt/preferences}#:
code{
diff --git a/manual/fr/user_customization-runtime.ssi b/manual/fr/user_customization-runtime.ssi
index c0e31ad..9250394 100644
--- a/manual/fr/user_customization-runtime.ssi
+++ b/manual/fr/user_customization-runtime.ssi
@@ -32,11 +32,11 @@ code{
}code
-Il est également possible de changer le nom d'utilisateur par défaut «user»
-et du mot de passe par défaut "live". Si vous voulez pour quelque raison,
-vous pouvez facilement faire ça comme suit:
+Il est également possible de changer le nom de l'utilisateur par défaut
+«user» et du mot de passe par défaut "live". Si vous voulez pour quelque
+raison, vous pouvez facilement faire ça comme suit:
-Pour modifier le nom d'utilisateur par défaut, vous pouvez simplement le
+Pour modifier le nom de l'utilisateur par défaut, vous pouvez simplement le
spécifier dans votre config:
code{
@@ -53,9 +53,9 @@ ce faire vous pouvez utiliser le hook "passwd" de
#{config/includes.chroot/lib/live/config/}#
2~customizing-locale-and-language Personnalisation des paramètres régionaux
-et la langue
+et de la langue
-Au démarrage du système live, la langue est impliqué dans trois étapes:
+Au démarrage du système live, la langue est impliquée dans trois étapes:
_* la génération des paramètres régionaux
@@ -79,12 +79,12 @@ noyau. Vous pouvez spécifier des paramètres régionaux par
#{language_country.encoding}#.
Tant la console et la configuration du clavier X dépendent du paramètre
-#{keyboard-layouts}# de l'option #{--bootappend-live}#. Options valides pour
-les dispositions des claviers X peuvent être trouvés dans
+#{keyboard-layouts}# de l'option #{--bootappend-live}#. Les options valides
+pour les dispositions des claviers X peuvent être trouvés dans
#{/usr/share/X11/xkb/rules/base.xml}# (plutôt limitées à des codes des pays
-à deux lettres). Pour trouver la valeur (les deux caractères), correspondant
-à une langue essayez de rechercher le nom anglais de la nation où la langue
-est parlée, par exemple:
+à deux lettres). Pour trouver la valeur (les deux caractères),
+correspondante à une langue essayez de rechercher le nom anglais de la
+nation où la langue est parlée, par exemple:
code{
@@ -102,7 +102,7 @@ code{
}code
-Une liste des valeurs valides des claviers pour la console peut être figuré
+Une liste des valeurs valides des claviers pour la console peut être figurée
avec la commande suivante:
code{
@@ -113,7 +113,7 @@ code{
}code
Alternativement, vous pouvez utiliser le paquet #{console-setup}#, un outil
-pour vous permettre de configurer la disposition de la console en utilisant
+pour vous aider à configurer la disposition de la console en utilisant
définitions X (XKB), vous pouvez alors définir votre clavier plus
précisément avec variables #{keyboard-layouts}#, #{keyboard-variant}#,
#{keyboard-options}# et #{keyboard-model}#; live-boot pourra également
@@ -140,8 +140,8 @@ ainsi autres supports, en plus de CDs, mais encore, dans son comportement
par défaut, il doit être considéré en lecture seule et toutes les évolutions
pendant l'exécution du système sont perdus à l'arrêt.
-La persistance est un nom commun pour les différents types de solutions pour
-sauver, après un redémarrage, certaines ou toutes les données, de cette
+La «persistance» est un nom commun pour les différents types de solutions
+pour sauver, après un redémarrage, certaines ou toutes les données, de cette
évolution pendant l'exécution du système. Pour comprendre comment cela
pourrait fonctionner il pourrait être utile de savoir que même si le système
est démarré et exécuté à partir d'un support en lecture seule, la
@@ -154,9 +154,9 @@ support inscriptible persistant comme supports de stockage locaux, un
partage réseau ou même une séance d'un CD/DVD multisession
(ré)inscriptible. Tous ces supports sont pris en charge dans Debian Live de
différentes manières, et tous, moins le dernier, nécessitent un paramètre
-d'amorçáge spéciale à préciser au moment du démarrage: #{persistent}#.
+d'amorçage spéciale à préciser au moment du démarrage: #{persistence}#.
-Si le paramètre de démarrage #{persistent}# est réglé (et #{nopersistent}#
+Si le paramètre de démarrage #{persistence}# est réglé (et #{nopersistence}#
n'est pas utilisé), les supports de stockage locaux (par exemple les disques
durs, clés USB) seront examinés pour trouver des volumes persistants pendant
le démarrage. Un volume persistant est un des éléments suivants:
@@ -169,8 +169,8 @@ fichiers.
_* un fichier image/archive situé sur la racine de tout système de fichiers
en lecture (même une partition NTFS d'un système d'exploitation étranger),
identifié par son nom de fichier. Dans ce cas, le nom du fichier doit
-également utiliser le système de fichiers contenant l'extension de fichier,
-par exemple, "<label>.ext3".
+contenir le nom du système de fichiers comme extension, par exemple,
+"<label>.ext4".
Il est possible de limiter les types de volumes persistants à utiliser en
spécifiant certains paramètres de démarrage décrits dans la page de manuel
@@ -188,15 +188,15 @@ _* #{home-sn}# pour instantanés du /home.
3~ Couches de persistance pleine
Par «persistance pleine» on entend que au lieu d'utiliser un tmpfs pour le
-stockage des modifications au support en lecture seule (avec le système
+stockage des modifications dans le support en lecture seule (avec le système
copy-on-write, COW) une partition accessible en écriture est utilisée. Pour
ce type de persistance le nom du volume doit être #{full-ov}#. Cela
-pourrait, par exemple, être une partition ext2 sur un disque dur ou sur une
+pourrait, par exemple, être une partition ext4 sur un disque dur ou sur une
clé usb créée avec, par exemple:
code{
- # mkfs.ext2 -L full-ov /dev/sdb1
+ # mkfs.ext4 -L full-ov /dev/sdb1
}code
@@ -212,13 +212,13 @@ code{
}code
-Voici un exemple de comment créer un fichier image ext2 utilisé pour la
+Voici un exemple de comment créer un fichier image ext4 utilisé pour la
persistance pleine:
code{
$ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file
- $ /sbin/mkfs.ext2 -F full-ov
+ $ /sbin/mkfs.ext4 -F full-ov
}code
@@ -228,45 +228,45 @@ Ensuite, copiez le fichier #{full-ov}# sur une partition accessible en
3~ Couches personnalisées
Un volume avec l'étiquette #{custom-ov}# peut être configuré pour créer des
-répertoires arbitraires persistants. Le fichier #{live.persist}#, situé sur
-le système de fichiers racine du volume, contrôle quels répertoires il fait
-persistants, et de quelle manière.
+répertoires persistants arbitraires. Le fichier #{live-persistence.conf}#,
+situé sur le système de fichiers racine du volume, contrôle quels
+répertoires il fait persistants, et de quelle manière.
-Comment on configure monter des couches personnalisés est décrit en détail
-dans la page de manuel live.persist(5), mais un simple exemple devrait être
-suffisant pour la plupart des utilisations. Imaginons que nous voulons faire
-notre répertoire personnel et APT cache persistants dans un système de
-fichiers ext3 sur la partition /dev/sdb1:
+Comment on configure monter des couches personnalisées est décrit en détail
+dans la page de manuel live-persistence.conf(5), mais un simple exemple
+devrait être suffisant pour la plupart des utilisations. Imaginons que nous
+voulons faire notre répertoire personnel et APT cache persistants dans un
+système de fichiers ext4 sur la partition /dev/sdb1:
code{
- $ mkfs.ext3 -L custom-ov /dev/sdb1
- $ mount -t ext3 /dev/sdb1 /mnt
- $ echo "/home" >> /mnt/live.persist
- $ echo "/var/cache/apt" >> /mnt/live.persist
+ $ mkfs.ext4 -L custom-ov /dev/sdb1
+ $ mount -t ext4 /dev/sdb1 /mnt
+ $ echo "/home" >> /mnt/live-persistence.conf
+ $ echo "/var/cache/apt" >> /mnt/live-persistence.conf
}code
-Alors nous redémarrons. Lors du premier démarrage les contenus du /home et
-/var/cache/apt seront copiés dans le volume persistant, et à partir de ce
-moment tous les changements dans ces répertoires seront stockés dans le
-volume persistant. S'il vous plaît souligner que les chemins d'accès aux
-répertoriés dans le fichier #{live.persist}# ne peuvent pas contenir
-d'espaces blancs ou les éléments spéciaux "." et "..". En outre, ni "/live"
-(ou un de ses sous-répertoires), ni "/" peuvent être rendus persistants en
-utilisant custom mounts (pour ce dernier, utilisez la persistance
-#{full-ov}# décrite ci-dessus).
-
-Plusieurs différents volumes de couches personnalisés (avec leurs propres
-fichiers #{live.persist}#) peuvent être utilisés au même temps, mais si
-plusieurs volumes font le même répertoire persistant, un seul d'entre eux
-sera utilisé. Si les deux sont «imbriqués» (un est un sous-répertoire de
-l'autre) le premier sera monté avant que le secondaire de sorte que aucun
-sera caché par l'autre. Monter des éléments personnalisés imbriqués est
-problématique s'ils sont énumérés dans le même fichier
-#{live.persist}#. Voir la page de manuel live.persist(5) pour savoir comment
-gérer ce cas, si vous avez vraiment besoin (remarque: vous n'avez
-généralement pas).
+Alors nous redémarrons. Lors du premier démarrage les contenus du #{/home}#
+et #{/var/cache/apt}# seront copiés dans le volume persistant, et à partir
+de ce moment tous les changements dans ces répertoires seront stockés dans
+le volume persistant. S'il vous plaît souligner que les chemins d'accès aux
+répertoriés dans le fichier #{live-persistence.conf}# ne peuvent pas
+contenir d'espaces blancs ou les éléments spéciaux #{.}# et #{..}#. En
+outre, ni #{/live}# (ou un de ses sous-répertoires), ni #{/}# peuvent être
+rendus persistants en utilisant custom mounts (pour ce dernier, utilisez la
+persistance #{full-ov}# décrite ci-dessus).
+
+Plusieurs volumes de couches personnalisées différents (avec leurs propres
+fichiers #{live-persistence.conf}#) peuvent être utilisées au même temps,
+mais si plusieurs volumes font le même répertoire persistant, un seul
+d'entre eux sera utilisé. Si les deux sont «imbriqués» (un est un
+sous-répertoire de l'autre) le premier sera monté avant que le secondaire de
+sorte que aucun sera caché par l'autre. Monter des éléments personnalisés
+imbriqués est problématique s'ils sont énumérés dans le même fichier
+#{live-persistence.conf}#. Voir la page de manuel live-persistence.conf(5)
+pour savoir comment gérer ce cas, si vous avez vraiment besoin (remarque:
+vous n'avez généralement pas).
3~ Instantanés
@@ -274,37 +274,37 @@ Les instantanés sont des collections de fichiers et de répertoires qui ne
sont pas montés lors de l'exécution, mais qui sont copiés à partir d'un
périphérique persistant à le système (tmpfs) au démarrage et qui sont
resynchronisés au redémarrage/arrêt du système. Le volume doit être étiqueté
-#{live-sn}#. Il est par défaut une simple archive cpio appelé
-#{live-sn.cpio.gz}#. Une coupure de courant pendant l'exécution pourrait
+#{live-sn}#. Il est par défaut une simple archive cpio appelée
+#{live-sn.cpio.gz}#. Une coupure de courant pendant l'exécution pourrait
conduire à la perte de données, donc un outil appelé #{live-snapshot
--refresh}# pourrait être appelé pour synchroniser des changements
importants. Ce type de persistance, car elle n'écrit pas continuellement
dans les supports persistants, est la plus respectuese avec les dispositifs
flash et la plus rapide de tous les systèmes de persistance, mais elle
-occupe autant RAM que la taille de l'instantané non compressé.
+occupe autant RAM que la taille de l'instantané non compressée.
Une version d'instantané de /home existe aussi, et son étiquette est
-#{home-sn.*}#; elle travaille le même que l'instantané principale, mais il
-est seulement appliquée à /home.
+#{home-sn.*}#; elle fonctionne le même que l'instantané principal, mais
+c'est seulement appliqué à /home.
Les instantanés ne peuvent pas actuellement gérer la suppression de
fichiers.
3~ SubText persistant
-Si un utilisateur a besoin de multiples stockages persistants du même type
+Si un utilisateur a besoin de stockages persistants multiples du même type
pour différents endroits ou l'essai, tel que #{full-ov-nonwork}# et
-#{full-ov-work}#, le paramètre de démarrage #{persistent-subtext}# utilisé
-en conjonction avec le paramètre de démarrage #{persistent}# permettra
-multiples mais uniques supports persistants. Un exemple serait le cas si un
-utilisateur voudrait utiliser une partition persistante étiqueté
+#{full-ov-work}#, le paramètre de démarrage #{persistence-subtext}# utilisé
+en conjonction avec le paramètre de démarrage #{persistence}# permettra
+multiples, mais uniques, supports persistants. Un exemple serait le cas si
+un utilisateur voudrait utiliser une partition persistante étiquetée
#{live-sn-subText}# il utiliserait les paramètres de démarrage:
-#{persistent}# #{persistent-subtext=subText}#.
+#{persistence}# #{persistence-subtext=subText}#.
3~ Remasterisation partielle
Les modifications de l'exécution du tmpfs pourraient être recueillies à
-l'aide de live-snapshot dans une squashfs et ajoutés au CD en remasterisant
+l'aide de live-snapshot dans une squashfs et ajoutées au CD en remasterisant
l'ISO dans le cas des CD-R ou en ajoutant une session à un cd/dvd(rw)
multisession; live-boot monte tous les systèmes de fichiers /live dans
l'ordre ou avec le paramètre de démarrage du module.
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index 5c96aa7..cc169cb 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -2,11 +2,11 @@
1~examples Exemples
-Ce chapitre s'occupe d'exemples de constructions pour les cas d'utilisation
+Ce chapitre s'occupe d'exemples de constructions pour des cas d'utilisation
spécifiques avec Debian Live. Si vous êtes nouveau avec la construction de
vos propres images Debian Live, nous vous recommandons d'abord regarder les
-trois tutoriels en séquence, comme chacun apprend nouvelles techniques qui
-vous aideront à utiliser et à comprendre les exemples restants.
+trois tutoriels en séquence, parce que chacun enseigne nouvelles techniques
+qui vous aideront à utiliser et à comprendre les exemples restants.
2~using-the-examples En utilisant les exemples
@@ -44,7 +44,7 @@ défaut contenant uniquement paquets de base (pas de Xorg) et quelques
paquets Debian de soutien live, comme un premier exercice en utilisant
live-build.
-Vous ne pouvez pas obtenir beaucoup plus simple que cela:
+Vous ne pouvez pas obtenir rien plus simple que cela:
code{
@@ -53,9 +53,9 @@ code{
}code
Examinez le contenu du répertoire #{config/}# si vous le souhaitez. Vous
-verrez stockés ici une configuration du squelette, pour être personnalise
-ou, dans ce cas, utiliser immédiatement pour construire une image par
-défaut.
+verrez stockés ici une arborescence de configuration, pour être
+personnalisee ou, dans ce cas, utiliser immédiatement pour construire une
+image par défaut.
Maintenant, en tant que superutilisateur, construire l'image en enregistrant
un journal avec #{tee}#.
@@ -67,13 +67,13 @@ code{
}code
En supposant que tout se passe bien, après un certain temps, le répertoire
-courant contient #{binary-hybrid.iso}#. Cette image ISO hybride peut être
-démarré directement dans une machine virtuelle comme décrit dans {Test d'une
-image ISO avec QEMU}#testing-iso-with-qemu et {Test d'une image ISO avec
-virtualbox-ose}#testing-iso-with-virtualbox, ou bien copiés sur un support
-optique ou un périphérique USB comme décrit dans {Graver une image ISO sur
-un support physique}#burning-iso-image et {Copie d'un image ISO hybride sur
-une clé USB}#copying-iso-hybrid-to-usb, respectivement.
+courant contiendra #{binary.hybrid.iso}#. Cette image ISO hybride peut être
+démarrée directement dans une machine virtuelle comme décrit dans {Test
+d'une image ISO avec QEMU}#testing-iso-with-qemu et {Test d'une image ISO
+avec virtualbox-ose}#testing-iso-with-virtualbox, ou bien copiée sur un
+support optique ou un périphérique USB comme décrit dans {Graver une image
+ISO sur un support physique}#burning-iso-image et {Copie d'un image ISO
+hybride sur une clé USB}#copying-iso-hybrid-to-usb, respectivement.
2~tutorial-2 Tutoriel 2: Un utilitaire de navigateur Web
@@ -94,13 +94,13 @@ code{
Notre choix de LXDE pour cet exemple reflète notre volonté de fournir un
environnement de bureau minime, puisque le point de l'image est
-l'utilisation unique, nous avons à l'esprit, le navigateur web. On pourrait
-aller encore plus loin et offrir une configuration par défaut pour le
-navigateur web dans #{config/includes.chroot/etc/iceweasel/profile/}#, ou
+l'utilisation unique que nous avons à l'esprit, le navigateur web. On
+pourrait aller encore plus loin et offrir une configuration par défaut pour
+le navigateur web dans #{config/includes.chroot/etc/iceweasel/profile/}#, ou
des paquets de soutien supplémentaires pour visualiser différents types de
-contenu web, mais nous laissons cela comme une exercice pour le lecteur.
+contenu web, mais nous laissons cela comme un exercice pour le lecteur.
-Construire l'image, encore une fois en tant que superutilisateur, tenir un
+Construire l'image, encore une fois en tant que superutilisateur, garder un
journal comme dans {Tutoriel 1}#tutorial-1:
code{
@@ -158,12 +158,12 @@ code{
Tout d'abord, #{--architectures i386}# assure que sur notre système de
construction #{amd64}#, nous construisons une version 32 bits qui peut être
-utilisé sur la plupart des machines. Deuxièmement, nous utilisons
+utilisée sur la plupart des machines. En seconde place, nous utilisons
#{--linux-flavours 686-pae}# parce que nous ne prévoyons pas utiliser cette
-image sur des systèmes beaucoup plus anciens. Troisièmement, nous avons
-choisi la liste des paquets #{lxde}# pour nous donner un bureau minimal. Et
-enfin, nous avons ajouté deux premiers paquets préférés: #{iceweasel}# et
-#{xchat}#.
+image sur des systèmes beaucoup plus anciens. En troisième lieu, nous avons
+choisi la liste de paquets /{lxde}/ pour nous donner un bureau minimal. Et
+enfin, nous avons ajouté deux premiers paquets préférés: /{iceweasel}/ et
+/{xchat}/.
Maintenant, construire l'image:
@@ -178,8 +178,8 @@ besoin de taper #{2>&1 | tee binary.log}# parce que cela est maintenant
inclus dans #{auto/build}#.
Une fois que vous avez testé l'image (comme dans {Tutoriel 1}#tutorial-1) et
-êtes satisfait avec son fonctionnement, il est temps pour initialiser notre
-référentiel #{git}#, ajoutant que les scripts d'auto que nous avons juste
+vous êtes satisfait avec son fonctionnement, il est temps pour initialiser
+notre dépôt #{git}#, ajoutant que les scripts d'auto que nous avons juste
créé, et ensuite faire le premier commit:
code{
@@ -193,12 +193,12 @@ code{
3~ Deuxième révision
Dans cette révision, nous allons nettoyer à partir de la première
-construction, ajouter le paquet #{vlc}# à notre configuration, reconstruire,
+construction, ajouter le paquet /{vlc}/ à notre configuration, reconstruire,
tester et faire le commit.
La commande #{lb clean}# va nettoyer tous les fichiers générés par la
construction précédente à l'exception du cache, ça évite d'avoir à
-re-télécharger les paquets. Cela garantit que le #{lb build}# postérieure
+re-télécharger les paquets. Cela garantit que la #{lb build}# suivante
ré-exécutera toutes les étapes pour régénérer les fichiers de notre nouvelle
configuration.
@@ -208,7 +208,7 @@ code{
}code
-Maintenant ajouter le paquet #{vlc}# à votre liste de paquets local dans
+Maintenant ajouter le paquet /{vlc}/ à votre liste de paquets locaux dans
#{config/package-lists/my.list.chroot}#:
code{
@@ -225,7 +225,7 @@ code{
}code
-Tester, et quand vous êtes satisfaits, commit la prochaine révision:
+Tester, et quand vous soyez satisfaits, commit la prochaine révision:
code{
@@ -237,8 +237,8 @@ Bien sûr, des changements plus compliqués à la configuration sont possibles,
peut-être l'ajout de fichiers dans les sous-répertoires de
#{config/}#. Quand vous livrez des nouvelles révisions, on doit prendre soin
de ne pas modifier à la main ou envoyer au dépôt les fichiers de niveau
-supérieur dans #{config}# contenant variables #{LB_*}#, car ce sont des
-produits de creation, aussi, et sont toujours nettoyés par #{lb clean}# et
+supérieur dans #{config}# contenant variables #{LB_*}#, car ce sont aussi
+des produits de creation et sont toujours nettoyés par #{lb clean}# et
re-créés avec #{lb config}# via leur respectives #{auto}# scripts.
Nous sommes arrivés à la fin de notre série de tutoriels. Alors que de
@@ -252,9 +252,9 @@ expériences recueillies des utilisateurs de Debian Live.
*{Cas d'utilisation:}* Créer une image avec live-build pour démarrer directement à un serveur VNC.
-Faire un répertoire de construction et créer une configuration du squelette
-construit autour de la liste standard x11, avec #{gdm3}#, #{metacity}# et
-#{xvnc4viewer}#, désactivant «recommends» pour faire un système minimal:
+Faire un répertoire de construction et créer une arborescence de fichiers
+construite autour de la liste standard x11, avec /{gdm3}/, /{metacity}/ et
+/{xvnc4viewer}/, désactivant «recommends» pour faire un système minimal:
code{
@@ -267,8 +267,9 @@ code{
}code
Créez le répertoire #{/etc/skel}# avec une #{.xsession}# personnalisée pour
-l'utilisateur par défaut qui va lancer metacity et commencer xvncviewer, en
-reliant le port #{5901}# sur un serveur à #{192.168.1.2}#:
+l'utilisateur par défaut qui va lancer /{metacity}/ et commencer
+/{xvncviewer}/, en reliant le port #{5901}# sur un serveur à
+#{192.168.1.2}#:
code{
@@ -296,18 +297,18 @@ Amusez-vous bien!
2~ Une image de base pour une clé USB de 128M
-*{Cas d'utilisation:}* Créer une image standard avec certains composants éliminés afin de s'adapter sur une clé USB avec 128M avec espace laissé pour l'utiliser à votre convenance.
+*{Cas d'utilisation:}* Créer une image standard avec certains composants éliminés afin de l'adapter sur une clé USB de 128M avec espace laissé pour l'utiliser à votre convenance.
-Lorsque l'optimisation d'une image adaptée à une dimension des certains
+Pour l'optimisation d'une image adaptée à la dimension des certains
supports, vous avez besoin de comprendre le compromis que vous faites entre
-la taille et la fonctionnalité. Dans cet exemple, nous réduisons uniquement
-que pour faire place à du matériel supplémentaire au sein d'une taille de
-128M, mais sans rien faire pour détruire l'intégrité des paquets contenus,
-telles que la purge des données de localisation via le paquet
-#{localepurge}#, ou d'autres tels optimisations "intrusives". On notera en
-particulier, vous ne devriez pas utiliser #{--bootstrap-flavour minimal}#
-sauf si vous savez vraiment ce que vous faites, que l'omission de paquets de
-priorité #{importants}# produira probablement un système live cassé.
+la taille et la fonctionnalité. Dans cet exemple, nous réduisons la taille
+uniquement que pour faire place au matériel supplémentaire au sein d'une
+taille de 128M, mais sans faire rien pour détruire l'intégrité des paquets
+contenus, telle que la purge des données de localisation via le paquet
+/{localepurge}/, ou d'autres optimisations "intrusives". On notera en
+particulier que vous ne devriez pas utiliser #{--bootstrap-flavour minimal}#
+sauf si vous savez vraiment ce que vous faites et que l'omission des paquets
+de priorité *{importante}* produira probablement un système live cassé.
code{
@@ -325,40 +326,40 @@ code{
}code
Sur le système de l'auteur au moment de l'écriture, la configuration
-ci-dessus produit une image de 78Mbyte. Cela se compare favorablement avec
-l'image de 166Mbyte produite par la configuration par défaut dans {Tutoriel
-1}#tutorial-1.
+ci-dessus produisait une image de 78Mbyte. Cela se compare favorablement
+avec l'image de 166Mbyte produite par la configuration par défaut dans
+{Tutoriel 1}#tutorial-1.
Le plus grand espace-économiseur ici, par rapport à la construction d'une
image standard sur une architecture #{i386}#, est de sélectionner uniquement
le saveur du noyau #{486}# au lieu de la valeur par défaut #{-k "486
-686-pae"}#. Laissant hors indices APT avec #{--apt-indices false}# permet
-aussi d'économiser une bonne quantité d'espace, le compromis étant que vous
-devez faire #{apt-get update}# avant d'utiliser apt dans le système
+686-pae"}#. Laissant hors «APT's indices» avec #{--apt-indices false}#
+permet aussi d'économiser une bonne quantité d'espace, le compromis étant
+que vous devez faire #{apt-get update}# avant d'utiliser apt dans le système
live. Le choix de la liste #{minimal}# laisse de côté les grands paquets de
#{locales}# et les services associés. Laissant hors les paquets recommandés
-avec #{--apt-recommends false}# économise de l'espace supplémentaire, au
-détriment d'omettre certains paquets vous pourriez autrement attendre à être
-là, tel que #{firmware-linux-free}# qui peuvent être nécessaires pour
+avec #{--apt-recommends false}# économise d'espace supplémentaire, au
+détriment d'omettre certains paquets que vous pourriez autrement attendre à
+être là, tel que /{firmware-linux-free}/ qui peuvent être nécessaires pour
soutenir certains supports matériels. Les options restantes économisent
-petites quantités d'espace supplémentaires. C'est à vous de décider si la
-fonctionnalité qui est sacrifié avec chaque optimisation est en vaut la
+petites quantités d'espace supplémentaire. C'est à vous de décider si la
+fonctionnalité qui est sacrifiée avec chaque optimisation est en vaut la
perte de fonctionnalité.
2~ Un bureau KDE localisé et installateur
-*{Cas d'utilisation:}* Créer une image de bureau KDE, localisé pour le portugais brésilien et incluant un installateur.
+*{Cas d'utilisation:}* Créer une image de bureau KDE, localisée pour le portugais brésilien et incluant un installateur.
-Nous voulons faire une image iso-hybride pour l'architecture i386 en
+Nous voulons faire une image iso-hybrid pour l'architecture i386 en
utilisant notre bureau préféré, dans ce cas, KDE, contenant tous les paquets
-mêmes qui seraient installés par l'installateur Debian standard pour KDE.
+qui seraient installés par l'installateur Debian standard pour KDE.
Notre premier problème est la découverte des noms des tâches
-appropriées. Actuellement, live-build ne peut pas aider. Alors que nous
-pourrions être chanceux et trouver ce par essais et erreurs, il y a un
-outil, #{grep-dctrl}#, qui peut être utilisé pour découvrir des descriptions
-de tâches dans tasksel-data, de sorte à préparer, assurez-vous que vous avez
-ces deux choses:
+appropriées. Actuellement, live-build ne peut pas aider à faire ça. Alors
+que nous pourrions être chanceux et trouver ce par essais et erreurs, il y a
+un outil, #{grep-dctrl}#, qui peut être utilisé pour découvrir les
+descriptions des tâches dans tasksel-data, de sorte à préparer, assurez-vous
+que vous avez ces deux choses:
code{
@@ -375,8 +376,8 @@ code{
}code
-Par cette commande, nous découvrons la tâche est appelée, assez clairement,
-brazilian-portuguese. Maintenant, pour trouver les tâches liées:
+Par cette commande, nous découvrons que la tâche est appelée, assez
+clairement, brazilian-portuguese. Maintenant, pour trouver les tâches liées:
code{
@@ -410,8 +411,8 @@ code{
}code
-Notez que nous avons inclus le paquet #{debian-installer-launcher}# pour
-lancer l'installateur à partir du bureau live, nous avons également précisé
-le noyau 486, parce qu'il est actuellement nécessaire faire que
-l'installateur et le noyau du systéme live coïncident pour que le lanceur
-fonctionne correctement.
+Notez que nous avons inclus le paquet debian-installer-launcher pour lancer
+l'installateur à partir du bureau live, nous avons également précisé le
+noyau 486, parce qu'il est actuellement nécessaire faire que l'installateur
+et le noyau du systéme live coïncident pour que le lanceur fonctionne
+correctement.
diff --git a/manual/fr/user_installation.ssi b/manual/fr/user_installation.ssi
index ec8d672..48c2671 100644
--- a/manual/fr/user_installation.ssi
+++ b/manual/fr/user_installation.ssi
@@ -104,7 +104,7 @@ code{
Si vous ne souhaitez pas de créer ou d'installer live-build à partir des
sources, vous pouvez utiliser des instantanés. Ils sont construits
-automatiquement à partir de la dernière version du Git et ils sont
+automatiquement à partir de la dernière version du dépôt Git et ils sont
disponibles à http://live.debian.net/debian/.
2~ live-boot et live-config
@@ -114,7 +114,7 @@ disponibles à http://live.debian.net/debian/.
3~ À partir du dépôt Debian
Tous deux live-boot et live-config sont disponibles dans le dépôt Debian
-comme {Installation de live-build}#installing-live-build.
+comme expliqué dans {Installation de live-build}#installing-live-build.
3~ À partir du code source
@@ -138,16 +138,16 @@ vos paquets à partir des sources.
_* Créer les fichiers .deb de live-boot et live-config
Vous devez créer sur votre distribution objectif ou en chroot contenant
-votre plateforme objectif: cela signifie que si votre objectif est Wheezy
-alors vous devez créer sur Wheezy.
-
-Utilisez un système de construction automatique personnel tels que
-/{pbuilder}/ ou /{sbuild}/ si vous avez besoin pour créer #{live-boot}# pour
-une distribution objectif qui diffère de votre système de construction. Par
-exemple, pour les images live de Wheezy, créez #{live-boot}# dans un chroot
-Wheezy. Si votre distribution objectif correspond à votre distribution vous
+votre plateforme objectif: cela signifie que si votre objectif est wheezy
+alors vous devez créer sur wheezy.
+
+Utilisez un système de construction automatique personnel tel que
+/{pbuilder}/ ou /{sbuild}/ si vous avez besoin pour créer live-boot pour une
+distribution objectif qui diffère de votre système de construction. Par
+exemple, pour les images live de wheezy, créez live-boot dans un chroot
+wheezy. Si votre distribution objectif correspond à votre distribution vous
pouvez créer directement sur le système de construction en utilisant
-#{dpkg-buildpackage}# (fournis par le paquet /{dpkg-dev}/):
+#{dpkg-buildpackage}# (fourni par le paquet /{dpkg-dev}/):
code{
@@ -171,10 +171,10 @@ additionnels}#additional-repositories.
3~ À partir des instantanés
Vous pouvez laisser live-build utiliser automatiquement les derniers
-instantanés de live-boot et live-config configurant un dépôt de tierce
-partie dans votre répertoire de configuration de live-build. En supposant
-que vous avez déjà créé un arbre de configuration dans le répertoire courant
-avec #{lb config}#:
+instantanés de live-boot et live-config configurant un dépôt de tiers dans
+votre répertoire de configuration de live-build. En supposant que vous avez
+déjà créé un arbre de configuration dans le répertoire courant avec #{lb
+config}#:
code{
diff --git a/manual/fr/user_managing_a_configuration.ssi b/manual/fr/user_managing_a_configuration.ssi
index f87047a..efeb930 100644
--- a/manual/fr/user_managing_a_configuration.ssi
+++ b/manual/fr/user_managing_a_configuration.ssi
@@ -4,7 +4,7 @@
Ce chapitre explique comment gérer une configuration d'un système live à
partir d'une création initiale, à travers des révisions successives et des
-versions successives du logiciel live-build et de l'image live lui-même.
+versions successives du logiciel live-build et de l'image live elle-même.
2~ Utiliser auto pour gérer les modifications de configuration
@@ -12,8 +12,8 @@ Les configurations live sont rarement parfaites du premier coup. Vous aurez
probablement besoin de faire une série de révisions jusqu'à ce que vous êtes
satisfait. Cependant, des incohérences peuvent se glisser dans votre
configuration d'une révision à la prochaine si vous ne faites pas
-attention. Le principal problème est, une fois qu'une variable est donné une
-valeur par défaut, cette valeur ne sera pas recalculé à partir d'autres
+attention. Le principal problème est, une fois qu'une variable est donnée
+une valeur par défaut, cette valeur ne sera pas recalculée à partir d'autres
variables qui peuvent changer dans les révisions ultérieures.
Par exemple, lorsque la distribution est d'abord définie, nombreuses
@@ -23,14 +23,14 @@ distribution, ces variables dépendantes conservent les anciennes valeurs qui
ne sont plus appropriées.
Un deuxième problème lié est que si vous exécutez #{lb config}# et ensuite
-mettez à jour une nouvelle version de live-build qui a changé l'un des noms
-de variables, vous découvrirez ce que par un examen manuel des variables
+mettez à jour une nouvelle version de live-build qui a changée l'un des noms
+des variables, vous découvrirez ce que par un examen manuel des variables
dans votre fichiers dans #{config/*}#, que vous devrez ensuite utiliser pour
définir l'option appropriée à nouveau.
Tout cela serait une nuisance terrible si ce n'était pas pour les scripts
-auto/* simples emballages pour les commandes #{lb config}#, #{lb build}# et
-#{lb clean}# qui sont conçus pour vous aider gérer votre configuration. Il
+auto/*, simples emballages pour les commandes #{lb config}#, #{lb build}# et
+#{lb clean}# qui sont conçus pour vous aider à gérer votre configuration. Il
suffit de créer un script auto/config contenant la commande #{lb config}#
avec toutes les options désirées, et un auto/clean qui supprime les fichiers
contenant les valeurs des variables de configuration, et chaque fois que
@@ -39,17 +39,17 @@ exécutés. Cela permettra d'assurer que votre configuration a une cohérence
interne d'une révision à l'autre et d'une version de live-build à la
suivante (bien que vous aurez encore de prendre soin et lire la
documentation lorsque vous mettez live-build à niveau pour faire les
-ajustements nécessaires ).
+ajustements nécessaires).
2~ Exemples de scripts auto
Utiliser des exemples de scripts auto tels que les suivants comme point de
-départ pour votre nouveau configuration de live-build. Prenez note que
-lorsque vous appelez la commande #{lb}# que votre script auto emballage vous
-devez spécifier #{noauto}# comme paramètre afin de s'assurer que le script
-automatique n'est pas appelé à nouveau, de façon récursive. Aussi, n'oubliez
-pas de s'assurer que les scripts sont exécutables (par exemple #{chmod 755
-auto/*}#).
+départ pour votre nouvelle configuration de live-build. Prenez note que
+lorsque vous appelez la commande #{lb}# que votre script auto emballage,
+vous devez spécifier #{noauto}# comme paramètre afin de s'assurer que le
+script automatique n'est pas appelé à nouveau, de façon récursive. Aussi,
+n'oubliez pas de s'assurer que les scripts sont exécutables (par exemple
+#{chmod 755 auto/*}#).
#{auto/config}#
diff --git a/manual/fr/user_overview.ssi b/manual/fr/user_overview.ssi
index 22ea572..2a7c197 100644
--- a/manual/fr/user_overview.ssi
+++ b/manual/fr/user_overview.ssi
@@ -14,12 +14,12 @@ L'idée derrière live-build est de constituer un cadre qui utilise un
répertoire de configuration pour automatiser et personnaliser complètement
tous les aspects de la construction d'une image Live.
-Plusieurs concepts sont similaires à celles ceux dans le paquet Debian
-debhelper écrit par Joey Hess:
+Plusieurs concepts sont similaires à ceux dans le paquet Debian
+/{debhelper}/ écrit par Joey Hess:
_* Les scripts ont un emplacement central pour la configuration de leur
-fonctionnement. Avec debhelper, c'est le sous-répertoire #{debian/}# d'un
-arbre de paquets. Par exemple, dh_install cherchera, entre autres, un
+fonctionnement. Avec /{debhelper}/, c'est le sous-répertoire #{debian/}#
+d'un arbre de paquets. Par exemple, dh_install cherchera, entre autres, un
fichier appelé #{debian/install}# pour déterminer quels fichiers doivent
exister dans un paquet binaire particulier. De la même manière, live-build
enregistre son configuration entièrement sous un sous-répertoire
@@ -28,11 +28,11 @@ enregistre son configuration entièrement sous un sous-répertoire
_* Les scripts sont indépendants - c'est-à-dire, il est toujours sûr
d'exécuter chaque commande.
-Contrairement à debhelper, live-build contient un outil pour générer un
-répertoire de configuration en squelette, #{lb config}#. Cela pourrait être
-considéré comme similaire à des outils tels que #{dh-make}#. Pour plus
-d'informations à propos de #{lb config}#, s'il vous plaît voir {La commande
-lb config}#lb-config.
+Contrairement à /{debhelper}/, live-build contient un outil pour générer une
+arborescence de configuration, #{lb config}#. Cela pourrait être considéré
+comme similaire à des outils tels que /{dh-make}/. Pour plus d'informations
+à propos de #{lb config}#, s'il vous plaît voir {La commande lb
+config}#lb-config.
Le reste de cette section examine les trois commandes les plus importantes:
@@ -53,12 +53,11 @@ Comme indiqué dans {live-build}#live-build, les scripts qui composent
live-build lisent leur configuration avec la commande #{source}# à partir
d'un seul répertoire nommé #{config/}#. Comme la construction de ce
répertoire à la main serait fastidieux et source d'erreurs, la commande #{lb
-config}# peut être utilisée pour créer des répertoires de configuration de
-squelette.
+config}# peut être utilisée pour créer une arborescence de configuration.
Exécuter #{lb config}# sans aucun argument crée un sous-répertoire
#{config/}# dont il remplit avec certains paramètres, et un sous-répertoire
-en squelette #{auto/}#.
+#{auto/}# avec une arborescence de fichiers.
code{
@@ -107,10 +106,11 @@ Le travail de la commande #{lb clean}# est enlever les différentes parties
d'une construction afin que autres compilations ultérieures puissent
commencer à partir d'un état propre. Par défaut, les étapes #{chroot}#,
#{binary}# et #{source}# sont nettoyées, mais le cache est laissé intact. En
-outre, les étapes individuelles peuvent être nettoyées. Par exemple, si vous
-avez effectué des changements qui affectent uniquement la phase binaire,
-utilisez #{lb clean --binary}# avant de construire un nouveau binaire. Voir
-la page de manuel de #{lb_clean}# pour une liste complète des options.
+outre, les étapes peuvent être nettoyées individuellement. Par exemple, si
+vous avez effectué des changements qui affectent uniquement la phase
+binaire, utilisez #{lb clean --binary}# avant de construire un nouveau
+binary. Voir la page de manuel de #{lb_clean}# pour une liste complète des
+options.
2~live-boot Le paquet live-boot
@@ -121,11 +121,11 @@ Debian Live, netboot tarballs, et les images pour clés USB.
Au démarrage il va chercher un support en lecture seule qui contient un
répertoire #{/live/}# où un système de fichiers racine (souvent une image du
-système de fichiers compressé comme squashfs) est stocké. S'il est trouvé,
+système de fichiers compressée comme squashfs) est stocké. S'il est trouvé,
il va créer un environnement accessible en écriture, en utilisant aufs, afin
que systémes similaires à Debian puissent démarrer à partir de ça.
-Plus d'information sur ramfs initial dans Debian peut être trouvé dans le
+Plus d'information sur initial ramfs dans Debian peut être trouvé dans le
Debian Linux Kernel Handbook à http://kernel-handbook.alioth.debian.org/
dans le chapitre sur initramfs.
diff --git a/manual/it/about_manual.ssi b/manual/it/about_manual.ssi
index 2fd4e11..207d1ff 100644
--- a/manual/it/about_manual.ssi
+++ b/manual/it/about_manual.ssi
@@ -2,14 +2,16 @@
1~about-manual A proposito di questo manuale
-Questo manuale funge da unico punto d'accesso a tutta la documentazione
-relativa al progetto Debian Live e si applica in particolare al software
-prodotto per il rilascio di Debian 7.0 "Wheezy". Sebbene sia principalmente
-focalizzato nell'aiutare a costruire un sistema live e non su argomenti per
-l'utente finale, è comunque possibile trovare alcune informazioni utili in
-queste sezioni: le {Nozioni di base}#the-basics coprono la preparazione
-delle immagini da avviare da un supporto o dalla rete, mentre
-{Personalizzare i comportamenti durante
+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 7.0 "wheezy" release. An up-to-date version
+can always be found at http://live.debian.net/
+
+Sebbene sia principalmente focalizzato nell'aiutare a costruire un sistema
+live e non su argomenti per l'utente finale, è comunque possibile trovare
+alcune informazioni utili in queste sezioni: le {Nozioni di base}#the-basics
+coprono la preparazione delle immagini da avviare da un supporto o dalla
+rete, mentre {Personalizzare i comportamenti durante
l'esecuzione}#customizing-run-time-behaviours descrive alcune opzioni
specificabili al prompt d'avvio, come la scelta di un layout di tastiera e
una lingua, e l'utilizzo della persistenza.
@@ -23,26 +25,27 @@ 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 suggeriamo di leggerlo nel seguente ordine. Per iniziare
-leggere questo capitolo, {A proposito di questo manuale}#about-manual, da
-cima a fondo insieme alla sezione {Glossario}#terms, quindi passare ai tre
-tutorial all'inizio della sezione {Esempi}#examples progettati per insegnare
-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 le {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
@@ -66,15 +69,15 @@ _* *{Host system}*: L'ambiente utilizzato per creare il sistema live.
_* *{Target system}*: L'ambiente usato per eseguire il sistema live.
_* *{live-boot}*: Una raccolta di script usati per avviare sistemi
-live. live-boot era una parte di live-initramfs.
+live. live-boot era una parte di /{live-initramfs}/.
_* *{live-build}*: Una raccolta di script usati per creare sistemi Debian
-Live personalizzati. live-build era conosciuto come live-helper, ed ancora
-prima come live-package.
+Live personalizzati. live-build era conosciuto come /{live-helper}/, ed
+ancora prima come /{live-package}/.
_* *{live-config}*: Una raccolta di script usati per configurare un sistema
live durante il processo di inizializzazione. live-config era una parte di
-live-initramfs.
+/{live-initramfs}/.
_* *{live-manual}*: Questo documento è inserito nel pacchetto chiamato
live-manual.
@@ -85,8 +88,8 @@ distribuzione Debian.
_* *{Boot parameters}*: Parametri che possono essere immessi nel prompt del
boot loader per modificare il comportamento del kernel o di live-config.
-_* *{chroot}*: Il programma chroot, #{chroot(8)}#, rende possibile eseguire
-diverse istanze dell'ambiente GNU/Linux su un singolo sistema
+_* *{chroot}*: Il programma /{chroot}/, #{chroot(8)}#, rende possibile
+eseguire diverse istanze dell'ambiente GNU/Linux su un singolo sistema
simultaneamente senza riavviare.
_* *{Binary image}*: Un file che contiene il sistema live, come binary.iso o
@@ -95,19 +98,15 @@ binary.img.
_* *{Target distribution}*: La distribuzione su cui sarà basato il sistema
live. Può differire dalla distribuzione presente sul proprio computer.
-_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Nomi in codice per i
-rilasci Debian; al momento Squeeze è l'attuale *{stable}* e Wheezy l'attuale
-*{testing}*. Sid sarà sempre il sinonimo della *{unstable}*. In tutto il
-manuale si tende ad usare i nomi in codice dei rilasci, in quanto questo è
-ciò che è previsto dagli strumenti stessi.
-
-La distribuzione *{stable}* contiene l'ultima distribuzione ufficialmente
-rilasciata da Debian; la *{testing}* è il punto di raccolta per i pacchetti
-della prossima *{stable}*. Uno dei principali vantaggi nell'uso di questa
-distribuzione sta nell'avere software più recente rispetto alla
-*{stable}*. La distribuzione *{unstable}* è dove avviene lo sviluppo attivo
-di Debian; viene generalmente usata dagli sviluppatori o da coloro che amano
-l'azzardo.
+_* *{stable/testing/unstable}*: The *{stable}* distribution contains the
+latest officially released distribution of Debian. The *{testing}*
+distribution is the staging area for the next *{stable}* release. A major
+advantage of using this distribution is that it has more recent versions of
+software relative to the *{stable}* release. The *{unstable}* distribution
+is where active development of Debian occurs. Generally, this distribution
+is run by developers and those who like to live on the edge. Throughout the
+manual, we tend to use codenames for the releases, such as wheezy or sid, as
+that is what is supported by the tools themselves.
2~ Autori
@@ -249,29 +248,15 @@ code{
_* Si noti che tutte le modifiche vanno eseguite sul ramo debian-next e non
su quello debian.
-_* Dopo aver modificato i file in #{manual/en/}#, chiamare il target
-"commit" nella directory superiore per bonificare i file ed aggiornare i
-file di traduzione:
-
-code{
-
- $ make commit
-
-}code
-
-quindi
-
-code{
-
- $ git add .
-
-}code
+_* Do not use #{make commit}# unless you are updating translations in this
+commit, and in that case, do not mix changes to the English manual and
+translations in the same commit, but use separate commits for each. See the
+{Translation}#translation section for more details.
-_* 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.
+_* Write commit messages that consist of complete, meaningful 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{
@@ -293,9 +278,10 @@ Per inviare una traduzione per una nuova lingua, seguire questi tre passi:
_* Tradurre i file about_manual.ssi.pot, about_project.ssi.pot e
index.html.in.pot nella propria lingua con il proprio editor preferito (tipo
-poedit). Inviare i file tradotti alla mailing list. Una volta che abbiamo
-ricevuto il contributo, aggiungeremo la nuova lingua al manuale (fornendo i
-file po) e la attiveremo per la procedura di compilazione automatica.
+/{poedit}/). Inviare i file tradotti alla mailing list. Una volta che
+abbiamo ricevuto il contributo, aggiungeremo la nuova lingua al manuale
+(fornendo i file po) e la attiveremo per la procedura di compilazione
+automatica.
_* 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
@@ -304,6 +290,6 @@ preferisce.
_* 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}#.
+#{git commit -a -m "Translating..."}# e #{git push}#.
*{Nota:}* anche se #{make commit}# e #{make build}# rimuovono entrambi la directory di compilazione, se si compila il manuale per rivedere le modifiche come consigliato, si consiglia di pulire l'albero git prima del push; per fare ciò si puà usare il comando #{make clean}#. Grazie al file .gitignore, quest'ultimo passaggio non è obbligatorio ma è una buona abitudine che evita di fare involontariamente il commit di certi file.
diff --git a/manual/it/about_project.ssi b/manual/it/about_project.ssi
index 42c0b64..1f27b09 100644
--- a/manual/it/about_project.ssi
+++ b/manual/it/about_project.ssi
@@ -20,7 +20,7 @@ _* Supportano solamente i386.
_* Modificano l'aspetto e il comportamento dei pacchetti snellendoli per
risparmiare spazio.
-_* They include packages from outside of the Debian archive.
+_* Includono pacchetti esterni all'archivio Debian.
_* Forniscono un kernel con patch addizionali che non appartengono a Debian.
@@ -32,10 +32,10 @@ immagini netboot.
3~ Perché creare il proprio sistema live?
-Debian è il Sistema Operativo Universale: ha un sistema live per mostraree
+Debian è il Sistema Operativo Universale, ha un sistema live per mostrare e
rappresentare accuratamente il sistema con i seguenti vantaggi:
-_* Sarebbe un sottoprogetto di Debian.
+_* È un sottoprogetto di Debian.
_* Riflette lo stato (attuale) di una distribuzione.
@@ -75,17 +75,16 @@ di Debian.
Nel caso in cui serva una configurazione predefinita differente, sarà fatto
in coordinazione con il maintainer del pacchetto in Debian.
-Viene fornito un sistema per configurare i pacchetti tramite debconf nel
-#{lb config}# (use --preseed FILE) consentendo di installare pacchetti
-configurati secondo le proprie preferenze nell'immagine Debian Live
-personalizzata, ma per le immagini ufficiali verrà usata la configurazione
-predefinita. Per ulteriori informazioni si veda {Panoramica sulla
+Viene fornito un sistema per configurare i pacchetti tramite debconf
+consentendo di installare pacchetti configurati secondo le proprie
+preferenze nell'immagine Debian Live personalizzata, ma per le immagini
+ufficiali verrà usata la configurazione predefinita. Per ulteriori
+informazioni si veda {Panoramica sulla
personalizzazione}#customization-overview.
Eccezione: ci sono alcuni cambiamenti essenziali per far nascere un sistema
-live (ad esempio configurare pam per permettere le password vuote). Queste
-modifiche essenziali devono essere tenute al minimo possibile e saranno
-eventualmente aggiunte ai repository Debian.
+live. Queste modifiche essenziali devono essere tenute al minimo possibile e
+saranno eventualmente aggiunte ai repository Debian.
2~contact Contatti
@@ -99,7 +98,8 @@ _* *{IRC}*: Molti utenti e sviluppatori sono presenti sul canale
prega di essere pazienti nell'ottenere una risposta; se non si riceve
risposta scrivere alla mailing list.
-_* *{BTS}*: Il Debian Bug Tracking System (BTS) contiene i dettagli dei bug
-riportati dagli utenti e dagli sviluppatori. A ciascun bug viene assegnato
-un numero, e viene mantenuto finché non è segnato come risolto. Per
-ulteriori informazioni si veda {Segnalare bug}#bugs.
+_* *{BTS}*: Il {Debian Bug Tracking System}http://www.debian.org/Bugs/ (BTS)
+contiene i dettagli dei bug riportati dagli utenti e dagli sviluppatori. A
+ciascun bug viene assegnato un numero, e viene mantenuto finché non è
+segnato come risolto. Per ulteriori informazioni si veda {Segnalare
+bug}#bugs.
diff --git a/manual/it/live-manual.ssm b/manual/it/live-manual.ssm
index 59f2f9c..4b66ee6 100644
--- a/manual/it/live-manual.ssm
+++ b/manual/it/live-manual.ssm
@@ -9,13 +9,13 @@
: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>Il testo completo della GNU General Public License può essere trovato nel file /usr/share/common-licenses/GPL-3.
@date:
- :published: 2012-04-03
+ :published: 04.06.2012
@publisher: Debian Live Project <debian-live at lists.debian.org>
@make:
- :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/
- :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/
+ :bold: /squeeze|wheezy|sid/
+ :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
diff --git a/manual/it/project_bugs.ssi b/manual/it/project_bugs.ssi
index 3f32eaf..f822c9d 100644
--- a/manual/it/project_bugs.ssi
+++ b/manual/it/project_bugs.ssi
@@ -75,7 +75,7 @@ _* Versione di live-boot sul sistema ospitante
_* Versione di live-config sul sistema live
-_* Versione di #{debootstrap}# o #{cdebootstrap}# sul sistema ospitante
+_* Versione di /{debootstrap}/ o /{cdebootstrap}/ sul sistema ospitante
_* Architettura del sistema live
@@ -127,8 +127,8 @@ Dove appare il bug?
3~ Durante la compilazione mentre esegue il bootstrap
-live-build avvia inizialmente un sistema Debian di base con #{debootstrap}#
-o #{cdebootstrap}#; può fallire a seconda dello strumento utilizzato e della
+live-build avvia inizialmente un sistema Debian di base con /{debootstrap}/
+o /{cdebootstrap}/; può fallire a seconda dello strumento utilizzato e della
distribuzione Debian che si sta avviando. Se il bug appare a questo punto
controllare che l'errore sia relativo ad uno specifico pacchetto Debian (più
probabile) o allo strumento di avvio stesso.
@@ -147,7 +147,7 @@ un sistema normale.
In questo caso non è un bug in Debian Live, ma piuttosto in Debian, inviare
una segnalazione sul pacchetto che ha fallito. Si otterranno maggiori
-informazioni eseguendo #{debootstrap}# separatamente dal sistema live o
+informazioni eseguendo /{debootstrap}/ separatamente dal sistema live o
eseguendo #{lb bootstrap --debug}#.
Se si verifica un problema utilizzando un mirror locale o un qualsiasi tipo
diff --git a/manual/it/project_coding-style.ssi b/manual/it/project_coding-style.ssi
index 618b287..12f5c24 100644
--- a/manual/it/project_coding-style.ssi
+++ b/manual/it/project_coding-style.ssi
@@ -15,6 +15,8 @@ di `foo`.
_* È possibile verificare i propri script con "sh -n" e "checkbashisms".
+_* Make sure all shell code runs with 'set -e'.
+
2~ Rientri
_* Usare sempre i tab piuttosto che gli spazi.
@@ -52,7 +54,7 @@ Sbagliato:
code{
- foo () {
+ Foo () {
bar
}
@@ -62,7 +64,7 @@ Corretto:
code{
- foo ()
+ Foo ()
{
bar
}
@@ -146,3 +148,6 @@ test -x /bin/foo; ...}#".
_* Ove possibile utilizzare #{case}# invece di #{test}#, essendo più facile
da leggere e più veloce in esecuzione.
+
+_* Use capitalized names for functions to limit messing with the users
+environment.
diff --git a/manual/it/project_procedures.ssi b/manual/it/project_procedures.ssi
index 334c2d8..651218d 100644
--- a/manual/it/project_procedures.ssi
+++ b/manual/it/project_procedures.ssi
@@ -40,13 +40,20 @@ _* Le immagini vengono create e ospitate su cdimage.debian.org.
2~ Rilasci minori
-_* Bisogna nuovamente aggiornare i mirror di debian, debian-security e
+_* Again, we need updated mirrors of debian, debian-security and
debian-volatile.
_* Le immagini vengono create e ospitate su cdimage.debian.org.
_* Inviare email di annuncio.
+3~ Last Point Release of a Debian Release
+
+Remember to adjust both chroot and binary mirrors when building the last set
+of images for a Debian release after it has been moved away from
+ftp.debian.org to archive.debian.org. That way, old prebuilt live images are
+still useful without user modifications.
+
3~ Modello per l'annuncio di un rilascio minore.
Si può generare un'email per l'annuncio dei rilasci minori usando il modello
diff --git a/manual/it/style_guide.ssi b/manual/it/style_guide.ssi
index 8b01cc3..edd8e20 100644
--- a/manual/it/style_guide.ssi
+++ b/manual/it/style_guide.ssi
@@ -342,11 +342,11 @@ intervention if the code changes.
Leave the code blocks empty (they will be automatically added then) if you
want to make your translation easier to maintain.
-_* /{New lines}/
+_* /{Newlines}/
-The translated texts need to have the exact same new lines as the original
+The translated texts need to have the exact same newlines as the original
texts. Be careful to press the "Enter" key or type *{\n}* if they appear in
-the original files. These new lines often appear, for instance, in the code
+the original files. These newlines often appear, for instance, in the code
blocks.
Make no mistake, this does not mean that the translated text needs to have
@@ -362,9 +362,7 @@ Translators should never translate:
- The commands given as examples
- - Metadata (often between colons *{:metadata:}*) especially the date in
- /{live-manual.ssm.po}/ because it changes every time live-manual is
- updated.
+ - Metadata (often between colons *{:metadata:}*)
- Links
diff --git a/manual/it/user_basics.ssi b/manual/it/user_basics.ssi
index adce3c5..b4ac2e8 100644
--- a/manual/it/user_basics.ssi
+++ b/manual/it/user_basics.ssi
@@ -96,7 +96,7 @@ code{
Questo processo può richiedere tempo, a seconda della velocità della
connessione di rete. Una volta completato, nell'attuale directory ci sarà un
-file immagine #{binary-hybrid.iso}# pronto da usare.
+file immagine #{binary.hybrid.iso}# pronto da usare.
2~using-iso-hybrid Utilizzare un'immagine ISO live ibrida
@@ -107,14 +107,14 @@ una penna USB.
3~burning-iso-image Masterizzare un'immagine ISO su un supporto fisico
-Burning an ISO image is easy. Just install wodim and use it from the
-command-line to burn the image. For instance:
+Masterizzare un'immagine ISO è semplice, basta installare wodim e
+utilizzarlo da riga di comando; ad esempio:
code{
# apt-get install wodim
- $ wodim binary-hybrid.iso
+ $ wodim binary.hybrid.iso
}code
@@ -136,7 +136,7 @@ presente su di essa!}*
code{
- $ dd if=binary-hybrid.iso of=${USBSTICK}
+ $ dd if=binary.hybrid.iso of=${USBSTICK}
}code
@@ -155,8 +155,7 @@ sistema live prima di quella usuale.
Avviando il supporto si otterrà un menu, premendo il tasto enter il sistema
partirà utilizzando la voce #{Live}# e le opzioni predefinite. Per ulteriori
informazioni sulle opzioni di boot, si veda la voce "help" nel menu e le
-pagine di manuale di #{live-boot}# e #{live-config}# all'interno del
-sistema.
+pagine di manuale di live-boot e live-config all'interno del sistema.
Supponendo di aver selezionato #{Live}# e avviato l'immagine desktop
predefinita, dopo i messaggi di avvio si dovrebbe automaticamente accedere
@@ -191,12 +190,12 @@ necessità.
3~testing-iso-with-qemu Provare un'immagine ISO con QEMU
Il programma più versatile in Debian è QEMU. Se il processore gestisce la
-virtualizzazione hardware utilizzare il pacchetto #{qemu-kvm}#; la
+virtualizzazione hardware utilizzare il pacchetto /{qemu-kvm}/; la
descrizione elenca brevemente i requisiti.
-Per prima cosa installare #{qemu-kvm}# o altrimenti #{qemu}#, nel qual caso
+Per prima cosa installare /{qemu-kvm}/ o altrimenti /{qemu}/, nel qual caso
il nome del programma nei successivi sarà #{qemu}# invece di #{kvm}#. Il
-pacchetto #{qemu-utils}# è inoltre utile per creare immagini di dischi
+pacchetto /{qemu-utils}/ è inoltre utile per creare immagini di dischi
virtuali con #{qemu-img}#.
code{
@@ -209,7 +208,7 @@ Avviare un'immagine ISO è semplice:
code{
- $ kvm -cdrom binary-hybrid.iso
+ $ kvm -cdrom binary.hybrid.iso
}code
@@ -217,7 +216,7 @@ Per maggiori dettagli si vedano le pagine di manuale.
3~testing-iso-with-virtualbox Provare un'immagine ISO con virtualbox-ose
-Per provare la ISO con #{virtualbox-ose}#:
+Per provare la ISO con /{virtualbox-ose}/:
code{
@@ -228,14 +227,10 @@ code{
}code
Creare una nuova macchina virtuale, modificare le impostazione di
-archiviazione in modo da usare #{binary-hybrid.iso}# come dispositivo
+archiviazione in modo da usare #{binary.hybrid.iso}# come dispositivo
CD/DVD, e avviare la macchina.
-Nota: per sistemi live contenenti X.org che si vogliono provare con
-#{virtualbox-ose}#, si può voler includere il pacchetto dei driver per X.org
-di VirtualBox, #{virtualbox-ose-guest-x11}#, nella configurazione di
-live-build. In caso contrario la risoluzione è limitata a 800x600.
-
+*{Nota:}* per sistemi live contenenti X.org che si vogliono provare con /{virtualbox-ose}/, si può voler includere il pacchetto dei driver per X.org di VirtualBox, /{virtualbox-ose-guest-x11}/, nella configurazione di live-build. In caso contrario la risoluzione è limitata a 800x600.
code{
$ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot
@@ -254,10 +249,7 @@ che non supporta le immagini ibride, o si vuole usare lo spazio rimanente
sul supporto per altri scopi, come una partizione persistente, allora
occorre un'immagine HDD.
-Nota: se si è creata un'immagine ISO ibrida con gli esempi precedenti,
-occorre pulire la directory di lavoro con il comando #{lb clean}# (vedere
-{Il comando lb clean}#lb-clean):
-
+*{Nota:}* se si è creata un'immagine ISO ibrida con gli esempi precedenti, occorre pulire la directory di lavoro con il comando #{lb clean}# (vedere {Il comando lb clean}#lb-clean):
code{
# lb clean --binary
@@ -291,11 +283,11 @@ syslinux, pronti per essere scritti direttamente su una penna USB. Dal
momento che utilizzare un'immagine HDD è come utilizzare un'immagine ISO
ibrida via USB, seguire le istruzioni contenute in {Utilizzare un'immagine
live ISO ibrida}#using-iso-hybrid tenendo però conto che il nome del file
-sarà #{binary.img}# invece di #{binary-hybrid.iso}#.
+sarà #{binary.img}# invece di #{binary.hybrid.iso}#.
3~testing-hdd-with-qemu Provare un'immagine HDD con Qemu
-Installare QEMU come descritto in {Provare un'immagine ISO con
+Installare /{qemu}/ come descritto in {Provare un'immagine ISO con
QEMU}#testing-iso-with-qemu; quindi eseguire #{kvm}# o #{qemu}#, a seconda
di quale versione è necessaria al sistema ospitante, specificando
#{binary.img}# come disco rigido principale.
@@ -310,7 +302,7 @@ code{
Per utilizzare lo spazio libero che rimane dopo aver copiato il file
#{binary.img}# su una penna USB, usare uno strumento di partizionamento come
-#{gparted}# o #{parted}# per creare una nuova partizione. La prima
+/{gparted}/ o /{parted}/ per creare una nuova partizione. La prima
partizione verrà utilizzata dal sistema Debian Live.
code{
@@ -329,11 +321,7 @@ code{
}code
-Nota: se si desidera utilizzare lo spazio extra con Windows pare che questo
-sistema operativo non possa accedere a nessuna partizione eccetto la
-prima. Alcune soluzioni a questo problema sono state discusse sulla nostra
-{mailing list}#contact, ma non sembrano esserci risposte semplici.
-
+*{Nota:}* se si desidera utilizzare lo spazio extra con Windows pare che questo sistema operativo non possa accedere a nessuna partizione eccetto la prima. Alcune soluzioni a questo problema sono state discusse sulla nostra {mailing list}#contact, ma non sembrano esserci risposte semplici.
*{Ricorda: ogni volta che si installa un nuovo file binary.img sulla penna, tutti i dati sulla chiavetta saranno persi perché la tabella delle partizioni viene sovrascritta con i contenuti dell'immagine, per cui salvare prima la propria partizione extra in modo da ripristinarla dopo l'aggiornamento dell'immagine live.}*
2~building-netboot-image Creare un'immagine netboot
@@ -342,9 +330,7 @@ La seguente sequenza di comandi creerà un'immagine netboot di base
contenente il sistema Debian standard senza X.org. È adatta per il boot
tramite rete.
-Nota: se qualcuno tra gli esempi precedenti è stato seguito, bisogna pulire
-la directory di lavoro con il comando #{lb clean}#:
-
+*{Nota:}* se qualcuno tra gli esempi precedenti è stato seguito, bisogna pulire la directory di lavoro con il comando #{lb clean}#:
code{
# lb clean --binary
@@ -426,10 +412,10 @@ code{
Fornisce al sistema il kernel e il ramdisk iniziale in fase di esecuzione.
-Si installi il pacchetto tftpd-hpa, che mette a disposizione tutti i file
-contenuti in una directory root, di solito #{/srv/tftp}#. Affinché si possa
-disporre dei file contenuti in #{/srv/debian-live/tftpboot}#, eseguire il
-seguente comando come utente root:
+Si installi il pacchetto /{tftpd-hpa}/, che mette a disposizione tutti i
+file contenuti in una directory root, di solito #{/srv/tftp}#. Affinché si
+possa disporre dei file contenuti in #{/srv/debian-live/tftpboot}#, eseguire
+il seguente comando come utente root:
code{
@@ -445,7 +431,7 @@ Una volta che il computer ospite ha scaricato e avviato un kernel Linux e
caricato il suo initrd, cercherà di montare l'immagine del filesystem Live
tramite un server NFS.
-Bisogna installare il pacchetto #{nfs-kernel-server}#.
+Bisogna installare il pacchetto /{nfs-kernel-server}/.
Quindi, rendere disponibile l'immagine del filesystem via NFS aggiungendo
una riga come la seguente in #{/etc/exports}#:
@@ -482,7 +468,7 @@ soluzioni.
3~ Qemu
-_* Installare #{qemu}#, #{bridge-utils}#, #{sudo}#.
+_* Installare /{qemu}/, /{bridge-utils}/, /{sudo}/.
Modificare #{/etc/qemu-ifup}#:
diff --git a/manual/it/user_customization-binary.ssi b/manual/it/user_customization-binary.ssi
index 0ec2a1e..27ece15 100644
--- a/manual/it/user_customization-binary.ssi
+++ b/manual/it/user_customization-binary.ssi
@@ -47,7 +47,7 @@ code{
include menu.cfg
default vesamenu.c32
prompt 0
- timeout 5
+ timeout 50
}code
@@ -59,7 +59,7 @@ code{
#!/bin/sh
- sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg
+ sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg
}code
diff --git a/manual/it/user_customization-contents.ssi b/manual/it/user_customization-contents.ssi
index 9e29dd7..daa333d 100644
--- a/manual/it/user_customization-contents.ssi
+++ b/manual/it/user_customization-contents.ssi
@@ -44,9 +44,9 @@ elaborazione; si veda {Live/chroot hook locali}#live-chroot-local-hooks se è
necessaria l'elaborazione.
Per includere i file si aggiungano semplicemente alla directory
-#{config/includes.chroot}#. Questa corrisponde alla directory root (#{/}#)
-del sistema live. Per esempio, per aggiungere un file
-#{/var/www/index.html}# nel sistema live, si usi:
+#{config/includes.chroot}#. Questa corrisponde alla directory root #{/}# del
+sistema live. Per esempio, per aggiungere un file #{/var/www/index.html}#
+nel sistema live, si usi:
code{
@@ -153,5 +153,5 @@ dalla fase (#{.chroot}# o #{.binary}#) sono considerati file di
preconfigurazione di debconf e sono installati da live-build usando
#{debconf-set-selections}# durante la fase corrispondente.
-Per ulteriori informazioni su debconf, vedere debconf(7) nel pacchetto
-#{debconf}#.
+Per ulteriori informazioni su debconf, vedere #{debconf(7)}# nel pacchetto
+/{debconf}/.
diff --git a/manual/it/user_customization-installer.ssi b/manual/it/user_customization-installer.ssi
index e1ebe0a..2f90c0e 100644
--- a/manual/it/user_customization-installer.ssi
+++ b/manual/it/user_customization-installer.ssi
@@ -18,7 +18,7 @@ I tre principali tipi dell'installer sono:
*{Installatore Debian "normale"}*: un'immagine Debian Live con un kernel e un initrd separati i quali (quando viene selezionato dal bootloader appropriato) lancia un'istanza standard dell'Installatore Debian, come quando si scarica un'immagine di Debian per CD e la si avvia. Le immagini che contengono un sistema live e un'installatore indipendenti sono spesso definite "immagini combinate".
In queste immagini, Debian è installata prendendo e installando i pacchetti
-.deb usando {debootstrap}# o #{cdebootstrap}#, da supporti locali o dalla
+.deb usando /{debootstrap}/ o /{cdebootstrap}/, da supporti locali o dalla
rete, risultante in un sistema Debian standard installato sul disco rigido.
L'intero processo può essere preimpostato e personalizzato in diversi modi;
@@ -31,16 +31,14 @@ abilitarlo.
L'installazione procederà nello stesso modo di un'installazione "Normale"
come descritto sopra, ma nella fase dell'installazione del pacchetto, invece
-di usare #{debootstrap}# per prelevare e installare i pacchetti, l'immagine
+di usare /{debootstrap}/ per prelevare e installare i pacchetti, l'immagine
del filesystem live viene copiata sulla destinazione. Questo si ottiene con
uno speciale udeb chiamato live-installer.
Dopo questa fase, l'Installatore Debian continua normalmente, installando e
configurando elementi come bootloader e utenti locali, ecc.
-Nota: per supportare nel bootloader sia la voce normale che quella live
-dell'installatore sullo stesso supporto si deve disabilitare live-installer
-preconfigurando #{live-installer/enable=false}#.
+*{Nota:}* per supportare nel bootloader sia la voce normale che quella live dell'installatore sullo stesso supporto si deve disabilitare live-installer preconfigurando #{live-installer/enable=false}#.
*{Installatore Debian "Desktop"}*: indipendentemente dal tipo di Installatore Debian incluso, #{d-i}# può essere lanciato cliccando un'icona sul desktop, in alcune situazioni più semplice per l'utente. Per poterne usufruire deve essere incluso il pacchetto debian-installer-launcher.
@@ -86,4 +84,4 @@ nell'immagine inserirli in #{config/packages.binary/}#. I file e le
directory aggiuntivi o di rimpiazzo si possono includere nell'initrd
dell'installatore in maniera simile agli {Include locali del
Live/chroot}#live-chroot-local-includes, inserendo il materiale in
-#{config/binary_debian-installer-includes/}#.
+#{config/includes.binary_debian-installer/}#.
diff --git a/manual/it/user_customization-packages.ssi b/manual/it/user_customization-packages.ssi
index cad1bf7..37dc112 100644
--- a/manual/it/user_customization-packages.ssi
+++ b/manual/it/user_customization-packages.ssi
@@ -13,13 +13,14 @@ velocità di scaricamento, dovreste usare un mirror a voi vicino. Si possono
inoltre aggiungere i propri repository per pacchetti di backport,
sperimentali o personalizzati, o aggiungere i pacchetti direttamente come
file. È possibile definire una propria lista di pacchetti da includere,
-usarne una predefinita di live-build, usare task di #{tasksel}#, o una
+usarne una predefinita di live-build, usare task di /{tasksel}/, o una
combinazione di tutti e tre. Infine una serie di opzioni fornisce un certo
-controllo su apt, o aptitude se si preferisce, in fase di compilazione
-quando i pacchetti sono installati. Ciò può tornare utile se si usa un
-proxy, se si vuole disabilitare l'installazione dei pacchetti raccomandati
-per risparmiare spazio o controllare quali versioni dei pacchetti vengono
-installate con il pinning, giusto per citare alcune possibilità.
+controllo su /{apt}/, o /{aptitude}/ se si preferisce, in fase di
+compilazione quando i pacchetti sono installati. Ciò può tornare utile se si
+usa un proxy, se si vuole disabilitare l'installazione dei pacchetti
+raccomandati per risparmiare spazio o controllare quali versioni dei
+pacchetti vengono installate con il pinning, giusto per citare alcune
+possibilità.
2~ Sorgenti dei pacchetti
@@ -27,14 +28,14 @@ installate con il pinning, giusto per citare alcune possibilità.
La distribuzione che viene scelta ha un ampio impatto su quali pacchetti
siano disponibili per essere inclusi nell'immagine live. Specificare il nome
-in codice, il predefinito per la versione Wheezy di live-build è #{wheezy}#;
+in codice, il predefinito per la versione wheezy di live-build è wheezy;
qualsiasi attuale distribuzione mantenuta negli archivi Debian può essere
qui specificata con il suo nome in codice. (Per ulteriori dettagli
consultare il {Glossario}#terms). L'opzione #{--distribution}# non solo
-influenza la sorgente dei pacchetti nell'archivio, ma indica a
-#{live-build}# di comportarsi secondo la necessità per compilare ciascuna
-distribuzione supportata. Ad esempio se si vuole costruire un rilascio
-*{unstable}*, Sid, specificare:
+influenza la sorgente dei pacchetti nell'archivio, ma indica a live-build di
+comportarsi secondo la necessità per compilare ciascuna distribuzione
+supportata. Ad esempio se si vuole costruire un rilascio *{unstable}*, sid,
+specificare:
code{
@@ -71,7 +72,7 @@ vicino per la migliore velocità di scaricamento. Ciascuna delle opzioni
#{--mirror-*}# determina quale mirror della distribuzione è usato nei vari
stadi della compilazione. Ricordando dalle {Fasi della
creazione}#stages-of-the-build che la fase di *{avvio}* è quando il chroot è
-inizialmente popolato da debootstrap con un sistema minimale e quella di
+inizialmente popolato da /{debootstrap}/ con un sistema minimale e quella di
*{chroot}* è quando viene creato il chroot usato per costruire il file
system del sistema live. Perciò per queste fasi vengono usati i
corrispondenti cambi di mirror, e in seguito, nella fase *{binaria}* vengono
@@ -197,20 +198,20 @@ inclusi e condizionali come descritto nella sezioni seguenti.
Gli elenchi predefiniti si possono integrare usando quelli locali dei
pacchetti in #{config/package-lists/}#.
-Per essere processate, gli elenchi dei pacchetti che si trovano in questa
+Per essere processati, gli elenchi dei pacchetti che si trovano in questa
directory devono avere un suffisso #{.list}# e un suffisso #{.chroot}# o
#{.binary}# aggiuntivo per indicare per quale fase sia l'elenco.
-*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.
+*{Nota:}* se non si specifica il suffisso l'elenco sarà usato per entrambe le fasi. Normalmente è preferibile specificare #{.list.chroot}# in modo che i pacchetti vengono installati solo nel filesystem live evitando di avere una copia extra del #{.deb}# sul dispositivo.
3~ Elenchi locali di pacchetti binari
-To make a binary stage list, place a file suffixed with #{.list.binary}# in
-#{config/package-lists/}#. These packages are not installed in the live
-filesystem, but are included on the live media under #{pool/}#. You would
-typically use such a list with one of the non-live installer variants. As
-mentioned above, if you want this list to be the same as your chroot stage
-list, simply use the #{.list}# suffix by itself.
+Per creare un elenco di binari inserire un file con suffisso
+#{.list.binary}# in #{config/package-lists/}#; questi pacchetti non sono
+installati nel filesystem ma inclusi sul dispositivo live sotto
+#{pool/}#. Solitamente questo elenco si usa con una delle varianti non-live
+dell'installatore; come detto sopra, se si vuole che questo sia identico
+all'elenco della fase chroot, usare semplicemente il suffisso #{.list}#.
3~ Estendere un'elenco di pacchetti usando gli include
@@ -220,8 +221,8 @@ include. Far riferimento a questi nella directory
come scriverne di propri.
Per esempio, per creare un elenco che includa quello predefinito di
-#{gnome}#più iceweasel, creare #{config/package-lists/mio.elenco.chroot}#
-con i seguenti contenuti:
+#{gnome}#più /{iceweasel}/, creare
+#{config/package-lists/mio.elenco.chroot}# con i seguenti contenuti:
code{
@@ -252,7 +253,7 @@ code{
}code
Si può verificare per ognuna di una serie di valori, ad esempio per
-installare #{memtest86+}# specificando sia #{--architectures i386}# sia
+installare /{memtest86+}/ specificando sia #{--architectures i386}# sia
#{--architectures amd64}#:
code{
@@ -264,7 +265,7 @@ code{
}code
È possibile provare altre variabili che contengano più di un valore, ad
-esempio per installare #{vrms}# specificando sia da #{contrib}# sia da
+esempio per installare /{vrms}/ specificando sia da #{contrib}# sia da
#{non-free}# tramite #{--archive-areas}#:
code{
@@ -322,12 +323,13 @@ modo, non c'è nessuna voce nel menu per i task delle lingue, ma la scelta
della lingua dell'utente durante l'installazione influenza la selezione dei
corrispondenti task della lingua.
-When developing a desktop live image, the image typically boots directly to
-a working desktop, the choices of both desktop and default language having
-been made at build time, not at run time as in the case of the Debian
-Installer. That's not to say that a live image couldn't be built to support
-multiple desktops or multiple languages and offer the user a choice, but
-that is not live-build's default behaviour.
+Sviluppando un'immagine live per desktop, questa si avvia direttamente su
+un'area di lavoro, le scelte del desktop e della lingua predefinita sono
+state fatte al momento della compilazione e non al volo come nel caso
+dell'installatore Debian. Questo non per dire che un'immagine live non possa
+essere creata con un supporto per desktop o lingue multipli per offrire
+all'utente una scelta, ma che non è il comportamento predefinito nella
+creazione di una live.
Poiché automaticamente non viene fatta alcuna preparazione sui task della
lingua, i quali includono cose come caratteri specifici per la lingua e
@@ -343,10 +345,10 @@ code{
}code
-Since desktop tasks are "internal" tasks, for every desktop flavour task
-included in the image, the corresponding value, if it differs from the
-default, "gnome", must be preseeded in the "tasksel/desktop" debconf
-variable or else tasksel will not recognize and install it. Thus:
+Dal momento che i task desktop sono "interni", bisogna preconfigurare ogni
+altro desktop da includere nell'immagine e diverso dal predefinito "gnome"
+nella variabile debconf "tasksel/desktop", altrimenti tasksel non li
+installerà:
code{
@@ -355,7 +357,8 @@ code{
}code
-This parameter can take multiple values, e.g. "lxde xfce" instead of "kde".
+Questo parametro supporta valori multipli, ad esempio "lxde xfce" invece di
+"kde".
2~installing-modified-or-third-party-packages Installare pacchetti
modificati o di terze parti
@@ -442,7 +445,7 @@ iniziano con #{apt}#.
3~choosing-apt-or-aptitude Scegliere apt o aptitude
Per installare pacchetti in fase di compilazione si può optare sia per
-#{apt}# sia per #{aptitude}#, l'argomento #{--apt}# di #{lb config}#
+/{apt}/ sia per /{aptitude}/, l'argomento #{--apt}# di #{lb config}#
determina quale usare. Sceglie il metodo implementando il comportamento
preferito per l'installazione dei pacchetti, la notevole differenza è come
vengono gestiti quelli mancanti.
@@ -479,11 +482,11 @@ code{
}code
-Questo non influenzerà le voci in /etc/apt/sources.list, determina solo se
-/var/lib/apt contiene o meno i file degli indici. Il compromesso è che APT
-necessita di quegli indici per operar enel sistema live, perciò prima di
-eseguire #{apt-cache search}# o #{apt-get install}#, per esempio, l'utente
-deve usare prima #{apt-get update}# per crearli.
+Questo non influenzerà le voci in #{/etc/apt/sources.list}#, determina solo
+se /#{var/lib/apt}# contiene o meno i file degli indici. Il compromesso è
+che APT necessita di quegli indici per operar enel sistema live, perciò
+prima di eseguire #{apt-cache search}# o #{apt-get install}#, per esempio,
+l'utente deve usare prima #{apt-get update}# per crearli.
In caso si trovi che l'installazione dei pacchetti raccomandati appesantisca
troppo l'immagine, si può disabilitare l'opzione predefinita di APT con:
@@ -520,11 +523,11 @@ può essere configurato sia in fase di costruzione sia di esecuzione; per la
prima creare #{config/chroot_apt/preferences}# mentre per l'ultima creare
#{config/includes.chroot/etc/apt/preferences}#.
-Nell'ipotesi di creare un sistema live Wheezy e avendo la necessità di
-installare da Sid tutti i pacchetti live destinati all'immagine binaria
-questa fase, bisogna aggiungere Sid alle fonti di APT e farne il pinning
+Nell'ipotesi di creare un sistema live wheezy e avendo la necessità di
+installare da sid tutti i pacchetti live destinati all'immagine binaria
+questa fase, bisogna aggiungere sid alle fonti di APT e farne il pinning
affinché verranno installati da lì solo i pacchetti voluti, mentre per tutti
-gli altri si attingerà dalla distribuzione principale, Wheezy. Quanto segue
+gli altri si attingerà dalla distribuzione principale, wheezy. Quanto segue
servirà allo scopo:
code{
@@ -542,7 +545,7 @@ code{
}code
-*{Nota:}* con la versione 0.8.14 o superiore di Apt si possono utilizzare wildcard nei nomi dei pacchetti (*{Package: live-*}*). Ciò significa che funziona con Wheezy usando:
+*{Nota:}* con la versione 0.8.14 o superiore di Apt si possono utilizzare wildcard nei nomi dei pacchetti (*{Package: live-*}*). Ciò significa che funziona con wheezy usando:
code{
@@ -554,9 +557,9 @@ Un valore negativo della priorità evita che un pacchetto venga installato,
come nel caso in cui non se ne voglia uno raccomandato da un altro. Si
suppone di costruire un'immagine di LXDE utilizzando l'opzione
#{--package-lists lxde}# ma non si desidera che all'utente venga richiesto
-di salvare la password del wifi nel portachiavi. L'elenco include #{gdm}#
-che dipende da #{gksu}# che a sua volta raccomanda #{gnome-keyring}#, in
-questo caso si vorrà omettere il pacchetto #{gnome-keyring}# aggiungendo a
+di salvare la password del wifi nel portachiavi. L'elenco include /{gdm}/
+che dipende da /{gksu}/ che a sua volta raccomanda /{gnome-keyring}/, in
+questo caso si vorrà omettere il pacchetto /{gnome-keyring}/ aggiungendo a
#{config/chroot_apt/preferences}# la seguente definizione:
code{
diff --git a/manual/it/user_customization-runtime.ssi b/manual/it/user_customization-runtime.ssi
index 51cacd9..e7b9ad4 100644
--- a/manual/it/user_customization-runtime.ssi
+++ b/manual/it/user_customization-runtime.ssi
@@ -145,10 +145,10 @@ scrivibile persistente come un supporto di memorizzazione locale, una
condivisione di rete o anche una sessione di un CD/DVD riscrivibile
multisessione. Tutti questi supporti sono gestiti in Debian Live in modi
differenti, e tutti tranne l'ultimo richiedono un parametro d'avvio speciale
-da specificare all'avvio: #{persistent}#.
+da specificare all'avvio: #{persistence}#.
-Se il parametro di boot #{persistent}# è impostato (e non lo è
-#{nopersistent}#), i supporti di memorizzazione locali (hard disk,
+Se il parametro di boot #{persistence}# è impostato (e non lo è
+#{nopersistence}#), i supporti di memorizzazione locali (hard disk,
dispositivi USB) saranno rilevati come volumi persistenti durante
l'avvio. Un volume persistente è uno dei seguenti:
@@ -160,7 +160,7 @@ _* un file immagine o archivio situato nella directory radice di un
qualsiasi filesystem leggibile (anche una partizione NTFS di un sistema
estraneo), identificato dal nome del file. In questo caso il nome del file
deve contenere anche il tipo di filesystem come estensione, ad esempio
-"<label>.ext3".
+"<label>.ext4".
È possibile limitare i tipi di volume persistenti da usare specificando
certi parametri di boot descritti nella manpage di live-boot(7). Le "label
@@ -180,12 +180,12 @@ Con "persistenza completa" si intende l'uso di un volume persistente invece
di un filesystem temporaneo (tmpfs) per salvare le modifiche al supporto in
sola lettura (con il sistema COW, copy-on-write). Per questo tipo di
persistenza la label deve essere #{full-ov}#, che potrebbe essere una
-partizione di tipo ext2 su un hard disk o una penna USB creata ad esempio
+partizione di tipo ext4 su un hard disk o una penna USB creata ad esempio
con:
code{
- # mkfs.ext2 -L full-ov /dev/sdb1
+ # mkfs.ext4 -L full-ov /dev/sdb1
}code
@@ -201,13 +201,13 @@ code{
}code
-Ecco un esempio di come creare un file immagine ext2 da utilizzare per la
+Ecco un esempio di come creare un file immagine ext4 da utilizzare per la
persistenza completa:
code{
$ dd if=/dev/null of=full-ov bs=1G seek=1 # per un file immagine da 1GB
- $ /sbin/mkfs.ext2 -F full-ov
+ $ /sbin/mkfs.ext4 -F full-ov
}code
@@ -217,43 +217,43 @@ scrivibile e riavviare.
3~ Strati personalizzati
Un volume con una label #{custom-ov}# può essere configurato per creare
-directory persistenti arbitrarie. Il file #{live.persist}#, situato nella
-directory radice del filesystem del volume, controlla quali rendere
+directory persistenti arbitrarie. Il file #{live-persistence.conf}#, situato
+nella directory radice del filesystem del volume, controlla quali rendere
persistenti e in che modo.
-Nella manpage di live.persist(5) è descritto dettagliatamente come è
-configurato il mount degli strati personalizzati, ma un semplice esempio
+Nella manpage di live-persistence.conf(5) è descritto dettagliatamente come
+è configurato il mount degli strati personalizzati, ma un semplice esempio
dovrebbe essere sufficiente per la maggior parte degli usi. Supponendo di
voler creare la directory home e quella della cache di APT in modo
-persistente in un filesystem ext3 sulla partizione /dev/sdb1:
+persistente in un filesystem ext4 sulla partizione /dev/sdb1:
code{
- $ mkfs.ext3 -L custom-ov /dev/sdb1
- $ mount -t ext3 /dev/sdb1 /mnt
- $ echo "/home" >> /mnt/live.persist
- $ echo "/var/cache/apt" >> /mnt/live.persist
+ $ mkfs.ext4 -L custom-ov /dev/sdb1
+ $ mount -t ext4 /dev/sdb1 /mnt
+ $ echo "/home" >> /mnt/live-persistence.conf
+ $ echo "/var/cache/apt" >> /mnt/live-persistence.conf
}code
-Quindi riavviare. Durante il primo avvio il contenuto di /home e
-/var/cache/apt saranno copiati nel volume persistente e da allora tutte le
-modifiche a queste directory risiederanno in modo persistente sul
+Quindi riavviare. Durante il primo avvio il contenuto di #{/home}# e
+#{/var/cache/apt}# saranno copiati nel volume persistente e da allora tutte
+le modifiche a queste directory risiederanno in modo persistente sul
volume. C'è da considerare che tutti i path elencati nel file
-#{live.persist}# non possono contenere spazi o i caratteri speciali "." e
-".."; inoltre, né "/live" (o nessuna delle sue sottodirectory) né "/" può
-essere resa persistente tramite i mount personalizzati (per l'ultimo usare
-la tipologia #{full-ov}# descritta prima).
+#{live-persistence.conf}# non possono contenere spazi o i caratteri speciali
+#{.}# e #{..}#; inoltre, né #{/live}# (o nessuna delle sue sottodirectory)
+né #{/}# può essere resa persistente tramite i mount personalizzati (per
+l'ultimo usare la tipologia #{full-ov}# descritta prima).
Possono essere utilizzati svariati volumi di stratificazione personalizzati
-(con i rispettivi file #{live.persist}#) allo stesso tempo ma se questi
-creano la stessa directory persistente, ne verrà usata solo una. Se due
-directory montate sono "nidificate" (una è la sottodirectory dell'altra), la
-superiore sarà montata per prima, per cui nessuna operazione di mount verrà
-sovrastata dall'altra. I mount nidificati personalizzati sono problematici
-se sono elencati nello stesso file #{live.persist}. Se si ha davvero la
-necessità (in genere non si dovrebbe averla :), consultare la manpage di
-live.persist(5) per sapere come gestire questo caso.
+(con i rispettivi file #{live-persistence.conf}#) allo stesso tempo ma se
+questi creano la stessa directory persistente, ne verrà usata solo una. Se
+due directory montate sono "nidificate" (una è la sottodirectory
+dell'altra), la superiore sarà montata per prima, per cui nessuna operazione
+di mount verrà sovrastata dall'altra. I mount nidificati personalizzati sono
+problematici se sono elencati nello stesso file #{live-persistence.conf}. Se
+si ha davvero la necessità (in genere non si dovrebbe averla), consultare la
+manpage di live-persistence.conf(5) per sapere come gestire questo caso.
3~ Istantanee
@@ -278,11 +278,11 @@ Attualmente le istantanee non possono gestire la cancellazione dei file.
Se un utente avesse bisogno di archiviazioni multiple dello stesso tipo per
differenti posti o per test, come #{full-ov-casa}# e #{full-ov-lavoro}#, il
-parametro d'avvio #{persistent-subtext}# usato in congiunzione con
+parametro d'avvio #{persistence-subtext}# usato in congiunzione con
#{persistent}# permetterà supporti persistenti multipli ma univoci. Un
esempio potrebbe essere un utente che vuole usare una partizione etichettata
-come #{live-sn-sottotesto}#, userebbe: #{persistent}#
-#{persistent-subtext=sottotesto}#.
+come #{live-sn-sottotesto}#, userebbe: #{persistence}#
+#{persistence-subtext=sottotesto}#.
3~ Rimasterizzazione parziale
diff --git a/manual/it/user_examples.ssi b/manual/it/user_examples.ssi
index 911904f..d8f0dd5 100644
--- a/manual/it/user_examples.ssi
+++ b/manual/it/user_examples.ssi
@@ -62,7 +62,7 @@ code{
}code
Presupponendo che tutto vada per il verso giusto, dopo un po' la directory
-corrente conterrà #{binary-hybrid.iso}#. Questa immagine ISO ibrida può
+corrente conterrà #{binary.hybrid.iso}#. Questa immagine ISO ibrida può
essere avviata direttamente in una macchina virtuale come descritto in
{Provare un'immagine ISO con Qemu}#testing-iso-with-qemu e {Provare
un'immagine ISO con virtualbox-ose}#testing-iso-with-virtualbox, oppure
@@ -156,9 +156,9 @@ Per prima cosa, #{--architectures i386}# assicura che sul nostro sistema
#{amd64}# costruiamo una versione a 32-bit utilizzabile sulla maggior parte
delle macchine. In secondo luogo, usiamo #{--linux-flavours 686-pae}# dato
che non prevediamo di usare questa immagine su sistemi troppo vecchi. Terzo,
-abbiamo scelto la lista di pacchetti #{lxde}# per avere un desktop
+abbiamo scelto la lista di pacchetti /{lxde}/ per avere un desktop
minimale. Infine, abbiamo aggiunto due pacchetti preferiti per cominciare:
-#{iceweasel}# e #{xchat}#.
+/{iceweasel}/ e /{xchat}/.
Costruire quindi l'immagine:
@@ -187,7 +187,7 @@ code{
3~ Seconda revisione
In questa revisione ripuliremo la prima compilazione, aggiungeremo il
-pacchetto #{vlc}# alla configurazione, dunque avverrà una ricompilazione,
+pacchetto /{vlc}/ alla configurazione, dunque avverrà una ricompilazione,
verifica e commit.
Il comando #{lb clean}# ripulirà tutti i file ottenuti con la precedente
@@ -201,7 +201,7 @@ code{
}code
-Now append the #{vlc}# package to our local package list in
+Ora inserire il pacchetto /{vlc}/ all'elenco locale dei pacchetti
#{config/package-lists/my.list.chroot}#:
code{
@@ -247,8 +247,8 @@ utenti Debian Live.
*{Caso d'uso:}* creazione di un'immagine con live-build per avviare direttamente un server VNC.
Creare una directory con al suo interno una configurazione scheletrica
-costruita sulla base dell'elenco di standard-x11, tra cui #{gdm3}#,
-#{metacity}# e #{xvnc4viewer}#, disabilitando i raccomandati per ottenere un
+costruita sulla base dell'elenco di standard-x11, tra cui /{gdm3}/,
+/{metacity}/ e /{xvnc4viewer}/, disabilitando i raccomandati per ottenere un
sistema minimale:
code{
@@ -262,8 +262,8 @@ code{
}code
Creare la directory #{/etc/skel}# e inserirvi un #{.xsession}#
-personalizzato per l'utente predefinito che lancerà metacity e avvierà
-xvncviewer, connesso alla porta #{5901}# su un server all'indirizzo
+personalizzato per l'utente predefinito che lancerà /{metacity}/ e avvierà
+/{xvncviewer}/, connesso alla porta #{5901}# su un server all'indirizzo
#{192.168.1.2}#:
code{
@@ -299,10 +299,10 @@ supporto, è necessario capire il compromesso che si deve fare tra la
dimensione e la funzionalità. In questo esempio, taglieremo solo quanto
basta per far sì che il tutto stia in 128M, senza fare nient'altro che
distrugga l'integrità dei pacchetti contenuti, come eliminare localizzazioni
-con il pacchetto #{localepurge}# o altre ottimizzazioni "intrusive". È da
+con il pacchetto /{localepurge}/ o altre ottimizzazioni "intrusive". È da
notare che non va usato #{--bootstrap-flavour minimal}# a meno che non si
sappia cosa si sta facendo, come omettere la priorità dei pacchetti
-#{important}# che molto probabilmente produrrà un sistema live danneggiato.
+*{important}* che molto probabilmente produrrà un sistema live danneggiato.
code{
@@ -332,7 +332,7 @@ apt nel sistema live. Scegliendo la lista #{minima}# dei pacchetti si
esclude il grosso pacchetto #{locales}# e le utilità associate. Saltare i
pacchetti raccomandati con #{--apt-recommends false}# salva altro spazio, a
scapito di alcuni pacchetti che ci si aspetta di trovare, come
-#{firmware-linux-free}# che potrebbe servire a supportare un certo
+/{firmware-linux-free}/ che potrebbe servire a supportare un certo
hardware. Le restanti opzioni limano altre piccole quantità di spazio. Sta a
voi decidere se le funzionalità sacrificate con ciascuna ottimizzazione
valgono la pena.
@@ -378,11 +378,11 @@ code{
}code
-At boot time we will generate the pt_BR.UTF-8 locale and select the
-pt-latin1 keyboard layout. We will also need to preseed our desktop choice,
-"kde" so that tasksel will install the correct desktop task, as it differs
-from the default (see {Desktop and languages
-tasks}#desktop-and-language-tasks). Now let's put the pieces together:
+Durante l'avvio verrà generata la localizzazione pt_BR.UTF-8 e selezionato
+il layout di tastiera pt-latin1. Ci sarà anche bisogno di preconfigurare la
+nostra scelta desktop, "kde" cosicché tasksel installerà il task corretto,
+che differisce dal predefinito (vedere {Task per desktop e
+lingua}#desktop-and-language-tasks). È ora di mettere insieme i pezzi:
code{
@@ -400,8 +400,8 @@ code{
}code
-Si noti che è stato incluso il pacchetto #{debian-installer-launcher}# in
-modo da poter lanciare l'installer dal desktop della live, e che è stato
-anche specificato il kernel 486, dato che attualmente è necessario che il
-kernel dell'installer e quello del sistema live coincidano affinché il
-launcher funzioni correttamente.
+Si noti che è stato incluso il pacchetto debian-installer-launcher in modo
+da poter lanciare l'installer dal desktop della live, e che è stato anche
+specificato il kernel 486, dato che attualmente è necessario che il kernel
+dell'installer e quello del sistema live coincidano affinché il launcher
+funzioni correttamente.
diff --git a/manual/it/user_installation.ssi b/manual/it/user_installation.ssi
index 2976841..2e4eecd 100644
--- a/manual/it/user_installation.ssi
+++ b/manual/it/user_installation.ssi
@@ -138,12 +138,12 @@ _* Costruire un .deb di live-boot e live-config
È necessario compilare sulla distribuzione di destinazione, oppure in un
chroot contenente la piattaforma di destinazione: significa che se
-l'obiettivo è Wheezy allora bisogna compilare su Wheezy.
+l'obiettivo è wheezy allora bisogna compilare su wheezy.
-Se si deve compilare #{live-boot}# per una distribuzione di destinazione
-diversa dal proprio sistema, utilizzare un compilatore tipo /{pbuilder}/ o
-/{sbuild}/. Ad esempio, per immagini live Wheezy, si generi #{live-boot}# in
-un chroot Wheezy. Se la distribuzione di destinazione corrisponde con la
+Se si deve compilare live-boot per una distribuzione di destinazione diversa
+dal proprio sistema, utilizzare un compilatore tipo /{pbuilder}/ o
+/{sbuild}/. Ad esempio, per immagini live wheezy, si generi live-boot in un
+chroot wheezy. Se la distribuzione di destinazione corrisponde con la
distribuzione del proprio sistema, si può costruire direttamente sul sistema
usando #{dpkg-buildpackage}# (fornito dal pacchetto /{dpkg-dev}/):
diff --git a/manual/it/user_overview.ssi b/manual/it/user_overview.ssi
index e2961d4..4406b57 100644
--- a/manual/it/user_overview.ssi
+++ b/manual/it/user_overview.ssi
@@ -16,22 +16,22 @@ directory di configurazione per automatizzare totalmente e personalizzare
tutti gli aspetti della creazione di un'immagine live.
Molti concetti sono simili a quelli negli strumenti del pacchetto Debian
-debhelper scritto da Joey Hess:
+/{debhelper}/ scritto da Joey Hess:
_* Gli script hanno una locazione centrale per configurare le loro
-operazioni, in debhelper questa è la sottodirectory #{debian/}# dell'albero
-di un pacchetto. Ad esempio dh_install cercherà, tra gli altri, un file
-chiamato #{debian/install}# per determinare quali file dovrebbero esistere
-in un certo pacchetto binario. Allo stesso modo, live-build salva la sua
-configurazione interamente in una sottodirectory #{config/}#.
+operazioni, in /{debhelper}/ questa è la sottodirectory #{debian/}#
+dell'albero di un pacchetto. Ad esempio dh_install cercherà, tra gli altri,
+un file chiamato #{debian/install}# per determinare quali file dovrebbero
+esistere in un certo pacchetto binario. Allo stesso modo, live-build salva
+la sua configurazione interamente in una sottodirectory #{config/}#.
_* Gli script sono indipendenti, vale a dire che è sempre sicuro eseguire
ogni comando.
-Al contrario di debhelper, live-build contiene uno strumento per generare
-una directory scheletro di configurazione, #{lb config}#, che può essere
-considerato simile a utilità come #{dh-make}#. Per maggiori informazioni su
-#{lb config}# si veda {Il comando lb config}#lb-config.
+Al contrario di /{debhelper}/, live-build contiene uno strumento per
+generare una directory scheletro di configurazione, #{lb config}#, che può
+essere considerato simile a utilità come /{dh-make}/. Per maggiori
+informazioni su #{lb config}# si veda {Il comando lb config}#lb-config.
Il resto di questa sezione tratta i tre comandi più importanti:
diff --git a/manual/po/de/about_manual.ssi.po b/manual/po/de/about_manual.ssi.po
index 7dea398..2e70288 100644
--- a/manual/po/de/about_manual.ssi.po
+++ b/manual/po/de/about_manual.ssi.po
@@ -1,12 +1,11 @@
# German translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-07 08:59-0400\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-18 19:35+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,30 +18,49 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:2
msgid ":B~ About this manual"
-msgstr ""
+msgstr ":B~ Über dieses Handbuch"
#. type: Plain text
#: en/about_manual.ssi:4
msgid "1~about-manual About this manual"
-msgstr ""
+msgstr "1~about-manual Über dieses Handbuch"
#. type: Plain text
#: en/about_manual.ssi:6
msgid ""
"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 7.0 \"Wheezy\" 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."
+"by the project for the Debian 7.0 \"wheezy\" release. An up-to-date version "
+"can always be found at http://live.debian.net/"
msgstr ""
+"Dieses Handbuch dient als zentraler Einstiegspunkt für die gesamte "
+"Dokumentation des Debian Live Projekts, insbesondere zur Software die für "
+"Debian 7.0 \"wheezy\" erstellt wurde. Eine aktualisierte Version dieses "
+"Handbuches befindet sich auf http://live.debian.net/."
#. type: Plain text
#: en/about_manual.ssi:8
msgid ""
+"While live-manual 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 ""
+"Obwohl live-manual primär das Ziel hat beim Bau eines Live Systems zu helfen "
+"und nicht Anwenderfragen zu beantworten, können Benutzer einige nützliche "
+"Informationen in den folgenden Abschnitten finden: {Die Grundlagen}#the-"
+"basics deckt das Vorbereiten von Images um von Medien oder über das Netzwerk "
+"gestartet zu werden und {Anpassung des Laufzeitverhalten}#customizing-run-"
+"time-behaviours beschreibt einige Optionen welche als Startparameter benutzt "
+"werden können, z.B. die Auswahl des Tastaturlayouts und der Systemsprache "
+"oder Persistenz."
+
+#. type: Plain text
+#: en/about_manual.ssi:10
+msgid ""
"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 "
"using #{sudo}#. To distinguish between commands which may be executed by an "
@@ -50,42 +68,64 @@ msgid ""
"prepended by #{$}# or #{#}# respectively. This symbol is not a part of the "
"command."
msgstr ""
+"Einige der erwähnten Befehle im Text müssen als Superuser ausgeführt werden. "
+"Dies kann entweder dadurch erreicht werden, indem zuerst auf den root "
+"Benutzer gewechselt wird mittels #{su}# oder durch die Benutzung von #{sudo}"
+"#. Um die Befehle welche als unprivilegierter Benutzer ausgeführt werden "
+"können und diesen welche Superuser Rechte benötigen, sind den Befehlen #{$}# "
+"respektive #{#}# vorangestellt. Dieses Symbol ist nicht Teil des Befehls."
#. type: Plain text
-#: en/about_manual.ssi:10
+#: en/about_manual.ssi:12
msgid "2~ For the impatient"
-msgstr ""
+msgstr "Für die Ungeduldigen"
#. type: Plain text
-#: en/about_manual.ssi:12
+#: en/about_manual.ssi:14
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 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, "
+"the details. Therefore, we suggest reading in the following order."
+msgstr ""
+"Obowhl wir denken dass alles in diesem Handbuch mehr oder weniger für die "
+"einen oder anderen Benutzer wichtig ist, sind wir uns bewusst, dass es sich "
+"um viel Material handelt. Für ein schnelles Erfolgserlebnis in der Anwendung "
+"dieser Software schlagen wir die folgende Reihenfolge vor, bevor sie sich "
+"mit den Details befassen: "
+
+#. type: Plain text
+#: en/about_manual.ssi:16
+msgid ""
+"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."
+"a taste of what can be done with Debian Live."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:14
-msgid "2~terms Terms"
+#: en/about_manual.ssi:18
+msgid ""
+"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
-#: en/about_manual.ssi:16
+#: en/about_manual.ssi:20
+msgid "2~terms Terms"
+msgstr "2~terms Begriffe"
+
+#. type: Plain text
+#: en/about_manual.ssi:22
msgid ""
"_* *{Live system}*: An operating system that can boot without installation "
"to a hard drive. Live systems do not alter local operating system(s) or file"
@@ -95,14 +135,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:18
+#: en/about_manual.ssi:24
msgid ""
"_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, "
"live-build, live-config, and live-manual packages."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:20
+#: en/about_manual.ssi:26
msgid ""
"_* *{Debian Live system}*: A live system that uses software from the Debian "
"operating system that may be booted from CDs, DVDs, USB sticks, over the "
@@ -111,180 +151,172 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:22
+#: en/about_manual.ssi:28
msgid "_* *{Host system}*: The environment used to create the live system."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:24
+#: en/about_manual.ssi:30
msgid "_* *{Target system}*: The environment used to run the live system."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:26
+#: en/about_manual.ssi:32
msgid ""
"_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
-"boot was formerly a part of live-initramfs."
+"boot was formerly a part of /{live-initramfs}/."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:28
+#: en/about_manual.ssi:34
msgid ""
"_* *{live-build}*: A collection of scripts used to build customized Debian "
-"Live systems. live-build was formerly known as live-helper, and even earlier "
-"known as live-package."
+"Live systems. live-build was formerly known as /{live-helper}/, and even "
+"earlier known as /{live-package}/."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:30
+#: en/about_manual.ssi:36
msgid ""
"_* *{live-config}*: A collection of scripts used to configure a live system "
-"during the boot process. live-config was formerly a part of live-initramfs."
+"during the boot process. live-config was formerly a part of /{live-"
+"initramfs}/."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:32
+#: en/about_manual.ssi:38
msgid ""
"_* *{live-manual}*: This document is maintained in a package called live-"
"manual."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:34
+#: en/about_manual.ssi:40
msgid ""
"_* *{Debian Installer (d-i)}*: The official installation system for the "
"Debian distribution."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:36
+#: en/about_manual.ssi:42
msgid ""
"_* *{Boot parameters}*: Parameters that can be entered at the bootloader "
"prompt to influence the kernel or live-config."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:38
+#: en/about_manual.ssi:44
msgid ""
-"_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+"_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run "
"different instances of the GNU/Linux environment on a single system "
"simultaneously without rebooting."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:40
+#: en/about_manual.ssi:46
msgid ""
"_* *{Binary image}*: A file containing the live system, such as binary.iso "
"or binary.img."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:42
+#: en/about_manual.ssi:48
msgid ""
"_* *{Target distribution}*: The distribution upon which your live system "
"will be based. This can differ from the distribution of your host system."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:44
-msgid ""
-"_* *{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."
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:46
+#: en/about_manual.ssi:50
msgid ""
-"The *{stable}* distribution contains the latest officially released "
-"distribution of Debian. The *{testing}* distribution is the staging area for "
-"the next *{stable}* release. A major advantage of using this distribution is "
-"that it has more recent versions of software relative to the *{stable}* "
-"release. The *{unstable}* distribution is where active development of Debian "
-"occurs. Generally, this distribution is run by developers and those who like "
-"to live on the edge."
+"_* *{stable/testing/unstable}*: The *{stable}* distribution contains the "
+"latest officially released distribution of Debian. The *{testing}* "
+"distribution is the staging area for the next *{stable}* release. A major "
+"advantage of using this distribution is that it has more recent versions of "
+"software relative to the *{stable}* release. The *{unstable}* distribution "
+"is where active development of Debian occurs. Generally, this distribution "
+"is run by developers and those who like to live on the edge. Throughout the "
+"manual, we tend to use codenames for the releases, such as wheezy or sid, as "
+"that is what is supported by the tools themselves."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:48
+#: en/about_manual.ssi:52
msgid "2~ Authors"
-msgstr ""
+msgstr "2~ Autoren"
#. type: Plain text
-#: en/about_manual.ssi:50
+#: en/about_manual.ssi:54
msgid "A list of authors (in alphabetical order):"
-msgstr ""
+msgstr "Liste der Autoren (in alphabetischer Reihenfolge):"
#. type: Plain text
-#: en/about_manual.ssi:52
+#: en/about_manual.ssi:56
msgid "_* Ben Armstrong"
-msgstr ""
+msgstr "_* Ben Armstrong"
#. type: Plain text
-#: en/about_manual.ssi:54
+#: en/about_manual.ssi:58
msgid "_* Brendan Sleight"
-msgstr ""
+msgstr "_* Brendan Sleight"
#. type: Plain text
-#: en/about_manual.ssi:56
+#: en/about_manual.ssi:60
msgid "_* Chris Lamb"
-msgstr ""
+msgstr "_* Chris Lamb"
#. type: Plain text
-#: en/about_manual.ssi:58
+#: en/about_manual.ssi:62
msgid "_* Daniel Baumann"
-msgstr ""
+msgstr "_* Daniel Baumann"
#. type: Plain text
-#: en/about_manual.ssi:60
+#: en/about_manual.ssi:64
msgid "_* Franklin Piat"
-msgstr ""
+msgstr "_* Franklin Piat"
#. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:66
msgid "_* Jonas Stein"
-msgstr ""
+msgstr "_* Jonas Stein"
#. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:68
msgid "_* Kai Hendry"
-msgstr ""
+msgstr "_* Kai Hendry"
#. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:70
msgid "_* Marco Amadori"
-msgstr ""
+msgstr "_* Marco Amadori"
#. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:72
msgid "_* Mathieu Geli"
-msgstr ""
+msgstr "_* Mathieu Geli"
#. type: Plain text
-#: en/about_manual.ssi:70
+#: en/about_manual.ssi:74
msgid "_* Matthias Kirschner"
-msgstr ""
+msgstr "_* Matthias Kirschner"
#. type: Plain text
-#: en/about_manual.ssi:72
+#: en/about_manual.ssi:76
msgid "_* Richard Nelson"
-msgstr ""
+msgstr "_* Richard Nelson"
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:78
msgid "_* Trent W. Buck"
-msgstr ""
+msgstr "_* Trent W. Buck"
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:80
msgid "2~how-to-contribute Contributing to this document"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:78
+#: en/about_manual.ssi:82
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -293,7 +325,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:80
+#: en/about_manual.ssi:84
msgid ""
"When submitting a contribution, please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted, the "
@@ -302,35 +334,36 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:82
+#: en/about_manual.ssi:86
msgid ""
"The sources for this manual are maintained using the Git version control "
"system. You can check out the latest copy by executing:"
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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -354,56 +387,58 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:86
+#: en/about_manual.ssi:90
msgid "$ 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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -427,30 +462,31 @@ msgstr ""
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:90
+#: en/about_manual.ssi:94
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -458,26 +494,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:94
+#: en/about_manual.ssi:98
#, no-wrap
msgid " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:98
+#: en/about_manual.ssi:102
msgid ""
"You may build the live-manual from the top level directory of your Git "
"checkout by executing:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:102
+#: en/about_manual.ssi:106
#, no-wrap
msgid " $ make build\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:110
msgid ""
"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 "
@@ -485,40 +521,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:110
+#: en/about_manual.ssi:114
#, no-wrap
msgid " $ make build LANGUAGES=en\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:114
+#: en/about_manual.ssi:118
msgid "It is also possible to build by document type, e.g:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:122
#, no-wrap
msgid " $ make build FORMATS=pdf\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:122
+#: en/about_manual.ssi:126
msgid "Or combine both, e.g:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:126
+#: en/about_manual.ssi:130
#, no-wrap
msgid " $ make build FORMATS=html LANGUAGES=it\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:130
+#: en/about_manual.ssi:134
msgid "3~ Applying changes"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:132
+#: en/about_manual.ssi:136
msgid ""
"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 "
@@ -526,12 +562,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:134
+#: en/about_manual.ssi:138
msgid "_* Fetch the public commit key:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:143
+#: en/about_manual.ssi:147
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
@@ -543,12 +579,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:147
+#: en/about_manual.ssi:151
msgid "_* Add the following section to your openssh-client config:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:160
#, no-wrap
msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
@@ -560,12 +596,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:164
msgid "_* Check out a clone of the manual through ssh:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:165
+#: en/about_manual.ssi:169
#, no-wrap
msgid ""
" $ git clone git at live.debian.net:/live-manual.git\n"
@@ -573,92 +609,76 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:169
+#: en/about_manual.ssi:173
msgid ""
"_* 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:171
-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:175
-#, no-wrap
-msgid " $ make commit\n"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:179
-msgid "_* Then"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:183
-#, no-wrap
-msgid " $ git add .\n"
+msgid ""
+"_* Do not use #{make commit}# unless you are updating translations in this "
+"commit, and in that case, do not mix changes to the English manual and "
+"translations in the same commit, but use separate commits for each. See the "
+"{Translation}#translation section for more details."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:187
+#: en/about_manual.ssi:177
msgid ""
-"_* 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."
+"_* Write commit messages that consist of complete, meaningful 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:191
+#: en/about_manual.ssi:181
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:195
+#: en/about_manual.ssi:185
msgid "_* Push the commit to the server:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:199
+#: en/about_manual.ssi:189
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:203
+#: en/about_manual.ssi:193
msgid "3~translation Translation"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:205
+#: en/about_manual.ssi:195
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:207
+#: en/about_manual.ssi:197
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). "
-"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."
+"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."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:209
+#: en/about_manual.ssi:199
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:211
+#: en/about_manual.ssi:201
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
"are updated from the po files and then you can review your changes launching "
@@ -667,7 +687,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:212
+#: en/about_manual.ssi:202
#, 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/about_project.ssi.po b/manual/po/de/about_project.ssi.po
index 49678a2..1a17bb1 100644
--- a/manual/po/de/about_project.ssi.po
+++ b/manual/po/de/about_project.ssi.po
@@ -1,12 +1,11 @@
# German translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-19 22:16+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-05-25 14:30+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -109,7 +108,7 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:32
-msgid "_* It would be a subproject of Debian."
+msgid "_* It is a subproject of Debian."
msgstr ""
#. type: Plain text
@@ -194,20 +193,19 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:60
msgid ""
-"A system for configuring packages is provided using debconf in #{lb config}# "
-"(use --preseed FILE) allowing custom configured packages to be installed in "
-"your custom produced Debian Live images, but for official live images only "
-"default configuration will be used. For more information, please see "
-"{Customization overview}#customization-overview."
+"A system for configuring packages is provided using debconf allowing custom "
+"configured packages to be installed in your custom produced Debian Live "
+"images, but for official live images only default configuration will be "
+"used. For more information, please see {Customization overview}"
+"#customization-overview."
msgstr ""
#. type: Plain text
#: en/about_project.ssi:62
msgid ""
"Exception: There are a few essential changes needed to bring a live system "
-"to life (e.g. configuring pam to allow empty passwords). These essential "
-"changes have to be kept as minimal as possible and should be merged within "
-"the Debian repository if possible."
+"to life. These essential changes have to be kept as minimal as possible and "
+"should be merged within the Debian repository if possible."
msgstr ""
#. type: Plain text
@@ -236,8 +234,8 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:69
msgid ""
-"_* *{BTS}*: The Debian Bug Tracking System (BTS) contains details of bugs "
-"reported by users and developers. Each bug is given a number, and is kept on "
-"file until it is marked as having been dealt with. For more information, "
-"please see {Reporting bugs}#bugs."
+"_* *{BTS}*: The {Debian Bug Tracking System}http://www.debian.org/Bugs/ "
+"(BTS) contains details of bugs reported by users and developers. Each bug is "
+"given a number, and is kept on file until it is marked as having been dealt "
+"with. For more information, please see {Reporting bugs}#bugs."
msgstr ""
diff --git a/manual/po/de/index.html.in.po b/manual/po/de/index.html.in.po
index a3f1f93..b0dcf61 100644
--- a/manual/po/de/index.html.in.po
+++ b/manual/po/de/index.html.in.po
@@ -1,12 +1,12 @@
# German translations for live-manual package
# 2010-2011 Daniel Baumann <daniel at debian.org>
-# This file is distributed under the same license as the live-config package.
+# This file is distributed under the same license as the live-manual package.
# Carlos Zuferri «chals» <chals at altorricon.com>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual 3.0~a3-1\n"
-"POT-Creation-Date: 2012-01-07 16:03+0100\n"
+"POT-Creation-Date: 2012-06-02 18:16+0300\n"
"PO-Revision-Date: 2011-12-26 19:06+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -40,7 +40,7 @@ msgstr ""
#. type: Content of: <html><body><p>
#: en/index.html.in:17
msgid ""
-"Please report errors, omissions, patches and suggestions to our mailinglist "
+"Please report errors, omissions, patches and suggestions to our mailing list "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
"org</a> and read about <a href=\"html/live-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
@@ -111,7 +111,7 @@ msgstr "Quellen"
#. type: Content of: <html><body><p>
#: en/index.html.in:38
msgid ""
-"The sources for this manual is available in a <a href=\"http://git.or.cz/"
+"The sources for this manual are available in a <a href=\"http://git.or.cz/"
"\">Git</a> repository at live.debian.net."
msgstr ""
"Die Quellen dieses Handbuches sind in einem <a href=\"http://git.or.cz/"
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index 9690fb2..65bd4be 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -1,12 +1,11 @@
# German translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-03 00:19+0300\n"
+"POT-Creation-Date: 2012-06-04 12:21+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,7 +18,7 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:2
msgid "% SiSU 2.0"
-msgstr "% SiSU 2.0"
+msgstr ""
#. type: Plain text
#: en/live-manual.ssm:4
@@ -48,8 +47,10 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-04-03\n"
+" :published: 2012-06-04\n"
msgstr ""
+"@date:\n"
+" :published: 04.06.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
@@ -61,16 +62,11 @@ msgstr "@publisher: Debian Live Projekt <debian-live at lists.debian.org>"
#, no-wrap
msgid ""
"@make:\n"
-" :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/\n"
-" :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
+" :bold: /squeeze|wheezy|sid/\n"
+" :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
msgstr ""
-"@make:\n"
-" :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/\n"
-" :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
-" :num_top: 1\n"
-" :skin: skin_debian-live\n"
#. type: Plain text
#: en/live-manual.ssm:23
@@ -180,7 +176,7 @@ msgstr "<< user_examples.ssi"
#. type: Plain text
#: en/live-manual.ssm:65 en/style_guide.ssi:2
msgid ":B~ Appendix"
-msgstr ""
+msgstr ":B~ Anhang"
#. type: Plain text
#: en/live-manual.ssm:66
diff --git a/manual/po/de/project_bugs.ssi.po b/manual/po/de/project_bugs.ssi.po
index 75fc676..593b7da 100644
--- a/manual/po/de/project_bugs.ssi.po
+++ b/manual/po/de/project_bugs.ssi.po
@@ -1,12 +1,11 @@
# German translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,16 +16,19 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -34,63 +36,70 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: 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-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
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -98,49 +107,53 @@ msgstr ""
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: 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:353 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
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
@@ -304,7 +317,7 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:50
msgid ""
-"_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system"
+"_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system"
msgstr ""
#. type: Plain text
@@ -400,8 +413,8 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:82
msgid ""
-"live-build first bootstraps a basic Debian system with #{debootstrap}# or #"
-"{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
+"live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
+"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
"distribution it is bootstrapping, it may fail. If a bug appears here, check "
"if the error is related to a specific Debian package (most likely), or if it "
"is related to bootstrapping tool itself."
@@ -433,7 +446,7 @@ msgstr ""
#: en/project_bugs.ssi:90
msgid ""
"If this is the case, this is not a bug in Debian Live, but rather in Debian "
-"- please report it against the failing package. Running #{debootstrap}# "
+"- please report it against the failing package. Running /{debootstrap}/ "
"separately from the Live system build or running #{lb bootstrap --debug}# "
"will give you more information."
msgstr ""
diff --git a/manual/po/de/project_coding-style.ssi.po b/manual/po/de/project_coding-style.ssi.po
index d93d24d..e781f17 100644
--- a/manual/po/de/project_coding-style.ssi.po
+++ b/manual/po/de/project_coding-style.ssi.po
@@ -1,12 +1,11 @@
# German translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-31 16:32+0300\n"
+"POT-Creation-Date: 2012-04-07 22:16+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,29 +16,30 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -87,29 +87,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -195,37 +196,42 @@ msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:16
-msgid "2~ Indenting"
+msgid "_* Make sure all shell code runs with 'set -e'."
msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:18
-msgid "_* Always use tabs over spaces."
+msgid "2~ Indenting"
msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:20
-msgid "2~ Wrapping"
+msgid "_* Always use tabs over spaces."
msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:22
-msgid "_* Generally, lines are 80 chars at maximum."
+msgid "2~ Wrapping"
msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:24
+msgid "_* Generally, lines are 80 chars at maximum."
+msgstr ""
+
+#. type: Plain text
+#: en/project_coding-style.ssi:26
msgid "_* Use the \"Linux style\" of line breaks:"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:26 en/project_coding-style.ssi:49
-#: en/project_coding-style.ssi:90 en/project_coding-style.ssi:108
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:51
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:110
msgid "Bad:"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:32
+#: en/project_coding-style.ssi:34
#, no-wrap
msgid ""
" if foo; then\n"
@@ -234,13 +240,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:59
-#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:119
+#: en/project_coding-style.ssi:38 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:100 en/project_coding-style.ssi:121
msgid "Good:"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:43
+#: en/project_coding-style.ssi:45
#, no-wrap
msgid ""
" if foo\n"
@@ -250,108 +256,108 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:49
msgid "_* The same holds for functions:"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:55
+#: en/project_coding-style.ssi:57
#, no-wrap
msgid ""
-" foo () {\n"
+" Foo () {\n"
" bar\n"
" }\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:66
+#: en/project_coding-style.ssi:68
#, no-wrap
msgid ""
-" foo ()\n"
+" Foo ()\n"
" {\n"
" bar\n"
" }\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:72
msgid "2~ Variables"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:72
+#: en/project_coding-style.ssi:74
msgid "_* Variables are always in capital letters."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:74
+#: en/project_coding-style.ssi:76
msgid ""
"_* Variables that used in #{lb config}# always start with #{LB_}# prefix."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:76
+#: en/project_coding-style.ssi:78
msgid ""
"_* Internal temporary variables in live-build should start with the #{\\_LB_}"
"# prefix."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:78
+#: en/project_coding-style.ssi:80
msgid "_* Local variables start with live-build #{\\_\\_LB_}# prefix."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:80
+#: en/project_coding-style.ssi:82
msgid ""
"_* Variables in connection to a boot parameter in live-config start with #"
"{LIVE_}#."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:82
+#: en/project_coding-style.ssi:84
msgid "_* All other variables in live-config start with #{_}# prefix."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:84
+#: en/project_coding-style.ssi:86
msgid ""
"_* Use braces around variables; e.g. write #{${FOO}}# instead of #{$FOO}#."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:86
+#: en/project_coding-style.ssi:88
msgid ""
"_* Always protect variables with quotes to respect potential whitespaces: "
"write #{\"${FOO}\"}# not #{${FOO}}#."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:88
+#: en/project_coding-style.ssi:90
msgid ""
"_* For consistency reasons, always use quotes when assigning values to "
"variables:"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:94
+#: en/project_coding-style.ssi:96
#, no-wrap
msgid " FOO=bar\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:104
#, no-wrap
msgid " FOO=\"bar\"\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:108
msgid "_* If multiple variables are used, quote the full expression:"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:115
+#: en/project_coding-style.ssi:117
#, no-wrap
msgid ""
" if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
@@ -361,7 +367,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:126
+#: en/project_coding-style.ssi:128
#, no-wrap
msgid ""
" if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
@@ -371,19 +377,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:130
+#: en/project_coding-style.ssi:132
msgid "2~ Miscellaneous"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:132
+#: en/project_coding-style.ssi:134
msgid ""
"_* Use \"#{|}#\" (without the surround quotes) as a separator in calls to "
"sed, e.g. \"#{sed -e 's|foo|bar|'}#\" (without \"\")."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:134
+#: en/project_coding-style.ssi:136
msgid ""
"_* Don't use the #{test}# command for comparisons or tests, use \"#{[}#\" \"#"
"{]}#\" (without \"\"); e.g. \"#{if [ -x /bin/foo ]; ...}#\" and not \"#{if "
@@ -391,8 +397,15 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:135
+#: en/project_coding-style.ssi:138
msgid ""
"_* Use #{case}# wherever possible over #{test}#, as it's easier to read and "
"faster in execution."
msgstr ""
+
+#. type: Plain text
+#: en/project_coding-style.ssi:139
+msgid ""
+"_* Use capitalized names for functions to limit messing with the users "
+"environment."
+msgstr ""
diff --git a/manual/po/de/project_procedures.ssi.po b/manual/po/de/project_procedures.ssi.po
index 2149f12..565227a 100644
--- a/manual/po/de/project_procedures.ssi.po
+++ b/manual/po/de/project_procedures.ssi.po
@@ -1,12 +1,11 @@
# German translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2012-04-23 20:28+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,16 +16,18 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -34,63 +35,69 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: 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-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
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -98,49 +105,53 @@ msgstr ""
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: 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:353 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
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
@@ -233,7 +244,7 @@ msgstr ""
#. type: Plain text
#: en/project_procedures.ssi:36
msgid ""
-"_* Again, we need updated mirror of debian, debian-security and debian-"
+"_* Again, we need updated mirrors of debian, debian-security and debian-"
"volatile."
msgstr ""
@@ -244,18 +255,32 @@ msgstr ""
#. type: Plain text
#: en/project_procedures.ssi:42
+msgid "3~ Last Point Release of a Debian Release"
+msgstr ""
+
+#. type: Plain text
+#: en/project_procedures.ssi:47
+msgid ""
+"Remember to adjust both chroot and binary mirrors when building the last set "
+"of images for a Debian release after it has been moved away from ftp.debian."
+"org to archive.debian.org. That way, old prebuilt live images are still "
+"useful without user modifications."
+msgstr ""
+
+#. type: Plain text
+#: en/project_procedures.ssi:49
msgid "3~ Point release announcement template"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:44
+#: en/project_procedures.ssi:51
msgid ""
"An annoucement mail for point releases can be generated using the template "
"below and the following command:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:52
+#: en/project_procedures.ssi:59
#, no-wrap
msgid ""
" $ sed \\\n"
@@ -266,20 +291,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:56
+#: en/project_procedures.ssi:63
msgid ""
"Please check the mail carefully before sending and pass it to others for "
"proof-reading."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:60
+#: en/project_procedures.ssi:67
#, no-wrap
msgid " Debian Live images for Debian GNU/Linux %major% updated\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:64
+#: en/project_procedures.ssi:71
#, no-wrap
msgid ""
" The Debian Live project is pleased to announce the availability of\n"
@@ -288,19 +313,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:66
+#: en/project_procedures.ssi:73
#, no-wrap
msgid " The images are available for download at:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:68
+#: en/project_procedures.ssi:75
#, no-wrap
msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:73
+#: en/project_procedures.ssi:80
#, no-wrap
msgid ""
" This update incorporates the changes made in the %minor% point release,\n"
@@ -310,29 +335,29 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:75
+#: en/project_procedures.ssi:82
#, no-wrap
msgid " <http://lists.debian.org/debian-announce/%release_mail%>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:77
+#: en/project_procedures.ssi:84
#, no-wrap
msgid " It also includes the following Live-specific changes:\n"
msgstr ""
#. type: Bullet: ' * '
-#: en/project_procedures.ssi:81
+#: en/project_procedures.ssi:88
msgid "[INSERT LIVE-SPECIFIC CHANGE HERE]"
msgstr ""
#. type: Bullet: ' * '
-#: en/project_procedures.ssi:81
+#: en/project_procedures.ssi:88
msgid "[LARGER ISSUES MAY DESERVE THEIR OWN SECTION]"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:85
+#: en/project_procedures.ssi:92
#, no-wrap
msgid ""
" URLs\n"
@@ -340,67 +365,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:87
+#: en/project_procedures.ssi:94
#, no-wrap
msgid " Download location of updated images:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:89
+#: en/project_procedures.ssi:96
#, no-wrap
msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:91
+#: en/project_procedures.ssi:98
#, no-wrap
msgid " Debian Live project homepage:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:93
+#: en/project_procedures.ssi:100
#, no-wrap
msgid " <http://live.debian.net/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:95
+#: en/project_procedures.ssi:102
#, no-wrap
msgid " The current stable distribution:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:97
+#: en/project_procedures.ssi:104
#, no-wrap
msgid " <http://ftp.debian.org/debian/dists/stable>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:99
+#: en/project_procedures.ssi:106
#, no-wrap
msgid " stable distribution information (release notes, errata etc.):\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:101
+#: en/project_procedures.ssi:108
#, no-wrap
msgid " <http://www.debian.org/releases/stable/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:103
+#: en/project_procedures.ssi:110
#, no-wrap
msgid " Security announcements and information:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:105
+#: en/project_procedures.ssi:112
#, no-wrap
msgid " <http://www.debian.org/security/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:109
+#: en/project_procedures.ssi:116
#, no-wrap
msgid ""
" About Debian\n"
@@ -408,7 +433,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:113
+#: en/project_procedures.ssi:120
#, no-wrap
msgid ""
" The Debian Project is an association of Free Software developers who\n"
@@ -417,7 +442,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:117
+#: en/project_procedures.ssi:124
#, no-wrap
msgid ""
" About Debian Live\n"
@@ -425,7 +450,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:122
+#: en/project_procedures.ssi:129
#, no-wrap
msgid ""
" Debian Live is an official sub-project of Debian which produces Debian\n"
@@ -435,7 +460,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:126
+#: en/project_procedures.ssi:133
#, no-wrap
msgid ""
" Contact Information\n"
@@ -443,7 +468,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:130
+#: en/project_procedures.ssi:137
#, no-wrap
msgid ""
" For further information, please visit the Debian Live web pages at\n"
diff --git a/manual/po/de/style_guide.ssi.po b/manual/po/de/style_guide.ssi.po
index b2173dd..9d4f5d4 100644
--- a/manual/po/de/style_guide.ssi.po
+++ b/manual/po/de/style_guide.ssi.po
@@ -1,12 +1,11 @@
# German translations for live-manual package
-# Copyright (C) 2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-31 19:15+0300\n"
+"POT-Creation-Date: 2012-06-03 17:04+0300\n"
"PO-Revision-Date: 2012-02-11 16:42+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,20 +18,19 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:65 en/style_guide.ssi:2
msgid ":B~ Appendix"
-msgstr ""
+msgstr ":B~ Anhang"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
@@ -93,17 +91,16 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
@@ -832,15 +829,15 @@ msgstr ""
#. type: Plain text
#: en/style_guide.ssi:228
-msgid "_* /{New lines}/"
+msgid "_* /{Newlines}/"
msgstr ""
#. type: Plain text
#: en/style_guide.ssi:230
msgid ""
-"The translated texts need to have the exact same new lines as the original "
+"The translated texts need to have the exact same newlines as the original "
"texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
-"in the original files. These new lines often appear, for instance, in the "
+"in the original files. These newlines often appear, for instance, in the "
"code blocks."
msgstr ""
@@ -878,9 +875,7 @@ msgstr ""
#. type: Bullet: ' - '
#: en/style_guide.ssi:244
-msgid ""
-"Metadata (often between colons *{:metadata:}*) especially the date in /{live-"
-"manual.ssm.po}/ because it changes every time live-manual is updated."
+msgid "Metadata (often between colons *{:metadata:}*)"
msgstr ""
#. type: Bullet: ' - '
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/de/user_basics.ssi.po
index 2f218d4..3009492 100644
--- a/manual/po/de/user_basics.ssi.po
+++ b/manual/po/de/user_basics.ssi.po
@@ -1,12 +1,11 @@
# German translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-01-12 08:28-0400\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,16 +16,18 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -34,8 +35,10 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -59,39 +62,42 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -99,8 +105,10 @@ msgstr ""
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -124,25 +132,26 @@ msgstr ""
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
@@ -302,7 +311,7 @@ msgstr ""
#: en/user_basics.ssi:48
msgid ""
"This process can take a while, depending on the speed of your network "
-"connection. When it is complete, there should be a #{binary-hybrid.iso}# "
+"connection. When it is complete, there should be a #{binary.hybrid.iso}# "
"image file, ready to use, in the current directory."
msgstr ""
@@ -341,7 +350,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:62
#, no-wrap
-msgid " $ wodim binary-hybrid.iso\n"
+msgid " $ wodim binary.hybrid.iso\n"
msgstr ""
#. type: Plain text
@@ -373,7 +382,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:75
#, no-wrap
-msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
+msgid " $ dd if=binary.hybrid.iso of=${USBSTICK}\n"
msgstr ""
#. type: Plain text
@@ -400,8 +409,8 @@ msgid ""
"Once you've booted the media, you are presented with a boot menu. If you "
"just press enter here, the system will boot using the default entry, #{Live}"
"# and default options. For more information about boot options, see the "
-"\"help\" entry in the menu and also the #{live-boot}# and #{live-config}# "
-"man pages found within the live system."
+"\"help\" entry in the menu and also the live-boot and live-config man pages "
+"found within the live system."
msgstr ""
#. type: Plain text
@@ -471,16 +480,16 @@ msgstr ""
#: en/user_basics.ssi:104
msgid ""
"The most versatile VM in Debian is QEMU. If your processor has hardware "
-"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
+"support for virtualization, use the /{qemu-kvm}/ package; the /{qemu-kvm}/ "
"package description briefly lists the requirements."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:106
msgid ""
-"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
-"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
-"the following examples. The #{qemu-utils}# package is also valuable for "
+"First, install /{qemu-kvm}/ if your processor supports it. If not, install /"
+"{qemu}/, in which case the program name is #{qemu}# instead of #{kvm}# in "
+"the following examples. The /{qemu-utils}/ package is also valuable for "
"creating virtual disk images with #{qemu-img}#."
msgstr ""
@@ -498,7 +507,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:118
#, no-wrap
-msgid " $ kvm -cdrom binary-hybrid.iso\n"
+msgid " $ kvm -cdrom binary.hybrid.iso\n"
msgstr ""
#. type: Plain text
@@ -513,7 +522,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:126
-msgid "In order to test the ISO with #{virtualbox-ose}#:"
+msgid "In order to test the ISO with /{virtualbox-ose}/:"
msgstr ""
#. type: Plain text
@@ -531,17 +540,14 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:136
msgid ""
-"Create a new virtual machine, change the storage settings to use #{binary-"
+"Create a new virtual machine, change the storage settings to use #{binary."
"hybrid.iso}# as the CD/DVD device, and start the machine."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:138
-msgid ""
-"Note: For live systems containing X.org that you want to test with #"
-"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
-"package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. "
-"Otherwise, the resolution is limited to 800x600."
+#, no-wrap
+msgid "*{Note:}* For live systems containing X.org that you want to test with /{virtualbox-ose}/, you may wish to include the VirtualBox X.org driver package, /{virtualbox-ose-guest-x11}/, in your live-build configuration. Otherwise, the resolution is limited to 800x600.\n"
msgstr ""
#. type: Plain text
@@ -570,10 +576,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:150
-msgid ""
-"Note: if you created an ISO hybrid image with the previous example, you will "
-"need to clean up your working directory with the #{lb clean}# command (see "
-"{The lb clean command}#lb-clean):"
+#, no-wrap
+msgid "*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):\n"
msgstr ""
#. type: Plain text
@@ -619,7 +623,7 @@ msgid ""
"bootloader, ready to be directly written on a USB stick. Since using an HDD "
"image is just like using an ISO hybrid image on USB, follow the instructions "
"in {Using an ISO hybrid live image}#using-iso-hybrid, except use the "
-"filename #{binary.img}# instead of #{binary-hybrid.iso}#."
+"filename #{binary.img}# instead of #{binary.hybrid.iso}#."
msgstr ""
#. type: Plain text
@@ -630,10 +634,10 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:182
msgid ""
-"First, install QEMU as described above in {Testing an ISO image with QEMU}"
-"#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which "
-"version your host system needs, specifying #{binary.img}# as the first hard "
-"drive."
+"First, install /{qemu}/ as described above in {Testing an ISO image with "
+"QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on "
+"which version your host system needs, specifying #{binary.img}# as the first "
+"hard drive."
msgstr ""
#. type: Plain text
@@ -651,7 +655,7 @@ msgstr ""
#: en/user_basics.ssi:192
msgid ""
"To use the remaining free space after copying #{binary.img}# to a USB stick, "
-"use a partitioning tool such as #{gparted}# or #{parted}# to create a new "
+"use a partitioning tool such as /{gparted}/ or /{parted}/ to create a new "
"partition on the stick. The first partition will be used by the Debian Live "
"system."
msgstr ""
@@ -678,11 +682,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:208
-msgid ""
-"Note: If you want to use the extra space with Windows, apparently that OS "
-"cannot normally access any partitions but the first. Some solutions to this "
-"problem have been discussed on our {mailing list}#contact, but it seems "
-"there are no easy answers."
+#, no-wrap
+msgid "*{Note:}* If you want to use the extra space with Windows, apparently that OS cannot normally access any partitions but the first. Some solutions to this problem have been discussed on our {mailing list}#contact, but it seems there are no easy answers.\n"
msgstr ""
#. type: Plain text
@@ -706,9 +707,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:216
-msgid ""
-"Note: if you performed any previous examples, you will need to clean up your "
-"working directory with the #{lb clean}# command:"
+#, no-wrap
+msgid "*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:\n"
msgstr ""
#. type: Plain text
@@ -840,9 +840,10 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:280
msgid ""
-"You should install the tftpd-hpa package. It can serve all files contained "
-"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
-"#{/srv/debian-live/tftpboot}#, run as root the following command:"
+"You should install the /{tftpd-hpa}/ package. It can serve all files "
+"contained inside a root directory, usually #{/srv/tftp}#. To let it serve "
+"files inside #{/srv/debian-live/tftpboot}#, run as root the following "
+"command:"
msgstr ""
#. type: Plain text
@@ -871,7 +872,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:294
-msgid "You need to install the #{nfs-kernel-server}# package."
+msgid "You need to install the /{nfs-kernel-server}/ package."
msgstr ""
#. type: Plain text
@@ -935,7 +936,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:322
-msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
+msgid "_* Install /{qemu}/, /{bridge-utils}/, /{sudo}/."
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_customization-binary.ssi.po b/manual/po/de/user_customization-binary.ssi.po
index d97664e..a6ed050 100644
--- a/manual/po/de/user_customization-binary.ssi.po
+++ b/manual/po/de/user_customization-binary.ssi.po
@@ -1,12 +1,11 @@
# German translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-25 21:42+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,28 +16,30 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -62,51 +63,54 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -130,25 +134,26 @@ msgstr ""
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
@@ -239,7 +244,7 @@ msgid ""
" include menu.cfg\n"
" default vesamenu.c32\n"
" prompt 0\n"
-" timeout 5\n"
+" timeout 50\n"
msgstr ""
#. type: Plain text
@@ -259,7 +264,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:43
#, no-wrap
-msgid " sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg\n"
+msgid " sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_customization-contents.ssi.po b/manual/po/de/user_customization-contents.ssi.po
index 8c405f5..3c2636f 100644
--- a/manual/po/de/user_customization-contents.ssi.po
+++ b/manual/po/de/user_customization-contents.ssi.po
@@ -1,12 +1,11 @@
# German translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-01-15 16:28+0100\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,16 +16,19 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -34,9 +36,10 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -60,39 +63,43 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -100,9 +107,10 @@ msgstr ""
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -126,25 +134,26 @@ msgstr ""
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
@@ -236,7 +245,7 @@ msgstr ""
#: en/user_customization-contents.ssi:24
msgid ""
"To include files, simply add them to your #{config/includes.chroot}# "
-"directory. This directory corresponds to the root directory (#{/}#) of the "
+"directory. This directory corresponds to the root directory #{/}# of the "
"live system. For example, to add a file #{/var/www/index.html}# in the live "
"system, use:"
msgstr ""
@@ -412,6 +421,6 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:93
msgid ""
-"For more information about debconf, please see debconf(7) in the #{debconf}# "
-"package."
+"For more information about debconf, please see #{debconf(7)}# in the /"
+"{debconf}/ package."
msgstr ""
diff --git a/manual/po/de/user_customization-installer.ssi.po b/manual/po/de/user_customization-installer.ssi.po
index b0250d5..24b3c5b 100644
--- a/manual/po/de/user_customization-installer.ssi.po
+++ b/manual/po/de/user_customization-installer.ssi.po
@@ -1,12 +1,11 @@
# German translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,28 +16,29 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -62,21 +62,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -85,28 +86,29 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -130,21 +132,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -199,7 +202,7 @@ msgstr ""
#: en/user_customization-installer.ssi:16
msgid ""
"On such images, Debian is installed by fetching and installing .deb packages "
-"using #{debootstrap}# or #{cdebootstrap}#, from the local media or some "
+"using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some "
"network-based network, resulting in a standard Debian system being installed "
"to the hard disk."
msgstr ""
@@ -224,7 +227,7 @@ msgstr ""
msgid ""
"Installation will proceed in an identical fashion to the \"Regular\" "
"installation described above, but at the actual package installation stage, "
-"instead of using #{debootstrap}# to fetch and install packages, the live "
+"instead of using /{debootstrap}/ to fetch and install packages, the live "
"filesystem image is copied to the target. This is achieved with a special "
"udeb called live-installer."
msgstr ""
@@ -238,10 +241,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-installer.ssi:26
-msgid ""
-"Note: to support both normal and live installer entries in the bootloader of "
-"the same live media, you must disable live-installer by preseeding #{live-"
-"installer/enable=false}#."
+#, no-wrap
+msgid "*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.\n"
msgstr ""
#. type: Plain text
@@ -309,5 +310,5 @@ msgid ""
"binary/}# to include them in the image. Additional or replacement files and "
"directories may be included in the installer initrd as well, in a similar "
"fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
-"placing the material in #{config/binary_debian-installer-includes/}#."
+"placing the material in #{config/includes.binary_debian-installer/}#."
msgstr ""
diff --git a/manual/po/de/user_customization-overview.ssi.po b/manual/po/de/user_customization-overview.ssi.po
index efad689..f5ae3ff 100644
--- a/manual/po/de/user_customization-overview.ssi.po
+++ b/manual/po/de/user_customization-overview.ssi.po
@@ -1,12 +1,11 @@
# German translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -110,7 +109,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-overview.ssi:22
msgid ""
-"Although #{lb config}# does create a skeletal configuration in the config/ "
+"Although #{lb config}# creates a skeletal configuration in the config/ "
"directory, to accomplish your goals, you may need to provide additional "
"files in subdirectories of config/. Depending on where the files are stored "
"in the configuration, they may be copied into the live system's filesystem "
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index 6276c19..1c160b1 100644
--- a/manual/po/de/user_customization-packages.ssi.po
+++ b/manual/po/de/user_customization-packages.ssi.po
@@ -1,12 +1,11 @@
# German translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-04-14 22:45+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,28 +16,29 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -62,21 +62,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -85,28 +86,29 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -130,21 +132,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -174,12 +177,12 @@ msgid ""
"distribution mirror. You can also add your own repositories for backports, "
"experimental or custom packages, or include packages directly as files. You "
"can define your own lists of packages to include, use live-build's "
-"predefined lists, use #{tasksel}# tasks, or a combination of all three. "
-"Finally, a number of options give some control over apt, or if you prefer, "
-"aptitude, at build time when packages are installed. You may find these "
-"handy if you use a proxy, want to disable installation of recommended "
-"packages to save space, or need to control which versions of packages are "
-"installed via APT pinning, to name a few possibilities."
+"predefined lists, use /{tasksel}/ tasks, or a combination of all three. "
+"Finally, a number of options give some control over /{apt}/, or if you "
+"prefer, /{aptitude}/, at build time when packages are installed. You may "
+"find these handy if you use a proxy, want to disable installation of "
+"recommended packages to save space, or need to control which versions of "
+"packages are installed via APT pinning, to name a few possibilities."
msgstr ""
#. type: Plain text
@@ -197,12 +200,12 @@ msgstr ""
msgid ""
"The distribution you choose has the broadest impact on which packages are "
"available to include in your live image. Specify the codename, which "
-"defaults to #{wheezy}# for the Wheezy version of live-build. Any current "
+"defaults to wheezy for the wheezy version of live-build. Any current "
"distribution carried in the Debian archive may be specified by its codename "
"here. (See {Terms}#terms for more details.) The #{--distribution}# option "
"not only influences the source of packages within the archive, but also "
-"instructs #{live-build}# to behave as needed to build each supported "
-"distribution. For example, to build against the *{unstable}* release, Sid, "
+"instructs live-build to behave as needed to build each supported "
+"distribution. For example, to build against the *{unstable}* release, sid, "
"specify:"
msgstr ""
@@ -257,12 +260,12 @@ msgid ""
"download speed. Each of the #{--mirror-*}# options governs which "
"distribution mirror is used at various stages of the build. Recall from "
"{Stages of the build}#stages-of-the-build that the *{bootstrap}* stage is "
-"when the chroot is initially populated by debootstrap with a minimal system, "
-"and the *{chroot}* stage is when the chroot used to construct the live "
-"system's filesystem is built. Thus, the corresponding mirror switches are "
-"used for those stages, and later, in the *{binary}* stage, the #{--mirror-"
-"binary}# and #{--mirror-binary-security}# values are used, superceding any "
-"mirrors used in an earlier stage."
+"when the chroot is initially populated by /{debootstrap}/ with a minimal "
+"system, and the *{chroot}* stage is when the chroot used to construct the "
+"live system's filesystem is built. Thus, the corresponding mirror switches "
+"are used for those stages, and later, in the *{binary}* stage, the #{--"
+"mirror-binary}# and #{--mirror-binary-security}# values are used, "
+"superceding any mirrors used in an earlier stage."
msgstr ""
#. type: Plain text
@@ -509,9 +512,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:125
msgid ""
-"For example, to make a list that includes the predefined #{gnome}# list plus "
-"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
-"contents:"
+"For example, to make a list that includes the predefined #{gnome}# list "
+"plus /{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the "
+"following contents:"
msgstr ""
#. type: Plain text
@@ -557,9 +560,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:148
msgid ""
-"You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architectures i386}# or #{--architectures amd64}# is "
-"specified:"
+"You may test for any one of a number of values, e.g. to install /"
+"{memtest86+}/ if either #{--architectures i386}# or #{--architectures amd64}"
+"# is specified:"
msgstr ""
#. type: Plain text
@@ -575,7 +578,7 @@ msgstr ""
#: en/user_customization-packages.ssi:158
msgid ""
"You may also test against variables that may contain more than one value, e."
-"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
+"g. to install /{vrms}/ if either #{contrib}# or #{non-free}# is specified "
"via #{--archive-areas}#:"
msgstr ""
@@ -637,8 +640,8 @@ msgstr ""
msgid ""
"The primary tasks available in the Debian Installer can be listed with #"
"{tasksel --list-tasks}# in the live system. The contents of any task, "
-"including ones not included in this list, may be examined with #{tasksel --"
-"task-packages}#."
+"including the ones not included in this list, may be examined with #{tasksel "
+"--task-packages}#."
msgstr ""
#. type: Plain text
@@ -883,7 +886,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:266
msgid ""
-"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
+"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 "
"to #{lb config}#. Choose the method implementing the preferred behaviour for "
"package installation, the notable difference being how missing packages are "
@@ -952,11 +955,11 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:294
msgid ""
-"This will not influence the entries in /etc/apt/sources.list, but merely "
-"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
-"APT needs those indices in order to operate in the live system, so before "
-"performing #{apt-cache search}# or #{apt-get install}#, for instance, the "
-"user must #{apt-get update}# first to create those indices."
+"This will not influence the entries in #{/etc/apt/sources.list}#, but merely "
+"whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is "
+"that APT needs those indices in order to operate in the live system, so "
+"before performing #{apt-cache search}# or #{apt-get install}#, for instance, "
+"the user must #{apt-get update}# first to create those indices."
msgstr ""
#. type: Plain text
@@ -1019,11 +1022,11 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:314
msgid ""
-"Let's say you are building a Wheezy 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 "
+"Let's say you are building a wheezy 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, Wheezy. The following will "
+"taken from the target system distribution, wheezy. The following will "
"accomplish this:"
msgstr ""
@@ -1051,7 +1054,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:331
#, no-wrap
-msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with Wheezy using:\n"
+msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:\n"
msgstr ""
#. type: Plain text
@@ -1066,9 +1069,9 @@ msgid ""
"the case where you do not want a package that is recommended by another "
"package. Suppose you are building an LXDE image using #{--package-lists lxde}"
"# option, but don't want the user prompted to store wifi passwords in the "
-"keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
-"turn recommends #{gnome-keyring}#. So you want to omit the recommended #"
-"{gnome-keyring}# package. This can be done by adding the following stanza to "
+"keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in "
+"turn recommends /{gnome-keyring}/. So you want to omit the recommended /"
+"{gnome-keyring}/ package. This can be done by adding the following stanza to "
"#{config/chroot_apt/preferences}#:"
msgstr ""
diff --git a/manual/po/de/user_customization-runtime.ssi.po b/manual/po/de/user_customization-runtime.ssi.po
index d415657..5ab405a 100644
--- a/manual/po/de/user_customization-runtime.ssi.po
+++ b/manual/po/de/user_customization-runtime.ssi.po
@@ -1,12 +1,11 @@
# German translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-24 15:08+0100\n"
+"POT-Creation-Date: 2012-06-03 20:02+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,28 +16,29 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -86,28 +86,29 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -374,7 +375,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:96
msgid ""
-"Persistence is a common name for different kinds of solutions for saving "
+"'Persistence' is a common name for different kinds of solutions for saving "
"across reboots some, or all, of this run-time evolution of the system. To "
"understand how it could work it could be handy to know that even if the "
"system is booted and run from read-only media, modification to the files and "
@@ -389,15 +390,16 @@ msgid ""
"medium like local storage media, a network share or even a session of a "
"multisession (re)writable CD/DVD. All these media are supported in Debian "
"Live in different ways, and all but the last one require a special boot "
-"parameter to be specified at boot time: #{persistent}#."
+"parameter to be specified at boot time: #{persistence}#."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:100
msgid ""
-"If the boot parameter #{persistent}# is set (and #{nopersistent}# is not "
+"If the boot parameter #{persistence}# is set (and #{nopersistence}# is not "
"set), local storage media (e.g. hard disks, USB drives) will be probed for "
-"persistent volumes during boot. A persistent volume is any of the following:"
+"persistence volumes during boot. A persistence volume is any of the "
+"following:"
msgstr ""
#. type: Plain text
@@ -416,20 +418,20 @@ msgid ""
"_* an image/archive file located on the root of any readable filesystem "
"(even an NTFS partition of a foreign OS), identified by its file name. In "
"this case the file name must also use the containing filesystem as the file "
-"extension, e.g. \"<label>.ext3\"."
+"extension, e.g. \"<label>.ext4\"."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:108
msgid ""
-"It is possible to restrict which types of persistent volumes to use by "
+"It is possible to restrict which types of persistence volumes to use by "
"specifying certain boot parameters described in the live-boot(7) man page. "
"The \"identifying labels\" referred to above can be any of the following:"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:110
-msgid "_* #{full-ov}# for full persistent overlays."
+msgid "_* #{full-ov}# for full persistence overlays."
msgstr ""
#. type: Plain text
@@ -449,7 +451,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:118
-msgid "3~ Full persistent overlays"
+msgid "3~ Full persistence overlays"
msgstr ""
#. type: Plain text
@@ -457,15 +459,15 @@ msgstr ""
msgid ""
"By 'full persistence' it is meant that instead of using a tmpfs for storing "
"modifications to the read-only media (with the copy-on-write, COW, system) a "
-"persistent volume is used. For this type of persistence the volume label "
-"must be #{full-ov}#. This could, for instance, be an ext2 partition on a "
+"persistence volume is used. For this type of persistence the volume label "
+"must be #{full-ov}#. This could, for instance, be an ext4 partition on a "
"hard disk or on a usb key created with, e.g.:"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:124
#, no-wrap
-msgid " # mkfs.ext2 -L full-ov /dev/sdb1\n"
+msgid " # mkfs.ext4 -L full-ov /dev/sdb1\n"
msgstr ""
#. type: Plain text
@@ -489,7 +491,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:138
msgid ""
-"Here's an example of how to create an ext2-based image file used for full "
+"Here's an example of how to create an ext4-based image file used for full "
"persistence:"
msgstr ""
@@ -498,7 +500,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file\n"
-" $ /sbin/mkfs.ext2 -F full-ov\n"
+" $ /sbin/mkfs.ext4 -F full-ov\n"
msgstr ""
#. type: Plain text
@@ -517,54 +519,54 @@ msgstr ""
#: en/user_customization-runtime.ssi:151
msgid ""
"A volume with the label #{custom-ov}# can be configured to make arbitrary "
-"directories persistent. The file #{live.persist}#, located on the volume's "
-"filesystem root, controls which directories it makes persistent, and in "
-"which way."
+"directories persistent. The file #{live-persistence.conf}#, located on the "
+"volume's filesystem root, controls which directories it makes persistent, "
+"and in which way."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:153
msgid ""
"How custom overlay mounts are configured is described in full detail in the "
-"live.persist(5) man page, but a simple example should be sufficient for most "
-"uses. Let's say we want to make our home directory and APT cache persistent "
-"in an ext3 filesystem on the /dev/sdb1 partition:"
+"live-persistence.conf(5) man page, but a simple example should be sufficient "
+"for most uses. Let's say we want to make our home directory and APT cache "
+"persistent in an ext4 filesystem on the /dev/sdb1 partition:"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:160
#, no-wrap
msgid ""
-" $ mkfs.ext3 -L custom-ov /dev/sdb1\n"
-" $ mount -t ext3 /dev/sdb1 /mnt\n"
-" $ echo \"/home\" >> /mnt/live.persist\n"
-" $ echo \"/var/cache/apt\" >> /mnt/live.persist\n"
+" $ mkfs.ext4 -L custom-ov /dev/sdb1\n"
+" $ mount -t ext4 /dev/sdb1 /mnt\n"
+" $ echo \"/home\" >> /mnt/live-persistence.conf\n"
+" $ echo \"/var/cache/apt\" >> /mnt/live-persistence.conf\n"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:164
msgid ""
-"Then we reboot. During the first boot the contents of /home and /var/cache/"
-"apt will be copied into the persistent volume, and from then on all changes "
-"to these directories will live in the persistent volume. Please note that "
-"any paths listed in the #{live.persist}# file cannot contain white spaces or "
-"the special \".\" and \"..\" path components. Also, neither \"/live\" (or "
-"any of its sub-directories) nor \"/\" can be made persistent using custom "
-"mounts (for the latter, use the #{full-ov}# type persistence described "
-"above)."
+"Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
+"cache/apt}# will be copied into the persistence volume, and from then on all "
+"changes to these directories will live in the persistence volume. Please "
+"note that any paths listed in the #{live-persistence.conf}# file cannot "
+"contain white spaces or the special #{.}# and #{..}# path components. Also, "
+"neither #{/live}# (or any of its sub-directories) nor #{/}# can be made "
+"persistent using custom mounts (for the latter, use the #{full-ov}# type "
+"persistence described above)."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:166
msgid ""
-"Several different custom overlay volumes (with their own #{live.persist}# "
-"files) can be used at the same time, but if several volumes make the same "
-"directory persistent, only one of them will be used. If any two mounts are "
-"\"nested\" (i.e. one is a sub-directory of the other) the parent will be "
+"Several different custom overlay volumes (with their own #{live-persistence."
+"conf}# files) can be used at the same time, but if several volumes make the "
+"same directory persistent, only one of them will be used. If any two mounts "
+"are \"nested\" (i.e. one is a sub-directory of the other) the parent will be "
"mounted before the child so no mount will be hidden by the other. Nested "
-"custom mounts are problematic if they are listed in the same #{live.persist}"
-"# file. See the live.persist(5) man page for how to handle that case if you "
-"really need it (hint: you usually don't)."
+"custom mounts are problematic if they are listed in the same #{live-"
+"persistence.conf}# file. See the live-persistence.conf(5) man page for how "
+"to handle that case if you really need it (hint: you usually don't)."
msgstr ""
#. type: Plain text
@@ -576,13 +578,13 @@ msgstr ""
#: en/user_customization-runtime.ssi:170
msgid ""
"Snapshots are collections of files and directories which are not mounted "
-"while running but which are copied from a persistent volume to the system "
+"while running but which are copied from a persistence volume to the system "
"(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The "
"volume must be labeled #{live-sn}#, and it defaults to a simple cpio archive "
"named #{live-sn.cpio.gz}#. A power interruption during run time could lead "
"to data loss, hence, if you have important changes, invoke #{live-snapshot --"
"refresh}# as often as needed. This type of persistence, since it does not "
-"write continuously to the persistent media, is the most flash-based device "
+"write continuously to the persistence media, is the most flash-based device "
"friendly and the fastest of all the persistence systems, but it occupies as "
"much RAM as the size of the uncompressed snapshot."
msgstr ""
@@ -601,19 +603,19 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:176
-msgid "3~ Persistent SubText"
+msgid "3~ Persistence SubText"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:178
msgid ""
-"If a user would need multiple persistent storage of the same type for "
+"If a user would need multiple persistence storage of the same type for "
"different locations or testing, such as #{full-ov-nonwork}# and #{full-ov-"
-"work}#, the boot parameter #{persistent-subtext}# used in conjunction with "
-"the boot parameter #{persistent}# will allow for multiple but unique "
-"persistent media. An example would be if a user wanted to use a persistent "
+"work}#, the boot parameter #{persistence-subtext}# used in conjunction with "
+"the boot parameter #{persistence}# will allow for multiple but unique "
+"persistence media. An example would be if a user wanted to use a persistence "
"partition labeled #{live-sn-subText}# they would use the boot parameters of: "
-"#{persistent}# #{persistent-subtext=subText}#."
+"#{persistence}# #{persistence-subtext=subText}#."
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index 75705a5..20b9f9d 100644
--- a/manual/po/de/user_examples.ssi.po
+++ b/manual/po/de/user_examples.ssi.po
@@ -1,12 +1,11 @@
# German translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-13 14:44+0100\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -22,26 +21,27 @@ msgid ":B~ Examples"
msgstr ":B~ Beispiele"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 en/user_customization-contents.ssi:26
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -67,49 +67,51 @@ msgstr ":B~ Beispiele"
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 en/user_customization-contents.ssi:31
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -135,25 +137,26 @@ msgstr ""
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
@@ -165,7 +168,7 @@ msgid " # lb build\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#: en/user_customization-binary.ssi:41 en/user_examples.ssi:95
#, no-wrap
msgid " #!/bin/sh\n"
msgstr ""
@@ -274,7 +277,7 @@ msgstr ""
#: en/user_examples.ssi:46
msgid ""
"Assuming all goes well, after a while, the current directory will contain #"
-"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+"{binary.hybrid.iso}#. This ISO hybrid image can be booted directly in a "
"virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-"
"with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
"virtualbox, or else imaged onto optical media or a USB flash device as "
@@ -403,9 +406,9 @@ msgid ""
"First, #{--architectures i386}# ensures that on our #{amd64}# build system, "
"we build a 32-bit version suitable for use on most machines. Second, we use #"
"{--linux-flavours 686-pae}# because we don't anticipate using this image on "
-"much older systems. Third, we've chosen the #{lxde}# package list to give us "
+"much older systems. Third, we've chosen the /{lxde}/ package list to give us "
"a minimal desktop. And finally, we have added two initial favourite "
-"packages: #{iceweasel}# and #{xchat}#."
+"packages: /{iceweasel}/ and /{xchat}/."
msgstr ""
#. type: Plain text
@@ -445,8 +448,8 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:137
msgid ""
-"In this revision, we're going to clean up from the first build, add the #"
-"{vlc}# package to our configuration, rebuild, test and commit."
+"In this revision, we're going to clean up from the first build, add the /"
+"{vlc}/ package to our configuration, rebuild, test and commit."
msgstr ""
#. type: Plain text
@@ -467,7 +470,7 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:147
msgid ""
-"Now append the #{vlc}# package to our local package list in #{config/package-"
+"Now append the /{vlc}/ package to our local package list in #{config/package-"
"lists/my.list.chroot}#:"
msgstr ""
@@ -534,8 +537,8 @@ msgstr ""
#: en/user_examples.ssi:179
msgid ""
"Make a build directory and create a skeletal configuration in it built "
-"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
-"{xvnc4viewer}#, disabling recommends to make a minimal system:"
+"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
+"{xvnc4viewer}/, disabling recommends to make a minimal system:"
msgstr ""
#. type: Plain text
@@ -553,8 +556,8 @@ msgstr ""
#: en/user_examples.ssi:191
msgid ""
"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
-"the default user that will launch metacity and start xvncviewer, connecting "
-"to port #{5901}# on a server at #{192.168.1.2}#:"
+"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
+"connecting to port #{5901}# on a server at #{192.168.1.2}#:"
msgstr ""
#. type: Plain text
@@ -610,10 +613,10 @@ msgid ""
"the tradeoffs you are making between size and functionality. In this "
"example, we trim only so much as to make room for additional material within "
"a 128M media size, but without doing anything to destroy integrity of the "
-"packages contained within, such as the purging of locale data via the #"
-"{localepurge}# package, or other such \"intrusive\" optimizations. Of "
+"packages contained within, such as the purging of locale data via the /"
+"{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
"particular note, you should not use #{--bootstrap-flavour minimal}# unless "
-"you really know what you're doing, as omitting priority #{important}# "
+"you really know what you're doing, as omitting priority *{important}* "
"packages will most likely produce a broken live system."
msgstr ""
@@ -649,8 +652,8 @@ msgid ""
"system. Choosing the #{minimal}# package list leaves out the large #{locales}"
"# package and associated utilities. Dropping recommended packages with #{--"
"apt-recommends false}# saves some additional space, at the expense of "
-"omitting some packages you might otherwise expect to be there, such as #"
-"{firmware-linux-free}# which may be needed to support certain hardware. The "
+"omitting some packages you might otherwise expect to be there, such as /"
+"{firmware-linux-free}/ which may be needed to support certain hardware. The "
"remaining options shave off additional small amounts of space. It's up to "
"you to decide if the functionality that is sacrificed with each optimization "
"is worth the loss in functionality."
@@ -750,8 +753,8 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:292
msgid ""
-"Note that we have included the #{debian-installer-launcher}# package to "
-"launch the installer from the live desktop, and have also specified the 486 "
-"flavour kernel, as it is currently necessary to make the installer and live "
-"system kernels match for the launcher to work properly."
+"Note that we have included the debian-installer-launcher package to launch "
+"the installer from the live desktop, and have also specified the 486 flavour "
+"kernel, as it is currently necessary to make the installer and live system "
+"kernels match for the launcher to work properly."
msgstr ""
diff --git a/manual/po/de/user_installation.ssi.po b/manual/po/de/user_installation.ssi.po
index 68590fe..2fdbaaa 100644
--- a/manual/po/de/user_installation.ssi.po
+++ b/manual/po/de/user_installation.ssi.po
@@ -1,12 +1,11 @@
# German translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-31 16:32+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,29 +16,30 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -87,29 +87,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -408,16 +409,16 @@ msgstr ""
#: en/user_installation.ssi:125
msgid ""
"You must build either on your target distribution or in a chroot containing "
-"your target platform: this means if your target is Wheezy then you should "
-"build against Wheezy."
+"your target platform: this means if your target is wheezy then you should "
+"build against wheezy."
msgstr ""
#. type: Plain text
#: en/user_installation.ssi:127
msgid ""
"Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
-"build #{live-boot}# for a target distribution that differs from your build "
-"system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy "
+"build live-boot for a target distribution that differs from your build "
+"system. For example, for wheezy live images, build live-boot in a wheezy "
"chroot. If your target distribution happens to match your build system "
"distribution, you may build directly on the build system using #{dpkg-"
"buildpackage}# (provided by the /{dpkg-dev}/ package):"
diff --git a/manual/po/de/user_managing_a_configuration.ssi.po b/manual/po/de/user_managing_a_configuration.ssi.po
index 2477772..a131226 100644
--- a/manual/po/de/user_managing_a_configuration.ssi.po
+++ b/manual/po/de/user_managing_a_configuration.ssi.po
@@ -1,12 +1,11 @@
# German translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,28 +16,30 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -62,21 +63,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -85,28 +87,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -130,21 +134,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -216,7 +221,7 @@ msgid ""
"variable values, and each time you run #{lb config}# and #{lb clean}#, these "
"files will be executed. This will ensure that your configuration is kept "
"internally consistent from one revision to the next and from one live-build "
-"release to the next (though you will still have to take care and read the "
+"release to the next (Although you will still have to take care and read the "
"documentation when you upgrade live-build and make adjustments as needed)."
msgstr ""
diff --git a/manual/po/de/user_overview.ssi.po b/manual/po/de/user_overview.ssi.po
index 67349d8..40ed412 100644
--- a/manual/po/de/user_overview.ssi.po
+++ b/manual/po/de/user_overview.ssi.po
@@ -1,12 +1,11 @@
# German translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-19 18:09+0100\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,28 +16,30 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -62,21 +63,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -85,28 +87,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -130,21 +134,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -192,15 +197,15 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:14
msgid ""
-"Many concepts are similar to those in the debhelper Debian package tools "
+"Many concepts are similar to those in the /{debhelper}/ Debian package tools "
"written by Joey Hess:"
msgstr ""
#. type: Plain text
#: en/user_overview.ssi:16
msgid ""
-"_* The scripts have a central location for configuring their operation. In "
-"debhelper, this is the #{debian/}# subdirectory of a package tree. For "
+"_* The scripts have a central location for configuring their operation. In /"
+"{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For "
"example, dh_install will look, amongst others, for a file called #{debian/"
"install}# to determine which files should exist in a particular binary "
"package. In much the same way, live-build stores its configuration entirely "
@@ -217,9 +222,9 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:20
msgid ""
-"Unlike debhelper, live-build contains a tool to generate a skeleton "
+"Unlike /{debhelper}/, live-build contains a tool to generate a skeleton "
"configuration directory, #{lb config}#. This could be considered to be "
-"similar to tools such as #{dh-make}#. For more information about #{lb config}"
+"similar to tools such as /{dh-make}/. For more information about #{lb config}"
"#, please see {The lb config command}#lb-config."
msgstr ""
diff --git a/manual/po/es/about_manual.ssi.po b/manual/po/es/about_manual.ssi.po
index c086678..0cb3adc 100644
--- a/manual/po/es/about_manual.ssi.po
+++ b/manual/po/es/about_manual.ssi.po
@@ -1,5 +1,4 @@
# Spanish translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
@@ -10,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-07 08:59-0400\n"
-"PO-Revision-Date: 2012-03-07 22:32+0100\n"
+"POT-Creation-Date: 2012-04-18 19:35+0300\n"
+"PO-Revision-Date: 2012-04-23 20:31+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -36,31 +35,39 @@ msgstr "1~about-manual Acerca de este manual"
msgid ""
"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 7.0 \"Wheezy\" 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."
+"by the project for the Debian 7.0 \"wheezy\" release. An up-to-date version "
+"can always be found at http://live.debian.net/"
msgstr ""
"El objetivo principal de este manual es servir como único punto de acceso a "
"toda la documentación referente al projecto Debian Live y en particular al "
-"sofware que el proyecto crea para Debian 7.0 \"Wheezy\". Está principalmente "
-"enfocado a ayudar en la creación de un sistema en vivo y no está dirigido al "
-"usuario final de estos sistemas. Un usuario final puede encontrar "
-"información útil en las siguentes secciones: {Conceptos básicos}#the-basics "
-"que cubre la preparación de las imágenes para arrancar un sistema desde un "
-"medio de almacenamiento o desde una red local. {Personalización del "
-"comportamiento en tiempo de ejecución}#customizing-run-time-behaviours que "
-"describe algunas de las opciones que pueden especificarse en el indicador de "
-"arranque, como pueden ser la selección de la distribución del teclado, las "
-"variantes locales o la persistencia."
+"sofware que el proyecto crea para Debian 7.0 \"wheezy\". Se puede encontrar "
+"siempre una versión actualizada en http://live.debian.net/"
+
+#. type: Plain text
+#: en/about_manual.ssi:8
+msgid ""
+"While live-manual 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 ""
+"live-manual está principalmente enfocado a ayudar en la creación de un "
+"sistema en vivo y no está dirigido al usuario final de estos sistemas. Un "
+"usuario final puede encontrar información útil en las siguentes secciones: "
+"{Conceptos básicos}#the-basics que cubre la preparación de las imágenes para "
+"arrancar un sistema desde un medio de almacenamiento o desde una red local. "
+"{Personalización del comportamiento en tiempo de ejecución}#customizing-run-"
+"time-behaviours que describe algunas de las opciones que pueden "
+"especificarse en el indicador de arranque, como pueden ser la selección de "
+"la distribución del teclado, las variantes locales o la persistencia."
# El idioma ingles necesita personalizar los verbos. En castellano tenemos tres formas, la forma coloquial (tu), la forma de respeto (ustéd) y la impersonal. Se utilizará esta última forma con el fin de darle al manual el rigor que se merece.
# root se entiende que es nombre propio. Se deja con minúscula inicial deliberadamente.
#. type: Plain text
-#: en/about_manual.ssi:8
+#: en/about_manual.ssi:10
msgid ""
"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 "
@@ -78,63 +85,74 @@ msgstr ""
"orden."
#. type: Plain text
-#: en/about_manual.ssi:10
+#: en/about_manual.ssi:12
msgid "2~ For the impatient"
msgstr "2~ Para el impaciente."
-# A pesar de que "software" es un termino difundido entre los "entendidos" en el tema, se intentará esquivar de la mejor manera posible en cada frase.
-# Se entiend eque netboot es un nombre propio y se pone en minúsculas de manera premeditada
#. type: Plain text
-#: en/about_manual.ssi:12
+#: en/about_manual.ssi:14
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 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."
+"the details. Therefore, we suggest reading in the following order."
msgstr ""
"Aunque se cree que todo lo descrito en este manual es importante para la "
"mayoría de los usuarios, es cierto que hay mucho material a interiorizar y "
"que los usuarios desean experimentar con las herramientas de forma rápida y "
"satisfactoria antes de entrar en detalles. Por lo tanto, se sugiere leer "
-"siguiendo el siguiente orden. Primero leer el capítulo {Acerca de este "
-"manual}#about-manual, desde el principio y terminando en la sección "
-"{Términos}#terms. Después saltar hasta los tres tutoriales que están al "
-"principio de la sección {Ejemplos}#examples pensados para aprender a "
-"configurar y construir imágenes de sistemas en vivo de forma básica. Se "
-"deberá leer primero {Uso de los ejemplos}#using-the-examples, seguido de "
-"{Tutorial 1: Una imagen estándar}#tutorial-1 y {Tutorial 2: Una utilidad de "
-"navegador web}#tutorial-2, para finalizar con {Tutorial 3: Una imagen "
-"personalizada}#tutorial-3. Al final de estos tutoriales, el lector tendrá "
-"una visión de lo que se puede hacer con Debian Live. Se anima a profundizar "
-"en el estudio del manual con la lectura detenida del siguiente capítulo: "
-"{Conceptos básicos}#the-basics, y de una manera más somera el capítulo {La "
-"creación de una imagen netboot}#building-netboot-image, para acabar con la "
-"lectura de {Descripción general de la personalización}#customization-"
-"overview y los capítulos que le siguen. Se espera que, en este punto, el "
-"lector esté lo suficientemente motivado con lo que se puede hacer con Debian "
-"Live para leer el resto del manual, de principio a fin."
+"siguiendo el siguiente orden."
#. type: Plain text
-#: en/about_manual.ssi:14
+#: en/about_manual.ssi:16
+msgid ""
+"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."
+msgstr ""
+"Primero leer el capítulo {Acerca de este manual}#about-manual, desde el "
+"principio y terminando en la sección {Términos}#terms. Después saltar hasta "
+"los tres tutoriales que están al principio de la sección {Ejemplos}#examples "
+"pensados para aprender a configurar y construir imágenes de sistemas en vivo "
+"de forma básica. Se deberá leer primero {Uso de los ejemplos}#using-the-"
+"examples, seguido de {Tutorial 1: Una imagen estándar}#tutorial-1 y "
+"{Tutorial 2: Una utilidad de navegador web}#tutorial-2, para finalizar con "
+"{Tutorial 3: Una imagen personalizada}#tutorial-3. Al final de estos "
+"tutoriales, el lector tendrá una visión de lo que se puede hacer con Debian "
+"Live."
+
+#. type: Plain text
+#: en/about_manual.ssi:18
+msgid ""
+"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 ""
+"Se anima a profundizar en el estudio del manual con la lectura detenida del "
+"siguiente capítulo: {Conceptos básicos}#the-basics, y de una manera más "
+"somera el capítulo {La creación de una imagen netboot}#building-netboot-"
+"image, para acabar con la lectura de {Descripción general de la "
+"personalización}#customization-overview y los capítulos que le siguen. Se "
+"espera que, en este punto, el lector esté lo suficientemente motivado con lo "
+"que se puede hacer con Debian Live para leer el resto del manual, de "
+"principio a fin."
+
+#. type: Plain text
+#: en/about_manual.ssi:20
msgid "2~terms Terms"
msgstr "2~terms Términos"
#. type: Plain text
-#: en/about_manual.ssi:16
+#: en/about_manual.ssi:22
msgid ""
"_* *{Live system}*: An operating system that can boot without installation "
"to a hard drive. Live systems do not alter local operating system(s) or file"
@@ -151,7 +169,7 @@ msgstr ""
"desde la red local."
#. type: Plain text
-#: en/about_manual.ssi:18
+#: en/about_manual.ssi:24
msgid ""
"_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, "
"live-build, live-config, and live-manual packages."
@@ -162,7 +180,7 @@ msgstr ""
# Se ha traducido "USB Stick" como "llave USB" que se mantendrá así en el resto del documento siempre que se necesite hacer referencia al dispositivo de memoria USB.
# No se ha traducido netboot entendiendo que es un nombre propio aunque se ha dejado la minúscula intencionadamente.
#. type: Plain text
-#: en/about_manual.ssi:20
+#: en/about_manual.ssi:26
msgid ""
"_* *{Debian Live system}*: A live system that uses software from the Debian "
"operating system that may be booted from CDs, DVDs, USB sticks, over the "
@@ -176,7 +194,7 @@ msgstr ""
# Se entiend Host como Nombre propio.
#. type: Plain text
-#: en/about_manual.ssi:22
+#: en/about_manual.ssi:28
msgid "_* *{Host system}*: The environment used to create the live system."
msgstr ""
"_* *{Sistema huésped}*: Es el conjunto de herramientas y equipo utilizado "
@@ -184,7 +202,7 @@ msgstr ""
# Se entiende que Target es un nombre propio.
#. type: Plain text
-#: en/about_manual.ssi:24
+#: en/about_manual.ssi:30
msgid "_* *{Target system}*: The environment used to run the live system."
msgstr ""
"_* *{Sistema objetivo}*: Es el conjunto de herramientas y equipo donde se "
@@ -192,38 +210,39 @@ msgstr ""
# No se ha traducido scripts entendiendo que es un nombre propio. Se ha dejado en minúscula deliberadamente.
#. type: Plain text
-#: en/about_manual.ssi:26
+#: en/about_manual.ssi:32
msgid ""
"_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
-"boot was formerly a part of live-initramfs."
+"boot was formerly a part of /{live-initramfs}/."
msgstr ""
"_* *{live-boot}*: Es una colección de scripts que serán responsables de "
"arrancar el sistema en vivo. live-boot fue anteriormente una parte del "
-"paquete live-initramfs."
+"paquete /{live-initramfs}/."
#. type: Plain text
-#: en/about_manual.ssi:28
+#: en/about_manual.ssi:34
msgid ""
"_* *{live-build}*: A collection of scripts used to build customized Debian "
-"Live systems. live-build was formerly known as live-helper, and even earlier "
-"known as live-package."
+"Live systems. live-build was formerly known as /{live-helper}/, and even "
+"earlier known as /{live-package}/."
msgstr ""
"_* *{live-build}*: Es una colección de scripts utilizados para construir "
"sistemas Debian Live personalizados. live-build fue conocido anteriormente "
-"como live-helper, y en una versión anterior como live-package."
+"como /{live-helper}/, y en una versión anterior como /{live-package}/."
#. type: Plain text
-#: en/about_manual.ssi:30
+#: en/about_manual.ssi:36
msgid ""
"_* *{live-config}*: A collection of scripts used to configure a live system "
-"during the boot process. live-config was formerly a part of live-initramfs."
+"during the boot process. live-config was formerly a part of /{live-"
+"initramfs}/."
msgstr ""
"_* *{live-config}*: Es una colección de scripts utilizados para configurar "
"un sistema en vivo durante el proceso de arranque. live-config fue "
-"anteriormente parte del paquete live-initramfs."
+"anteriormente parte del paquete /{live-initramfs}/."
#. type: Plain text
-#: en/about_manual.ssi:32
+#: en/about_manual.ssi:38
msgid ""
"_* *{live-manual}*: This document is maintained in a package called live-"
"manual."
@@ -234,7 +253,7 @@ msgstr ""
# Se ha traducido system por mecanismo para no confundir con la traducción de system entendida como un conjunto de equipo+herramientas que sirven para realizar una actividad concreta.
# Se ha preferido no traducir Debian Installer entendiendolo como nombre propio.
#. type: Plain text
-#: en/about_manual.ssi:34
+#: en/about_manual.ssi:40
msgid ""
"_* *{Debian Installer (d-i)}*: The official installation system for the "
"Debian distribution."
@@ -243,7 +262,7 @@ msgstr ""
"oficial de instalación para la distribución Debian."
#. type: Plain text
-#: en/about_manual.ssi:36
+#: en/about_manual.ssi:42
msgid ""
"_* *{Boot parameters}*: Parameters that can be entered at the bootloader "
"prompt to influence the kernel or live-config."
@@ -255,18 +274,18 @@ msgstr ""
# No se ha traducido chroot entendiendo que es nombre propio, manteniendo la minúscula deliberadamente.
#. type: Plain text
-#: en/about_manual.ssi:38
+#: en/about_manual.ssi:44
msgid ""
-"_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+"_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run "
"different instances of the GNU/Linux environment on a single system "
"simultaneously without rebooting."
msgstr ""
-"_* *{chroot}*: El programa chroot, #{chroot(8)}#, permite ejecutar "
+"_* *{chroot}*: El programa /{chroot}/, #{chroot(8)}#, permite ejecutar "
"diferentes instancias de un entorno GNU/Linux en un solo sistema de manera "
"simultánea sin necesidad de reiniciar el sistema."
#. type: Plain text
-#: en/about_manual.ssi:40
+#: en/about_manual.ssi:46
msgid ""
"_* *{Binary image}*: A file containing the live system, such as binary.iso "
"or binary.img."
@@ -275,7 +294,7 @@ msgstr ""
"vivo. Su nombre puede ser binary.iso o binary.img dependiendo de su formato."
#. type: Plain text
-#: en/about_manual.ssi:42
+#: en/about_manual.ssi:48
msgid ""
"_* *{Target distribution}*: The distribution upon which your live system "
"will be based. This can differ from the distribution of your host system."
@@ -284,122 +303,107 @@ msgstr ""
"cual estará basado el sistema en vivo que puede diferir de la versión de la "
"distribución en el sistema huésped."
-# Se han mantenido stable, testing y unstable en negrita entendiendo que son nombres propios que pueden ser introducidos en comandos
#. type: Plain text
-#: en/about_manual.ssi:44
-msgid ""
-"_* *{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."
-msgstr ""
-"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Son los nombres clave "
-"de las diferentes versiones de distribución Debian. En el momento de "
-"escribir este documento, Squeeze es la actual versión *{stable}* o estable, "
-"Wheezy es la actual versión *{testing}* o en pruebas. Sid es y será siempre "
-"sinónimo de versión *{unstable}* o inestable. A lo largo de todo el manual "
-"se usan los nombres en clave de las versiones ya que las herramientas "
-"también los usan."
-
-#. type: Plain text
-#: en/about_manual.ssi:46
+#: en/about_manual.ssi:50
msgid ""
-"The *{stable}* distribution contains the latest officially released "
-"distribution of Debian. The *{testing}* distribution is the staging area for "
-"the next *{stable}* release. A major advantage of using this distribution is "
-"that it has more recent versions of software relative to the *{stable}* "
-"release. The *{unstable}* distribution is where active development of Debian "
-"occurs. Generally, this distribution is run by developers and those who like "
-"to live on the edge."
-msgstr ""
-"La distribución *{stable}* contiene la última distribución Debian "
-"oficialmente publicada. La distribución *{testing}* está en la rampa de "
-"salida para ser la próxima distribución *{stable}*. La principal ventaja de "
-"utilizar esta distribución es que tiene versiones de programas más recientes "
-"si se compara con la versión *{stable}*. La distribución *{unstable}* es "
-"dónde se realiza el desarrollo de Debian. Generalmente esta distribución es "
-"usada por los desarrolladores y aquellos que les gusta vivir al filo de lo "
-"imposible."
+"_* *{stable/testing/unstable}*: The *{stable}* distribution contains the "
+"latest officially released distribution of Debian. The *{testing}* "
+"distribution is the staging area for the next *{stable}* release. A major "
+"advantage of using this distribution is that it has more recent versions of "
+"software relative to the *{stable}* release. The *{unstable}* distribution "
+"is where active development of Debian occurs. Generally, this distribution "
+"is run by developers and those who like to live on the edge. Throughout the "
+"manual, we tend to use codenames for the releases, such as wheezy or sid, as "
+"that is what is supported by the tools themselves."
+msgstr ""
+"_* *{stable/testing/unstable}*: La distribución *{stable}* contiene la "
+"última distribución Debian oficialmente publicada. La distribución *{testing}"
+"* está en la rampa de salida para ser la próxima distribución *{stable}*. La "
+"principal ventaja de utilizar esta distribución es que tiene versiones de "
+"programas más recientes si se compara con la versión *{stable}*. La "
+"distribución *{unstable}* es dónde se realiza el desarrollo de Debian. "
+"Generalmente esta distribución es usada por los desarrolladores y aquellos "
+"que les gusta vivir al filo de lo imposible. A lo largo del manual, se usan "
+"sus nombres en clave, como por ejemplo wheezy o sid, ya que es lo que las "
+"mismas herramientas reconocen. "
#. type: Plain text
-#: en/about_manual.ssi:48
+#: en/about_manual.ssi:52
msgid "2~ Authors"
msgstr "2~ Autores"
#. type: Plain text
-#: en/about_manual.ssi:50
+#: en/about_manual.ssi:54
msgid "A list of authors (in alphabetical order):"
msgstr "Lista de autores (en orden alfabético):"
#. type: Plain text
-#: en/about_manual.ssi:52
+#: en/about_manual.ssi:56
msgid "_* Ben Armstrong"
msgstr "_* Ben Armstrong"
#. type: Plain text
-#: en/about_manual.ssi:54
+#: en/about_manual.ssi:58
msgid "_* Brendan Sleight"
msgstr "_* Brendan Sleight"
#. type: Plain text
-#: en/about_manual.ssi:56
+#: en/about_manual.ssi:60
msgid "_* Chris Lamb"
msgstr "_* Chris Lamb"
#. type: Plain text
-#: en/about_manual.ssi:58
+#: en/about_manual.ssi:62
msgid "_* Daniel Baumann"
msgstr "_* Daniel Baumann"
#. type: Plain text
-#: en/about_manual.ssi:60
+#: en/about_manual.ssi:64
msgid "_* Franklin Piat"
msgstr "_* Franklin Piat"
#. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:66
msgid "_* Jonas Stein"
msgstr "_* Jonas Stein"
#. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:68
msgid "_* Kai Hendry"
msgstr "_* Kai Hendry"
#. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:70
msgid "_* Marco Amadori"
msgstr "_* Marco Amadori"
#. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:72
msgid "_* Mathieu Geli"
msgstr "_* Mathieu Geli"
#. type: Plain text
-#: en/about_manual.ssi:70
+#: en/about_manual.ssi:74
msgid "_* Matthias Kirschner"
msgstr "_* Matthias Kirschner"
#. type: Plain text
-#: en/about_manual.ssi:72
+#: en/about_manual.ssi:76
msgid "_* Richard Nelson"
msgstr "_* Richard Nelson"
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:78
msgid "_* Trent W. Buck"
msgstr "_* Trent W. Buck"
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:80
msgid "2~how-to-contribute Contributing to this document"
msgstr "2~how-to-contribute Cómo contribuir en este documento"
#. type: Plain text
-#: en/about_manual.ssi:78
+#: en/about_manual.ssi:82
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -412,7 +416,7 @@ msgstr ""
"sección {Contacto}#contact para más información."
#. type: Plain text
-#: en/about_manual.ssi:80
+#: en/about_manual.ssi:84
msgid ""
"When submitting a contribution, please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted, the "
@@ -425,7 +429,7 @@ msgstr ""
"documento, esto es, GPL versión 3 o posterior."
#. type: Plain text
-#: en/about_manual.ssi:82
+#: en/about_manual.ssi:86
msgid ""
"The sources for this manual are maintained using the Git version control "
"system. You can check out the latest copy by executing:"
@@ -435,28 +439,29 @@ msgstr ""
"siguiente orden:"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -480,56 +485,58 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:86
+#: en/about_manual.ssi:90
msgid "$ 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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -553,30 +560,31 @@ msgstr ""
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/about_manual.ssi:90
+#: en/about_manual.ssi:94
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -587,13 +595,13 @@ msgstr ""
"necesarios para la construcción de live-manual ejecutando la siguiente orden:"
#. type: Plain text
-#: en/about_manual.ssi:94
+#: en/about_manual.ssi:98
#, no-wrap
msgid " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:98
+#: en/about_manual.ssi:102
msgid ""
"You may build the live-manual from the top level directory of your Git "
"checkout by executing:"
@@ -603,13 +611,13 @@ msgstr ""
"la siguiente orden:\n"
#. type: Plain text
-#: en/about_manual.ssi:102
+#: en/about_manual.ssi:106
#, no-wrap
msgid " $ make build\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:110
msgid ""
"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 "
@@ -620,40 +628,40 @@ msgstr ""
"la siguiente orden:\n"
#. type: Plain text
-#: en/about_manual.ssi:110
+#: en/about_manual.ssi:114
#, no-wrap
msgid " $ make build LANGUAGES=en\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:114
+#: en/about_manual.ssi:118
msgid "It is also possible to build by document type, e.g:"
msgstr "Es posible generar el documento por formato:"
#. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:122
#, no-wrap
msgid " $ make build FORMATS=pdf\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:122
+#: en/about_manual.ssi:126
msgid "Or combine both, e.g:"
msgstr "O combinar ambos, por ejemplo:"
#. type: Plain text
-#: en/about_manual.ssi:126
+#: en/about_manual.ssi:130
#, no-wrap
msgid " $ make build FORMATS=html LANGUAGES=it\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:130
+#: en/about_manual.ssi:134
msgid "3~ Applying changes"
msgstr "3~ Aplicar cambios"
#. type: Plain text
-#: en/about_manual.ssi:132
+#: en/about_manual.ssi:136
msgid ""
"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 "
@@ -665,12 +673,12 @@ msgstr ""
"el siguiente procedimiento:\n"
#. type: Plain text
-#: en/about_manual.ssi:134
+#: en/about_manual.ssi:138
msgid "_* Fetch the public commit key:"
msgstr "_* Obtener la clave pública de entrega:\n"
#. type: Plain text
-#: en/about_manual.ssi:143
+#: en/about_manual.ssi:147
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
@@ -682,14 +690,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:147
+#: en/about_manual.ssi:151
msgid "_* Add the following section to your openssh-client config:"
msgstr ""
"_* Añadir la siguiente sección en el fichero de configuración de openssh-"
"client:\n"
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:160
#, no-wrap
msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
@@ -701,12 +709,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:164
msgid "_* Check out a clone of the manual through ssh:"
msgstr "_* Obtener un clon del manual mediante git utilizando ssh:\n"
#. type: Plain text
-#: en/about_manual.ssi:165
+#: en/about_manual.ssi:169
#, no-wrap
msgid ""
" $ git clone git at live.debian.net:/live-manual.git\n"
@@ -714,7 +722,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:169
+#: en/about_manual.ssi:173
msgid ""
"_* Note that you should commit any changes on the debian-next branch, not on "
"the debian branch."
@@ -723,95 +731,79 @@ msgstr ""
"Debian."
#. type: Plain text
-#: en/about_manual.ssi:171
-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 ""
-"_* Después de editar los ficheros que se deseen en #{manual/en/}#, ejecutar "
-"«make commit» en el directorio superior para sanear los ficheros y "
-"actualizar los ficheros de traducciones:\n"
-
-#. type: Plain text
#: en/about_manual.ssi:175
-#, no-wrap
-msgid " $ make commit\n"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:179
-msgid "_* Then"
-msgstr "_* Entonces"
-
-#. type: Plain text
-#: en/about_manual.ssi:183
-#, no-wrap
-msgid " $ git add .\n"
+msgid ""
+"_* Do not use #{make commit}# unless you are updating translations in this "
+"commit, and in that case, do not mix changes to the English manual and "
+"translations in the same commit, but use separate commits for each. See the "
+"{Translation}#translation section for more details."
msgstr ""
+"_* No ejecutar #{make commit}# a menos de que se actualicen las traducciones "
+"al mismo tiempo, y en ese caso, no mezclar los cambios del manual en inglés "
+"con las traducciones en el mismo commit, sino en commits separados. Ver la "
+"sección {Tranducción}#translation para más detalles."
#. type: Plain text
-#: en/about_manual.ssi:187
+#: en/about_manual.ssi:177
msgid ""
-"_* 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."
+"_* Write commit messages that consist of complete, meaningful 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 ""
-"_* Una vez se han saneado y se han añadido los ficheros, se deberán entregar "
-"los cambios. Hay que escribir un mensaje de entrega que consistirá en una o "
-"varias frases en ingles, comenzando con una letra mayúscula y acabando con "
-"un punto final. Es habitual comenzar estas frases con la forma 'Fixing/"
-"Adding/Removing/Correcting/Translating', por ejemplo:\n"
+"_* Hay que escribir un mensaje de entrega que consistirá en una o varias "
+"frases en ingles con significado completo, comenzando con una letra "
+"mayúscula y acabando con un punto final. Es habitual comenzar estas frases "
+"con la forma 'Fixing/Adding/Removing/Correcting/Translating', por ejemplo:"
#. type: Plain text
-#: en/about_manual.ssi:191
+#: en/about_manual.ssi:181
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:195
+#: en/about_manual.ssi:185
msgid "_* Push the commit to the server:"
msgstr ""
"_* Para finalizar se realizará la entrega al servidor utilizando el "
"siguiente comando:"
#. type: Plain text
-#: en/about_manual.ssi:199
+#: en/about_manual.ssi:189
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:203
+#: en/about_manual.ssi:193
msgid "3~translation Translation"
msgstr "3~translation Traducción"
#. type: Plain text
-#: en/about_manual.ssi:205
+#: en/about_manual.ssi:195
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
"Para enviar una traducción para un nuevo idioma, se deben seguir los "
"siguientes pasos:"
#. type: Plain text
-#: en/about_manual.ssi:207
+#: en/about_manual.ssi:197
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). "
-"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."
+"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."
msgstr ""
"_* Traducir los ficheros about_manual.ssi.pot, about_project.ssi.pot e index."
-"html.in.pot al idioma deseado con cualquier editor (como puede ser poedit) y "
-"enviarlos a la lista de correos. Una vez hayan sido revisados, el idioma "
-"será añadido al manual, (añadiendo los ficheros .po) y se activará en el "
-"autobuild."
+"html.in.pot al idioma deseado con cualquier editor (como puede ser /"
+"{poedit}/) y enviarlos a la lista de correos. Una vez hayan sido revisados, "
+"el idioma será añadido al manual, (añadiendo los ficheros .po) y se activará "
+"en el autobuild."
#. type: Plain text
-#: en/about_manual.ssi:209
+#: en/about_manual.ssi:199
msgid ""
"_* Once the new language is added, you can randomly start translating all po "
"files in #{manual/po/}#."
@@ -821,7 +813,7 @@ msgstr ""
"aleatoria."
#. type: Plain text
-#: en/about_manual.ssi:211
+#: en/about_manual.ssi:201
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
"are updated from the po files and then you can review your changes launching "
@@ -835,7 +827,7 @@ msgstr ""
"\"Translating...\"}# y #{git push}#."
#. type: Plain text
-#: en/about_manual.ssi:212
+#: en/about_manual.ssi:202
#, 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 "*{Nota:}* Tener en cuenta que a pesar de que tanto #{make commit}# como #{make build}# borran el directorio «build», si se crea el manual para revisar los cambios tal y como se recomienda, es posible que se desee limpiar el árbol git antes de enviar los cambios. Para hacer esto, se puede usar #{make clean}#. Este último paso no es obligatorio, gracias al fichero .gitignore, pero es una buena práctica para evitar enviar ficheros involuntariamente.\n"
diff --git a/manual/po/es/about_project.ssi.po b/manual/po/es/about_project.ssi.po
index 6996bad..1b76033 100644
--- a/manual/po/es/about_project.ssi.po
+++ b/manual/po/es/about_project.ssi.po
@@ -1,5 +1,4 @@
# Spanish translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
@@ -10,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-19 22:16+0100\n"
+"POT-Creation-Date: 2012-05-25 14:30+0300\n"
"PO-Revision-Date: 2012-02-19 21:29+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -132,8 +131,8 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:32
-msgid "_* It would be a subproject of Debian."
-msgstr "_* Sería un subproyecto de Debian."
+msgid "_* It is a subproject of Debian."
+msgstr "_* Es un subproyecto de Debian."
#. type: Plain text
#: en/about_project.ssi:34
@@ -235,29 +234,26 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:60
msgid ""
-"A system for configuring packages is provided using debconf in #{lb config}# "
-"(use --preseed FILE) allowing custom configured packages to be installed in "
-"your custom produced Debian Live images, but for official live images only "
-"default configuration will be used. For more information, please see "
-"{Customization overview}#customization-overview."
+"A system for configuring packages is provided using debconf allowing custom "
+"configured packages to be installed in your custom produced Debian Live "
+"images, but for official live images only default configuration will be "
+"used. For more information, please see {Customization overview}"
+"#customization-overview."
msgstr ""
"En #{lb config}# se emplea un sistema para configurar paquetes que utiliza "
-"debconf (mediante el uso de la opción --preseed FICHERO), permitiendo la "
-"personalización de la configuración de los paquetes que van a ser instalados "
-"en la imagen Debian Live que se genere, pero las imágenes Live oficiales "
-"solamente utilizarán la configuración por defecto."
+"debconf, permitiendo la personalización de la configuración de los paquetes "
+"que van a ser instalados en la imagen Debian Live que se genere, pero las "
+"imágenes Live oficiales solamente utilizarán la configuración por defecto."
#. type: Plain text
#: en/about_project.ssi:62
msgid ""
"Exception: There are a few essential changes needed to bring a live system "
-"to life (e.g. configuring pam to allow empty passwords). These essential "
-"changes have to be kept as minimal as possible and should be merged within "
-"the Debian repository if possible."
+"to life. These essential changes have to be kept as minimal as possible and "
+"should be merged within the Debian repository if possible."
msgstr ""
"Excepción: Es esencial realizar unos pocos cambios para que un sistema pueda "
-"funcionar en vivo (como por ejemplo configurar pam para permitir "
-"contraseñas vacias). Estos cambios esenciales se deben mantener tan pequeños "
+"funcionar en vivo. Estos cambios esenciales se deben mantener tan pequeños "
"como sea posible y deberán ser mezclados en el repositorio Debian siempre "
"que exista la posibilidad."
@@ -296,12 +292,13 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:69
msgid ""
-"_* *{BTS}*: The Debian Bug Tracking System (BTS) contains details of bugs "
-"reported by users and developers. Each bug is given a number, and is kept on "
-"file until it is marked as having been dealt with. For more information, "
-"please see {Reporting bugs}#bugs."
+"_* *{BTS}*: The {Debian Bug Tracking System}http://www.debian.org/Bugs/ "
+"(BTS) contains details of bugs reported by users and developers. Each bug is "
+"given a number, and is kept on file until it is marked as having been dealt "
+"with. For more information, please see {Reporting bugs}#bugs."
msgstr ""
-"_* *{BTS}*: El sistema de gestión de errores de Debian (BTS) contiene "
-"detalles de problemas enviados por usuarios y desarrolladores. Los errores "
-"están numerados y se mantiene un registro hasta que son reparados. Si se "
-"desea más información ver {Informes de errores}#bugs."
+"_* *{BTS}*: El {sistema de gestión de errores de Debian}http://www.debian."
+"org/Bugs/ (BTS) contiene detalles de problemas enviados por usuarios y "
+"desarrolladores. Los errores están numerados y se mantiene un registro hasta "
+"que son reparados. Si se desea más información ver {Informes de errores}"
+"#bugs."
diff --git a/manual/po/es/index.html.in.po b/manual/po/es/index.html.in.po
index 19b6773..64408e1 100644
--- a/manual/po/es/index.html.in.po
+++ b/manual/po/es/index.html.in.po
@@ -1,5 +1,4 @@
# Spanish translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
@@ -10,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-07 16:03+0100\n"
+"POT-Creation-Date: 2012-06-02 18:16+0300\n"
"PO-Revision-Date: 2011-12-26 19:07+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -45,7 +44,7 @@ msgstr ""
#. type: Content of: <html><body><p>
#: en/index.html.in:17
msgid ""
-"Please report errors, omissions, patches and suggestions to our mailinglist "
+"Please report errors, omissions, patches and suggestions to our mailing list "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
"org</a> and read about <a href=\"html/live-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
@@ -116,7 +115,7 @@ msgstr "Originales"
#. type: Content of: <html><body><p>
#: en/index.html.in:38
msgid ""
-"The sources for this manual is available in a <a href=\"http://git.or.cz/"
+"The sources for this manual are available in a <a href=\"http://git.or.cz/"
"\">Git</a> repository at live.debian.net."
msgstr ""
"Los originales de este manual están disponibles en el repositorio <a href="
diff --git a/manual/po/es/live-manual.ssm.po b/manual/po/es/live-manual.ssm.po
index beec0ed..9e6092d 100644
--- a/manual/po/es/live-manual.ssm.po
+++ b/manual/po/es/live-manual.ssm.po
@@ -1,5 +1,4 @@
# Spanish translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
@@ -9,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-03 00:19+0300\n"
+"POT-Creation-Date: 2012-06-04 12:21+0300\n"
"PO-Revision-Date: 2011-03-12 08:00-0000\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com\n"
@@ -24,7 +23,7 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:2
msgid "% SiSU 2.0"
-msgstr "% SiSU 2.0"
+msgstr ""
#. type: Plain text
#: en/live-manual.ssm:4
@@ -34,7 +33,7 @@ msgstr "@title: Manual Debian Live "
#. type: Plain text
#: en/live-manual.ssm:6
msgid "@creator: Debian Live Project <debian-live at lists.debian.org>"
-msgstr "@creator: Debian Live Project <debian-live at lists.debian.org>"
+msgstr "@creator: Proyecto Debian Live <debian-live at lists.debian.org>"
#. type: Plain text
#: en/live-manual.ssm:10
@@ -53,34 +52,31 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-04-03\n"
+" :published: 2012-06-04\n"
msgstr ""
+"@date:\n"
+" :published: 04.06.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
msgid "@publisher: Debian Live Project <debian-live at lists.debian.org>"
-msgstr "@publisher: Debian Live Project <debian-live at lists.debian.org>"
+msgstr "@publisher: Proyecto Debian Live <debian-live at lists.debian.org>"
#. type: Plain text
#: en/live-manual.ssm:21
#, no-wrap
msgid ""
"@make:\n"
-" :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/\n"
-" :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
+" :bold: /squeeze|wheezy|sid/\n"
+" :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
msgstr ""
-"@make:\n"
-" :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/\n"
-" :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
-" :num_top: 1\n"
-" :skin: skin_debian-live\n"
#. type: Plain text
#: en/live-manual.ssm:23
msgid ":A~ @title"
-msgstr ":A~ @title"
+msgstr ""
#. type: Plain text
#: en/live-manual.ssm:25
@@ -90,12 +86,12 @@ msgstr ":B~ Acerca de este manual"
#. type: Plain text
#: en/live-manual.ssm:27
msgid "<< about_manual.ssi"
-msgstr "<< about_manual.ssi"
+msgstr ""
#. type: Plain text
#: en/live-manual.ssm:29
msgid "<< about_project.ssi"
-msgstr "<< about_project.ssi"
+msgstr ""
#. type: Plain text
#: en/live-manual.ssm:31
@@ -105,52 +101,52 @@ msgstr ":B~ Usuario"
#. type: Plain text
#: en/live-manual.ssm:33
msgid "<< user_installation.ssi"
-msgstr "<< user_installation.ssi"
+msgstr ""
#. type: Plain text
#: en/live-manual.ssm:35
msgid "<< user_basics.ssi"
-msgstr "<< user_basics.ssi"
+msgstr ""
#. type: Plain text
#: en/live-manual.ssm:37
msgid "<< user_overview.ssi"
-msgstr "<< user_overview.ssi"
+msgstr ""
#. type: Plain text
#: en/live-manual.ssm:39
msgid "<< user_managing_a_configuration.ssi"
-msgstr "<< user_managing_a_configuration.ssi"
+msgstr ""
#. type: Plain text
#: en/live-manual.ssm:41
msgid "<< user_customization-overview.ssi"
-msgstr "<< user_customization-overview.ssi"
+msgstr ""
#. type: Plain text
#: en/live-manual.ssm:43
msgid "<< user_customization-packages.ssi"
-msgstr "<< user_customization-packages.ssi"
+msgstr ""
#. type: Plain text
#: en/live-manual.ssm:45
msgid "<< user_customization-contents.ssi"
-msgstr "<< user_customization-contents.ssi"
+msgstr ""
#. type: Plain text
#: en/live-manual.ssm:47
msgid "<< user_customization-runtime.ssi"
-msgstr "<< user_customization-runtime.ssi"
+msgstr ""
#. type: Plain text
#: en/live-manual.ssm:49
msgid "<< user_customization-binary.ssi"
-msgstr "<< user_customization-binary.ssi"
+msgstr ""
#. type: Plain text
#: en/live-manual.ssm:51
msgid "<< user_customization-installer.ssi"
-msgstr "<< user_customization-installer.ssi"
+msgstr ""
#. type: Plain text
#: en/live-manual.ssm:53
@@ -160,17 +156,17 @@ msgstr ":B~ Proyecto"
#. type: Plain text
#: en/live-manual.ssm:55
msgid "<< project_bugs.ssi"
-msgstr "<< project_bugs.ssi"
+msgstr ""
#. type: Plain text
#: en/live-manual.ssm:57
msgid "<< project_coding-style.ssi"
-msgstr "<< project_coding-style.ssi"
+msgstr ""
#. type: Plain text
#: en/live-manual.ssm:59
msgid "<< project_procedures.ssi"
-msgstr "<< project_procedures.ssi"
+msgstr ""
#. type: Plain text
#: en/live-manual.ssm:61 en/user_examples.ssi:2
@@ -180,7 +176,7 @@ msgstr ":B~ Ejemplos"
#. type: Plain text
#: en/live-manual.ssm:63
msgid "<< user_examples.ssi"
-msgstr "<< user_examples.ssi"
+msgstr ""
#. type: Plain text
#: en/live-manual.ssm:65 en/style_guide.ssi:2
@@ -190,4 +186,4 @@ msgstr ":B~ Apéndice"
#. type: Plain text
#: en/live-manual.ssm:66
msgid "<< style_guide.ssi"
-msgstr "<< style_guide.ssi"
+msgstr ""
diff --git a/manual/po/es/project_bugs.ssi.po b/manual/po/es/project_bugs.ssi.po
index c6e60bb..5c6fbf2 100644
--- a/manual/po/es/project_bugs.ssi.po
+++ b/manual/po/es/project_bugs.ssi.po
@@ -1,5 +1,4 @@
# Spanish translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
@@ -9,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
"PO-Revision-Date: 2012-02-19 18:14+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -22,16 +21,19 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -39,63 +41,70 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: 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-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
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -103,49 +112,53 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: 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:353 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
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -351,9 +364,9 @@ msgstr "_* Versión de live-config en el sistema en vivo."
#. type: Plain text
#: en/project_bugs.ssi:50
msgid ""
-"_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system"
+"_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system"
msgstr ""
-"_* Versión de #{debootstrap}# y/o #{cdebootstrap}# en el sistema anfitrión."
+"_* Versión de /{debootstrap}/ y/o /{cdebootstrap}/ en el sistema anfitrión."
#. type: Plain text
#: en/project_bugs.ssi:52
@@ -475,14 +488,14 @@ msgstr "3~ En la preinstalación (bootstrap) en tiempo de creación."
#. type: Plain text
#: en/project_bugs.ssi:82
msgid ""
-"live-build first bootstraps a basic Debian system with #{debootstrap}# or #"
-"{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
+"live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
+"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
"distribution it is bootstrapping, it may fail. If a bug appears here, check "
"if the error is related to a specific Debian package (most likely), or if it "
"is related to bootstrapping tool itself."
msgstr ""
-"live-build arranca primero un sistema Debian básico con #{debootstrap}# o #"
-"{cdebootstrap}#. Puede fallar dependiendo de la herramienta usada en la "
+"live-build arranca primero un sistema Debian básico con /{debootstrap}/ o /"
+"{cdebootstrap}/. Puede fallar dependiendo de la herramienta usada en la "
"preinstalación y de la distribución Debian empleada. Si un error aparece en "
"este momento, se debe comprobar si está relacionado con un paquete "
"específico de Debian (es lo más probable), o si está relacionado con la "
@@ -522,13 +535,13 @@ msgstr ""
#: en/project_bugs.ssi:90
msgid ""
"If this is the case, this is not a bug in Debian Live, but rather in Debian "
-"- please report it against the failing package. Running #{debootstrap}# "
+"- please report it against the failing package. Running /{debootstrap}/ "
"separately from the Live system build or running #{lb bootstrap --debug}# "
"will give you more information."
msgstr ""
"Si este es el caso, esto no es un error de Debian Live, sino de Debian - se "
"debe informar sobre el paquete que falla. Se puede obtener más información "
-"ejecutando #{debootstrap}# de forma separada del sistema de creación en vivo "
+"ejecutando /{debootstrap}/ de forma separada del sistema de creación en vivo "
"o ejecutando #{lb bootstrap --debug}#."
#. type: Plain text
diff --git a/manual/po/es/project_coding-style.ssi.po b/manual/po/es/project_coding-style.ssi.po
index ca5567f..2a9238e 100644
--- a/manual/po/es/project_coding-style.ssi.po
+++ b/manual/po/es/project_coding-style.ssi.po
@@ -1,5 +1,4 @@
# Spanish translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
@@ -9,8 +8,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-31 16:32+0300\n"
-"PO-Revision-Date: 2012-02-19 18:18+0100\n"
+"POT-Creation-Date: 2012-04-07 22:16+0300\n"
+"PO-Revision-Date: 2012-04-07 22:26+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
"Language-Team: Debian live Spanish translation team <debian-live at lists."
@@ -22,29 +21,30 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -92,29 +92,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -208,37 +209,42 @@ msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:16
+msgid "_* Make sure all shell code runs with 'set -e'."
+msgstr "_* Asegurarse de que el código funcione con 'set -e'."
+
+#. type: Plain text
+#: en/project_coding-style.ssi:18
msgid "2~ Indenting"
msgstr "2~ Sangrado"
#. type: Plain text
-#: en/project_coding-style.ssi:18
+#: en/project_coding-style.ssi:20
msgid "_* Always use tabs over spaces."
msgstr "_* Utilizar siempre los tabuladores en lugar de espacios."
#. type: Plain text
-#: en/project_coding-style.ssi:20
+#: en/project_coding-style.ssi:22
msgid "2~ Wrapping"
msgstr "2~ Ajuste de líneas"
#. type: Plain text
-#: en/project_coding-style.ssi:22
+#: en/project_coding-style.ssi:24
msgid "_* Generally, lines are 80 chars at maximum."
msgstr "_* En general, las líneas contienen 80 caracteres como máximo."
#. type: Plain text
-#: en/project_coding-style.ssi:24
+#: en/project_coding-style.ssi:26
msgid "_* Use the \"Linux style\" of line breaks:"
msgstr "_* Utilizar los saltos de línea al «estilo Linux»:"
#. type: Plain text
-#: en/project_coding-style.ssi:26 en/project_coding-style.ssi:49
-#: en/project_coding-style.ssi:90 en/project_coding-style.ssi:108
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:51
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:110
msgid "Bad:"
msgstr "Mal:"
#. type: Plain text
-#: en/project_coding-style.ssi:32
+#: en/project_coding-style.ssi:34
#, no-wrap
msgid ""
" if foo; then\n"
@@ -247,13 +253,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:59
-#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:119
+#: en/project_coding-style.ssi:38 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:100 en/project_coding-style.ssi:121
msgid "Good:"
msgstr "Bien:"
#. type: Plain text
-#: en/project_coding-style.ssi:43
+#: en/project_coding-style.ssi:45
#, no-wrap
msgid ""
" if foo\n"
@@ -263,41 +269,41 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:49
msgid "_* The same holds for functions:"
msgstr "_* Lo mismo vale para las funciones:"
#. type: Plain text
-#: en/project_coding-style.ssi:55
+#: en/project_coding-style.ssi:57
#, no-wrap
msgid ""
-" foo () {\n"
+" Foo () {\n"
" bar\n"
" }\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:66
+#: en/project_coding-style.ssi:68
#, no-wrap
msgid ""
-" foo ()\n"
+" Foo ()\n"
" {\n"
" bar\n"
" }\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:72
msgid "2~ Variables"
msgstr "2~ Variables"
#. type: Plain text
-#: en/project_coding-style.ssi:72
+#: en/project_coding-style.ssi:74
msgid "_* Variables are always in capital letters."
msgstr "_* Las variables deben escribirse siempre en letras mayúsculas."
#. type: Plain text
-#: en/project_coding-style.ssi:74
+#: en/project_coding-style.ssi:76
msgid ""
"_* Variables that used in #{lb config}# always start with #{LB_}# prefix."
msgstr ""
@@ -305,7 +311,7 @@ msgstr ""
"prefijo #{LB_}#"
#. type: Plain text
-#: en/project_coding-style.ssi:76
+#: en/project_coding-style.ssi:78
msgid ""
"_* Internal temporary variables in live-build should start with the #{\\_LB_}"
"# prefix."
@@ -314,13 +320,13 @@ msgstr ""
"prefijo #{\\_LB_}#"
#. type: Plain text
-#: en/project_coding-style.ssi:78
+#: en/project_coding-style.ssi:80
msgid "_* Local variables start with live-build #{\\_\\_LB_}# prefix."
msgstr ""
"_* Las variables locales comienzan con el prefijo live-build #{\\_\\_LB_}#"
#. type: Plain text
-#: en/project_coding-style.ssi:80
+#: en/project_coding-style.ssi:82
msgid ""
"_* Variables in connection to a boot parameter in live-config start with #"
"{LIVE_}#."
@@ -329,13 +335,13 @@ msgstr ""
"comienzan con #{LIVE_}#."
#. type: Plain text
-#: en/project_coding-style.ssi:82
+#: en/project_coding-style.ssi:84
msgid "_* All other variables in live-config start with #{_}# prefix."
msgstr ""
"_* Todas las demás variables de live-config comienzan con el prefijo #{_}#"
#. type: Plain text
-#: en/project_coding-style.ssi:84
+#: en/project_coding-style.ssi:86
msgid ""
"_* Use braces around variables; e.g. write #{${FOO}}# instead of #{$FOO}#."
msgstr ""
@@ -343,7 +349,7 @@ msgstr ""
"lugar de #{$FOO}#."
#. type: Plain text
-#: en/project_coding-style.ssi:86
+#: en/project_coding-style.ssi:88
msgid ""
"_* Always protect variables with quotes to respect potential whitespaces: "
"write #{\"${FOO}\"}# not #{${FOO}}#."
@@ -352,7 +358,7 @@ msgstr ""
"blanco: Escribir #{\"${FOO}\"}# en lugar de #{${FOO}}#."
#. type: Plain text
-#: en/project_coding-style.ssi:88
+#: en/project_coding-style.ssi:90
msgid ""
"_* For consistency reasons, always use quotes when assigning values to "
"variables:"
@@ -361,26 +367,26 @@ msgstr ""
"asignación de valores a las variables:"
#. type: Plain text
-#: en/project_coding-style.ssi:94
+#: en/project_coding-style.ssi:96
#, no-wrap
msgid " FOO=bar\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:104
#, no-wrap
msgid " FOO=\"bar\"\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:108
msgid "_* If multiple variables are used, quote the full expression:"
msgstr ""
"_* Si se utilizan múltiples variables, incluir la expresión completa entre "
"comillas dobles:"
#. type: Plain text
-#: en/project_coding-style.ssi:115
+#: en/project_coding-style.ssi:117
#, no-wrap
msgid ""
" if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
@@ -390,7 +396,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:126
+#: en/project_coding-style.ssi:128
#, no-wrap
msgid ""
" if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
@@ -400,12 +406,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:130
+#: en/project_coding-style.ssi:132
msgid "2~ Miscellaneous"
msgstr "2~ Miscelánea"
#. type: Plain text
-#: en/project_coding-style.ssi:132
+#: en/project_coding-style.ssi:134
msgid ""
"_* Use \"#{|}#\" (without the surround quotes) as a separator in calls to "
"sed, e.g. \"#{sed -e 's|foo|bar|'}#\" (without \"\")."
@@ -414,7 +420,7 @@ msgstr ""
"invoque a sed, p.ej. \"#{sed -e 's|foo|bar|'}#\" (Pero sin las comillas \"\")"
#. type: Plain text
-#: en/project_coding-style.ssi:134
+#: en/project_coding-style.ssi:136
msgid ""
"_* Don't use the #{test}# command for comparisons or tests, use \"#{[}#\" \"#"
"{]}#\" (without \"\"); e.g. \"#{if [ -x /bin/foo ]; ...}#\" and not \"#{if "
@@ -425,10 +431,19 @@ msgstr ""
"foo ]; ...}#\" en lugar de \"#{if test -x /bin/foo; ...}#\"."
#. type: Plain text
-#: en/project_coding-style.ssi:135
+#: en/project_coding-style.ssi:138
msgid ""
"_* Use #{case}# wherever possible over #{test}#, as it's easier to read and "
"faster in execution."
msgstr ""
"_* Se debe utilizar #{case}# siempre que sea posible en lugar de #{test}#, "
"ya que es más fácil de leer y más rápido en la ejecución."
+
+#. type: Plain text
+#: en/project_coding-style.ssi:139
+msgid ""
+"_* Use capitalized names for functions to limit messing with the users "
+"environment."
+msgstr ""
+"_* Usar mayúsculas en los nombres de las funciones para evitar confusiones "
+"con el entorno de los usuarios."
diff --git a/manual/po/es/project_procedures.ssi.po b/manual/po/es/project_procedures.ssi.po
index 1dfe77f..f721c5f 100644
--- a/manual/po/es/project_procedures.ssi.po
+++ b/manual/po/es/project_procedures.ssi.po
@@ -1,5 +1,4 @@
# Spanish translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
@@ -9,8 +8,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
-"PO-Revision-Date: 2012-02-19 18:24+0100\n"
+"POT-Creation-Date: 2012-04-23 20:28+0300\n"
+"PO-Revision-Date: 2012-04-07 18:34+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
"Language-Team: Debian live Spanish translation team <debian-live at lists."
@@ -22,16 +21,18 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -39,63 +40,69 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: 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-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
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -103,49 +110,53 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: 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:353 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
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -256,7 +267,7 @@ msgstr "2~ Nuevas versiones"
#. type: Plain text
#: en/project_procedures.ssi:36
msgid ""
-"_* Again, we need updated mirror of debian, debian-security and debian-"
+"_* Again, we need updated mirrors of debian, debian-security and debian-"
"volatile."
msgstr ""
"_* Una vez más, se necesita una réplica actualizada de Debian, debian-"
@@ -269,11 +280,30 @@ msgstr "_* Correo para enviar anuncios."
#. type: Plain text
#: en/project_procedures.ssi:42
+msgid "3~ Last Point Release of a Debian Release"
+msgstr "3~ Última actualización de una versión Debian"
+
+#. type: Plain text
+#: en/project_procedures.ssi:47
+msgid ""
+"Remember to adjust both chroot and binary mirrors when building the last set "
+"of images for a Debian release after it has been moved away from ftp.debian."
+"org to archive.debian.org. That way, old prebuilt live images are still "
+"useful without user modifications."
+msgstr ""
+"Recordar que se deben ajustar tanto las réplicas de chroot como las de "
+"binary cuando se construye la última serie de imágenes para una versión de "
+"Debian después de haber sido trasladada de ftp.debian.org a archive.debian."
+"org. De esta manera, las viejas imágenes preconstruidas siguen siendo "
+"útiles, sin modificaciones de los usuarios."
+
+#. type: Plain text
+#: en/project_procedures.ssi:49
msgid "3~ Point release announcement template"
msgstr "3~ Plantilla para anunciar nuevas versiones."
#. type: Plain text
-#: en/project_procedures.ssi:44
+#: en/project_procedures.ssi:51
msgid ""
"An annoucement mail for point releases can be generated using the template "
"below and the following command:"
@@ -282,7 +312,7 @@ msgstr ""
"plantilla y el siguiente comando: "
#. type: Plain text
-#: en/project_procedures.ssi:52
+#: en/project_procedures.ssi:59
#, no-wrap
msgid ""
" $ sed \\\n"
@@ -293,7 +323,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:56
+#: en/project_procedures.ssi:63
msgid ""
"Please check the mail carefully before sending and pass it to others for "
"proof-reading."
@@ -302,13 +332,13 @@ msgstr ""
"para su corrección."
#. type: Plain text
-#: en/project_procedures.ssi:60
+#: en/project_procedures.ssi:67
#, no-wrap
msgid " Debian Live images for Debian GNU/Linux %major% updated\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:64
+#: en/project_procedures.ssi:71
#, no-wrap
msgid ""
" The Debian Live project is pleased to announce the availability of\n"
@@ -317,19 +347,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:66
+#: en/project_procedures.ssi:73
#, no-wrap
msgid " The images are available for download at:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:68
+#: en/project_procedures.ssi:75
#, no-wrap
msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:73
+#: en/project_procedures.ssi:80
#, no-wrap
msgid ""
" This update incorporates the changes made in the %minor% point release,\n"
@@ -339,29 +369,29 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:75
+#: en/project_procedures.ssi:82
#, no-wrap
msgid " <http://lists.debian.org/debian-announce/%release_mail%>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:77
+#: en/project_procedures.ssi:84
#, no-wrap
msgid " It also includes the following Live-specific changes:\n"
msgstr ""
#. type: Bullet: ' * '
-#: en/project_procedures.ssi:81
+#: en/project_procedures.ssi:88
msgid "[INSERT LIVE-SPECIFIC CHANGE HERE]"
msgstr ""
#. type: Bullet: ' * '
-#: en/project_procedures.ssi:81
+#: en/project_procedures.ssi:88
msgid "[LARGER ISSUES MAY DESERVE THEIR OWN SECTION]"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:85
+#: en/project_procedures.ssi:92
#, no-wrap
msgid ""
" URLs\n"
@@ -369,67 +399,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:87
+#: en/project_procedures.ssi:94
#, no-wrap
msgid " Download location of updated images:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:89
+#: en/project_procedures.ssi:96
#, no-wrap
msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:91
+#: en/project_procedures.ssi:98
#, no-wrap
msgid " Debian Live project homepage:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:93
+#: en/project_procedures.ssi:100
#, no-wrap
msgid " <http://live.debian.net/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:95
+#: en/project_procedures.ssi:102
#, no-wrap
msgid " The current stable distribution:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:97
+#: en/project_procedures.ssi:104
#, no-wrap
msgid " <http://ftp.debian.org/debian/dists/stable>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:99
+#: en/project_procedures.ssi:106
#, no-wrap
msgid " stable distribution information (release notes, errata etc.):\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:101
+#: en/project_procedures.ssi:108
#, no-wrap
msgid " <http://www.debian.org/releases/stable/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:103
+#: en/project_procedures.ssi:110
#, no-wrap
msgid " Security announcements and information:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:105
+#: en/project_procedures.ssi:112
#, no-wrap
msgid " <http://www.debian.org/security/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:109
+#: en/project_procedures.ssi:116
#, no-wrap
msgid ""
" About Debian\n"
@@ -437,7 +467,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:113
+#: en/project_procedures.ssi:120
#, no-wrap
msgid ""
" The Debian Project is an association of Free Software developers who\n"
@@ -446,7 +476,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:117
+#: en/project_procedures.ssi:124
#, no-wrap
msgid ""
" About Debian Live\n"
@@ -454,7 +484,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:122
+#: en/project_procedures.ssi:129
#, no-wrap
msgid ""
" Debian Live is an official sub-project of Debian which produces Debian\n"
@@ -464,7 +494,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:126
+#: en/project_procedures.ssi:133
#, no-wrap
msgid ""
" Contact Information\n"
@@ -472,7 +502,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:130
+#: en/project_procedures.ssi:137
#, no-wrap
msgid ""
" For further information, please visit the Debian Live web pages at\n"
diff --git a/manual/po/es/style_guide.ssi.po b/manual/po/es/style_guide.ssi.po
index a893b5b..428af2e 100644
--- a/manual/po/es/style_guide.ssi.po
+++ b/manual/po/es/style_guide.ssi.po
@@ -1,12 +1,11 @@
# Spanish translations for live-manual package
-# Copyright (C) 2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-31 19:15+0300\n"
+"POT-Creation-Date: 2012-06-03 17:04+0300\n"
"PO-Revision-Date: 2012-02-11 16:42+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -22,17 +21,16 @@ msgid ":B~ Appendix"
msgstr ":B~ Apéndice"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
@@ -93,17 +91,16 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
@@ -832,15 +829,15 @@ msgstr ""
#. type: Plain text
#: en/style_guide.ssi:228
-msgid "_* /{New lines}/"
+msgid "_* /{Newlines}/"
msgstr ""
#. type: Plain text
#: en/style_guide.ssi:230
msgid ""
-"The translated texts need to have the exact same new lines as the original "
+"The translated texts need to have the exact same newlines as the original "
"texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
-"in the original files. These new lines often appear, for instance, in the "
+"in the original files. These newlines often appear, for instance, in the "
"code blocks."
msgstr ""
@@ -878,9 +875,7 @@ msgstr ""
#. type: Bullet: ' - '
#: en/style_guide.ssi:244
-msgid ""
-"Metadata (often between colons *{:metadata:}*) especially the date in /{live-"
-"manual.ssm.po}/ because it changes every time live-manual is updated."
+msgid "Metadata (often between colons *{:metadata:}*)"
msgstr ""
#. type: Bullet: ' - '
diff --git a/manual/po/es/user_basics.ssi.po b/manual/po/es/user_basics.ssi.po
index 7783e2a..49bd693 100644
--- a/manual/po/es/user_basics.ssi.po
+++ b/manual/po/es/user_basics.ssi.po
@@ -1,5 +1,4 @@
# Spanish translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
@@ -9,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-01-12 08:28-0400\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
"PO-Revision-Date: 2012-02-19 21:41+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -22,16 +21,18 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -39,8 +40,10 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -64,39 +67,42 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -104,8 +110,10 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -129,25 +137,26 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -373,11 +382,11 @@ msgstr " # lb build\n"
#: en/user_basics.ssi:48
msgid ""
"This process can take a while, depending on the speed of your network "
-"connection. When it is complete, there should be a #{binary-hybrid.iso}# "
+"connection. When it is complete, there should be a #{binary.hybrid.iso}# "
"image file, ready to use, in the current directory."
msgstr ""
"Este proceso puede llevar un tiempo, dependiendo de la velocidad de la "
-"conexión de red. Cuando haya terminado, debería haber un fichero #{binary-"
+"conexión de red. Cuando haya terminado, debería haber un fichero #{binary."
"hybrid.iso}# listo para ser usado en el directorio actual."
#. type: Plain text
@@ -421,7 +430,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:62
#, no-wrap
-msgid " $ wodim binary-hybrid.iso\n"
+msgid " $ wodim binary.hybrid.iso\n"
msgstr ""
#. type: Plain text
@@ -468,7 +477,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:75
#, no-wrap
-msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
+msgid " $ dd if=binary.hybrid.iso of=${USBSTICK}\n"
msgstr ""
#. type: Plain text
@@ -502,15 +511,15 @@ msgid ""
"Once you've booted the media, you are presented with a boot menu. If you "
"just press enter here, the system will boot using the default entry, #{Live}"
"# and default options. For more information about boot options, see the "
-"\"help\" entry in the menu and also the #{live-boot}# and #{live-config}# "
-"man pages found within the live system."
+"\"help\" entry in the menu and also the live-boot and live-config man pages "
+"found within the live system."
msgstr ""
"Una vez que se haya arrancado desde los medios de almacenamiento externos, "
"se accede a un menú de arranque. Si se pulsa la tecla «enter», el sistema "
"arrancará usando el modo por defecto #{Live}# y las opciones "
"predeterminadas. Para obtener más información acerca de las opciones de "
"arranque, ver la opción «help» del menú y también las páginas del manual de "
-"#{live-boot}# y #{live-config}# que se encuentran en el sistema en vivo."
+"live-boot y live-config que se encuentran en el sistema en vivo."
#. type: Plain text
#: en/user_basics.ssi:86
@@ -603,25 +612,25 @@ msgstr "3~testing-iso-with-qemu Probar una imagen ISO con QEMU"
#: en/user_basics.ssi:104
msgid ""
"The most versatile VM in Debian is QEMU. If your processor has hardware "
-"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
+"support for virtualization, use the /{qemu-kvm}/ package; the /{qemu-kvm}/ "
"package description briefly lists the requirements."
msgstr ""
"La máquina virtual más versátil en Debian es QEMU. Si el procesador tiene "
-"soporte de hardware para virtualización, utilizar el paquete #{qemu-kvm}# en "
-"la descripción del paquete #{qemu-kvm}# se enumera brevemente la lista de "
+"soporte de hardware para virtualización, utilizar el paquete /{qemu-kvm}/ en "
+"la descripción del paquete /{qemu-kvm}/ se enumera brevemente la lista de "
"requisitos."
#. type: Plain text
#: en/user_basics.ssi:106
msgid ""
-"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
-"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
-"the following examples. The #{qemu-utils}# package is also valuable for "
+"First, install /{qemu-kvm}/ if your processor supports it. If not, install /"
+"{qemu}/, in which case the program name is #{qemu}# instead of #{kvm}# in "
+"the following examples. The /{qemu-utils}/ package is also valuable for "
"creating virtual disk images with #{qemu-img}#."
msgstr ""
"En primer lugar, instalar #{qemu-kvm}# si el procesador lo soporta. Si no es "
"así, instalar #{qemu}#, en cuyo caso el nombre del programa será #{qemu}# en "
-"vez de #{kvm}# en los siguientes ejemplos. El paquete #{qemu-utils}# también "
+"vez de #{kvm}# en los siguientes ejemplos. El paquete /{qemu-utils}/ también "
"es útil para la creación de imágenes virtuales de disco con #{qemu-img}#."
#. type: Plain text
@@ -638,7 +647,7 @@ msgstr "Arrancar una imagen ISO es sencillo:"
#. type: Plain text
#: en/user_basics.ssi:118
#, no-wrap
-msgid " $ kvm -cdrom binary-hybrid.iso\n"
+msgid " $ kvm -cdrom binary.hybrid.iso\n"
msgstr ""
#. type: Plain text
@@ -654,8 +663,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:126
-msgid "In order to test the ISO with #{virtualbox-ose}#:"
-msgstr "Para probar una imagen ISO con #{virtualbox-ose}#:"
+msgid "In order to test the ISO with /{virtualbox-ose}/:"
+msgstr "Para probar una imagen ISO con /{virtualbox-ose}/:"
#. type: Plain text
#: en/user_basics.ssi:130
@@ -672,25 +681,18 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:136
msgid ""
-"Create a new virtual machine, change the storage settings to use #{binary-"
+"Create a new virtual machine, change the storage settings to use #{binary."
"hybrid.iso}# as the CD/DVD device, and start the machine."
msgstr ""
"Crear una nueva máquina virtual, cambiar la configuración de almacenamiento "
-"para utilizar #{binary-hybrid.iso}# como dispositivo CD/DVD y arrancar la "
+"para utilizar #{binary.hybrid.iso}# como dispositivo CD/DVD y arrancar la "
"máquina."
#. type: Plain text
#: en/user_basics.ssi:138
-msgid ""
-"Note: For live systems containing X.org that you want to test with #"
-"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
-"package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. "
-"Otherwise, the resolution is limited to 800x600."
-msgstr ""
-"Nota: Para probar los sistemas en vivo con soporte X.org en virtualbox-ose, "
-"se puede incluir el paquete del driver de VirtualBox X.org, #{virtualbox-ose-"
-"guest-x11}#, en la configuración de live-build. De lo contrario, la "
-"resolución se limita a 800x600"
+#, no-wrap
+msgid "*{Note:}* For live systems containing X.org that you want to test with /{virtualbox-ose}/, you may wish to include the VirtualBox X.org driver package, /{virtualbox-ose-guest-x11}/, in your live-build configuration. Otherwise, the resolution is limited to 800x600.\n"
+msgstr "*{Nota:}* Para probar los sistemas en vivo con soporte X.org en /{virtualbox-ose}/, se puede incluir el paquete del driver de VirtualBox X.org, /{virtualbox-ose-guest-x11}/, en la configuración de live-build. De lo contrario, la resolución se limita a 800x600"
#. type: Plain text
#: en/user_basics.ssi:142
@@ -727,14 +729,9 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:150
-msgid ""
-"Note: if you created an ISO hybrid image with the previous example, you will "
-"need to clean up your working directory with the #{lb clean}# command (see "
-"{The lb clean command}#lb-clean):"
-msgstr ""
-"Nota: si se ha creado una imagen ISO híbrida con el ejemplo anterior, se "
-"tendrá que limpiar el directorio de trabajo con el comando #{lb clean}# (ver "
-"{El comando lb clean}#lb-clean):"
+#, no-wrap
+msgid "*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):\n"
+msgstr "*{Nota:}* si se ha creado una imagen ISO híbrida con el ejemplo anterior, se tendrá que limpiar el directorio de trabajo con el comando #{lb clean}# (ver {El comando lb clean}#lb-clean):"
#. type: Plain text
#: en/user_basics.ssi:154 en/user_basics.ssi:220
@@ -783,14 +780,14 @@ msgid ""
"bootloader, ready to be directly written on a USB stick. Since using an HDD "
"image is just like using an ISO hybrid image on USB, follow the instructions "
"in {Using an ISO hybrid live image}#using-iso-hybrid, except use the "
-"filename #{binary.img}# instead of #{binary-hybrid.iso}#."
+"filename #{binary.img}# instead of #{binary.hybrid.iso}#."
msgstr ""
"La imagen binaria generada contiene una partición VFAT y el gestor de "
"arranque syslinux, lista para ser copiada directamente en un dispositivo "
"USB. Dado que utilizar una imagen HDD es igual a usar una imagen ISO híbrida "
"en un USB, seguir las instrucciones de {Usar una imagen ISO híbrida}#using-"
"iso-hybrid con la diferencia de usar el nombre #{binary.img}# en lugar de #"
-"{binary-hybrid.iso}#."
+"{binary.hybrid.iso}#."
#. type: Plain text
#: en/user_basics.ssi:180
@@ -800,15 +797,15 @@ msgstr "3~testing-hdd-with-qemu Probar una imágen HDD con Qemu"
#. type: Plain text
#: en/user_basics.ssi:182
msgid ""
-"First, install QEMU as described above in {Testing an ISO image with QEMU}"
-"#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which "
-"version your host system needs, specifying #{binary.img}# as the first hard "
-"drive."
+"First, install /{qemu}/ as described above in {Testing an ISO image with "
+"QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on "
+"which version your host system needs, specifying #{binary.img}# as the first "
+"hard drive."
msgstr ""
-"En primer lugar, instalar QEMU como se describe más arriba en {Probar una "
-"imágen ISO con QEMU}#testing-iso-with-qemu A continuación, ejecutar #{kvm}# "
-"o #{qemu}#, según qué versión necesita el sistema anfitrión y especificando #"
-"{binary.img}# como primer disco duro."
+"En primer lugar, instalar /{qemu}/ como se describe más arriba en {Probar "
+"una imágen ISO con QEMU}#testing-iso-with-qemu A continuación, ejecutar #"
+"{kvm}# o #{qemu}#, según qué versión necesita el sistema anfitrión y "
+"especificando #{binary.img}# como primer disco duro."
#. type: Plain text
#: en/user_basics.ssi:186
@@ -825,13 +822,13 @@ msgstr "3~using-usb-extra-space Usar el espacio libre en el dispositivo USB"
#: en/user_basics.ssi:192
msgid ""
"To use the remaining free space after copying #{binary.img}# to a USB stick, "
-"use a partitioning tool such as #{gparted}# or #{parted}# to create a new "
+"use a partitioning tool such as /{gparted}/ or /{parted}/ to create a new "
"partition on the stick. The first partition will be used by the Debian Live "
"system."
msgstr ""
"Si se desea usar el espacio libre después de haber instalado la imagen #"
"{binary.img}# en una llave USB, se puede usar un programa de particionado "
-"como #{gparted}# o #{parted}# para crear una partición nueva en el "
+"como /{gparted}/ o /{parted}/ para crear una partición nueva en el "
"dispositivo. La primera partición será usada por el sistema Debian en vivo."
#. type: Plain text
@@ -859,16 +856,9 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:208
-msgid ""
-"Note: If you want to use the extra space with Windows, apparently that OS "
-"cannot normally access any partitions but the first. Some solutions to this "
-"problem have been discussed on our {mailing list}#contact, but it seems "
-"there are no easy answers."
-msgstr ""
-"Nota: Si se desea usar el espacio extra con Windows, segun parece, ese "
-"sistema operativo no puede acceder normalmente a otra partición más que a la "
-"primera. Se han comentado algunas soluciones a este problema en nuestra "
-"{lista de correo}#contact pero según parece no hay una solución fácil."
+#, no-wrap
+msgid "*{Note:}* If you want to use the extra space with Windows, apparently that OS cannot normally access any partitions but the first. Some solutions to this problem have been discussed on our {mailing list}#contact, but it seems there are no easy answers.\n"
+msgstr "{Nota:}* Si se desea usar el espacio extra con Windows, segun parece, ese sistema operativo no puede acceder normalmente a otra partición más que a la primera. Se han comentado algunas soluciones a este problema en nuestra {lista de correo}#contact pero según parece no hay una solución fácil."
#. type: Plain text
#: en/user_basics.ssi:210
@@ -894,12 +884,9 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:216
-msgid ""
-"Note: if you performed any previous examples, you will need to clean up your "
-"working directory with the #{lb clean}# command:"
-msgstr ""
-"Nota: si se ha seguido algúno de los ejemplos anteriores, se tendrá que "
-"limpiar el directorio de trabajo con el comando #{lb clean}#:"
+#, no-wrap
+msgid "*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:\n"
+msgstr "*{Nota:}* si se ha seguido algúno de los ejemplos anteriores, se tendrá que limpiar el directorio de trabajo con el comando #{lb clean}#:"
#. type: Plain text
#: en/user_basics.ssi:224
@@ -1059,14 +1046,16 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:280
msgid ""
-"You should install the tftpd-hpa package. It can serve all files contained "
-"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
-"#{/srv/debian-live/tftpboot}#, run as root the following command:"
+"You should install the /{tftpd-hpa}/ package. It can serve all files "
+"contained inside a root directory, usually #{/srv/tftp}#. To let it serve "
+"files inside #{/srv/debian-live/tftpboot}#, run as root the following "
+"command:"
msgstr ""
-"Se debe instalar el paquete tftpd-hpa. Este servidor podrá suministrar todos "
-"los ficheros contenidos de un directorio raíz, normalmente #{/srv/tftp}#. "
-"Para permitirle que pueda servir los ficheros de #{/srv/debian-live/tftpboot}"
-"#, se debe ejecutar el siguiente comando con privilegios de superusuario:"
+"Se debe instalar el paquete /{tftpd-hpa}/. Este servidor podrá suministrar "
+"todos los ficheros contenidos de un directorio raíz, normalmente #{/srv/tftp}"
+"#. Para permitirle que pueda servir los ficheros de #{/srv/debian-live/"
+"tftpboot}#, se debe ejecutar el siguiente comando con privilegios de "
+"superusuario:"
#. type: Plain text
#: en/user_basics.ssi:284
@@ -1097,8 +1086,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:294
-msgid "You need to install the #{nfs-kernel-server}# package."
-msgstr "Se debe instalar el paquete #{nfs-kernel-server}#."
+msgid "You need to install the /{nfs-kernel-server}/ package."
+msgstr "Se debe instalar el paquete /{nfs-kernel-server}/."
#. type: Plain text
#: en/user_basics.ssi:296
@@ -1178,8 +1167,8 @@ msgstr "3~ Qemu"
#. type: Plain text
#: en/user_basics.ssi:322
-msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
-msgstr "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
+msgid "_* Install /{qemu}/, /{bridge-utils}/, /{sudo}/."
+msgstr "_* Instalar /{qemu}/, /{bridge-utils}/, /{sudo}/."
#. type: Plain text
#: en/user_basics.ssi:324
diff --git a/manual/po/es/user_customization-binary.ssi.po b/manual/po/es/user_customization-binary.ssi.po
index 0b309e2..7c6b8a2 100644
--- a/manual/po/es/user_customization-binary.ssi.po
+++ b/manual/po/es/user_customization-binary.ssi.po
@@ -1,5 +1,4 @@
# Spanish translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
@@ -9,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-25 21:42+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
"PO-Revision-Date: 2012-02-24 16:54+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -22,28 +21,30 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -67,51 +68,54 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -135,25 +139,26 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -270,7 +275,7 @@ msgid ""
" include menu.cfg\n"
" default vesamenu.c32\n"
" prompt 0\n"
-" timeout 5\n"
+" timeout 50\n"
msgstr ""
#. type: Plain text
@@ -293,7 +298,7 @@ msgstr " #!/bin/sh\n"
#. type: Plain text
#: en/user_customization-binary.ssi:43
#, no-wrap
-msgid " sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg\n"
+msgid " sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/es/user_customization-contents.ssi.po b/manual/po/es/user_customization-contents.ssi.po
index 47bf4d8..88c4f39 100644
--- a/manual/po/es/user_customization-contents.ssi.po
+++ b/manual/po/es/user_customization-contents.ssi.po
@@ -1,12 +1,11 @@
# Spanish translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-01-15 16:28+0100\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: 2012-02-19 18:05+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -18,16 +17,19 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -35,9 +37,10 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -61,39 +64,43 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -101,9 +108,10 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -127,25 +135,26 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -273,15 +282,15 @@ msgstr ""
#: en/user_customization-contents.ssi:24
msgid ""
"To include files, simply add them to your #{config/includes.chroot}# "
-"directory. This directory corresponds to the root directory (#{/}#) of the "
+"directory. This directory corresponds to the root directory #{/}# of the "
"live system. For example, to add a file #{/var/www/index.html}# in the live "
"system, use:"
msgstr ""
"Para incluir ficheros solamente hace falta añadirlos al directorio de "
"configuración #{config/includes.chroot}#. Habrá una relación directa entre "
-"este directorio y el directorio raiz (#{/}#) del sistema en vivo. Por "
-"ejemplo, si se desea añadir un fichero para que sea el fichero #{/var/www/"
-"index.html}# del sistema en vivo se puede hacer lo siguiente:"
+"este directorio y el directorio raiz #{/}# del sistema en vivo. Por ejemplo, "
+"si se desea añadir un fichero para que sea el fichero #{/var/www/index.html}"
+"# del sistema en vivo se puede hacer lo siguiente:"
#. type: Plain text
#: en/user_customization-contents.ssi:29
@@ -516,8 +525,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:93
msgid ""
-"For more information about debconf, please see debconf(7) in the #{debconf}# "
-"package."
+"For more information about debconf, please see #{debconf(7)}# in the /"
+"{debconf}/ package."
msgstr ""
-"Ver debconf(7) en el paquete #{debconf}# para obtener más información acerca "
-"de debconf."
+"Ver #{debconf(7)}# en el paquete /{debconf}/ para obtener más información "
+"acerca de debconf."
diff --git a/manual/po/es/user_customization-installer.ssi.po b/manual/po/es/user_customization-installer.ssi.po
index a33ad84..3830477 100644
--- a/manual/po/es/user_customization-installer.ssi.po
+++ b/manual/po/es/user_customization-installer.ssi.po
@@ -1,5 +1,4 @@
# Spanish translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
@@ -9,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
"PO-Revision-Date: 2012-03-19 20:54+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -24,28 +23,29 @@ msgstr ""
"X-Poedit-SourceCharset: utf-8\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -69,21 +69,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -92,28 +93,29 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -137,21 +139,22 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -213,12 +216,12 @@ msgstr "*{Imágenes con Instalador Debian «official»}*: Esta imagen de Debian
#: en/user_customization-installer.ssi:16
msgid ""
"On such images, Debian is installed by fetching and installing .deb packages "
-"using #{debootstrap}# or #{cdebootstrap}#, from the local media or some "
+"using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some "
"network-based network, resulting in a standard Debian system being installed "
"to the hard disk."
msgstr ""
"En estas imágenes, el sistema operativo Debian se instala mediante la "
-"herramienta #{debootstrap}# o #{cdebootstrap}# que descarga paquetes .deb, "
+"herramienta /{debootstrap}/ o /{cdebootstrap}/ que descarga paquetes .deb, "
"desde medios locales o por red local, y los instala de forma tradicional. El "
"resultado final es un sistema Debian estándar instalado en el disco duro."
@@ -247,12 +250,12 @@ msgstr "*{Imágenes con Instalador Debian «Live»}*: Estas imágenes de Debian
msgid ""
"Installation will proceed in an identical fashion to the \"Regular\" "
"installation described above, but at the actual package installation stage, "
-"instead of using #{debootstrap}# to fetch and install packages, the live "
+"instead of using /{debootstrap}/ to fetch and install packages, the live "
"filesystem image is copied to the target. This is achieved with a special "
"udeb called live-installer."
msgstr ""
"El procedimiento de instalación es idéntico al realizado por las imagenes "
-"«Regulares» pero, en lugar de utilizar #{debootstrap}# para obtener e "
+"«Regulares» pero, en lugar de utilizar /{debootstrap}/ para obtener e "
"instalar paquetes .deb, lo que hace es copiar al disco duro la imagen del "
"sistema de ficheros que se había preparado para lanzar el sistema en vivo. "
"Esto se logra mediante un .udeb especial llamado live-installer."
@@ -269,15 +272,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-installer.ssi:26
-msgid ""
-"Note: to support both normal and live installer entries in the bootloader of "
-"the same live media, you must disable live-installer by preseeding #{live-"
-"installer/enable=false}#."
-msgstr ""
-"Nota: Para poder arrancar los dos tipos de imágenes, Regular y Live, en el "
-"mismo medio, el gestor de arranque debe poder deshabilitar live-installer. "
-"Esto se hace utilizando la variable de preconfiguración (preseed) #{live-"
-"installer/enable=false}#."
+#, no-wrap
+msgid "*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.\n"
+msgstr "*{Nota:}* Para poder arrancar los dos tipos de imágenes, Regular y Live, en el mismo medio, el gestor de arranque debe poder deshabilitar live-installer. Esto se hace utilizando la variable de preconfiguración (preseed) #{live-installer/enable=false}#.\n"
#. type: Plain text
#: en/user_customization-installer.ssi:28
@@ -360,7 +357,7 @@ msgid ""
"binary/}# to include them in the image. Additional or replacement files and "
"directories may be included in the installer initrd as well, in a similar "
"fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
-"placing the material in #{config/binary_debian-installer-includes/}#."
+"placing the material in #{config/includes.binary_debian-installer/}#."
msgstr ""
"Es posible que, con propósitos experimentales o para depuración de errores, "
"se desee incluir paquetes udeb creados localmente para el #{d-i}#. Estos "
@@ -370,4 +367,4 @@ msgstr ""
"incluirse o reemplazarse ficheros y directorios en el initrd del instalador "
"de una manera similar a la que se describe en {Includes locales en Live/"
"chroot}#live-chroot-local-includes, depositando el material en el directorio "
-"#{config/binary_debian-installer-includes/}#."
+"#{config/includes.binary_debian-installer/}#."
diff --git a/manual/po/es/user_customization-overview.ssi.po b/manual/po/es/user_customization-overview.ssi.po
index 89f0d73..1c80ed2 100644
--- a/manual/po/es/user_customization-overview.ssi.po
+++ b/manual/po/es/user_customization-overview.ssi.po
@@ -1,5 +1,4 @@
# Spanish translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
@@ -9,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: 2012-02-19 17:36+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -102,7 +101,7 @@ msgstr ""
"sistema en vivo, con el fin de facilitar la referencia cuando se trabaja en "
"una configuración. No hay ningún problema en hacerlo, ya que ninguno de los "
"scripts que contiene el sistema huésped será ejecutado, a menos que se "
-"configure el sistema huésped como sistema en vivo, cosa que no tiene sentido."
+"configure el sistema huésped como sistema en vivo."
#. type: Plain text
#: en/user_customization-overview.ssi:14
@@ -171,7 +170,7 @@ msgstr "2~ Opciones para lb config en ficheros"
#. type: Plain text
#: en/user_customization-overview.ssi:22
msgid ""
-"Although #{lb config}# does create a skeletal configuration in the config/ "
+"Although #{lb config}# creates a skeletal configuration in the config/ "
"directory, to accomplish your goals, you may need to provide additional "
"files in subdirectories of config/. Depending on where the files are stored "
"in the configuration, they may be copied into the live system's filesystem "
diff --git a/manual/po/es/user_customization-packages.ssi.po b/manual/po/es/user_customization-packages.ssi.po
index 1f4e7b9..954b3cf 100644
--- a/manual/po/es/user_customization-packages.ssi.po
+++ b/manual/po/es/user_customization-packages.ssi.po
@@ -1,5 +1,4 @@
# Spanish translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
@@ -9,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-04-14 22:45+0300\n"
"PO-Revision-Date: 2012-02-19 17:53+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -24,28 +23,29 @@ msgstr ""
"X-Poedit-SourceCharset: utf-8\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -69,21 +69,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -92,28 +93,29 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -137,21 +139,22 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -183,12 +186,12 @@ msgid ""
"distribution mirror. You can also add your own repositories for backports, "
"experimental or custom packages, or include packages directly as files. You "
"can define your own lists of packages to include, use live-build's "
-"predefined lists, use #{tasksel}# tasks, or a combination of all three. "
-"Finally, a number of options give some control over apt, or if you prefer, "
-"aptitude, at build time when packages are installed. You may find these "
-"handy if you use a proxy, want to disable installation of recommended "
-"packages to save space, or need to control which versions of packages are "
-"installed via APT pinning, to name a few possibilities."
+"predefined lists, use /{tasksel}/ tasks, or a combination of all three. "
+"Finally, a number of options give some control over /{apt}/, or if you "
+"prefer, /{aptitude}/, at build time when packages are installed. You may "
+"find these handy if you use a proxy, want to disable installation of "
+"recommended packages to save space, or need to control which versions of "
+"packages are installed via APT pinning, to name a few possibilities."
msgstr ""
"Quizás la tarea más básica de personalización en Debian Live es la selección "
"de paquetes que serán incluidos en la imagen. Este capítulo orienta a través "
@@ -201,14 +204,14 @@ msgstr ""
"más cercano. Se pueden añadir repositorios para backports, experimentales, "
"paquetes personalizados o incluir ficheros de paquetes directamente. Se "
"pueden definir listas de paquetes personalizadas, utilizar listas "
-"predefinidas en live-build, seleccionar tareas de #{tasksel}# o una "
+"predefinidas en live-build, seleccionar tareas de /{tasksel}/ o una "
"combinación de los tres métodos. Por último existen varias opciones que dan "
-"algún control sobre cuando son instalados los paquetes por la herramienta "
-"apt o la herramienta aptitude, según sea la elegida. Estas opciones pueden "
-"ser útiles si se utiliza un proxy, se quiere desactivar la instalación de "
-"paquetes recomendados para ahorrar espacio o se necesita controlar las "
-"versiones de los paquetes a instalar mediante APT pinning, por nombrar "
-"algunas posibilidades."
+"algún control sobre cuando son instalados los paquetes por la herramienta /"
+"{apt}/ o la herramienta /{aptitude}/, según sea la elegida. Estas opciones "
+"pueden ser útiles si se utiliza un proxy, se quiere desactivar la "
+"instalación de paquetes recomendados para ahorrar espacio o se necesita "
+"controlar las versiones de los paquetes a instalar mediante APT pinning, por "
+"nombrar algunas posibilidades."
#. type: Plain text
#: en/user_customization-packages.ssi:8
@@ -225,24 +228,24 @@ msgstr "3~ Distribución, áreas de archivo y modo"
msgid ""
"The distribution you choose has the broadest impact on which packages are "
"available to include in your live image. Specify the codename, which "
-"defaults to #{wheezy}# for the Wheezy version of live-build. Any current "
+"defaults to wheezy for the wheezy version of live-build. Any current "
"distribution carried in the Debian archive may be specified by its codename "
"here. (See {Terms}#terms for more details.) The #{--distribution}# option "
"not only influences the source of packages within the archive, but also "
-"instructs #{live-build}# to behave as needed to build each supported "
-"distribution. For example, to build against the *{unstable}* release, Sid, "
+"instructs live-build to behave as needed to build each supported "
+"distribution. For example, to build against the *{unstable}* release, sid, "
"specify:"
msgstr ""
"La distribución seleccionada tiene gran impacto en qué paquetes están "
"disponibles para incluir en la imagen. Se debe indicar el nombre en clave de "
-"la distribución, que por defecto es #{wheezy}# para la versión Wheezy de "
-"live-build. Se puede especificar cualquier nombre de distribución disponible "
-"en los repositorios Debian indicando su nombre en clave. (Para más detalles "
-"ver {Términos}#terms). La opción #{--distribution}# no solamente influencia "
-"la fuente de los paquetes dentro del archivo Debian, sino que instruye a #"
-"{live-build}# a comportarse tal y como se necesita para construir cada una "
-"de las distribuciones. Por ejemplo, para construir contra la versión *"
-"{inestable}*, Sid, se debe indicar: "
+"la distribución, que por defecto es wheezy para la versión wheezy de live-"
+"build. Se puede especificar cualquier nombre de distribución disponible en "
+"los repositorios Debian indicando su nombre en clave. (Para más detalles ver "
+"{Términos}#terms). La opción #{--distribution}# no solamente influencia la "
+"fuente de los paquetes dentro del archivo Debian, sino que instruye a live-"
+"build a comportarse tal y como se necesita para construir cada una de las "
+"distribuciones. Por ejemplo, para construir contra la versión *{inestable}*, "
+"sid, se debe indicar: "
#. type: Plain text
#: en/user_customization-packages.ssi:16
@@ -308,12 +311,12 @@ msgid ""
"download speed. Each of the #{--mirror-*}# options governs which "
"distribution mirror is used at various stages of the build. Recall from "
"{Stages of the build}#stages-of-the-build that the *{bootstrap}* stage is "
-"when the chroot is initially populated by debootstrap with a minimal system, "
-"and the *{chroot}* stage is when the chroot used to construct the live "
-"system's filesystem is built. Thus, the corresponding mirror switches are "
-"used for those stages, and later, in the *{binary}* stage, the #{--mirror-"
-"binary}# and #{--mirror-binary-security}# values are used, superceding any "
-"mirrors used in an earlier stage."
+"when the chroot is initially populated by /{debootstrap}/ with a minimal "
+"system, and the *{chroot}* stage is when the chroot used to construct the "
+"live system's filesystem is built. Thus, the corresponding mirror switches "
+"are used for those stages, and later, in the *{binary}* stage, the #{--"
+"mirror-binary}# and #{--mirror-binary-security}# values are used, "
+"superceding any mirrors used in an earlier stage."
msgstr ""
"Los repositorios de Debian están replicados en una gran red alrededor del "
"mundo, de manera que se puede seleccionar la réplica más cercana con el fin "
@@ -322,13 +325,13 @@ msgstr ""
"diferentes etapas de creación. Si se recuerda de {Etapas de la creación}"
"#stages-of-the-build, en la etapa de preinstalación (bootstrap) es cuando se "
"crea el directorio chroot y se rellena con un sistema mínimo mediante la "
-"herramienta debootstrap, y en la etapa *{chroot}* es cuando el directorio "
-"chroot es completado con los paquetes necesarios para crear el sistema de "
-"ficheros que será utilizado en el sistema en vivo. A cada una de estas "
-"etapas le corresponde su propia opción #{--mirror-*}#. Posteriormente, en la "
-"etapa *{binary}* se utilizarán las réplicas Debian indicadas en los valores "
-"de las opciones #{--mirror-binary}# y #{--mirror-binary-security}# en lugar "
-"de utilizar los indicados para las etapas anteriores."
+"herramienta /{debootstrap}/, y en la etapa *{chroot}* es cuando el "
+"directorio chroot es completado con los paquetes necesarios para crear el "
+"sistema de ficheros que será utilizado en el sistema en vivo. A cada una de "
+"estas etapas le corresponde su propia opción #{--mirror-*}#. Posteriormente, "
+"en la etapa *{binary}* se utilizarán las réplicas Debian indicadas en los "
+"valores de las opciones #{--mirror-binary}# y #{--mirror-binary-security}# "
+"en lugar de utilizar los indicados para las etapas anteriores."
#. type: Plain text
#: en/user_customization-packages.ssi:36
@@ -650,14 +653,14 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:125
msgid ""
-"For example, to make a list that includes the predefined #{gnome}# list plus "
-"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
-"contents:"
+"For example, to make a list that includes the predefined #{gnome}# list "
+"plus /{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the "
+"following contents:"
msgstr ""
"Por ejemplo, para hacer una lista de paquetes que incluya la lista de "
-"paquetes predefinida #{gnome}# y añadir el paquete iceweasel se puede crear "
-"un fichero llamado #{config/package-lists/my.list.chroot}# con el siguiente "
-"contenido:"
+"paquetes predefinida #{gnome}# y añadir el paquete /{iceweasel}/ se puede "
+"crear un fichero llamado #{config/package-lists/my.list.chroot}# con el "
+"siguiente contenido:"
#. type: Plain text
#: en/user_customization-packages.ssi:130
@@ -712,12 +715,12 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:148
msgid ""
-"You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architectures i386}# or #{--architectures amd64}# is "
-"specified:"
+"You may test for any one of a number of values, e.g. to install /"
+"{memtest86+}/ if either #{--architectures i386}# or #{--architectures amd64}"
+"# is specified:"
msgstr ""
"En la expresión condicional pueden utilizarse varios valores. Por ejemplo "
-"para instalar el paquete #{memtest86+}# si la arquitectura es i386 (#{--"
+"para instalar el paquete /{memtest86+}/ si la arquitectura es i386 (#{--"
"architectures i386}#) o es amd64 (#{--architectures amd64}#) se puede "
"especificar:"
@@ -734,11 +737,11 @@ msgstr ""
#: en/user_customization-packages.ssi:158
msgid ""
"You may also test against variables that may contain more than one value, e."
-"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
+"g. to install /{vrms}/ if either #{contrib}# or #{non-free}# is specified "
"via #{--archive-areas}#:"
msgstr ""
"En la expresión condicional también pueden utilizarse variables que pueden "
-"contener más de un valor. Por ejemplo para instalar #{vrms}# si se utilizan "
+"contener más de un valor. Por ejemplo para instalar /{vrms}/ si se utilizan "
"las áreas del archivo #{contrib}# o #{non-free}# mediante la opción #{--"
"archive-areas}# se puede indicar:"
@@ -807,8 +810,8 @@ msgstr ""
msgid ""
"The primary tasks available in the Debian Installer can be listed with #"
"{tasksel --list-tasks}# in the live system. The contents of any task, "
-"including ones not included in this list, may be examined with #{tasksel --"
-"task-packages}#."
+"including the ones not included in this list, may be examined with #{tasksel "
+"--task-packages}#."
msgstr ""
"Una vez ha sido arrancado el sistema en vivo puede conocerse qué tareas "
"primarias están disponibles en el Instalador de Debian mediante la orden #"
@@ -1146,14 +1149,14 @@ msgstr "3~choosing-apt-or-aptitude Utilizar apt o aptitude"
#. type: Plain text
#: en/user_customization-packages.ssi:266
msgid ""
-"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
+"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 "
"to #{lb config}#. Choose the method implementing the preferred behaviour for "
"package installation, the notable difference being how missing packages are "
"handled."
msgstr ""
-"Se puede seleccionar qué herramienta se utilizará para instalar paquetes, #"
-"{apt}# o #{aptitude}#, en el momento de crear la imagen mediante la opción #"
+"Se puede seleccionar qué herramienta se utilizará para instalar paquetes, /"
+"{apt}/ o /{aptitude}/, en el momento de crear la imagen mediante la opción #"
"{--apt}# de #{lb config}#. Esta selección definirá el comportamiento "
"preferido en la instalación de paquetes, siendo la mayor diferencia la "
"manera de tratar los paquetes no disponibles."
@@ -1231,16 +1234,16 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:294
msgid ""
-"This will not influence the entries in /etc/apt/sources.list, but merely "
-"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
-"APT needs those indices in order to operate in the live system, so before "
-"performing #{apt-cache search}# or #{apt-get install}#, for instance, the "
-"user must #{apt-get update}# first to create those indices."
+"This will not influence the entries in #{/etc/apt/sources.list}#, but merely "
+"whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is "
+"that APT needs those indices in order to operate in the live system, so "
+"before performing #{apt-cache search}# or #{apt-get install}#, for instance, "
+"the user must #{apt-get update}# first to create those indices."
msgstr ""
-"Esto no modificará el comportamiento de las entradas definidas en /etc/apt/"
-"sources.list, sino que solo afecta a si exitirán o no ficheros de índice en "
-"el directorio /var/lib/apt. El compromiso viene de que APT necesita estos "
-"ficheros índices para funcionar en el sistema en vivo, así que, si no "
+"Esto no modificará el comportamiento de las entradas definidas en #{/etc/apt/"
+"sources.list}#, sino que solo afecta a si exitirán o no ficheros de índice "
+"en el directorio #{/var/lib/apt}#. El compromiso viene de que APT necesita "
+"estos ficheros índices para funcionar en el sistema en vivo, así que, si no "
"existen, el usuario deberá ejecutar la orden #{apt-get update}# para crear "
"estos índices antes de poder ejecutar una orden del tipo #{apt-cache search}"
"# o #{apt-get install}#."
@@ -1330,19 +1333,19 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:314
msgid ""
-"Let's say you are building a Wheezy 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 "
+"Let's say you are building a wheezy 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, Wheezy. The following will "
+"taken from the target system distribution, wheezy. The following will "
"accomplish this:"
msgstr ""
-"Supongamos que se está creando un sistema en vivo basado en Wheezy pero se "
+"Supongamos que se está creando un sistema en vivo basado en wheezy pero se "
"necesita instalar todos los paquetes \"live\" que terminan instalados en la "
-"imagen binaria final desde la versión inestable «Sid» en el momento de crear "
-"la imagen. Se deberá añadir Sid a los orígenes (sources) de APT y fijarlo "
-"(pin) de manera que solamente los paquetes fijados sean instalados desde Sid "
-"mientras que el resto será obtenido desde la distribución base, Wheezy. Esto "
+"imagen binaria final desde la versión inestable «sid» en el momento de crear "
+"la imagen. Se deberá añadir sid a los orígenes (sources) de APT y fijarlo "
+"(pin) de manera que solamente los paquetes fijados sean instalados desde sid "
+"mientras que el resto será obtenido desde la distribución base, wheezy. Esto "
"se puede realizar de la siguiente forma:"
#. type: Plain text
@@ -1369,8 +1372,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:331
#, no-wrap
-msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with Wheezy using:\n"
-msgstr "*{Nota:}* Se pueden usar comodines en los nombres de los paquetes a fijar (p.ej. *{Package: live-*}*) si se usa una versión de apt igual o superior a 0.8.14. Esto significa que funciona con Wheezy usando:\n"
+msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:\n"
+msgstr "*{Nota:}* Se pueden usar comodines en los nombres de los paquetes a fijar (p.ej. *{Package: live-*}*) si se usa una versión de apt igual o superior a 0.8.14. Esto significa que funciona con wheezy usando:\n"
#. type: Plain text
#: en/user_customization-packages.ssi:335
@@ -1384,9 +1387,9 @@ msgid ""
"the case where you do not want a package that is recommended by another "
"package. Suppose you are building an LXDE image using #{--package-lists lxde}"
"# option, but don't want the user prompted to store wifi passwords in the "
-"keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
-"turn recommends #{gnome-keyring}#. So you want to omit the recommended #"
-"{gnome-keyring}# package. This can be done by adding the following stanza to "
+"keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in "
+"turn recommends /{gnome-keyring}/. So you want to omit the recommended /"
+"{gnome-keyring}/ package. This can be done by adding the following stanza to "
"#{config/chroot_apt/preferences}#:"
msgstr ""
"Una prioridad pin negativa previene la instalación de un paquete, como puede "
@@ -1394,9 +1397,9 @@ msgstr ""
"instalado al instalar el primero. Supongamos que se está creando una imagen "
"LXDE mediante la opción #{--package-lists lxde}#, pero no se desea preguntar "
"al usuario si desea almacenar las claves wifi en el almacen de claves. La "
-"lista lxde incluye #{gdm}#, la cual depende de #{gksu}# que a su vez "
-"recomienda #{gnome-keyring}#. Así que el objetivo es omitir la instalación "
-"del paquete #{gnome-keyring}#, que puede conseguirse añadiendo un fichero "
+"lista lxde incluye /{gdm}/, la cual depende de /{gksu}/ que a su vez "
+"recomienda /{gnome-keyring}/. Así que el objetivo es omitir la instalación "
+"del paquete /{gnome-keyring}/, que puede conseguirse añadiendo un fichero "
"con el siguiente contenido a #{config/chroot_apt/preferences}#:"
#. type: Plain text
diff --git a/manual/po/es/user_customization-runtime.ssi.po b/manual/po/es/user_customization-runtime.ssi.po
index 9fd26d2..d7ed337 100644
--- a/manual/po/es/user_customization-runtime.ssi.po
+++ b/manual/po/es/user_customization-runtime.ssi.po
@@ -1,5 +1,4 @@
# Spanish translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
@@ -9,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-24 15:08+0100\n"
+"POT-Creation-Date: 2012-06-03 20:02+0300\n"
"PO-Revision-Date: 2012-03-24 13:18+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -22,28 +21,29 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -91,28 +91,29 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -446,14 +447,14 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:96
msgid ""
-"Persistence is a common name for different kinds of solutions for saving "
+"'Persistence' is a common name for different kinds of solutions for saving "
"across reboots some, or all, of this run-time evolution of the system. To "
"understand how it could work it could be handy to know that even if the "
"system is booted and run from read-only media, modification to the files and "
"directories are written on writable media, typically a ram disk (tmpfs) and "
"ram disks' data do not survive reboots."
msgstr ""
-"La persistencia es un nombre común que se dá a los diferentes tipos de "
+"La «persistencia» es un nombre común que se da a los diferentes tipos de "
"soluciones para guardar algunos o todos los cambios realizados durante la "
"ejecución tras reiniciar el sistema. Para entender cómo funciona es útil "
"saber que incluso si el sistema se inicia y se ejecuta desde los medios de "
@@ -468,24 +469,25 @@ msgid ""
"medium like local storage media, a network share or even a session of a "
"multisession (re)writable CD/DVD. All these media are supported in Debian "
"Live in different ways, and all but the last one require a special boot "
-"parameter to be specified at boot time: #{persistent}#."
+"parameter to be specified at boot time: #{persistence}#."
msgstr ""
"Los datos almacenados en esta memoria ram se pueden guardar en un soporte "
-"grabable como un medio de almacenamiento local, un recurso compartido en red "
-"o incluso en una sesión de un CD/DVD regrabable en multisesión. Todos estos "
-"medios son compatibles con Debian Live de diferentes maneras, y todos menos "
-"el último requieren un parámetro de arranque especial que se especificará en "
-"el momento del arranque: #{persistent}#."
+"grabable, como un medio de almacenamiento local, un recurso compartido en "
+"red o incluso en una sesión de un CD/DVD regrabable en multisesión. Todos "
+"estos medios son compatibles con Debian Live de diferentes maneras y todos, "
+"menos el último, requieren un parámetro de arranque especial que se "
+"especificará en el momento del arranque: #{persistence}#."
#. type: Plain text
#: en/user_customization-runtime.ssi:100
msgid ""
-"If the boot parameter #{persistent}# is set (and #{nopersistent}# is not "
+"If the boot parameter #{persistence}# is set (and #{nopersistence}# is not "
"set), local storage media (e.g. hard disks, USB drives) will be probed for "
-"persistent volumes during boot. A persistent volume is any of the following:"
+"persistence volumes during boot. A persistence volume is any of the "
+"following:"
msgstr ""
-"Si se usa el parámetro de arranque #{persistent}# (y no se usa la opción #"
-"{nopersistent}#), se busca en los medios de almacenamiento locales (p.ej. "
+"Si se usa el parámetro de arranque #{persistence}# (y no se usa la opción #"
+"{nopersistence}#), se busca en los medios de almacenamiento locales (p.ej. "
"discos duros, llaves USB) volúmenes con persistencia durante el arranque. Un "
"volumen persistente es cualquiera de los siguientes: "
@@ -507,18 +509,18 @@ msgid ""
"_* an image/archive file located on the root of any readable filesystem "
"(even an NTFS partition of a foreign OS), identified by its file name. In "
"this case the file name must also use the containing filesystem as the file "
-"extension, e.g. \"<label>.ext3\"."
+"extension, e.g. \"<label>.ext4\"."
msgstr ""
"_* una fichero imagen/archivo situado en el sistema raiz de cualquier "
"sistema de ficheros que pueda ser leido (incluso una partición NTFS de otro "
"sistema operativo), identificado por su nombre de fichero. En este caso el "
"nombre del fichero debe contener el nombre el sistema de ficheros como "
-"extensión, p.ej. \"<label>.ext3\"."
+"extensión, p.ej. \"<label>.ext4\"."
#. type: Plain text
#: en/user_customization-runtime.ssi:108
msgid ""
-"It is possible to restrict which types of persistent volumes to use by "
+"It is possible to restrict which types of persistence volumes to use by "
"specifying certain boot parameters described in the live-boot(7) man page. "
"The \"identifying labels\" referred to above can be any of the following:"
msgstr ""
@@ -529,7 +531,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:110
-msgid "_* #{full-ov}# for full persistent overlays."
+msgid "_* #{full-ov}# for full persistence overlays."
msgstr "_* #{full-ov}# para capas de persistencia total."
#. type: Plain text
@@ -549,7 +551,7 @@ msgstr "_* #{home-sn}# para instantáneas de /home."
#. type: Plain text
#: en/user_customization-runtime.ssi:118
-msgid "3~ Full persistent overlays"
+msgid "3~ Full persistence overlays"
msgstr "3~ Capas de persistencia total "
#. type: Plain text
@@ -557,8 +559,8 @@ msgstr "3~ Capas de persistencia total "
msgid ""
"By 'full persistence' it is meant that instead of using a tmpfs for storing "
"modifications to the read-only media (with the copy-on-write, COW, system) a "
-"persistent volume is used. For this type of persistence the volume label "
-"must be #{full-ov}#. This could, for instance, be an ext2 partition on a "
+"persistence volume is used. For this type of persistence the volume label "
+"must be #{full-ov}#. This could, for instance, be an ext4 partition on a "
"hard disk or on a usb key created with, e.g.:"
msgstr ""
"Por «Persistencia total» se entiende la utilización de una partición de "
@@ -566,13 +568,13 @@ msgstr ""
"guardar los cambios realizados en los medios de sólo lectura (con el sistema "
"copiar-al-escribir o COW «copy-on-write» N. del T.). Para utilizar este tipo "
"de persistencia la etiqueta del volumen debe ser #{full-ov}#. Esta podría "
-"ser, por ejemplo, una partición ext2 o un disco duro o una llave usb creada "
+"ser, por ejemplo, una partición ext4 o un disco duro o una llave usb creada "
"con. p.ej:"
#. type: Plain text
#: en/user_customization-runtime.ssi:124
#, no-wrap
-msgid " # mkfs.ext2 -L full-ov /dev/sdb1\n"
+msgid " # mkfs.ext4 -L full-ov /dev/sdb1\n"
msgstr ""
#. type: Plain text
@@ -599,10 +601,10 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:138
msgid ""
-"Here's an example of how to create an ext2-based image file used for full "
+"Here's an example of how to create an ext4-based image file used for full "
"persistence:"
msgstr ""
-"Un ejemplo de cómo crear un fichero imagen basado en ext2 usando "
+"Un ejemplo de cómo crear un fichero imagen basado en ext4 usando "
"persistencia total."
#. type: Plain text
@@ -610,7 +612,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file\n"
-" $ /sbin/mkfs.ext2 -F full-ov\n"
+" $ /sbin/mkfs.ext4 -F full-ov\n"
msgstr ""
#. type: Plain text
@@ -631,82 +633,82 @@ msgstr "3~ Capas personalizadas"
#: en/user_customization-runtime.ssi:151
msgid ""
"A volume with the label #{custom-ov}# can be configured to make arbitrary "
-"directories persistent. The file #{live.persist}#, located on the volume's "
-"filesystem root, controls which directories it makes persistent, and in "
-"which way."
+"directories persistent. The file #{live-persistence.conf}#, located on the "
+"volume's filesystem root, controls which directories it makes persistent, "
+"and in which way."
msgstr ""
"Un volumen con la etiqueta #{custom-ov}# puede ser personalizado para crear "
-"arbitrariamente directorios persistentes. El fichero #{live.persist}#, "
-"situado en el sistema de ficheros raiz del volumen, controla que directorios "
-"hace persistentes y también de que manera."
+"arbitrariamente directorios persistentes. El fichero #{live-persistence.conf}"
+"#, situado en el sistema de ficheros raiz del volumen, controla que "
+"directorios hace persistentes y también de que manera."
#. type: Plain text
#: en/user_customization-runtime.ssi:153
msgid ""
"How custom overlay mounts are configured is described in full detail in the "
-"live.persist(5) man page, but a simple example should be sufficient for most "
-"uses. Let's say we want to make our home directory and APT cache persistent "
-"in an ext3 filesystem on the /dev/sdb1 partition:"
+"live-persistence.conf(5) man page, but a simple example should be sufficient "
+"for most uses. Let's say we want to make our home directory and APT cache "
+"persistent in an ext4 filesystem on the /dev/sdb1 partition:"
msgstr ""
-"En la página de manual de live.persist(5) se explica en detalle cómo se "
-"configura el montaje de las capas, pero un sencillo ejemplo es suficiente "
-"para la mayoría de los casos. Supongamos que queremos crear nuestro "
-"directorio home y APT cache persistentes en un sistema de ficheros ext3 en "
-"la partición /dev/sdb1:"
+"En la página de manual de live-persistence.conf(5) se explica en detalle "
+"cómo se configura el montaje de las capas, pero un sencillo ejemplo es "
+"suficiente para la mayoría de los casos. Supongamos que queremos crear "
+"nuestro directorio home y APT cache persistentes en un sistema de ficheros "
+"ext4 en la partición /dev/sdb1:"
#. type: Plain text
#: en/user_customization-runtime.ssi:160
#, no-wrap
msgid ""
-" $ mkfs.ext3 -L custom-ov /dev/sdb1\n"
-" $ mount -t ext3 /dev/sdb1 /mnt\n"
-" $ echo \"/home\" >> /mnt/live.persist\n"
-" $ echo \"/var/cache/apt\" >> /mnt/live.persist\n"
+" $ mkfs.ext4 -L custom-ov /dev/sdb1\n"
+" $ mount -t ext4 /dev/sdb1 /mnt\n"
+" $ echo \"/home\" >> /mnt/live-persistence.conf\n"
+" $ echo \"/var/cache/apt\" >> /mnt/live-persistence.conf\n"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:164
msgid ""
-"Then we reboot. During the first boot the contents of /home and /var/cache/"
-"apt will be copied into the persistent volume, and from then on all changes "
-"to these directories will live in the persistent volume. Please note that "
-"any paths listed in the #{live.persist}# file cannot contain white spaces or "
-"the special \".\" and \"..\" path components. Also, neither \"/live\" (or "
-"any of its sub-directories) nor \"/\" can be made persistent using custom "
-"mounts (for the latter, use the #{full-ov}# type persistence described "
-"above)."
-msgstr ""
-"Entonces reiniciamos. Durante el primer arranque los contenidos de /home y /"
-"var/cache/apt se copiarán en el volumen persistente y a partir de ese "
+"Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
+"cache/apt}# will be copied into the persistence volume, and from then on all "
+"changes to these directories will live in the persistence volume. Please "
+"note that any paths listed in the #{live-persistence.conf}# file cannot "
+"contain white spaces or the special #{.}# and #{..}# path components. Also, "
+"neither #{/live}# (or any of its sub-directories) nor #{/}# can be made "
+"persistent using custom mounts (for the latter, use the #{full-ov}# type "
+"persistence described above)."
+msgstr ""
+"Entonces reiniciamos. Durante el primer arranque los contenidos de #{/home}# "
+"y #{/var/cache/apt}# se copiarán en el volumen persistente y a partir de ese "
"momento todos los cambios en esos directorios se guardarán allí. Tener en "
-"cuenta que los rutas listadas en el fichero #{live.persist}# no pueden "
-"contener espacios en blanco o los componentes especiales \".\" y \"..\". "
-"Además ni \"/live\" (o ninguno de sus sub-directorios) ni \"/\" pueden "
-"hacerse persistentes montándolos de forma personalizada. Para este último, "
-"usar el tipo de persistencia #{full-ov}# descrito anteriormente."
+"cuenta que las rutas listadas en el fichero #{live-persistence.conf}# no "
+"pueden contener espacios en blanco ni los componentes especiales #{.}# y #"
+"{..}#. Además, ni #{/live}# (o ninguno de sus sub-directorios) ni #{/}# "
+"pueden hacerse persistentes montándolos de forma personalizada. Para esto "
+"último, usar el tipo de persistencia #{full-ov}# descrito anteriormente."
#. type: Plain text
#: en/user_customization-runtime.ssi:166
msgid ""
-"Several different custom overlay volumes (with their own #{live.persist}# "
-"files) can be used at the same time, but if several volumes make the same "
-"directory persistent, only one of them will be used. If any two mounts are "
-"\"nested\" (i.e. one is a sub-directory of the other) the parent will be "
+"Several different custom overlay volumes (with their own #{live-persistence."
+"conf}# files) can be used at the same time, but if several volumes make the "
+"same directory persistent, only one of them will be used. If any two mounts "
+"are \"nested\" (i.e. one is a sub-directory of the other) the parent will be "
"mounted before the child so no mount will be hidden by the other. Nested "
-"custom mounts are problematic if they are listed in the same #{live.persist}"
-"# file. See the live.persist(5) man page for how to handle that case if you "
-"really need it (hint: you usually don't)."
+"custom mounts are problematic if they are listed in the same #{live-"
+"persistence.conf}# file. See the live-persistence.conf(5) man page for how "
+"to handle that case if you really need it (hint: you usually don't)."
msgstr ""
"Se puede usar diferentes volúmenes de capas personalizados al mismo tiempo "
-"(con sus propios ficheros #{live.persist}#) pero si varios volúmenes hacen "
-"que un mismo directorio sea persistente, sólo uno de ellos será usado. Si "
-"dos unidades montadas están \"anidadas\" (es decir, una es un sub-directorio "
-"de la otra) el directorio superior será montado antes que el inferior de "
-"este modo no quedará uno escondido por el otro. La personalización de los "
-"montajes anidadados es problemática si están listados en el mismo fichero #"
-"{live.persist}#. Consultar la página de manual de live.persist(5) para ver "
-"como manejar ese caso si realmente es necesario. (aclaración: normalmente no "
-"lo es)."
+"(con sus propios ficheros #{live-persistence.conf}#) pero si varios "
+"volúmenes hacen que un mismo directorio sea persistente, sólo uno de ellos "
+"será usado. Si dos unidades montadas están \"anidadas\" (es decir, una es un "
+"sub-directorio de la otra) el directorio superior será montado antes que el "
+"inferior de este modo no quedará uno escondido por el otro. La "
+"personalización de los montajes anidadados es problemática si están listados "
+"en el mismo fichero #{live-persistence.conf}#. Consultar la página de manual "
+"de live-persistence.conf(5) para ver como manejar ese caso si realmente es "
+"necesario. (aclaración: normalmente no lo es)."
#. type: Plain text
#: en/user_customization-runtime.ssi:168
@@ -717,13 +719,13 @@ msgstr "3~ Instantáneas"
#: en/user_customization-runtime.ssi:170
msgid ""
"Snapshots are collections of files and directories which are not mounted "
-"while running but which are copied from a persistent volume to the system "
+"while running but which are copied from a persistence volume to the system "
"(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The "
"volume must be labeled #{live-sn}#, and it defaults to a simple cpio archive "
"named #{live-sn.cpio.gz}#. A power interruption during run time could lead "
"to data loss, hence, if you have important changes, invoke #{live-snapshot --"
"refresh}# as often as needed. This type of persistence, since it does not "
-"write continuously to the persistent media, is the most flash-based device "
+"write continuously to the persistence media, is the most flash-based device "
"friendly and the fastest of all the persistence systems, but it occupies as "
"much RAM as the size of the uncompressed snapshot."
msgstr ""
@@ -757,27 +759,27 @@ msgstr "Las instantáneas no pueden manejar el borrado de ficheros."
#. type: Plain text
#: en/user_customization-runtime.ssi:176
-msgid "3~ Persistent SubText"
+msgid "3~ Persistence SubText"
msgstr "3~ SubText persistente"
#. type: Plain text
#: en/user_customization-runtime.ssi:178
msgid ""
-"If a user would need multiple persistent storage of the same type for "
+"If a user would need multiple persistence storage of the same type for "
"different locations or testing, such as #{full-ov-nonwork}# and #{full-ov-"
-"work}#, the boot parameter #{persistent-subtext}# used in conjunction with "
-"the boot parameter #{persistent}# will allow for multiple but unique "
-"persistent media. An example would be if a user wanted to use a persistent "
+"work}#, the boot parameter #{persistence-subtext}# used in conjunction with "
+"the boot parameter #{persistence}# will allow for multiple but unique "
+"persistence media. An example would be if a user wanted to use a persistence "
"partition labeled #{live-sn-subText}# they would use the boot parameters of: "
-"#{persistent}# #{persistent-subtext=subText}#."
+"#{persistence}# #{persistence-subtext=subText}#."
msgstr ""
"Si un usuario necesita un almacenamiento persistente múltiple del mismo tipo "
"para diferentes lugares o pruebas, tales como #{full-ov-nonwork}# y #{full-"
-"ov-work}#, el parámetro de arranque #{persistent-subtext}# usado junto con "
-"el parámetro de arranque #{persistent}# permitirá medios de almacenamiento "
+"ov-work}#, el parámetro de arranque #{persistence-subtext}# usado junto con "
+"el parámetro de arranque #{persistence}# permitirá medios de almacenamiento "
"persistentes múltiples pero únicos. Un ejemplo sería, si un usuario desea "
"utilizar una partición persistente etiquetada #{live-sn-subText}# usaría los "
-"parámetros de arranque: #{persistent}# #{persistent-subtext=subText}#."
+"parámetros de arranque: #{persistence}# #{persistence-subtext=subText}#."
#. type: Plain text
#: en/user_customization-runtime.ssi:180
diff --git a/manual/po/es/user_examples.ssi.po b/manual/po/es/user_examples.ssi.po
index e8e6f1b..bb1fc64 100644
--- a/manual/po/es/user_examples.ssi.po
+++ b/manual/po/es/user_examples.ssi.po
@@ -1,5 +1,4 @@
# Spanish translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
@@ -9,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-13 14:44+0100\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
"PO-Revision-Date: 2012-02-19 18:29+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -27,26 +26,27 @@ msgid ":B~ Examples"
msgstr ":B~ Ejemplos"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 en/user_customization-contents.ssi:26
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -72,49 +72,51 @@ msgstr ":B~ Ejemplos"
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 en/user_customization-contents.ssi:31
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -140,25 +142,26 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -170,7 +173,7 @@ msgid " # lb build\n"
msgstr " # lb build\n"
#. type: Plain text
-#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#: en/user_customization-binary.ssi:41 en/user_examples.ssi:95
#, no-wrap
msgid " #!/bin/sh\n"
msgstr " #!/bin/sh\n"
@@ -308,7 +311,7 @@ msgstr ""
#: en/user_examples.ssi:46
msgid ""
"Assuming all goes well, after a while, the current directory will contain #"
-"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+"{binary.hybrid.iso}#. This ISO hybrid image can be booted directly in a "
"virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-"
"with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
"virtualbox, or else imaged onto optical media or a USB flash device as "
@@ -317,7 +320,7 @@ msgid ""
"respectively."
msgstr ""
"Suponiendo que todo va bien, después de un rato, el directorio actual "
-"contendrá #{binary-hybrid.iso}#. Esta imagen ISO híbrida se puede arrancar "
+"contendrá #{binary.hybrid.iso}#. Esta imagen ISO híbrida se puede arrancar "
"directamente en una máquina virtual como se describe en {Probar una imagen "
"ISO con Qemu}#testing-iso-with-qemu y en {Probar una imagen ISO con "
"virtualbox-ose}#testing-iso-with-virtualbox o bien ser copiada a un medio "
@@ -466,17 +469,17 @@ msgid ""
"First, #{--architectures i386}# ensures that on our #{amd64}# build system, "
"we build a 32-bit version suitable for use on most machines. Second, we use #"
"{--linux-flavours 686-pae}# because we don't anticipate using this image on "
-"much older systems. Third, we've chosen the #{lxde}# package list to give us "
+"much older systems. Third, we've chosen the /{lxde}/ package list to give us "
"a minimal desktop. And finally, we have added two initial favourite "
-"packages: #{iceweasel}# and #{xchat}#."
+"packages: /{iceweasel}/ and /{xchat}/."
msgstr ""
"En primer lugar con #{--architectures i386}# se asegura de que en nuestro "
"sistema de creación #{amd64}# se crea una versión de 32-bits adecuada para "
"ser usada en la mayoría de máquinas. En segundo lugar, se usa #{--linux-"
"flavours 686-pae}# porque no se espera usar esta imagen en sistemas mucho "
-"más viejos. En tercer lugar se elige la lista de paquetes #{lxde}# para "
+"más viejos. En tercer lugar se elige la lista de paquetes /{lxde}/ para "
"proporcionar un escritorio mínimo. Y, por último, se añaden dos paquetes "
-"iniciales favoritos: #{iceweasel}# y #{xchat}#."
+"iniciales favoritos: /{iceweasel}/ y /{xchat}/."
#. type: Plain text
#: en/user_examples.ssi:115
@@ -522,11 +525,11 @@ msgstr "3~ Segunda revisión"
#. type: Plain text
#: en/user_examples.ssi:137
msgid ""
-"In this revision, we're going to clean up from the first build, add the #"
-"{vlc}# package to our configuration, rebuild, test and commit."
+"In this revision, we're going to clean up from the first build, add the /"
+"{vlc}/ package to our configuration, rebuild, test and commit."
msgstr ""
"En esta revisión, vamos a limpiar desde la primera creación, agregar el "
-"paquete #{vlc}# a nuestra configuración, crear de nuevo, probar y enviar los "
+"paquete /{vlc}/ a nuestra configuración, crear de nuevo, probar y enviar los "
"cambios al git."
#. type: Plain text
@@ -552,10 +555,10 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:147
msgid ""
-"Now append the #{vlc}# package to our local package list in #{config/package-"
+"Now append the /{vlc}/ package to our local package list in #{config/package-"
"lists/my.list.chroot}#:"
msgstr ""
-"Añadir ahora el paquete #{vlc}# a nuestra lista de paquetes local en #"
+"Añadir ahora el paquete /{vlc}/ a nuestra lista de paquetes local en #"
"{config/package-lists/my.list.chroot}#:"
#. type: Plain text
@@ -635,11 +638,11 @@ msgstr "*{Caso Práctico:}* Crear una imagen con live-build para arrancar direct
#: en/user_examples.ssi:179
msgid ""
"Make a build directory and create a skeletal configuration in it built "
-"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
-"{xvnc4viewer}#, disabling recommends to make a minimal system:"
+"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
+"{xvnc4viewer}/, disabling recommends to make a minimal system:"
msgstr ""
"Hacer un directorio de creación y crear una configuración en esqueleto según "
-"la lista estándar-x11, incluyendo #{gdm3}#, #{metacity}# y #{xvnc4viewer}#, "
+"la lista estándar-x11, incluyendo /{gdm3}/, /{metacity}/ y /{xvnc4viewer}/, "
"desactivando los paquetes recomendados para conseguir un sistema mínimo:"
#. type: Plain text
@@ -657,13 +660,13 @@ msgstr ""
#: en/user_examples.ssi:191
msgid ""
"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
-"the default user that will launch metacity and start xvncviewer, connecting "
-"to port #{5901}# on a server at #{192.168.1.2}#:"
+"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
+"connecting to port #{5901}# on a server at #{192.168.1.2}#:"
msgstr ""
"Crear el directorio #{/etc/skel}# y poner un fichero #{.xsession}# "
-"personalizado para el usuario que por defecto ejecutará metacity e iniciará "
-"el xvncviewer, conectándo al puerto #{5901}# de un servidor en #{192.168.1.2}"
-"#:"
+"personalizado para el usuario que por defecto ejecutará /{metacity}/ e "
+"iniciará el /{xvncviewer}/, conectándo al puerto #{5901}# de un servidor en #"
+"{192.168.1.2}#:"
#. type: Plain text
#: en/user_examples.ssi:197
@@ -718,10 +721,10 @@ msgid ""
"the tradeoffs you are making between size and functionality. In this "
"example, we trim only so much as to make room for additional material within "
"a 128M media size, but without doing anything to destroy integrity of the "
-"packages contained within, such as the purging of locale data via the #"
-"{localepurge}# package, or other such \"intrusive\" optimizations. Of "
+"packages contained within, such as the purging of locale data via the /"
+"{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
"particular note, you should not use #{--bootstrap-flavour minimal}# unless "
-"you really know what you're doing, as omitting priority #{important}# "
+"you really know what you're doing, as omitting priority *{important}* "
"packages will most likely produce a broken live system."
msgstr ""
"Al optimizar una imagen para adaptarla al tamaño de algunos medios de "
@@ -729,10 +732,10 @@ msgstr ""
"entre tamaño y funcionalidad. En este ejemplo, se recorta tanto sólo para "
"dar cabida a material adicional dentro de un tamaño de 128M, pero sin hacer "
"nada para destruir la integridad de los paquetes que contiene, tales como la "
-"depuración de las variantes locales a través del paquete #{localepurge}# u "
+"depuración de las variantes locales a través del paquete /{localepurge}/ u "
"otro tipo de optimizaciones «intrusivas». Cabe destacar que no se debe usar #"
"{--bootstrap-flavour minimal}# a menos de que realmente se sepa lo que se "
-"está haciendo, ya que al omitir paquetes de prioridad #{importante}# lo más "
+"está haciendo, ya que al omitir paquetes de prioridad *{importante}* lo más "
"probable es que se produzca un sistema roto."
#. type: Plain text
@@ -771,8 +774,8 @@ msgid ""
"system. Choosing the #{minimal}# package list leaves out the large #{locales}"
"# package and associated utilities. Dropping recommended packages with #{--"
"apt-recommends false}# saves some additional space, at the expense of "
-"omitting some packages you might otherwise expect to be there, such as #"
-"{firmware-linux-free}# which may be needed to support certain hardware. The "
+"omitting some packages you might otherwise expect to be there, such as /"
+"{firmware-linux-free}/ which may be needed to support certain hardware. The "
"remaining options shave off additional small amounts of space. It's up to "
"you to decide if the functionality that is sacrificed with each optimization "
"is worth the loss in functionality."
@@ -787,7 +790,7 @@ msgstr ""
"sus utilidades asociadas. Dejando los paquetes recomendados con #{--apt-"
"recommends false}# se ahorra un poco de espacio adicional a costa de omitir "
"algunos paquetes que de otro modo podría esperarse que estuvieran alli, tal "
-"como #{firmware-linux-free}# que puede ser necesario para el soporte de "
+"como /{firmware-linux-free}/ que puede ser necesario para el soporte de "
"cierto hardware. Las opciones restantes recortan pequeñas cantidades "
"adicionales de espacio. Es necesario decidir si vale la pena la "
"funcionalidad que se sacrifica con cada optimización."
@@ -903,13 +906,13 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:292
msgid ""
-"Note that we have included the #{debian-installer-launcher}# package to "
-"launch the installer from the live desktop, and have also specified the 486 "
-"flavour kernel, as it is currently necessary to make the installer and live "
-"system kernels match for the launcher to work properly."
+"Note that we have included the debian-installer-launcher package to launch "
+"the installer from the live desktop, and have also specified the 486 flavour "
+"kernel, as it is currently necessary to make the installer and live system "
+"kernels match for the launcher to work properly."
msgstr ""
-"Tener en cuenta que se ha incluido el paquete #{debian-installer-launcher}# "
-"para lanzar el instalador desde el escritorio en vivo, y que también se ha "
+"Tener en cuenta que se ha incluido el paquete debian-installer-launcher para "
+"lanzar el instalador desde el escritorio en vivo, y que también se ha "
"especificado el kernel 486, ya que actualmente es necesario que el "
"instalador y el kernel del sistema en vivo coincidan para que el lanzador "
"funcione correctamente."
diff --git a/manual/po/es/user_installation.ssi.po b/manual/po/es/user_installation.ssi.po
index 92b9bdd..20f4c9c 100644
--- a/manual/po/es/user_installation.ssi.po
+++ b/manual/po/es/user_installation.ssi.po
@@ -1,5 +1,4 @@
# Spanish translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
@@ -9,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-31 16:32+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
"PO-Revision-Date: 2012-02-19 21:35+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -21,29 +20,30 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -91,29 +91,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -439,28 +440,28 @@ msgstr "_* Creación de los paquetes .deb de live-boot y live-config"
#: en/user_installation.ssi:125
msgid ""
"You must build either on your target distribution or in a chroot containing "
-"your target platform: this means if your target is Wheezy then you should "
-"build against Wheezy."
+"your target platform: this means if your target is wheezy then you should "
+"build against wheezy."
msgstr ""
"Se debe crear ya sea en la distribución de destino o en un entorno chroot "
-"que contenga la plataforma de destino: es decir, si el objetivo es Wheezy "
-"entonces se debe crear usando Wheezy."
+"que contenga la plataforma de destino: es decir, si el objetivo es wheezy "
+"entonces se debe crear usando wheezy."
#. type: Plain text
#: en/user_installation.ssi:127
msgid ""
"Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
-"build #{live-boot}# for a target distribution that differs from your build "
-"system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy "
+"build live-boot for a target distribution that differs from your build "
+"system. For example, for wheezy live images, build live-boot in a wheezy "
"chroot. If your target distribution happens to match your build system "
"distribution, you may build directly on the build system using #{dpkg-"
"buildpackage}# (provided by the /{dpkg-dev}/ package):"
msgstr ""
"Utilizar un programa creador personal como /{pbuilder}/ o /{sbuild}/ si se "
-"necesita crear #{live-boot}# para una distribución de destino diferente del "
-"sistema de creación. Por ejemplo, para las imágenes en vivo de Wheezy, crear "
-"#{live-boot}# en un entorno chroot. Si la distribución de destino coincide "
-"con la distribución actual, se puede crear directamente sobre el sistema de "
+"necesita crear live-boot para una distribución de destino diferente del "
+"sistema de creación. Por ejemplo, para las imágenes en vivo de wheezy, crear "
+"live-boot en un entorno chroot. Si la distribución de destino coincide con "
+"la distribución actual, se puede crear directamente sobre el sistema de "
"creación con #{dpkg-buildpackage}# (proporcionada por el paquete /{dpkg-"
"dev}/ ):"
diff --git a/manual/po/es/user_managing_a_configuration.ssi.po b/manual/po/es/user_managing_a_configuration.ssi.po
index b6fa722..f8a2055 100644
--- a/manual/po/es/user_managing_a_configuration.ssi.po
+++ b/manual/po/es/user_managing_a_configuration.ssi.po
@@ -1,5 +1,4 @@
# Spanish translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
@@ -9,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: 2012-03-19 20:54+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -22,28 +21,30 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -67,21 +68,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -90,28 +92,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -135,21 +139,22 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -248,7 +253,7 @@ msgid ""
"variable values, and each time you run #{lb config}# and #{lb clean}#, these "
"files will be executed. This will ensure that your configuration is kept "
"internally consistent from one revision to the next and from one live-build "
-"release to the next (though you will still have to take care and read the "
+"release to the next (Although you will still have to take care and read the "
"documentation when you upgrade live-build and make adjustments as needed)."
msgstr ""
"Todo esto sería un terrible embrollo si no fuese por los scripts auto/* "
diff --git a/manual/po/es/user_overview.ssi.po b/manual/po/es/user_overview.ssi.po
index a73e8ee..248f25f 100644
--- a/manual/po/es/user_overview.ssi.po
+++ b/manual/po/es/user_overview.ssi.po
@@ -1,5 +1,4 @@
# Spanish translations for live-manual package
-# Copyright (C) 2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
@@ -9,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-19 18:09+0100\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: 2011-11-07 14:47+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -22,28 +21,30 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -67,21 +68,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -90,28 +92,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -135,21 +139,22 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -205,24 +210,24 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:14
msgid ""
-"Many concepts are similar to those in the debhelper Debian package tools "
+"Many concepts are similar to those in the /{debhelper}/ Debian package tools "
"written by Joey Hess:"
msgstr ""
-"Muchos conceptos son similares a los del paquete de herramientas de Debian "
-"debhelper escrito por Joey Hess:"
+"Muchos conceptos son similares a los del paquete de herramientas de Debian /"
+"{debhelper}/ escrito por Joey Hess:"
#. type: Plain text
#: en/user_overview.ssi:16
msgid ""
-"_* The scripts have a central location for configuring their operation. In "
-"debhelper, this is the #{debian/}# subdirectory of a package tree. For "
+"_* The scripts have a central location for configuring their operation. In /"
+"{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For "
"example, dh_install will look, amongst others, for a file called #{debian/"
"install}# to determine which files should exist in a particular binary "
"package. In much the same way, live-build stores its configuration entirely "
"under a #{config/}# subdirectory."
msgstr ""
"_* Los scripts tienen una ubicación central para la configuración de su "
-"funcionamiento. En debhelper, éste es el subdirectorio #{debian/}# de un "
+"funcionamiento. En /{debhelper}/, éste es el subdirectorio #{debian/}# de un "
"árbol de paquetes. Por ejemplo, dh_install buscará, entre otros, un fichero "
"llamado #{debian/install}# para determinar qué ficheros deben existir en un "
"paquete binario en particular. De la misma manera, live-build almacena toda "
@@ -240,16 +245,16 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:20
msgid ""
-"Unlike debhelper, live-build contains a tool to generate a skeleton "
+"Unlike /{debhelper}/, live-build contains a tool to generate a skeleton "
"configuration directory, #{lb config}#. This could be considered to be "
-"similar to tools such as #{dh-make}#. For more information about #{lb config}"
+"similar to tools such as /{dh-make}/. For more information about #{lb config}"
"#, please see {The lb config command}#lb-config."
msgstr ""
-"A diferencia de debhelper, live-build contiene una herramienta para crear un "
-"directorio de configuración en esqueleto, #{lb config}#. Ésto podría ser "
-"considerado como similar a herramientas tales como #{dh-make}#. Para obtener "
-"más información sobre #{lb config}#, consultar {El comando lb config }#lb-"
-"config"
+"A diferencia de /{debhelper}/, live-build contiene una herramienta para "
+"crear un directorio de configuración en esqueleto, #{lb config}#. Ésto "
+"podría ser considerado como similar a herramientas tales como /{dh-make}/. "
+"Para obtener más información sobre #{lb config}#, consultar {El comando lb "
+"config }#lb-config"
#. type: Plain text
#: en/user_overview.ssi:22
diff --git a/manual/po/fr/about_manual.ssi.po b/manual/po/fr/about_manual.ssi.po
index 01fbdec..8b93731 100644
--- a/manual/po/fr/about_manual.ssi.po
+++ b/manual/po/fr/about_manual.ssi.po
@@ -6,16 +6,16 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-07 08:59-0400\n"
-"PO-Revision-Date: 2012-03-17 19:42+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-18 19:35+0300\n"
+"PO-Revision-Date: 2012-04-18 19:53+0200\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
@@ -32,29 +32,37 @@ msgstr "1~about-manual À propos de ce manuel"
msgid ""
"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 7.0 \"Wheezy\" 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."
+"by the project for the Debian 7.0 \"wheezy\" release. An up-to-date version "
+"can always be found at http://live.debian.net/"
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 7.0 \"Wheezy\". 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 sur les supports ou sur 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."
+"produits par le projet pour Debian 7.0 \"wheezy\". Une version mise à jour "
+"peut toujours être trouvée à http://live.debian.net/"
#. type: Plain text
#: en/about_manual.ssi:8
msgid ""
+"While live-manual 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 ""
+"Tandis ce manuel 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 sur les "
+"supports ou sur 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 persistance."
+
+#. type: Plain text
+#: en/about_manual.ssi:10
+msgid ""
"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 "
"using #{sudo}#. To distinguish between commands which may be executed by an "
@@ -66,65 +74,77 @@ msgstr ""
"les privilèges de super-utilisateur, qui peuvent être obtenus en devenant "
"super-utilisateur à l'aide de #{su}# ou en utilisant #{sudo}#. Afin de "
"distinguer les commandes qui peuvent être exécutées par un utilisateur sans "
-"privilèges de celles nécessitant les privilèges super-utilisateur, les "
+"privilèges de celles nécessitant les privilèges de super-utilisateur, les "
"commandes sont précédées respectivement par #{$}# ou #{#}#. Ce symbole ne "
"fait pas partie de la commande."
#. type: Plain text
-#: en/about_manual.ssi:10
+#: en/about_manual.ssi:12
msgid "2~ For the impatient"
msgstr "2~ Pour les impatients"
#. type: Plain text
-#: en/about_manual.ssi:12
+#: en/about_manual.ssi:14
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 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."
+"the details. Therefore, we suggest reading in the following order."
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 "
+"suivant."
+
+#. type: Plain text
+#: en/about_manual.ssi:16
+msgid ""
+"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."
+msgstr ""
+"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."
+
+#. type: Plain text
+#: en/about_manual.ssi:18
+msgid ""
+"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 ""
+"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 "
+"sections suivantes. En ce point, nous espérons que vous soyez 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
+#: en/about_manual.ssi:20
msgid "2~terms Terms"
msgstr "2~terms Terminologie"
#. type: Plain text
-#: en/about_manual.ssi:16
+#: en/about_manual.ssi:22
msgid ""
"_* *{Live system}*: An operating system that can boot without installation "
"to a hard drive. Live systems do not alter local operating system(s) or file"
@@ -133,15 +153,15 @@ msgid ""
"sticks. Some may also boot over the network."
msgstr ""
"_* *{Système Live}*: Un système d'exploitation pouvant être démarré sans "
-"installation préalable sur disque dur. Les Systèmes Live ne modifient pas le "
-"système d'exploitation local ou les fichiers installés sur le disque dur "
+"installation préalable sur un disque dur. Les Systèmes Live ne modifient pas "
+"le système d'exploitation local ou les fichiers installés sur le disque dur "
"sans qu'on leur en donne explicitement l'instruction. D'habitude, les "
"systèmes Live sont démarrés à partir des supports tels que des CD, DVD, ou "
"des clés USB. Certains systèmes peuvent également être démarrés sur le "
"réseau."
#. type: Plain text
-#: en/about_manual.ssi:18
+#: en/about_manual.ssi:24
msgid ""
"_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, "
"live-build, live-config, and live-manual packages."
@@ -150,7 +170,7 @@ msgstr ""
"boot, live-build, live-config, et live-manual."
#. type: Plain text
-#: en/about_manual.ssi:20
+#: en/about_manual.ssi:26
msgid ""
"_* *{Debian Live system}*: A live system that uses software from the Debian "
"operating system that may be booted from CDs, DVDs, USB sticks, over the "
@@ -159,54 +179,55 @@ msgid ""
msgstr ""
"_* *{Système Debian Live}*: Un système live qui utilise les logiciels du "
"système d'exploitation Debian et qui peut être démarré sur CD, DVD, clé USB, "
-"en réseau (à l'aide des images netboot), et à partir d'Internet (à l'aide du "
-"paramètre de démarrage #{fetch=URL}#)."
+"sur le réseau (à l'aide des images netboot), et à partir d'Internet (à "
+"l'aide du paramètre de démarrage #{fetch=URL}#)."
#. type: Plain text
-#: en/about_manual.ssi:22
+#: en/about_manual.ssi:28
msgid "_* *{Host system}*: The environment used to create the live system."
msgstr ""
"_* *{Système hôte}*: L'environnement utilisé pour créer le système live."
#. type: Plain text
-#: en/about_manual.ssi:24
+#: en/about_manual.ssi:30
msgid "_* *{Target system}*: The environment used to run the live system."
msgstr ""
-"_* *{Système de destination}*: L'environnement utilisé pour faire tourner le "
+"_* *{Système objectif}*: L'environnement utilisé pour faire fonctionner le "
"système live."
#. type: Plain text
-#: en/about_manual.ssi:26
+#: en/about_manual.ssi:32
msgid ""
"_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
-"boot was formerly a part of live-initramfs."
+"boot was formerly a part of /{live-initramfs}/."
msgstr ""
"_* *{live-boot}*: Une collection de scripts utilisés pour lancer des "
-"systèmes live. live-boot faisait initialement partie de live-initramfs."
+"systèmes live. live-boot faisait initialement partie de /{live-initramfs}/."
#. type: Plain text
-#: en/about_manual.ssi:28
+#: en/about_manual.ssi:34
msgid ""
"_* *{live-build}*: A collection of scripts used to build customized Debian "
-"Live systems. live-build was formerly known as live-helper, and even earlier "
-"known as live-package."
+"Live systems. live-build was formerly known as /{live-helper}/, and even "
+"earlier known as /{live-package}/."
msgstr ""
"_* *{live-build}*: Une collection de scripts utilisés pour personnaliser les "
-"systèmes Debian Live. live-build était initialement nommé live-package, puis "
-"live-helper."
+"systèmes Debian Live. live-build était initialement nommé /{live-package}/, "
+"puis /{live-helper}/."
#. type: Plain text
-#: en/about_manual.ssi:30
+#: en/about_manual.ssi:36
msgid ""
"_* *{live-config}*: A collection of scripts used to configure a live system "
-"during the boot process. live-config was formerly a part of live-initramfs."
+"during the boot process. live-config was formerly a part of /{live-"
+"initramfs}/."
msgstr ""
"_* *{live-config}*: Une collection de scripts utilisés pour configurer un "
-"système live durant le processus d'amorçage. live-config faisait "
-"initialement partie de live-initramfs."
+"système live pendant le processus d'amorçage. live-config faisait "
+"initialement partie de /{live-initramfs}/."
#. type: Plain text
-#: en/about_manual.ssi:32
+#: en/about_manual.ssi:38
msgid ""
"_* *{live-manual}*: This document is maintained in a package called live-"
"manual."
@@ -215,7 +236,7 @@ msgstr ""
"manual."
#. type: Plain text
-#: en/about_manual.ssi:34
+#: en/about_manual.ssi:40
msgid ""
"_* *{Debian Installer (d-i)}*: The official installation system for the "
"Debian distribution."
@@ -224,27 +245,27 @@ msgstr ""
"distribution Debian."
#. type: Plain text
-#: en/about_manual.ssi:36
+#: en/about_manual.ssi:42
msgid ""
"_* *{Boot parameters}*: Parameters that can be entered at the bootloader "
"prompt to influence the kernel or live-config."
msgstr ""
-"_* *{Paramètres d'amorçage}*: Les paramètres pouvant être entrés à l'invite "
-"de démarrage afin de modifier le noyau ou live-config."
+"_* *{Paramètres d'amorçage}*: Les paramètres qui peuvent être entrés à "
+"l'invite de démarrage afin de modifier le noyau ou live-config."
#. type: Plain text
-#: en/about_manual.ssi:38
+#: en/about_manual.ssi:44
msgid ""
-"_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+"_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run "
"different instances of the GNU/Linux environment on a single system "
"simultaneously without rebooting."
msgstr ""
-"_* *{chroot}*: Le programme chroot, #{chroot(8)}#, nous permet de faire "
-"tourner plusieurs instances concurrentes de l'environnement GNU/Linux sur un "
-"système sans redémarrage."
+"_* *{chroot}*: Le logiciel /{chroot}/, #{chroot(8)}#, nous permet d'exécuter "
+"plusieurs instances concurrentes de l'environnement GNU/Linux sur un système "
+"sans redémarrage."
#. type: Plain text
-#: en/about_manual.ssi:40
+#: en/about_manual.ssi:46
msgid ""
"_* *{Binary image}*: A file containing the live system, such as binary.iso "
"or binary.img."
@@ -253,128 +274,116 @@ msgstr ""
"iso ou binary.img."
#. type: Plain text
-#: en/about_manual.ssi:42
+#: en/about_manual.ssi:48
msgid ""
"_* *{Target distribution}*: The distribution upon which your live system "
"will be based. This can differ from the distribution of your host system."
msgstr ""
-"_* *{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."
+"_* *{Distribution objectif}*: La distribution sur laquelle votre système "
+"live sera basée. Ceci peut être diffèrent de la distribution de votre "
+"système hôte."
#. type: Plain text
-#: en/about_manual.ssi:44
-msgid ""
-"_* *{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."
-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
+#: en/about_manual.ssi:50
msgid ""
-"The *{stable}* distribution contains the latest officially released "
-"distribution of Debian. The *{testing}* distribution is the staging area for "
-"the next *{stable}* release. A major advantage of using this distribution is "
-"that it has more recent versions of software relative to the *{stable}* "
-"release. The *{unstable}* distribution is where active development of Debian "
-"occurs. Generally, this distribution is run by developers and those who like "
-"to live on the edge."
-msgstr ""
-"La distribution *{stable}* contient la dernière version officielle de "
-"Debian. La distribution *{testing}* est la future version stable où seuls "
-"les paquets suffisamment matures peuvent entrer. Un avantage de cette "
-"distribution est qu'elle contient des logiciels de versions plus récentes "
-"que la version *{stable}*. La distribution *{unstable}* est en constante "
-"évolution. En général cette distribution est utilisée par les développeurs "
-"et ceux qui aiment le risque."
+"_* *{stable/testing/unstable}*: The *{stable}* distribution contains the "
+"latest officially released distribution of Debian. The *{testing}* "
+"distribution is the staging area for the next *{stable}* release. A major "
+"advantage of using this distribution is that it has more recent versions of "
+"software relative to the *{stable}* release. The *{unstable}* distribution "
+"is where active development of Debian occurs. Generally, this distribution "
+"is run by developers and those who like to live on the edge. Throughout the "
+"manual, we tend to use codenames for the releases, such as wheezy or sid, as "
+"that is what is supported by the tools themselves."
+msgstr ""
+"_* *{stable/testing/unstable}*: La distribution *{stable}* contient la "
+"dernière version officielle de Debian. La distribution *{testing}* est la "
+"prochaine version stable où seulement les paquets suffisamment matures "
+"peuvent entrer. Un avantage de cette distribution est qu'elle contient des "
+"logiciels de versions plus récentes que la version *{stable}*. La "
+"distribution *{unstable}* est en constante évolution. En général cette "
+"distribution est utilisée par les développeurs et ceux qui aiment le risque. "
+"Tout au long du manuel, nous avons tendance à utiliser les noms de code pour "
+"les évolutions majeures, tels que wheezy ou sid, car c'est ce qui est "
+"soutenu par les outils eux-mêmes."
#. type: Plain text
-#: en/about_manual.ssi:48
+#: en/about_manual.ssi:52
msgid "2~ Authors"
msgstr "2~ Auteurs"
#. type: Plain text
-#: en/about_manual.ssi:50
+#: en/about_manual.ssi:54
msgid "A list of authors (in alphabetical order):"
msgstr "La liste des auteurs (dans l'ordre alphabétique):"
#. type: Plain text
-#: en/about_manual.ssi:52
+#: en/about_manual.ssi:56
msgid "_* Ben Armstrong"
msgstr "_* Ben Armstrong"
#. type: Plain text
-#: en/about_manual.ssi:54
+#: en/about_manual.ssi:58
msgid "_* Brendan Sleight"
msgstr "_* Brendan Sleight"
#. type: Plain text
-#: en/about_manual.ssi:56
+#: en/about_manual.ssi:60
msgid "_* Chris Lamb"
msgstr "_* Chris Lamb"
#. type: Plain text
-#: en/about_manual.ssi:58
+#: en/about_manual.ssi:62
msgid "_* Daniel Baumann"
msgstr "_* Daniel Baumann"
#. type: Plain text
-#: en/about_manual.ssi:60
+#: en/about_manual.ssi:64
msgid "_* Franklin Piat"
msgstr "_* Franklin Piat"
#. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:66
msgid "_* Jonas Stein"
msgstr "_* Jonas Stein"
#. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:68
msgid "_* Kai Hendry"
msgstr "_* Kai Hendry"
#. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:70
msgid "_* Marco Amadori"
msgstr "_* Marco Amadori"
#. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:72
msgid "_* Mathieu Geli"
msgstr "_* Mathieu Geli"
#. type: Plain text
-#: en/about_manual.ssi:70
+#: en/about_manual.ssi:74
msgid "_* Matthias Kirschner"
msgstr "_* Matthias Kirschner"
#. type: Plain text
-#: en/about_manual.ssi:72
+#: en/about_manual.ssi:76
msgid "_* Richard Nelson"
msgstr "_* Richard Nelson"
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:78
msgid "_* Trent W. Buck"
msgstr "_* Trent W. Buck"
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:80
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
+#: en/about_manual.ssi:82
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -387,7 +396,7 @@ msgstr ""
"plaît voir {Contact}#contact pour plus d'informations."
#. type: Plain text
-#: en/about_manual.ssi:80
+#: en/about_manual.ssi:84
msgid ""
"When submitting a contribution, please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted, the "
@@ -400,7 +409,7 @@ msgstr ""
"reste du document, c'est-à-dire la GPL version 3 ou ultérieure."
#. type: Plain text
-#: en/about_manual.ssi:82
+#: en/about_manual.ssi:86
msgid ""
"The sources for this manual are maintained using the Git version control "
"system. You can check out the latest copy by executing:"
@@ -409,28 +418,29 @@ msgstr ""
"versions Git. Vous pouvez obtenir la dernière copie en exécutant:"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -454,56 +464,58 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:86
+#: en/about_manual.ssi:90
msgid "$ 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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -527,30 +539,31 @@ msgstr ""
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/about_manual.ssi:90
+#: en/about_manual.ssi:94
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -561,13 +574,13 @@ msgstr ""
"sont installés en exécutant:"
#. type: Plain text
-#: en/about_manual.ssi:94
+#: en/about_manual.ssi:98
#, no-wrap
msgid " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:98
+#: en/about_manual.ssi:102
msgid ""
"You may build the live-manual from the top level directory of your Git "
"checkout by executing:"
@@ -576,13 +589,13 @@ msgstr ""
"votre Git checkout en exécutant:"
#. type: Plain text
-#: en/about_manual.ssi:102
+#: en/about_manual.ssi:106
#, no-wrap
msgid " $ make build\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:110
msgid ""
"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 "
@@ -593,41 +606,41 @@ msgstr ""
"par exemple en exécutant:"
#. type: Plain text
-#: en/about_manual.ssi:110
+#: en/about_manual.ssi:114
#, no-wrap
msgid " $ make build LANGUAGES=en\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:114
+#: en/about_manual.ssi:118
msgid "It is also possible to build by document type, e.g:"
msgstr ""
"Il est également possible de construire par type de document, par exemple,"
#. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:122
#, no-wrap
msgid " $ make build FORMATS=pdf\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:122
+#: en/about_manual.ssi:126
msgid "Or combine both, e.g:"
msgstr "Ou combiner les deux, par exemple:"
#. type: Plain text
-#: en/about_manual.ssi:126
+#: en/about_manual.ssi:130
#, no-wrap
msgid " $ make build FORMATS=html LANGUAGES=it\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:130
+#: en/about_manual.ssi:134
msgid "3~ Applying changes"
msgstr "3~ Appliquer des modifications"
#. type: Plain text
-#: en/about_manual.ssi:132
+#: en/about_manual.ssi:136
msgid ""
"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 "
@@ -639,12 +652,12 @@ msgstr ""
"sont nécessaires."
#. type: Plain text
-#: en/about_manual.ssi:134
+#: en/about_manual.ssi:138
msgid "_* Fetch the public commit key:"
msgstr "_* Téléchargez la clé publique:"
#. type: Plain text
-#: en/about_manual.ssi:143
+#: en/about_manual.ssi:147
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
@@ -656,12 +669,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:147
+#: en/about_manual.ssi:151
msgid "_* Add the following section to your openssh-client config:"
msgstr "_* Ajoutez la section suivante à votre configuration openssh-client:"
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:160
#, no-wrap
msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
@@ -673,12 +686,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:164
msgid "_* Check out a clone of the manual through ssh:"
msgstr "_* Clonez le manuel via ssh:"
#. type: Plain text
-#: en/about_manual.ssi:165
+#: en/about_manual.ssi:169
#, no-wrap
msgid ""
" $ git clone git at live.debian.net:/live-manual.git\n"
@@ -686,102 +699,86 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:169
+#: en/about_manual.ssi:173
msgid ""
"_* Note that you should commit any changes on the debian-next branch, not on "
"the debian branch."
msgstr ""
-"_* Notez que vous devez livrer des changements sur la branche debian-next, "
+"_* Notez que vous devez livrer les changements sur la branche debian-next, "
"pas sur la branche debian."
#. type: Plain text
-#: en/about_manual.ssi:171
-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' "
-"dans le répertoire de niveau supérieur du dépôt afin de nettoyer les fichier "
-"et de mettre à jour les fichiers de traduction:"
-
-#. type: Plain text
#: en/about_manual.ssi:175
-#, no-wrap
-msgid " $ make commit\n"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:179
-msgid "_* Then"
-msgstr "_* Alors"
-
-#. type: Plain text
-#: en/about_manual.ssi:183
-#, no-wrap
-msgid " $ git add .\n"
+msgid ""
+"_* Do not use #{make commit}# unless you are updating translations in this "
+"commit, and in that case, do not mix changes to the English manual and "
+"translations in the same commit, but use separate commits for each. See the "
+"{Translation}#translation section for more details."
msgstr ""
+"_* Ne pas utiliser #{make commit}# à moins que vous mettez à jour les "
+"traductions dans le commit, et dans ce cas, ne pas mélanger les "
+"modifications apportées au manuel en anglais et les traductions dans la même "
+"livraison, mais utiliser commits séparées. Voir la section {Traduction}"
+"#translation pour plus de détails."
#. type: Plain text
-#: en/about_manual.ssi:187
+#: en/about_manual.ssi:177
msgid ""
-"_* 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."
+"_* Write commit messages that consist of complete, meaningful 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 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 avec la forme 'Fixing/Adding/Removing/Correcting/Translating', par "
-"exemple"
+"_* Veuillez écrire les commentaires du commit à l'aide de phrases complètes, "
+"en commençant par une majuscule et en terminant par un point, et avec la "
+"forme 'Fixing/Adding/Removing/Correcting/Translating', par exemple"
#. type: Plain text
-#: en/about_manual.ssi:191
+#: en/about_manual.ssi:181
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:195
+#: en/about_manual.ssi:185
msgid "_* Push the commit to the server:"
msgstr "_* Envoyez votre commit au serveur:"
#. type: Plain text
-#: en/about_manual.ssi:199
+#: en/about_manual.ssi:189
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:203
+#: en/about_manual.ssi:193
msgid "3~translation Translation"
msgstr "3~translation Traduction"
#. type: Plain text
-#: en/about_manual.ssi:205
+#: en/about_manual.ssi:195
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
"Pour soumettre une traduction pour une nouvelle langue, suivez ces trois "
"étapes:"
#. type: Plain text
-#: en/about_manual.ssi:207
+#: en/about_manual.ssi:197
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). "
-"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."
+"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."
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."
+"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:209
+#: en/about_manual.ssi:199
msgid ""
"_* Once the new language is added, you can randomly start translating all po "
"files in #{manual/po/}#."
@@ -790,7 +787,7 @@ msgstr ""
"de façon aléatoire tous les fichiers po dans #{manual/po/}#."
#. type: Plain text
-#: en/about_manual.ssi:211
+#: en/about_manual.ssi:201
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
"are updated from the po files and then you can review your changes launching "
@@ -803,7 +800,7 @@ msgstr ""
"{git commit -a -m \"Translating...\"}# et #{git push}#."
#. type: Plain text
-#: en/about_manual.ssi:212
+#: en/about_manual.ssi:202
#, 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.\n"
+msgstr "*{Remarque:}* S'il vous plaît soyez conscients 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.\n"
diff --git a/manual/po/fr/about_project.ssi.po b/manual/po/fr/about_project.ssi.po
index d072ee3..34cc9e1 100644
--- a/manual/po/fr/about_project.ssi.po
+++ b/manual/po/fr/about_project.ssi.po
@@ -1,13 +1,12 @@
# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-19 22:16+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-05-25 14:30+0300\n"
"PO-Revision-Date: 2012-03-17 19:45+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -44,8 +43,8 @@ msgid ""
"systems available and they are doing a great job. From the Debian "
"perspective most of them have one or more of the following disadvantages:"
msgstr ""
-"Lorsque Debian Live a été lancé, il y avait déjà plusieurs systèmes live "
-"basés sur debian et ils faisaient un excellent travail. Du point de vue de "
+"Lorsque Debian Live était lancé, il y avait déjà plusieurs systèmes live "
+"basés sur debian et ils faisaient un excellent travail. Du point de vue de "
"Debian la plupart d'entre eux ont un ou plusieurs des inconvénients suivants:"
#. type: Plain text
@@ -61,13 +60,13 @@ msgstr ""
#: en/about_project.ssi:14
msgid "_* They mix different distributions, e.g. *{testing}* and *{unstable}*."
msgstr ""
-"_* Ils mélangent les différentes distributions p. ex *{testing}* et *"
+"_* Ils mélangent des distributions différentes p. ex *{testing}* et *"
"{unstable}*."
#. type: Plain text
#: en/about_project.ssi:16
msgid "_* They support i386 only."
-msgstr "_* Ils supportent seulement i386."
+msgstr "_* Ils soutiennent seulement i386."
#. type: Plain text
#: en/about_project.ssi:18
@@ -76,7 +75,7 @@ msgid ""
"down to save space."
msgstr ""
"_* Ils modifient le comportement et/ou l'apparence des paquets en les "
-"dépouillant pour économiser l'espace."
+"dépouillant pour économiser de l'espace."
#. type: Plain text
#: en/about_project.ssi:20
@@ -129,8 +128,8 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:32
-msgid "_* It would be a subproject of Debian."
-msgstr "_* Ce serait un sous-projet de Debian."
+msgid "_* It is a subproject of Debian."
+msgstr "_* Il est un sous-projet de Debian."
#. type: Plain text
#: en/about_project.ssi:34
@@ -225,36 +224,33 @@ msgid ""
"Whenever we need a different default configuration, we will do that in "
"coordination with its package maintainer in Debian."
msgstr ""
-"Chaque fois que nous avons besoin d'une configuration par défaut différent, "
+"Chaque fois que nous avons besoin d'une configuration par défaut différente, "
"nous le ferons en coordination avec le responsable du paquet dans Debian."
#. type: Plain text
#: en/about_project.ssi:60
msgid ""
-"A system for configuring packages is provided using debconf in #{lb config}# "
-"(use --preseed FILE) allowing custom configured packages to be installed in "
-"your custom produced Debian Live images, but for official live images only "
-"default configuration will be used. For more information, please see "
-"{Customization overview}#customization-overview."
-msgstr ""
-"Un système de configuration des paquets est fourni avec debconf dans #{lb "
-"config}# (utiliser --preseed FICHIER) permettant la personnalisation des "
-"paquets installés sur votre image Debian Live, mais pour les images "
-"officielles seulement sera utilisé une configuration par défaut. Pour plus "
-"d'informations, s'il vous plaît voir {Vue d'ensemble de la personnalisation}"
+"A system for configuring packages is provided using debconf allowing custom "
+"configured packages to be installed in your custom produced Debian Live "
+"images, but for official live images only default configuration will be "
+"used. For more information, please see {Customization overview}"
"#customization-overview."
+msgstr ""
+"Un système de configuration des paquets est fourni avec debconf permettant "
+"la personnalisation des paquets installés sur votre image Debian Live, mais "
+"pour les images officielles seulement une configuration par défaut sera "
+"utilisée . Pour plus d'informations, s'il vous plaît voir {Vue d'ensemble de "
+"la personnalisation}#customization-overview."
#. type: Plain text
#: en/about_project.ssi:62
msgid ""
"Exception: There are a few essential changes needed to bring a live system "
-"to life (e.g. configuring pam to allow empty passwords). These essential "
-"changes have to be kept as minimal as possible and should be merged within "
-"the Debian repository if possible."
+"to life. These essential changes have to be kept as minimal as possible and "
+"should be merged within the Debian repository if possible."
msgstr ""
"Exception: Il y a quelques changements essentiels nécessaires pour mettre un "
-"système live en marche (par exemple la configuration de pam pour permettre "
-"des mots de passe vide). Ces changements essentiels doivent être maintenus "
+"système live en marche. Ces changements essentiels doivent être maintenus "
"aussi minimes que possible et devraient être fusionnées au sein du dépôt "
"Debian s'il est possible."
@@ -285,7 +281,7 @@ msgid ""
"patient for an answer. If no answer is forthcoming, please email the mailing "
"list."
msgstr ""
-"_* *{IRC}*: Un certain nombre d'utilisateurs et les développeurs sont "
+"_* *{IRC}*: Un certain nombre d'utilisateurs et de développeurs sont "
"présents dans le canal #debian-live sur irc.debian.org (OFTC). Quand vous "
"posez une question sur IRC, s'il vous plaît soyez patient en attendant une "
"réponse. Si aucune réponse n'est donnée, s'il vous plaît envoyez un courriel "
@@ -294,13 +290,13 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:69
msgid ""
-"_* *{BTS}*: The Debian Bug Tracking System (BTS) contains details of bugs "
-"reported by users and developers. Each bug is given a number, and is kept on "
-"file until it is marked as having been dealt with. For more information, "
-"please see {Reporting bugs}#bugs."
+"_* *{BTS}*: The {Debian Bug Tracking System}http://www.debian.org/Bugs/ "
+"(BTS) contains details of bugs reported by users and developers. Each bug is "
+"given a number, and is kept on file until it is marked as having been dealt "
+"with. For more information, please see {Reporting bugs}#bugs."
msgstr ""
-"_* *{BTS}*: Le Debian Bug Tracking System (BTS) contient les détails des "
-"bogues rapportés par les utilisateurs et les développeurs. Chaque bogue "
-"reçoit un numéro, et il est conservé jusqu'à ce qu'il soit marqué comme "
-"traité. Pour plus d'informations, s'il vous plaît voir {Rapporter des bogues}"
-"#bugs."
+"_* *{BTS}*: Le {Debian Bug Tracking System}http://www.debian.org/Bugs/ (BTS) "
+"contient les détails des bogues rapportés par les utilisateurs et les "
+"développeurs. Chaque bogue reçoit un numéro, et il est conservé jusqu'à ce "
+"qu'il est marqué comme traité. Pour plus d'informations, s'il vous plaît "
+"voir {Rapporter des bogues}#bugs."
diff --git a/manual/po/fr/index.html.in.po b/manual/po/fr/index.html.in.po
index dbe12e1..fe64495 100644
--- a/manual/po/fr/index.html.in.po
+++ b/manual/po/fr/index.html.in.po
@@ -1,13 +1,13 @@
# French translations for live-manual package
# 2010 Christophe Siraut <chris at tobald.eu.org>
-# This file is distributed under the same license as the live-config package.
+# This file is distributed under the same license as the live-manual package.
# Carlo Stemberger <carlo.stemberger at gmail.com>, 2010.
# Carlos Zuferri «chals» <chals at altorricon.com>, 2011.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-07 16:03+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-06-02 18:16+0300\n"
"PO-Revision-Date: 2011-12-26 19:07+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -41,7 +41,7 @@ msgstr ""
#. type: Content of: <html><body><p>
#: en/index.html.in:17
msgid ""
-"Please report errors, omissions, patches and suggestions to our mailinglist "
+"Please report errors, omissions, patches and suggestions to our mailing list "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
"org</a> and read about <a href=\"html/live-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
@@ -110,7 +110,7 @@ msgstr "Source"
#. type: Content of: <html><body><p>
#: en/index.html.in:38
msgid ""
-"The sources for this manual is available in a <a href=\"http://git.or.cz/"
+"The sources for this manual are available in a <a href=\"http://git.or.cz/"
"\">Git</a> repository at live.debian.net."
msgstr ""
"Les sources de ce manuel sont disponibles dans un répertoire <a href="
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index c6afd04..868662e 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -1,13 +1,12 @@
# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# Carlos Zuferri «chals» <chals at altorricon.com>, 2011.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-03 00:19+0300\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-06-04 12:21+0300\n"
"PO-Revision-Date: 2011-06-19 16:32+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -49,8 +48,10 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-04-03\n"
+" :published: 2012-06-04\n"
msgstr ""
+"@date:\n"
+" :published: 04.06.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
@@ -62,8 +63,8 @@ msgstr ""
#, no-wrap
msgid ""
"@make:\n"
-" :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/\n"
-" :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
+" :bold: /squeeze|wheezy|sid/\n"
+" :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
msgstr ""
diff --git a/manual/po/fr/project_bugs.ssi.po b/manual/po/fr/project_bugs.ssi.po
index 4d858d5..eed7739 100644
--- a/manual/po/fr/project_bugs.ssi.po
+++ b/manual/po/fr/project_bugs.ssi.po
@@ -1,147 +1,160 @@
# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-24 14:17-0400\n"
-"PO-Revision-Date: 2012-03-17 17:43+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"PO-Revision-Date: 2012-04-26 15:09+0200\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"
-
-#. 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/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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: 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-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
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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/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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: 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-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
-#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -191,7 +204,7 @@ msgid ""
"build, live-boot, and live-config before submitting a bug report."
msgstr ""
"_* Toujours essayer de reproduire le bogue avec *{les versions les plus "
-"récents}* de live-build, live-boot, et live-config avant de présenter un "
+"récentes}* de live-build, live-boot, et live-config avant de présenter un "
"rapport de bogue."
#. type: Plain text
@@ -218,8 +231,8 @@ msgid ""
"successful build may not always be possible."
msgstr ""
"Parce que les distributions Debian *{testing}* et Debian *{unstable}* sont "
-"une cible mouvante, quand vous les spécifiez comme la distribution du "
-"système cible, une construction avec succès n'est pas toujours possible."
+"une cible mouvante, quand vous les spécifiez comme les distributions du "
+"système objectif, une construction avec succès n'est pas toujours possible."
#. type: Plain text
#: en/project_bugs.ssi:20
@@ -259,10 +272,10 @@ msgstr ""
"Il est hors cadre de ce manuel vous former correctement à identifier et "
"corriger les problèmes dans les paquets des distributions de développement, "
"cependant, il y a deux choses que vous pouvez toujours essayer: Si une "
-"construction échoue lorsque la distribution cible est *{testing}*, essayez *"
-"{unstable}*. Si *{unstable}* ne fonctionne pas non plus, revenir à *{testing}"
-"* et fixer la nouvelle version du paquet qui échoue de *{unstable}* (voir "
-"{APT pinning}#apt-pinning pour plus de détails)."
+"construction échoue lorsque la distribution objectif est *{testing}*, "
+"essayez *{unstable}*. Si *{unstable}* ne fonctionne pas non plus, revenir à *"
+"{testing}* et fixer la nouvelle version du paquet qui échoue de *{unstable}* "
+"(voir {APT pinning}#apt-pinning pour plus de détails)."
#. type: Plain text
#: en/project_bugs.ssi:28
@@ -283,7 +296,7 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:32
msgid "2~ Use up-to-date packages"
-msgstr "2~ Utilisez paquets mises à jour"
+msgstr "2~ Utilisez paquets mis à jour"
#. type: Plain text
#: en/project_bugs.ssi:34
@@ -295,7 +308,7 @@ msgstr ""
"L'utilisation de paquets obsolètes peut causer des problèmes importants en "
"essayant de reproduire (et finalement régler) votre problème. Assurez-vous "
"que votre système de construction est mis à jour et tous les paquets inclus "
-"dans votre image sont mises à jour aussi."
+"dans votre image sont mis à jour aussi."
#. type: Plain text
#: en/project_bugs.ssi:36
@@ -348,9 +361,9 @@ msgstr "_* Version de live-config sur le système live"
#. type: Plain text
#: en/project_bugs.ssi:50
msgid ""
-"_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system"
+"_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system"
msgstr ""
-"_* Version de #{debootstrap}# et/ou #{cdebootstrap}# sur le système hôte"
+"_* Version de /{debootstrap}/ et/ou /{cdebootstrap}/ sur le système hôte"
#. type: Plain text
#: en/project_bugs.ssi:52
@@ -421,7 +434,7 @@ msgid ""
"settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or #"
"{LC_ALL=en_US}#."
msgstr ""
-"N'oubliez pas d'envoyer tous les journaux qui ont été produites avec le "
+"N'oubliez pas d'envoyer tous les journaux qui ont été produits avec le "
"paramètre régionaux anglais, par exemple exécuter vos commandes live-build "
"précédées par #{LC_ALL=C}# ou #{LC_ALL=en_US}#."
@@ -446,13 +459,13 @@ msgstr ""
"Si possible, isoler le cas qui échoue au plus petit changement possible. Il "
"n'est pas toujours facile de faire cela, donc si vous ne pouvez pas le gérer "
"pour votre rapport, ne vous inquiétez pas. Toutefois, si vous planifiez "
-"votre cycle de développement bien, en utilisant petits ensembles de changes "
-"par itération, vous pourriez être capable d'isoler le problème en "
-"construisant une configuration simple «base» qui correspond étroitement à la "
-"configuration réelle avec seulement le changement cassé ajouté. Si il est "
-"difficile de trier vos modifications que cassent, il est possible que vous y "
-"compris trop dans chaque ensemble de modifications et devraient se "
-"développer en petits incréments."
+"votre cycle de développement bien, en utilisant petits ensembles de "
+"changements par itération, vous pourriez être capable d'isoler le problème "
+"en construisant une configuration simple «base» qui correspond étroitement à "
+"la configuration réelle avec seulement le changement cassé ajouté. Si il est "
+"difficile de trier vos modifications qui cassent, il est possible que vous y "
+"compris trop dans chaque ensemble de modifications et vous devriez "
+"developper en petits incréments."
#. type: Plain text
#: en/project_bugs.ssi:76
@@ -472,16 +485,16 @@ msgstr "3~ Au moment de la construction tandis l'amorçage"
#. type: Plain text
#: en/project_bugs.ssi:82
msgid ""
-"live-build first bootstraps a basic Debian system with #{debootstrap}# or #"
-"{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
+"live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
+"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
"distribution it is bootstrapping, it may fail. If a bug appears here, check "
"if the error is related to a specific Debian package (most likely), or if it "
"is related to bootstrapping tool itself."
msgstr ""
-"live-build amorce d'abord un système Debian de base avec #{debootstrap}# ou #"
-"{cdebootstrap}#. Selon l'outil d'amorçage utilisé et de la distribution "
+"live-build amorce d'abord un système Debian de base avec /{debootstrap}/ ou /"
+"{cdebootstrap}/. Selon l'outil d'amorçage utilisé et de la distribution "
"Debian il peut échouer. Si un bogue apparaît ici, vérifiez si l'erreur est "
-"liée à un paquet Debian spécifique (plus probable), ou si il est liée à "
+"liée à un paquet Debian spécifique (plus probable), ou si elle est liée à "
"l'outil d'amorçage lui-même."
#. type: Plain text
@@ -517,13 +530,13 @@ msgstr ""
#: en/project_bugs.ssi:90
msgid ""
"If this is the case, this is not a bug in Debian Live, but rather in Debian "
-"- please report it against the failing package. Running #{debootstrap}# "
+"- please report it against the failing package. Running /{debootstrap}/ "
"separately from the Live system build or running #{lb bootstrap --debug}# "
"will give you more information."
msgstr ""
"Si c'est le cas, ce n'est pas un bogue dans Debian Live, mais plutôt dans "
"Debian - s'il vous plaît faire le rapport sur le paquet défaillant. "
-"L'exécution de #{debootstrap}# séparément du système de construction ou "
+"L'exécution de /{debootstrap}/ séparément du système de construction ou "
"l'exécution de #{lb bootstrap --debug}# vous donnera plus d'informations."
#. type: Plain text
@@ -534,8 +547,8 @@ msgid ""
"bootstrapping from an official mirror."
msgstr ""
"Aussi, si vous utilisez un miroir local et/ou un proxy et vous rencontrez un "
-"problème, s'il vous plaît toujours le reproduire d'abord en amorçant sur un "
-"miroir officiel."
+"problème, s'il vous plaît toujours le reproduire d'abord bootstrapping sur "
+"un miroir officiel."
#. type: Plain text
#: en/project_bugs.ssi:94
@@ -557,7 +570,7 @@ msgstr ""
"#collect-information. Ne pas oublier de mentionner, comment/quand l'image a "
"échoué, dans Qemu, VirtualBox, VMWare ou matériel réel. Si vous utilisez une "
"technologie de virtualisation d'aucune sorte, s'il vous plaît toujours "
-"tester sur matériel réel avant de rapporter un bug. Fournir une copie "
+"tester sur matériel réel avant de rapporter un bogue. Fournir une copie "
"d'écran de l'échec est également très utile."
#. type: Plain text
@@ -588,7 +601,7 @@ msgid ""
"that it has been discussed elsewhere, and a possible solution, patch, or "
"workaround has been proposed."
msgstr ""
-"Avant de présenter le bogue, s'il vous plaît recherchez sur le web pour le "
+"Avant de présenter le bogue, s'il vous plaît recherchez sur le web le "
"message d'erreur ou un symptôme particulier que vous obtenez. Comme il est "
"hautement improbable que vous êtes la seule personne qui expérience un "
"problème particulier, il y a toujours une chance qu'il a été discuté "
@@ -617,7 +630,7 @@ msgid ""
msgstr ""
"En outre, vous devriez vérifier les listes de bogues en cours de live-build, "
"live-boot, et live-config pour voir si quelque chose de semblable n'a été "
-"déjà signalé."
+"déjà signalée."
#. type: Plain text
#: en/project_bugs.ssi:110
@@ -647,12 +660,12 @@ msgid ""
"help before submitting a bug report, please send a message to the mailing "
"list and we will help you to figure it out."
msgstr ""
-"En général, vous devez signaler des erreurs de construction contre le paquet "
-"live-build, des erreurs en temps de démarrage contre live-boot, et erreurs "
-"d'exécution contre live-config. Si vous n'êtes pas sûr de quel paquet est "
-"approprié ou avez besoin d'aide avant de soumettre un rapport de bogue, s'il "
-"vous plaît envoyez un message à la liste de diffusion et nous vous aiderons "
-"à décider."
+"En général, vous devez signaler les erreurs de construction contre le paquet "
+"live-build, les erreurs en temps de démarrage contre live-boot, et les "
+"erreurs d'exécution contre live-config. Si vous n'êtes pas sûr de quel "
+"paquet est approprié ou avez besoin d'aide avant de soumettre un rapport de "
+"bogue, s'il vous plaît envoyez un message à la liste de diffusion et nous "
+"vous aiderons à décider."
#. type: Plain text
#: en/project_bugs.ssi:115
diff --git a/manual/po/fr/project_coding-style.ssi.po b/manual/po/fr/project_coding-style.ssi.po
index 3fb69c4..3e7806b 100644
--- a/manual/po/fr/project_coding-style.ssi.po
+++ b/manual/po/fr/project_coding-style.ssi.po
@@ -1,14 +1,13 @@
# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-31 16:32+0300\n"
-"PO-Revision-Date: 2012-03-17 17:46+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-07 22:16+0300\n"
+"PO-Revision-Date: 2012-04-07 22:29+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: fr\n"
@@ -18,29 +17,30 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -88,29 +88,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -183,7 +184,7 @@ msgid ""
"_* Don't use syntax or semantics that are unique to the Bash shell. For "
"example, the use of array constructs."
msgstr ""
-"_* Ne pas utiliser la syntaxe ou la sémantique qui sont uniques à le shell "
+"_* Ne pas utiliser une syntaxe ou sémantique qui soit unique à le shell "
"Bash. Par exemple, l'utilisation d'arrays."
#. type: Plain text
@@ -200,37 +201,42 @@ msgstr "_* Vous pouvez vérifier vos scripts avec 'sh -n' et 'checkbashisms'."
#. type: Plain text
#: en/project_coding-style.ssi:16
+msgid "_* Make sure all shell code runs with 'set -e'."
+msgstr "_* Assurez-vous que tout le code fonctionne avec 'set-e '."
+
+#. type: Plain text
+#: en/project_coding-style.ssi:18
msgid "2~ Indenting"
msgstr "2~ Indentation"
#. type: Plain text
-#: en/project_coding-style.ssi:18
+#: en/project_coding-style.ssi:20
msgid "_* Always use tabs over spaces."
msgstr "_* Toujours utiliser des tabulations en lieu des espaces."
#. type: Plain text
-#: en/project_coding-style.ssi:20
+#: en/project_coding-style.ssi:22
msgid "2~ Wrapping"
msgstr "2~ Adaptateur"
#. type: Plain text
-#: en/project_coding-style.ssi:22
+#: en/project_coding-style.ssi:24
msgid "_* Generally, lines are 80 chars at maximum."
msgstr "_* Généralement, les lignes sont de 80 caractères au maximum."
#. type: Plain text
-#: en/project_coding-style.ssi:24
+#: en/project_coding-style.ssi:26
msgid "_* Use the \"Linux style\" of line breaks:"
msgstr "_* Utilisez le «style Linux» des sauts de ligne:"
#. type: Plain text
-#: en/project_coding-style.ssi:26 en/project_coding-style.ssi:49
-#: en/project_coding-style.ssi:90 en/project_coding-style.ssi:108
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:51
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:110
msgid "Bad:"
msgstr "Mal:"
#. type: Plain text
-#: en/project_coding-style.ssi:32
+#: en/project_coding-style.ssi:34
#, no-wrap
msgid ""
" if foo; then\n"
@@ -239,13 +245,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:59
-#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:119
+#: en/project_coding-style.ssi:38 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:100 en/project_coding-style.ssi:121
msgid "Good:"
msgstr "Bien:"
#. type: Plain text
-#: en/project_coding-style.ssi:43
+#: en/project_coding-style.ssi:45
#, no-wrap
msgid ""
" if foo\n"
@@ -255,41 +261,41 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:49
msgid "_* The same holds for functions:"
msgstr "_* La même chose vaut pour les fonctions:"
#. type: Plain text
-#: en/project_coding-style.ssi:55
+#: en/project_coding-style.ssi:57
#, no-wrap
msgid ""
-" foo () {\n"
+" Foo () {\n"
" bar\n"
" }\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:66
+#: en/project_coding-style.ssi:68
#, no-wrap
msgid ""
-" foo ()\n"
+" Foo ()\n"
" {\n"
" bar\n"
" }\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:72
msgid "2~ Variables"
msgstr "2~ Variables"
#. type: Plain text
-#: en/project_coding-style.ssi:72
+#: en/project_coding-style.ssi:74
msgid "_* Variables are always in capital letters."
msgstr "_* Les variables sont toujours en lettres majuscules."
#. type: Plain text
-#: en/project_coding-style.ssi:74
+#: en/project_coding-style.ssi:76
msgid ""
"_* Variables that used in #{lb config}# always start with #{LB_}# prefix."
msgstr ""
@@ -297,37 +303,37 @@ msgstr ""
"préfixe #{LB_}#."
#. type: Plain text
-#: en/project_coding-style.ssi:76
+#: en/project_coding-style.ssi:78
msgid ""
"_* Internal temporary variables in live-build should start with the #{\\_LB_}"
"# prefix."
msgstr ""
-"_* Les variables temporaires internes en live-build devraient commencer avec "
-"le préfixe #{\\_LB_}#."
+"_* Les variables temporaires internes dans live-build devraient commencer "
+"avec le préfixe #{\\_LB_}#."
#. type: Plain text
-#: en/project_coding-style.ssi:78
+#: en/project_coding-style.ssi:80
msgid "_* Local variables start with live-build #{\\_\\_LB_}# prefix."
msgstr "_* Les variables locales commencent avec le préfixe #{\\_\\_LB_}#."
#. type: Plain text
-#: en/project_coding-style.ssi:80
+#: en/project_coding-style.ssi:82
msgid ""
"_* Variables in connection to a boot parameter in live-config start with #"
"{LIVE_}#."
msgstr ""
-"_* Les variables en relation avec un paramètre de démarrage en live-config "
+"_* Les variables en relation avec un paramètre de démarrage dans live-config "
"commencent par #{LIVE_}#."
#. type: Plain text
-#: en/project_coding-style.ssi:82
+#: en/project_coding-style.ssi:84
msgid "_* All other variables in live-config start with #{_}# prefix."
msgstr ""
-"_* Toutes les autres variables en live-config commencent par le préfixe #{_}"
-"#."
+"_* Toutes les autres variables dans live-config commencent par le préfixe #"
+"{_}#."
#. type: Plain text
-#: en/project_coding-style.ssi:84
+#: en/project_coding-style.ssi:86
msgid ""
"_* Use braces around variables; e.g. write #{${FOO}}# instead of #{$FOO}#."
msgstr ""
@@ -335,7 +341,7 @@ msgstr ""
"# au lieu de #{$FOO}#."
#. type: Plain text
-#: en/project_coding-style.ssi:86
+#: en/project_coding-style.ssi:88
msgid ""
"_* Always protect variables with quotes to respect potential whitespaces: "
"write #{\"${FOO}\"}# not #{${FOO}}#."
@@ -344,7 +350,7 @@ msgstr ""
"espaces potentiels: écrire #{\"${FOO}\"}# en lieu de #{${FOO}}#."
#. type: Plain text
-#: en/project_coding-style.ssi:88
+#: en/project_coding-style.ssi:90
msgid ""
"_* For consistency reasons, always use quotes when assigning values to "
"variables:"
@@ -353,26 +359,26 @@ msgstr ""
"l'attribution des valeurs aux variables:"
#. type: Plain text
-#: en/project_coding-style.ssi:94
+#: en/project_coding-style.ssi:96
#, no-wrap
msgid " FOO=bar\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:104
#, no-wrap
msgid " FOO=\"bar\"\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:108
msgid "_* If multiple variables are used, quote the full expression:"
msgstr ""
"_* Si plusieurs variables sont utilisées, utiliser les guillemets pour "
"l'expression complète:"
#. type: Plain text
-#: en/project_coding-style.ssi:115
+#: en/project_coding-style.ssi:117
#, no-wrap
msgid ""
" if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
@@ -382,7 +388,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:126
+#: en/project_coding-style.ssi:128
#, no-wrap
msgid ""
" if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
@@ -392,21 +398,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:130
+#: en/project_coding-style.ssi:132
msgid "2~ Miscellaneous"
msgstr "2~ Autres"
#. type: Plain text
-#: en/project_coding-style.ssi:132
+#: en/project_coding-style.ssi:134
msgid ""
"_* Use \"#{|}#\" (without the surround quotes) as a separator in calls to "
"sed, e.g. \"#{sed -e 's|foo|bar|'}#\" (without \"\")."
msgstr ""
-"_* Utilisez \"#{|}#\" (sans les guillemets autour) comme un séparateur dans "
-"les appels à sed, par exemple \"#{sed -e 's|foo|bar|'}#\" (sans\" \")."
+"_* Utilisez \"#{|}#\" (sans les guillemets autour) comme séparateur dans les "
+"appels à sed, par exemple \"#{sed -e 's|foo|bar|'}#\" (sans\" \")."
#. type: Plain text
-#: en/project_coding-style.ssi:134
+#: en/project_coding-style.ssi:136
msgid ""
"_* Don't use the #{test}# command for comparisons or tests, use \"#{[}#\" \"#"
"{]}#\" (without \"\"); e.g. \"#{if [ -x /bin/foo ]; ...}#\" and not \"#{if "
@@ -417,10 +423,19 @@ msgstr ""
"foo ]; ...}#\" et non pas \"#{if test -x /bin/foo; ...}#\"."
#. type: Plain text
-#: en/project_coding-style.ssi:135
+#: en/project_coding-style.ssi:138
msgid ""
"_* Use #{case}# wherever possible over #{test}#, as it's easier to read and "
"faster in execution."
msgstr ""
"_* Utiliser #{case}# dans la mesure du possible en lieu de #{test}#, parce "
-"qu'il est plus facile à lire et plus rapide dans l'exécution."
+"qu'il est plus facile à lire et plus rapide en l'exécution."
+
+#. type: Plain text
+#: en/project_coding-style.ssi:139
+msgid ""
+"_* Use capitalized names for functions to limit messing with the users "
+"environment."
+msgstr ""
+"_* Utilisez noms en majuscule pour les fonctions pour éviter toute "
+"interférence avec l'environnement des utilisateurs."
diff --git a/manual/po/fr/project_procedures.ssi.po b/manual/po/fr/project_procedures.ssi.po
index 667142c..75314a7 100644
--- a/manual/po/fr/project_procedures.ssi.po
+++ b/manual/po/fr/project_procedures.ssi.po
@@ -1,33 +1,34 @@
# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2011.
+# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
-"PO-Revision-Date: 2011-09-11 15:18+0200\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-23 20:28+0300\n"
+"PO-Revision-Date: 2012-04-07 19:01+0200\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"
-
-#. 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+
+#. 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:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -35,63 +36,69 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: 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-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
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -99,49 +106,53 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: 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:353 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
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -162,8 +173,8 @@ msgid ""
"various tasks that need cooperation with other teams in Debian."
msgstr ""
"Ce chapitre documente les procédures au sein du projet Debian Live pour "
-"différentes tâches qui ont besoin de la coopération avec d'autres équipes "
-"dans Debian."
+"différentes tâches qui ont besoin de coopération avec d'autres équipes dans "
+"Debian."
#. type: Plain text
#: en/project_procedures.ssi:8
@@ -194,8 +205,8 @@ msgid ""
"in and builds live system images. The requirements to do this are:"
msgstr ""
"La libération d'une nouvelle version stable majeur de Debian inclut beaucoup "
-"de différentes équipes travaillant ensemble. À un certain point, l'équipe "
-"Live arrive et construit des images du système live. Les conditions pour ce "
+"de équipes différentes travaillant ensemble. À un certain point, l'équipe "
+"Live arrive et construit images des systèmes live. Les conditions pour ce "
"faire sont les suivantes:"
#. type: Plain text
@@ -204,9 +215,8 @@ msgid ""
"_* A mirror containing the released versions for the debian, debian-security "
"and debian-volatile archive which the debian-live buildd can access."
msgstr ""
-"_* Un miroir contenant les versions publiées pour les référentiels Debian, "
-"debian-security et debian-volatile auxquels debian-live buildd peut avoir "
-"accès."
+"_* Un miroir contenant les versions publiées des dépôts Debian, debian-"
+"security et debian-volatile auxquels le debian-live buildd peut avoir accès."
#. type: Plain text
#: en/project_procedures.ssi:24
@@ -251,33 +261,52 @@ msgstr "2~ Èvolutions mineures"
#. type: Plain text
#: en/project_procedures.ssi:36
msgid ""
-"_* Again, we need updated mirror of debian, debian-security and debian-"
+"_* Again, we need updated mirrors of debian, debian-security and debian-"
"volatile."
msgstr ""
-"_* Encore une fois, nous avons besoin d'un miroir mise à jour de Debian, "
+"_* Encore une fois, nous avons besoin de miroirs mis à jour de Debian, "
"Debian-security et debian-volatile."
#. type: Plain text
#: en/project_procedures.ssi:40
msgid "_* Send announcement mail."
-msgstr "_* Envoyer un courrier d'annonce."
+msgstr "_* Envoyer un courriel d'annonce."
#. type: Plain text
#: en/project_procedures.ssi:42
+msgid "3~ Last Point Release of a Debian Release"
+msgstr "3~ Dernière évolution mineure d'une version Debian"
+
+#. type: Plain text
+#: en/project_procedures.ssi:47
+msgid ""
+"Remember to adjust both chroot and binary mirrors when building the last set "
+"of images for a Debian release after it has been moved away from ftp.debian."
+"org to archive.debian.org. That way, old prebuilt live images are still "
+"useful without user modifications."
+msgstr ""
+"N'oubliez pas de régler à la fois les miroirs pour chroot et binary lors de "
+"la construction de la dernière série d'images pour une version de Debian "
+"après qu'elle a été déplacé de ftp.debian.org à archive.debian.org. De cette "
+"façon, les vieilles images live précompilées sont encore utiles, sans "
+"modifications des utilisateurs."
+
+#. type: Plain text
+#: en/project_procedures.ssi:49
msgid "3~ Point release announcement template"
msgstr "3~ Modèle pour l'annonce d'une évolution mineure"
#. type: Plain text
-#: en/project_procedures.ssi:44
+#: en/project_procedures.ssi:51
msgid ""
"An annoucement mail for point releases can be generated using the template "
"below and the following command:"
msgstr ""
-"Un courrier pour l'annonce d'une évolutioun mineure peut être généré en "
+"Un courriel pour l'annonce d'une évolutioun mineure peut être généré en "
"utilisant le modèle ci-dessous et la commande suivante:"
#. type: Plain text
-#: en/project_procedures.ssi:52
+#: en/project_procedures.ssi:59
#, no-wrap
msgid ""
" $ sed \\\n"
@@ -288,22 +317,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:56
+#: en/project_procedures.ssi:63
msgid ""
"Please check the mail carefully before sending and pass it to others for "
"proof-reading."
msgstr ""
-"S'il vous plaît vérifiez le courrier avant l'envoi et le passer à d'autres "
+"S'il vous plaît vérifiez le courriel avant l'envoi et le passer à d'autres "
"pour la relecture."
#. type: Plain text
-#: en/project_procedures.ssi:60
+#: en/project_procedures.ssi:67
#, no-wrap
msgid " Debian Live images for Debian GNU/Linux %major% updated\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:64
+#: en/project_procedures.ssi:71
#, no-wrap
msgid ""
" The Debian Live project is pleased to announce the availability of\n"
@@ -312,19 +341,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:66
+#: en/project_procedures.ssi:73
#, no-wrap
msgid " The images are available for download at:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:68
+#: en/project_procedures.ssi:75
#, no-wrap
msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:73
+#: en/project_procedures.ssi:80
#, no-wrap
msgid ""
" This update incorporates the changes made in the %minor% point release,\n"
@@ -334,29 +363,29 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:75
+#: en/project_procedures.ssi:82
#, no-wrap
msgid " <http://lists.debian.org/debian-announce/%release_mail%>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:77
+#: en/project_procedures.ssi:84
#, no-wrap
msgid " It also includes the following Live-specific changes:\n"
msgstr ""
#. type: Bullet: ' * '
-#: en/project_procedures.ssi:81
+#: en/project_procedures.ssi:88
msgid "[INSERT LIVE-SPECIFIC CHANGE HERE]"
msgstr ""
#. type: Bullet: ' * '
-#: en/project_procedures.ssi:81
+#: en/project_procedures.ssi:88
msgid "[LARGER ISSUES MAY DESERVE THEIR OWN SECTION]"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:85
+#: en/project_procedures.ssi:92
#, no-wrap
msgid ""
" URLs\n"
@@ -364,67 +393,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:87
+#: en/project_procedures.ssi:94
#, no-wrap
msgid " Download location of updated images:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:89
+#: en/project_procedures.ssi:96
#, no-wrap
msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:91
+#: en/project_procedures.ssi:98
#, no-wrap
msgid " Debian Live project homepage:\n"
-msgstr " Projet Debian Live Homepage:\n"
+msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:93
+#: en/project_procedures.ssi:100
#, no-wrap
msgid " <http://live.debian.net/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:95
+#: en/project_procedures.ssi:102
#, no-wrap
msgid " The current stable distribution:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:97
+#: en/project_procedures.ssi:104
#, no-wrap
msgid " <http://ftp.debian.org/debian/dists/stable>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:99
+#: en/project_procedures.ssi:106
#, no-wrap
msgid " stable distribution information (release notes, errata etc.):\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:101
+#: en/project_procedures.ssi:108
#, no-wrap
msgid " <http://www.debian.org/releases/stable/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:103
+#: en/project_procedures.ssi:110
#, no-wrap
msgid " Security announcements and information:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:105
+#: en/project_procedures.ssi:112
#, no-wrap
msgid " <http://www.debian.org/security/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:109
+#: en/project_procedures.ssi:116
#, no-wrap
msgid ""
" About Debian\n"
@@ -432,7 +461,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:113
+#: en/project_procedures.ssi:120
#, no-wrap
msgid ""
" The Debian Project is an association of Free Software developers who\n"
@@ -441,7 +470,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:117
+#: en/project_procedures.ssi:124
#, no-wrap
msgid ""
" About Debian Live\n"
@@ -449,7 +478,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:122
+#: en/project_procedures.ssi:129
#, no-wrap
msgid ""
" Debian Live is an official sub-project of Debian which produces Debian\n"
@@ -459,7 +488,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:126
+#: en/project_procedures.ssi:133
#, no-wrap
msgid ""
" Contact Information\n"
@@ -467,7 +496,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:130
+#: en/project_procedures.ssi:137
#, no-wrap
msgid ""
" For further information, please visit the Debian Live web pages at\n"
diff --git a/manual/po/fr/style_guide.ssi.po b/manual/po/fr/style_guide.ssi.po
index 9715a55..416cfda 100644
--- a/manual/po/fr/style_guide.ssi.po
+++ b/manual/po/fr/style_guide.ssi.po
@@ -1,12 +1,11 @@
# French translations for live-manual package
-# Copyright (C) 2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-31 19:15+0300\n"
+"POT-Creation-Date: 2012-06-03 17:04+0300\n"
"PO-Revision-Date: 2012-02-11 16:42+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -22,17 +21,16 @@ msgid ":B~ Appendix"
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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
@@ -93,17 +91,16 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
@@ -832,15 +829,15 @@ msgstr ""
#. type: Plain text
#: en/style_guide.ssi:228
-msgid "_* /{New lines}/"
+msgid "_* /{Newlines}/"
msgstr ""
#. type: Plain text
#: en/style_guide.ssi:230
msgid ""
-"The translated texts need to have the exact same new lines as the original "
+"The translated texts need to have the exact same newlines as the original "
"texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
-"in the original files. These new lines often appear, for instance, in the "
+"in the original files. These newlines often appear, for instance, in the "
"code blocks."
msgstr ""
@@ -878,9 +875,7 @@ msgstr ""
#. type: Bullet: ' - '
#: en/style_guide.ssi:244
-msgid ""
-"Metadata (often between colons *{:metadata:}*) especially the date in /{live-"
-"manual.ssm.po}/ because it changes every time live-manual is updated."
+msgid "Metadata (often between colons *{:metadata:}*)"
msgstr ""
#. type: Bullet: ' - '
diff --git a/manual/po/fr/user_basics.ssi.po b/manual/po/fr/user_basics.ssi.po
index aaae78f..4483ed0 100644
--- a/manual/po/fr/user_basics.ssi.po
+++ b/manual/po/fr/user_basics.ssi.po
@@ -1,33 +1,34 @@
# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-12 08:28-0400\n"
-"PO-Revision-Date: 2012-03-17 20:08+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
+"PO-Revision-Date: 2012-04-28 11:39+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"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"
-
-#. 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. 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:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -35,8 +36,10 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -60,39 +63,42 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -100,8 +106,10 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -125,25 +133,26 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -181,8 +190,8 @@ msgstr ""
"périphériques USB. Le chapitre se termine avec des instructions pour la "
"construction et l'utilisation d'une image #{net}# , qui est un peu plus "
"compliqué en raison de la configuration requise sur le serveur. C'est un "
-"sujet un peu avancée pour tous ceux qui ne connaissent pas déjà le démarrage "
-"par le réseau, mais est inclus ici car une fois la configuration est "
+"sujet un peu avancé pour tous ceux qui ne connaissent pas déjà le démarrage "
+"sur le réseau, mais est inclus ici car une fois la configuration est "
"terminée, il est un moyen très pratique pour tester et déployer des images "
"pour le démarrage sur le réseau local sans le tracas des supports de l'image."
@@ -211,9 +220,9 @@ msgid ""
"done at run time (see {Terms}#terms)."
msgstr ""
"Un système live signifie généralement un système d'exploitation démarré sur "
-"un ordinateur à partir d'un support amovible, tel qu'un CD-ROM ou une clé "
-"USB, ou d'un réseau prêt à l'emploi sans aucune installation sur le disque "
-"habituel(s), avec auto-configuration fait lors de l'exécution (voir {Termes}"
+"un ordinateur à partir d'un support amovible, tel qu'un CD-ROM, une clé USB "
+"ou d'un réseau, prêt à l'emploi sans aucune installation sur le disque "
+"habituel, avec auto-configuration fait lors de l'exécution (voir {Termes}"
"#terms)."
#. type: Plain text
@@ -230,7 +239,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:16
msgid "_* *{Linux kernel image}*, usually named #{vmlinuz*}#"
-msgstr "_* *{Linux kernel image}*, d'habitude appelé #{vmlinuz*}#"
+msgstr "_* *{Image du noyau Linux}*, d'habitude appelé #{vmlinuz*}#"
#. type: Plain text
#: en/user_basics.ssi:18
@@ -239,9 +248,9 @@ msgid ""
"boot, containing modules possibly needed to mount the System image and some "
"scripts to do it."
msgstr ""
-"_* *{Initial RAM disk image (initrd)}*: Un disque virtuel RAM configuré pour "
-"le démarrage de Linux, contenant possiblement des modules nécessaires pour "
-"monter l'image du système et certains scripts pour le faire."
+"_* *{Image du RAM-disque initial (initrd)}*: Un disque virtuel RAM configuré "
+"pour le démarrage de Linux, contenant possiblement des modules nécessaires "
+"pour monter l'image du système et certains scripts pour le faire."
#. type: Plain text
#: en/user_basics.ssi:20
@@ -253,14 +262,14 @@ msgid ""
"running system. However, all modifications will be lost upon shutdown unless "
"optional persistence is used (see {Persistence}#persistence)."
msgstr ""
-"_* *{System image}*: L'image du système de fichiers du système "
+"_* *{Image du système}*: L'image du système de fichiers du système "
"d'exploitation. Habituellement, un système de fichiers SquashFS comprimé est "
"utilisé pour réduire au minimum la taille de l'image Debian Live. Notez "
"qu'il est en lecture seulement. Ainsi, lors du démarrage du système Debian "
"Live nous allons utiliser un disque RAM et un mécanisme \"union\" pour "
"permettre l'écriture de fichiers dans le système en marche. Cependant, "
"toutes les modifications seront perdues lors de l'arrêt à moins que l'option "
-"persistance est utilisée (voir {Persistance}#persistence)."
+"«persistance» soit utilisée (voir {Persistance}#persistence)."
#. type: Plain text
#: en/user_basics.ssi:22
@@ -275,16 +284,16 @@ msgid ""
"ext2/3/4 and btrfs partitions, pxelinux for PXE netboot, GRUB for ext2/3/4 "
"partitions, etc."
msgstr ""
-"_* *{Bootloader}*: Un petit morceau de code conçu pour démarrer à partir du "
-"support choisi, il peut présenter un menu rapide ou permettre la sélection "
-"des options/configuration. Il charge le kernel Linux et son initrd pour "
-"fonctionner avec un système de fichiers associé. Différentes solutions "
+"_* *{Chargeur d'amorçage}*: Un petit morceau de code conçu pour démarrer à "
+"partir du support choisi, il peut présenter un menu rapide ou permettre la "
+"sélection des options/configurations. Il charge le noyau Linux et son initrd "
+"pour fonctionner avec un système de fichiers associé. Différentes solutions "
"peuvent être utilisées, selon le support de destination et le format du "
"système de fichiers contenant les composants mentionnés précédemment: "
"isolinux pour démarrer à partir d'un CD ou DVD au format ISO9660, syslinux "
-"pour démarrer le disque dur ou clé USB à partir d'une partition VFAT, "
-"extlinux pour ext2/3/4 et partitions btrfs, pxelinux pour netboot PXE, GRUB "
-"pour ext2/3/4 partitions, etc."
+"pour démarrer un disque dur ou une clé USB à partir d'une partition VFAT, "
+"extlinux pour partitions ext2/3/4 et btrfs, pxelinux pour netboot PXE, GRUB "
+"pour partitions ext2/3/4, etc."
#. type: Plain text
#: en/user_basics.ssi:24
@@ -294,9 +303,9 @@ msgid ""
"media-dependant format (ISO9660 image, disk image, etc.)."
msgstr ""
"Vous pouvez utiliser live-build pour construire l'image du système à partir "
-"de vos spécifications, configurer un kernel Linux, son initrd, et un "
-"chargeur de démarrage pour les exécuter, tout dans un format en fonction du "
-"support (image ISO9660, disque image, etc.)"
+"de vos spécifications, configurer un noyau Linux, son initrd, et un chargeur "
+"d'amorçage pour les exécuter, tout dans un format en fonction du support "
+"(image ISO9660, image disque, etc.)"
#. type: Plain text
#: en/user_basics.ssi:26
@@ -316,7 +325,7 @@ msgid ""
msgstr ""
"Quel que soit le type d'image, vous devrez effectuer les mêmes étapes de "
"base pour créer une image chaque fois. Comme premier exemple, exécuter la "
-"séquence suivante de commandes live-build pour créer une image ISO hybride "
+"séquence suivante de commandes live-build pour créer une image ISO hybride "
"de base contenant tout le système Debian standard sans X.org. Elle est "
"appropriée pour être gravée sur CD ou DVD, et également peut être copiée sur "
"une clé USB."
@@ -328,14 +337,14 @@ msgid ""
"hierarchy in the current directory for use by other commands:"
msgstr ""
"Tout d'abord, exécutez la commande #{lb config}#. Cela va créer une "
-"hiérarchie \"config /\" dans le répertoire courant pour l'utilisation par "
+"hiérarchie \"config/\" dans le répertoire courant pour l'utilisation par "
"d'autres commandes:"
#. type: Plain text
#: en/user_basics.ssi:34
#, no-wrap
msgid " $ lb config\n"
-msgstr " $ lb config\n"
+msgstr ""
#. type: Plain text
#: en/user_basics.ssi:38
@@ -354,7 +363,7 @@ msgid ""
"Now that the \"config/\" hierarchy exists, build the image with the #{lb "
"build}# command:"
msgstr ""
-"Maintenant que la hiérarchie \"config /\" existe, créez l'image avec la "
+"Maintenant que la hiérarchie \"config/\" existe, créez l'image avec la "
"commande #{lb build}# :"
#. type: Plain text
@@ -368,12 +377,12 @@ msgstr ""
#: en/user_basics.ssi:48
msgid ""
"This process can take a while, depending on the speed of your network "
-"connection. When it is complete, there should be a #{binary-hybrid.iso}# "
+"connection. When it is complete, there should be a #{binary.hybrid.iso}# "
"image file, ready to use, in the current directory."
msgstr ""
"Ce processus peut prendre un certain temps, en fonction de la vitesse de "
"votre connexion réseau. Quand il est complet, il devrait y avoir un fichier "
-"image #{binary-hybrid.iso}# prêt à l'emploi, dans le répertoire courant."
+"image #{binary.hybrid.iso}# prêt à l'emploi, dans le répertoire courant."
#. type: Plain text
#: en/user_basics.ssi:50
@@ -389,9 +398,9 @@ msgid ""
"a USB stick."
msgstr ""
"Après la construction ou le téléchargement d'une image ISO hybride, qui peut "
-"être obtenue à http://www.debian.org/CD/live/, l'étape suivante est "
-"d'habitude préparer votre support pour le démarrage, soit sur CD-R(W) ou DVD "
-"-R(W) des supports optiques ou une clé USB."
+"être obtenue sur http://www.debian.org/CD/live/, l'étape suivante est "
+"d'habitude préparer votre support pour le démarrage, soit sur CD-R(W) ou DVD-"
+"R(W), des supports optiques ou une clé USB."
#. type: Plain text
#: en/user_basics.ssi:54
@@ -416,7 +425,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:62
#, no-wrap
-msgid " $ wodim binary-hybrid.iso\n"
+msgid " $ wodim binary.hybrid.iso\n"
msgstr ""
#. type: Plain text
@@ -439,9 +448,9 @@ msgid ""
msgstr ""
"Les images ISO préparées avec la commande #{isohybrid}# comme les images #"
"{iso-hybrid}# produites par défaut, peuvent être simplement copiées sur une "
-"clé USB avec #{dd}# ou un programme équivalent. Brancher une clé USB avec "
-"une capacité suffisamment grande pour votre fichier image et déterminez quel "
-"dispositif il est, que nous appellons ci-dessous #{${USBSTICK}}#. C'est le "
+"clé USB avec #{dd}# ou un logiciel équivalent. Brancher une clé USB avec une "
+"capacité suffisamment grande pour votre fichier image et déterminez quel "
+"dispositif elle est, que nous appellons ci-dessous #{${USBSTICK}}#. C'est le "
"fichier de périphérique de votre clé, tel que #{/dev/sdb}#, pas une "
"partition, tel que #{/dev/sdb1}#! Vous pouvez trouver le nom du périphérique "
"en regardant la sortie de #{dmesg}# après avoir branché le dispositif, ou "
@@ -461,7 +470,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:75
#, no-wrap
-msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
+msgid " $ dd if=binary.hybrid.iso of=${USBSTICK}\n"
msgstr ""
#. type: Plain text
@@ -482,7 +491,7 @@ msgid ""
"device."
msgstr ""
"La première fois que vous démarrez votre support live, qu'il s'agisse de CD, "
-"DVD, clé USB, ou le démarrage par PXE, une certaine configuration dans le "
+"DVD, clé USB, ou du démarrage par PXE, une certaine configuration dans le "
"BIOS de votre ordinateur peut être d'abord nécessaire. Puisque les BIOS "
"varient grandement en fonctionnalités et raccourcis clavier, on ne peut pas "
"pénétrer dans le sujet en profondeur ici. Certains BIOS fournissent une "
@@ -498,15 +507,14 @@ msgid ""
"Once you've booted the media, you are presented with a boot menu. If you "
"just press enter here, the system will boot using the default entry, #{Live}"
"# and default options. For more information about boot options, see the "
-"\"help\" entry in the menu and also the #{live-boot}# and #{live-config}# "
-"man pages found within the live system."
+"\"help\" entry in the menu and also the live-boot and live-config man pages "
+"found within the live system."
msgstr ""
"Une fois que vous avez démarré le support, vous êtes présenté avec un menu "
"de démarrage. Si vous appuyez simplement sur enter ici, le système va "
"démarrer en utilisant l'entrée par défaut, #{Live}# Pour plus d'informations "
"sur les options de démarrage, consultez l'entrée «Help» dans le menu et "
-"aussi les pages de manuel de #{live-boot}# et #{live-config}# dans le "
-"système live."
+"aussi les pages de manuel de live-boot et live-config dans le système live."
#. type: Plain text
#: en/user_basics.ssi:86
@@ -522,7 +530,7 @@ msgstr ""
"bureau live par défaut, après les messages de démarrage défilent, vous "
"devriez être automatiquement connecté au compte #{user}# et voir un bureau, "
"prêt à l'emploi. Si vous avez démarré une image de la console uniquement, "
-"tels que saveurs #{standard}# ou #{sauvetage}# des images prédéfinies, vous "
+"tels que saveurs #{standard}# ou #{rescue}# des images précompilées, vous "
"devriez être automatiquement connecté à la console pour le compte #{user}# "
"et voir une invite du shell, prêt à l'emploi."
@@ -556,7 +564,7 @@ msgid ""
"_* There are some inherent limitations to running on a VM, e.g. poor video "
"performance, limited choice of emulated hardware."
msgstr ""
-"_* Il ya quelques limitations inhérentes à l'exécution sur une VM, par "
+"_* Il y a quelques limitations inhérentes à l'exécution sur une VM, par "
"exemple performance de vidéo médiocre, ou choix limité de matériel émulé."
#. type: Plain text
@@ -596,25 +604,25 @@ msgstr "3~testing-iso-with-qemu Test d'une image ISO avec QEMU"
#: en/user_basics.ssi:104
msgid ""
"The most versatile VM in Debian is QEMU. If your processor has hardware "
-"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
+"support for virtualization, use the /{qemu-kvm}/ package; the /{qemu-kvm}/ "
"package description briefly lists the requirements."
msgstr ""
"La VM la plus polyvalente de Debian est QEMU. Si votre processeur possède un "
-"support matériel pour la virtualisation, vouz pouvez utiliser le paquet #"
-"{qemu-kvm}#; La description du paquet #{qemu-kvm}# énumère brièvement les "
+"support matériel pour la virtualisation, vous pouvez utiliser le paquet /"
+"{qemu-kvm}/; La description du paquet /{qemu-kvm}/ énumère brièvement les "
"exigences."
#. type: Plain text
#: en/user_basics.ssi:106
msgid ""
-"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
-"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
-"the following examples. The #{qemu-utils}# package is also valuable for "
+"First, install /{qemu-kvm}/ if your processor supports it. If not, install /"
+"{qemu}/, in which case the program name is #{qemu}# instead of #{kvm}# in "
+"the following examples. The /{qemu-utils}/ package is also valuable for "
"creating virtual disk images with #{qemu-img}#."
msgstr ""
-"Tout d'abord, installez #{qemu-kvm}# si votre processeur le soutient. Sinon, "
-"installez #{qemu}#, dans ce cas, le nom du programme est #{qemu}# au lieu de "
-"#{kvm}# dans les exemples suivants. Le paquet #{qemu-utils}# est également "
+"Tout d'abord, installez /{qemu-kvm}/ si votre processeur le soutient. Sinon, "
+"installez /{qemu}/, dans ce cas, le nom du programme est #{qemu}# au lieu de "
+"#{kvm}# dans les exemples suivants. Le paquet /{qemu-utils}/ est également "
"valuable pour créer des images disque virtuels avec #{qemu-img}#."
#. type: Plain text
@@ -631,7 +639,7 @@ msgstr "Démarrer une image ISO est simple:"
#. type: Plain text
#: en/user_basics.ssi:118
#, no-wrap
-msgid " $ kvm -cdrom binary-hybrid.iso\n"
+msgid " $ kvm -cdrom binary.hybrid.iso\n"
msgstr ""
#. type: Plain text
@@ -647,8 +655,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:126
-msgid "In order to test the ISO with #{virtualbox-ose}#:"
-msgstr "Afin de tester l'ISO avec #{virtualbox-ose}#:"
+msgid "In order to test the ISO with /{virtualbox-ose}/:"
+msgstr "Afin de tester l'ISO avec /{virtualbox-ose}/:"
#. type: Plain text
#: en/user_basics.ssi:130
@@ -665,25 +673,18 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:136
msgid ""
-"Create a new virtual machine, change the storage settings to use #{binary-"
+"Create a new virtual machine, change the storage settings to use #{binary."
"hybrid.iso}# as the CD/DVD device, and start the machine."
msgstr ""
"Créer une nouvelle machine virtuelle, modifiez les paramètres de stockage "
-"pour utiliser #{binary-hybrid.iso}# comme le périphérique CD/DVD et démarrer "
+"pour utiliser #{binary.hybrid.iso}# comme le périphérique CD/DVD et démarrer "
"la machine."
#. type: Plain text
#: en/user_basics.ssi:138
-msgid ""
-"Note: For live systems containing X.org that you want to test with #"
-"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
-"package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. "
-"Otherwise, the resolution is limited to 800x600."
-msgstr ""
-"Remarque: Pour les systèmes live contenant X.org que vous voulez essayer "
-"avec #{virtualbox-ose}#, vous pouvez inclure le paquet des pilotes "
-"VirtualBox X.org, #{virtualbox-ose-guest-x11}#, dans votre configuration de "
-"live-build. Sinon, la résolution est limitée à 800x600."
+#, no-wrap
+msgid "*{Note:}* For live systems containing X.org that you want to test with /{virtualbox-ose}/, you may wish to include the VirtualBox X.org driver package, /{virtualbox-ose-guest-x11}/, in your live-build configuration. Otherwise, the resolution is limited to 800x600.\n"
+msgstr "*{Remarque:}* Pour les systèmes live contenant X.org que vous voulez essayer avec /{virtualbox-ose}/, vous pouvez inclure le paquet des pilotes VirtualBox X.org, /{virtualbox-ose-guest-x11}/, dans votre configuration de live-build. Sinon, la résolution est limitée à 800x600."
#. type: Plain text
#: en/user_basics.ssi:142
@@ -713,21 +714,16 @@ msgstr ""
"est #{binary.img}# qui ne peut être brûlé sur des supports optiques. Il "
"convient pour le démarrage à partir de clés USB, disques durs USB, et divers "
"autres dispositifs de stockage portables. Normalement, une image ISO hybride "
-"peut être utilisé à cette fin au lieu, mais si vous avez un BIOS qui ne gère "
-"pas correctement des images hybrides, ou si vous voulez utiliser l'espace "
-"disponible sur le support à certaines fins, tel que la persistance d'une "
-"partition, vous devez utiliser une image HDD. "
+"peut être utilisée à cette fin au lieu, mais si vous avez un BIOS qui ne "
+"gère pas correctement les images hybrides, ou si vous voulez utiliser "
+"l'espace disponible sur le support à certaines fins, tel que la persistance "
+"d'une partition, vous devez utiliser une image HDD. "
#. type: Plain text
#: en/user_basics.ssi:150
-msgid ""
-"Note: if you created an ISO hybrid image with the previous example, you will "
-"need to clean up your working directory with the #{lb clean}# command (see "
-"{The lb clean command}#lb-clean):"
-msgstr ""
-"Remarque: si vous avez créé une image ISO hybride avec l'exemple précédent, "
-"vous devrez nettoyer votre répertoire de travail avec la commande #{lb clean}"
-"# (voir {La commande lb clean}#lb-clean):"
+#, no-wrap
+msgid "*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):\n"
+msgstr "*{Remarque:}* si vous avez créé une image ISO hybride avec l'exemple précédent, vous devrez nettoyer votre répertoire de travail avec la commande #{lb clean}# (voir {La commande lb clean}#lb-clean):"
#. type: Plain text
#: en/user_basics.ssi:154 en/user_basics.ssi:220
@@ -776,14 +772,14 @@ msgid ""
"bootloader, ready to be directly written on a USB stick. Since using an HDD "
"image is just like using an ISO hybrid image on USB, follow the instructions "
"in {Using an ISO hybrid live image}#using-iso-hybrid, except use the "
-"filename #{binary.img}# instead of #{binary-hybrid.iso}#."
+"filename #{binary.img}# instead of #{binary.hybrid.iso}#."
msgstr ""
"L'image binaire générée contient une partition VFAT et le chargeur de "
"démarrage syslinux, prêtes à être écrites directement sur une clé USB. Comme "
"l'utilisation d'une image HDD est juste comme l'utilisation d'une image ISO "
"hybride sur USB, suivez les instructions {Utiliser une image live ISO "
"hybride}#using-iso-hybrid, à l'exception du nom de fichier #{binary.img}# en "
-"lieu de #{binary-hybrid.iso}#."
+"lieu de #{binary.hybrid.iso}#."
#. type: Plain text
#: en/user_basics.ssi:180
@@ -793,14 +789,14 @@ msgstr "3~testing-hdd-with-qemu Test d'une image HDD avec Qemu"
#. type: Plain text
#: en/user_basics.ssi:182
msgid ""
-"First, install QEMU as described above in {Testing an ISO image with QEMU}"
-"#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which "
-"version your host system needs, specifying #{binary.img}# as the first hard "
-"drive."
+"First, install /{qemu}/ as described above in {Testing an ISO image with "
+"QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on "
+"which version your host system needs, specifying #{binary.img}# as the first "
+"hard drive."
msgstr ""
-"D'abord, installer QEMU comme décrit ci-dessus dans {Test d'une image ISO "
-"avec QEMU}#testing-iso-with-qemu. Ensuite, exécutez #{kvm}# ou #{qemu}#, "
-"selon la version de vos besoins du système hôte, précisant #{binary.img}# "
+"D'abord, installer /{qemu}/ comme décrit ci-dessus dans {Test d'une image "
+"ISO avec QEMU}#testing-iso-with-qemu. Ensuite, exécutez #{kvm}# ou #{qemu}#, "
+"selon la version que votre système hôte a besoin, précisant #{binary.img}# "
"comme le premier disque dur."
#. type: Plain text
@@ -819,13 +815,13 @@ msgstr ""
#: en/user_basics.ssi:192
msgid ""
"To use the remaining free space after copying #{binary.img}# to a USB stick, "
-"use a partitioning tool such as #{gparted}# or #{parted}# to create a new "
+"use a partitioning tool such as /{gparted}/ or /{parted}/ to create a new "
"partition on the stick. The first partition will be used by the Debian Live "
"system."
msgstr ""
"Pour utiliser l'espace libre restant après avoir copié #{binary.img}# sur "
-"une clé USB, utilisez un outil de partitionnement tels que #{gparted}# ou #"
-"{parted}# afin de créer une nouvelle partition sur la clé. La première "
+"une clé USB, utilisez un outil de partitionnement tel que /{gparted}/ ou /"
+"{parted}/ afin de créer une nouvelle partition sur la clé. La première "
"partition sera utilisée par le système Debian Live."
#. type: Plain text
@@ -853,23 +849,15 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:208
-msgid ""
-"Note: If you want to use the extra space with Windows, apparently that OS "
-"cannot normally access any partitions but the first. Some solutions to this "
-"problem have been discussed on our {mailing list}#contact, but it seems "
-"there are no easy answers."
-msgstr ""
-"Remarque: Si vous voulez utiliser l'espace supplémentaire avec Windows, "
-"apparemment cet OS ne peut normalement pas accéder à n'importe quel "
-"partition, mais la première. Certaines solutions à ce problème ont été "
-"discutés sur notre {liste de diffusion}#contact, mais il semble qu'il n'y a "
-"pas de réponses faciles."
+#, no-wrap
+msgid "*{Note:}* If you want to use the extra space with Windows, apparently that OS cannot normally access any partitions but the first. Some solutions to this problem have been discussed on our {mailing list}#contact, but it seems there are no easy answers.\n"
+msgstr "*{Remarque:}* Si vous voulez utiliser l'espace supplémentaire avec Windows, apparemment cet OS ne peut normalement pas accéder à n'importe quelle partition, mais la première. Certaines solutions à ce problème ont été discutées sur notre {liste de diffusion}#contact, mais il semble qu'il n'y a pas de réponses faciles."
#. type: Plain text
#: en/user_basics.ssi:210
#, no-wrap
msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image, so back up your extra partition first to restore again after updating the live image.}*\n"
-msgstr "*{Rappelez-vous: Chaque fois que vous installez une nouvelle binary.img sur la clé, toutes les données sur la clé seront perdues parce que la table de partition est écrasé par le contenu de l'image, vous devez sauvegarder votre partition supplémentaire d'abord la restaurer à nouveau après la mise à jour du live image.}*\n"
+msgstr "*{Rappelez-vous: Chaque fois que vous installez une nouvelle binary.img sur la clé, toutes les données sur la clé seront perdues parce que la table de partition est écrasée par le contenu de l'image, vous devez sauvegarder votre partition supplémentaire d'abord la restaurer à nouveau après la mise à jour de l'image live.}*\n"
#. type: Plain text
#: en/user_basics.ssi:212
@@ -889,12 +877,9 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:216
-msgid ""
-"Note: if you performed any previous examples, you will need to clean up your "
-"working directory with the #{lb clean}# command:"
-msgstr ""
-"Remarque: Si vous avez réalisé tous les exemples précédents, vous aurez "
-"besoin de nettoyer votre répertoire de travail avec la commande #{lb clean}#:"
+#, no-wrap
+msgid "*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:\n"
+msgstr "*{Remarque:}* Si vous avez réalisé quelque des exemples précédents, vous aurez besoin de nettoyer votre répertoire de travail avec la commande #{lb clean}#:"
#. type: Plain text
#: en/user_basics.ssi:224
@@ -925,9 +910,9 @@ msgstr ""
"pas l'image du système de fichiers pour le client, afin que les fichiers "
"doivent être servis via NFS. Les options #{--net-root-path}# et #{--net-root-"
"server}# spécifien l'emplacement et le serveur, respectivement, du serveur "
-"NFS sur lequel l'image système de fichiers sera situé au moment du "
-"démarrage. Assurez-vous que ce sont mis à des valeurs appropriées pour votre "
-"réseau et serveur."
+"NFS sur lequel l'image du système de fichiers sera située au moment du "
+"démarrage. Assurez-vous que ceux-ci sont fixées à des valeurs appropriées "
+"pour votre réseau et serveur."
#. type: Plain text
#: en/user_basics.ssi:242
@@ -943,9 +928,9 @@ msgstr ""
"réside habituellement sur l'EPROM de la carte Ethernet. Ce programme envoie "
"une requête DHCP pour obtenir une adresse IP et les informations sur ce "
"qu'il faut faire ensuite. Typiquement, la prochaine étape est obtenir un "
-"chargeur de démarrage de niveau supérieur via le protocole TFTP. Cela "
-"pourrait être pxelinux, GRUB, ou démarrer directement à un système "
-"d'exploitation comme Linux."
+"chargeur d'amorçage de niveau supérieur via le protocole TFTP. Cela pourrait "
+"être pxelinux, GRUB, ou démarrer directement à un système d'exploitation "
+"comme Linux."
#. type: Plain text
#: en/user_basics.ssi:244
@@ -957,8 +942,8 @@ msgid ""
msgstr ""
"Par exemple, si vous décompressez le fichier généré #{binary-net.tar.gz}# "
"dans le répertoire #{/srv/debian-live}#, vous trouverez l'image du système "
-"de fichiers dans #{live/filesystem.squashfs}# et le kernel, initrd et le "
-"chargeur de démarrage pxelinux dans #{tftpboot/debian-live/i386}#."
+"de fichiers dans #{live/filesystem.squashfs}# et le noyau, initrd et le "
+"chargeur d'amorçage pxelinux dans #{tftpboot/debian-live/i386}#."
#. type: Plain text
#: en/user_basics.ssi:246
@@ -983,7 +968,7 @@ msgid ""
msgstr ""
"Nous devons configurer le serveur DHCP de notre réseau pour être sûr de "
"donner une adresse IP au client du système du démarrage sur le réseau, et "
-"pour annoncer l'emplacement du chargeur de démarrage PXE."
+"pour annoncer l'emplacement du chargeur d'amorçage PXE."
#. type: Plain text
#: en/user_basics.ssi:252
@@ -1048,19 +1033,20 @@ msgstr "3~ Serveur TFTP"
#: en/user_basics.ssi:278
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
-"Cela sert le kernel et le ramdisk initial pour le système au moment de "
+"Cela sert le noyau et le ramdisk initial pour le système au moment de "
"l'exécution."
#. type: Plain text
#: en/user_basics.ssi:280
msgid ""
-"You should install the tftpd-hpa package. It can serve all files contained "
-"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
-"#{/srv/debian-live/tftpboot}#, run as root the following command:"
+"You should install the /{tftpd-hpa}/ package. It can serve all files "
+"contained inside a root directory, usually #{/srv/tftp}#. To let it serve "
+"files inside #{/srv/debian-live/tftpboot}#, run as root the following "
+"command:"
msgstr ""
-"Vous devriez installer le paquet tftpd-hpa. Il peut servir tous les fichiers "
-"contenus dans un répertoire racine, d'habitude #{/srv/tftp}#. Pour le "
-"laisser servir des fichiers dans #{/srv/debian-live/tftpboot}#, exécuter "
+"Vous devriez installer le paquet /{tftpd-hpa}/. Il peut servir tous les "
+"fichiers contenus dans un répertoire racine, d'habitude #{/srv/tftp}#. Pour "
+"le laisser servir des fichiers dans #{/srv/debian-live/tftpboot}#, exécuter "
"comme utilisateur root la commande suivante:"
#. type: Plain text
@@ -1086,14 +1072,14 @@ msgid ""
"its initrd, it will try to mount the Live filesystem image through a NFS "
"server."
msgstr ""
-"Une fois l'ordinateur hôte a téléchargé et démarré un kernel Linux et chargé "
+"Une fois l'ordinateur hôte a téléchargé et démarré un noyau Linux et chargé "
"son initrd, il va essayer de monter l'image du système de fichiers live via "
"un serveur NFS."
#. type: Plain text
#: en/user_basics.ssi:294
-msgid "You need to install the #{nfs-kernel-server}# package."
-msgstr "Vous devez installer le paquet #{nfs-kernel-server}#."
+msgid "You need to install the /{nfs-kernel-server}/ package."
+msgstr "Vous devez installer le paquet /{nfs-kernel-server}/."
#. type: Plain text
#: en/user_basics.ssi:296
@@ -1115,7 +1101,7 @@ msgstr ""
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
-"et dire au serveur NFS sur cette exportation avec la commande suivante:"
+"et indiquer au serveur NFS sur cette exportation avec la commande suivante:"
#. type: Plain text
#: en/user_basics.ssi:308
@@ -1133,12 +1119,13 @@ msgid ""
"debian.org/manual/en.i386/ch04s05.html. They might help, as their processes "
"are very similar."
msgstr ""
-"Mise en place ces trois services peut être un peu délicat. Vous pourriez "
-"avoir besoin de patience pour obtenir que tous travaillent ensemble. Pour "
-"plus d'informations, consultez le wiki syslinux à http://syslinux.zytor.com/"
-"wiki/index.php/PXELINUX ou la section Debian Installer Manual's TFTP Net "
-"Booting à http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html. Ils "
-"pourraient aider parce que leurs processus sont très semblables."
+"La configuation de ces trois services peut être un peu dificile. Vous "
+"pourriez avoir besoin de patience pour obtenir que tous travaillent "
+"ensemble. Pour plus d'informations, consultez le wiki syslinux à http://"
+"syslinux.zytor.com/wiki/index.php/PXELINUX ou la section Debian Installer "
+"Manual's TFTP Net Booting à http://d-i.alioth.debian.org/manual/en.i386/"
+"ch04s05.html. Ils pourraient aider parce que leurs processus sont très "
+"semblables."
#. type: Plain text
#: en/user_basics.ssi:314
@@ -1170,8 +1157,8 @@ msgstr "3~ Qemu"
#. type: Plain text
#: en/user_basics.ssi:322
-msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
-msgstr "_* Installer #{qemu}#, #{bridge-utils}#, #{sudo}#."
+msgid "_* Install /{qemu}/, /{bridge-utils}/, /{sudo}/."
+msgstr "_* Installer /{qemu}/, /{bridge-utils}/, /{sudo}/."
#. type: Plain text
#: en/user_basics.ssi:324
diff --git a/manual/po/fr/user_customization-binary.ssi.po b/manual/po/fr/user_customization-binary.ssi.po
index 558ba75..c2a5e2a 100644
--- a/manual/po/fr/user_customization-binary.ssi.po
+++ b/manual/po/fr/user_customization-binary.ssi.po
@@ -1,45 +1,46 @@
# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-25 21:42+0100\n"
-"PO-Revision-Date: 2012-03-17 17:01+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"PO-Revision-Date: 2012-04-28 12:50+0200\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:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -63,51 +64,54 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -131,25 +135,26 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -181,9 +186,9 @@ msgstr ""
"live-build utilise /{syslinux}/ et certains de ses dérivés (selon le type "
"d'image) comme chargeurs d'amorçage par défaut. Vous pouvez facilement les "
"personnaliser de différentes façons qui vont de fournir un thème complet à "
-"changer le délai de démarrage ou tout simplement ajouter une image de "
-"démarrage personnalisée. Certains des exemples de personnalisation suivants "
-"utilisent méthodes différentes, comme {includes}#includes ou {hooks}#hooks."
+"changer le délai de démarrage ou tout simplement ajouter une image splash "
+"personnalisée. Certains des exemples de personnalisation suivants utilisent "
+"méthodes différentes, comme {includes}#includes ou {hooks}#hooks."
#. type: Plain text
#: en/user_customization-binary.ssi:10
@@ -265,7 +270,7 @@ msgid ""
" include menu.cfg\n"
" default vesamenu.c32\n"
" prompt 0\n"
-" timeout 5\n"
+" timeout 50\n"
msgstr ""
#. type: Plain text
@@ -288,7 +293,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:43
#, no-wrap
-msgid " sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg\n"
+msgid " sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg\n"
msgstr ""
#. type: Plain text
@@ -326,8 +331,8 @@ msgid ""
"128 characters."
msgstr ""
"_* #{LB_ISO_APPLICATION/--iso-application NAME}#: Cela devrait décrire "
-"l'application qui sera sur l'image. La longueur maximale de ce champ est de "
-"128 caractères."
+"l'application qui sera sur l'image. Le nombre maximum de caractères pour ce "
+"champ est 128."
#. type: Plain text
#: en/user_customization-binary.ssi:55
@@ -340,8 +345,8 @@ msgstr ""
"_* #{LB_ISO_PREPARER/--iso-preparer NAME}#: Cela devrait décrire le "
"préparateur de l'image, généralement avec certains détails de contact. Le "
"défaut de cette option est la version de live-build que vous utilisez, ce "
-"qui peut faciliter le débogage plus tard. La longueur maximale de ce champ "
-"est de 128 caractères."
+"qui peut faciliter le débogage plus tard. Le nombre maximum de caractères "
+"pour ce champ est 128."
#. type: Plain text
#: en/user_customization-binary.ssi:57
@@ -351,8 +356,8 @@ msgid ""
"length for this field is 128 characters."
msgstr ""
"_* #{LB_ISO_PUBLISHER/--iso-publisher NAME}#: Ce doit décrire l'éditeur de "
-"l'image, généralement avec certains détails de contact. La longueur maximale "
-"de ce champ est de 128 caractères."
+"l'image, généralement avec certains détails de contact. Le nombre maximum de "
+"caractères pour ce champ est 128."
#. type: Plain text
#: en/user_customization-binary.ssi:58
@@ -363,5 +368,5 @@ msgid ""
msgstr ""
"_* #{LB_ISO_VOLUME/--iso-volume NAME}#: Cela devrait spécifier l'ID de "
"volume de l'image. Il est utilisé comme une étiquette visible par "
-"l'utilisateur sur certaines plateformes comme Windows et Apple Mac OS. La "
-"longueur maximale de ce champ est de 128 caractères."
+"l'utilisateur sur certaines plateformes comme Windows et Apple Mac OS. Le "
+"nombre maximum de caractères pour ce champ est 128."
diff --git a/manual/po/fr/user_customization-contents.ssi.po b/manual/po/fr/user_customization-contents.ssi.po
index fb85186..e51d61f 100644
--- a/manual/po/fr/user_customization-contents.ssi.po
+++ b/manual/po/fr/user_customization-contents.ssi.po
@@ -1,33 +1,35 @@
# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-15 16:28+0100\n"
-"PO-Revision-Date: 2012-03-17 19:20+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
+"PO-Revision-Date: 2012-04-28 16:09+0200\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"
-
-#. 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. 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:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -35,9 +37,10 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -61,39 +64,43 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -101,9 +108,10 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -127,25 +135,26 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -169,13 +178,13 @@ msgid ""
"time, and preseeding allows you to configure packages when they are "
"installed by supplying answers to debconf questions."
msgstr ""
-"Ce chapitre aborde affiner la personnalisation du contenu du système live "
+"Ce chapitre aborde affiner la personnalisation des contenus du système live "
"delà du simple choix des paquets à inclure. Les includes vous permettent "
-"d'ajouter ou de remplacer des fichiers arbitraires à votre image Debian "
-"Live, les hooks vous permettent d'exécuter des commandes arbitraires à "
+"d'ajouter ou de remplacer des fichiers arbitraires dans votre image Debian "
+"Live, les hooks vous permettent d'exécuter des commandes arbitraires dans "
"différentes étapes de la construction et au démarrage, et la "
"préconfiguration (preseeding) vous permet de configurer les paquets quand "
-"ils sont installés en fournissant des réponses aux questions debconf ."
+"ils sont installés en fournissant des réponses aux questions debconf."
#. type: Plain text
#: en/user_customization-contents.ssi:8
@@ -191,11 +200,11 @@ msgid ""
"replace) arbitrary files in your Debian Live image. live-build provides "
"three mechanisms for using them:"
msgstr ""
-"Bien qu'idéalement un système Debian Live comprendrait les fichiers "
+"Bien qu'idéalement un système Debian Live comprendrait des fichiers "
"entièrement fournis par les paquets Debian non modifiés, on convient parfois "
"de fournir ou de modifier certains contenus par le biais de fichiers. Avec "
"les includes, il est possible d'ajouter (ou remplacer) des fichiers "
-"arbitraires à votre image live de Debian. live-build prévoit trois "
+"arbitraires dans votre image live de Debian. live-build prévoit trois "
"mécanismes pour leur utilisation:"
#. type: Plain text
@@ -228,7 +237,7 @@ msgid ""
"{Binary includes}#binary-includes for more information."
msgstr ""
"_* Binary includes: Ils vous permettent d'ajouter ou remplacer des fichiers "
-"spécifiques de Debian dans l'image binaire, comme les modèles et les "
+"spécifiques de Debian dans l'image binaire, comme des modèles et des "
"répertoires d'outils. S'il vous plaît voir {Binary includes}#binary-includes "
"pour plus d'informations."
@@ -257,26 +266,26 @@ msgid ""
"see {Live/chroot local hooks}#live-chroot-local-hooks if processing is "
"needed."
msgstr ""
-"Chroot local includes peuvent être utilisés pour ajouter ou remplacer des "
-"fichiers dans le système de fichiers chroot/Live afin qu'ils puissent être "
-"utilisés dans le système Live. Une utilisation typique est de peupler le "
-"répertoire squelette de l'utilisateur (#{/etc/skel}#) utilisé par le système "
-"live pour créer le répertoire home de l'utilisateur Live. Une autre est de "
-"fournir des fichiers de configuration qui peuvent être simplement ajoutés ou "
-"remplacés à l'image sans traitement, voir {Live/chroot local hooks}#live-"
-"chroot-local-hooks si le traitement est nécessaire."
+"Les chroot local includes peuvent être utilisés pour ajouter ou remplacer "
+"des fichiers dans le système de fichiers chroot/Live afin qu'ils puissent "
+"être utilisés dans le système Live. Une utilisation typique est de peupler "
+"l'arborescence du répertoir de l'utilisateur (#{/etc/skel}#) utilisé par le "
+"système live pour créer le répertoire home de l'utilisateur Live. Une autre "
+"est de fournir des fichiers de configuration qui peuvent être simplement "
+"ajoutés ou remplacés à l'image sans traitement, voir {Live/chroot local "
+"hooks}#live-chroot-local-hooks si le traitement est nécessaire."
#. type: Plain text
#: en/user_customization-contents.ssi:24
msgid ""
"To include files, simply add them to your #{config/includes.chroot}# "
-"directory. This directory corresponds to the root directory (#{/}#) of the "
+"directory. This directory corresponds to the root directory #{/}# of the "
"live system. For example, to add a file #{/var/www/index.html}# in the live "
"system, use:"
msgstr ""
"Pour inclure des fichiers, il suffit de les ajouter à votre répertoire #"
-"{config/includes.chroot}#. Ce répertoire correspond au répertoire racine (#"
-"{/}#) du système live. Par exemple, pour ajouter un fichier #{/var/www/index."
+"{config/includes.chroot}#. Ce répertoire correspond au répertoire racine #{/}"
+"# du système live. Par exemple, pour ajouter un fichier #{/var/www/index."
"html}# dans le système live, utilisez:"
#. type: Plain text
@@ -312,8 +321,8 @@ msgid ""
"Chroot local includes are installed after package installation so that files "
"installed by packages are overwritten."
msgstr ""
-"Chroot local includes sont installés après l'installation de paquets de "
-"sorte que les fichiers installés par les paquets sont écrasés."
+"Les chroot local includes sont installés après l'installation de paquets de "
+"sorte que les fichiers installés par les paquets sont remplacés."
#. type: Plain text
#: en/user_customization-contents.ssi:50
@@ -333,12 +342,12 @@ msgid ""
msgstr ""
"Pour inclure des matériels tels que des documents ou des vidéos sur le "
"système de fichiers des supports, afin qu'ils soient accessibles dès "
-"l'insertion du support sans avoir à démarrer le système live, vous pouvez "
-"utiliser binary local includes. Cela fonctionne de façon similaire aux "
-"chroot local includes. Par exemple, supposons que les fichiers #{~/"
-"video_demo.*}# sont des vidéos de démonstration du système live décrits par "
-"et liés par une page d'index HTML. Copiez simplement le matériel dans #"
-"{config/includes.binary/}# comme suit:"
+"l'insertion du support sans démarrer le système live, vous pouvez utiliser "
+"binary local includes. Cela fonctionne de façon similaire aux chroot local "
+"includes. Par exemple, supposons que les fichiers #{~/video_demo.*}# sont "
+"des vidéos de démonstration du système live décrits par et liés par une page "
+"d'index HTML. Copiez simplement le matériel dans #{config/includes.binary/}# "
+"comme suit:"
#. type: Plain text
#: en/user_customization-contents.ssi:56
@@ -396,8 +405,8 @@ msgid ""
"Hooks allow commands to be performed in the chroot and binary stages of the "
"build in order to customize the image."
msgstr ""
-"Les hooks permettent à les commandes être exécutées dans les étapes chroot "
-"et binary de la construction afin de personnaliser l'image. "
+"Les hooks permettent à les commandes être exécutées dans les étapes de la "
+"construction chroot et binary afin de personnaliser l'image. "
#. type: Plain text
#: en/user_customization-contents.ssi:78
@@ -446,7 +455,7 @@ msgstr ""
"config hooks comme expliqué dans la section \"Personnalisation\" de sa page "
"de manuel. Examiner les hooks de live-config fournis dans #{/lib/live/"
"config/}#, en notant les numéros de séquence. Puis fournir votre propre hook "
-"préfixée avec un numéro de séquence appropriée, soit comme un chroot local "
+"précédé d'un numéro de séquence appropriée, soit comme un chroot local "
"include dans #{config/includes.chroot/lib/live/config/}#, ou comme un paquet "
"personnalisé tel que discuté dans {Installation des paquets modifiés ou de "
"tiers}#installing-modified-or-third-party-packages."
@@ -472,9 +481,9 @@ msgstr ""
"Pour exécuter des commandes à l'étape binaire, créer un script hook avec le "
"suffixe #{.binary}# contenant les commandes dans le répertoire #{config/"
"hooks/}#. Le hook sera exécuté après toutes les autres commandes binaires "
-"sont exécutées, mais avant binary_checksums, la dernière commande binaire. "
-"Les commandes de votre hook ne s'exécutent pas dans le chroot, afin de "
-"prendre soin de ne pas modifier les fichiers en dehors de l'arbre de "
+"soient exécutées, mais avant binary_checksums, la dernière commande "
+"binaire. Les commandes de votre hook ne s'exécutent pas dans le chroot, "
+"afin de prendre soin de ne pas modifier les fichiers en dehors de l'arbre de "
"construction, ou vous pourriez endommager votre système de construction! "
"Voir les exemples de binary hook scripts pour diverses tâches courantes de "
"personnalisation binaires fournis dans #{/usr/share/live/build/examples/"
@@ -502,8 +511,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:93
msgid ""
-"For more information about debconf, please see debconf(7) in the #{debconf}# "
-"package."
+"For more information about debconf, please see #{debconf(7)}# in the /"
+"{debconf}/ package."
msgstr ""
-"Pour plus d'informations sur debconf, s'il vous plaît voir debconf(7) dans "
-"le paquet #{debconf}#."
+"Pour plus d'informations sur debconf, s'il vous plaît voir #{debconf(7)}# "
+"dans le paquet /{debconf}/."
diff --git a/manual/po/fr/user_customization-installer.ssi.po b/manual/po/fr/user_customization-installer.ssi.po
index 57db8fd..74c2688 100644
--- a/manual/po/fr/user_customization-installer.ssi.po
+++ b/manual/po/fr/user_customization-installer.ssi.po
@@ -1,13 +1,12 @@
# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
"PO-Revision-Date: 2012-03-19 21:01+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -18,28 +17,29 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -63,21 +63,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -86,28 +87,29 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -131,21 +133,22 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -171,7 +174,7 @@ msgid ""
"how the installer operates."
msgstr ""
"Les images du système Debian Live peuvent être intégrées avec l'installateur "
-"Debian. Il y a un certain nombre de différents types d'installation, variant "
+"Debian. Il y a un certain nombre de types d'installation différents, variant "
"en ce qui est inclus et comment fonctionne l'installateur."
#. type: Plain text
@@ -201,20 +204,20 @@ msgstr "Les trois principaux types de programme d'installation sont:"
#: en/user_customization-installer.ssi:14
#, no-wrap
msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as \"combined images\".\n"
-msgstr "*{Installateur Debian «Régulière»}*: C'est une image de Debian Live normale avec un noyau et initrd séparés qui (lorsqu'ils sont sélectionnés à partir du chargeur d'amorçage approprié) se lancen dans une instance d'installateur Debian standard, exactement comme si vous aviez téléchargé une image CD de Debian et la auriez démarrée. Les images contenant un système live et un installateur indépendant sont souvent appelés «images combinées\".\n"
+msgstr "*{Installateur Debian «Régulière»}*: C'est une image de Debian Live normale avec un noyau et initrd séparés qui (lorsqu'ils sont sélectionnés à partir du chargeur d'amorçage approprié) se lancen dans une instance d'installateur Debian standard, exactement comme si vous aviez téléchargé une image CD de Debian et la auriez démarrée. Les images contenant un système live et un installateur indépendant sont souvent appelées «images combinées».\n"
#. type: Plain text
#: en/user_customization-installer.ssi:16
msgid ""
"On such images, Debian is installed by fetching and installing .deb packages "
-"using #{debootstrap}# or #{cdebootstrap}#, from the local media or some "
+"using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some "
"network-based network, resulting in a standard Debian system being installed "
"to the hard disk."
msgstr ""
"Sur ces images, Debian est installé par l'extraction et l'installation de "
-"paquets .deb à l'aide de #{debootstrap}# ou #{cdebootstrap}#, à partir des "
-"supports locaux ou à partir du réseau, résultant en un système Debian "
-"standard en cours d'installation sur le disque dur."
+"paquets .deb à l'aide de /{debootstrap}/ ou /{cdebootstrap}/, à partir des "
+"supports locaux ou sur le réseau, résultant en un système Debian standard en "
+"cours d'installation sur le disque dur."
#. type: Plain text
#: en/user_customization-installer.ssi:18
@@ -241,15 +244,15 @@ msgstr "*{Installateur Debian \"Live\" }*: C'est une image de Debian Live avec u
msgid ""
"Installation will proceed in an identical fashion to the \"Regular\" "
"installation described above, but at the actual package installation stage, "
-"instead of using #{debootstrap}# to fetch and install packages, the live "
+"instead of using /{debootstrap}/ to fetch and install packages, the live "
"filesystem image is copied to the target. This is achieved with a special "
"udeb called live-installer."
msgstr ""
-"L'installation se poursuit de manière identique à l'installation \"régulière"
-"\" décrite ci-dessus, mais à l'étape de l'installation des paquets, au lieu "
-"d'utiliser #{debootstrap}# pour aller chercher et installer des paquets, "
+"L'installation continue de manière identique à l'installation «Régulière» "
+"décrite ci-dessus, mais à l'étape de l'installation des paquets, au lieu "
+"d'utiliser /{debootstrap}/ pour aller chercher et installer des paquets, "
"l'image du système de fichiers live est copiée vers la cible. Ce résultat "
-"est obtenu avec un udeb spécial appelé «live-installer»."
+"est obtenu avec un udeb spécial appelé live-installer."
#. type: Plain text
#: en/user_customization-installer.ssi:24
@@ -257,20 +260,15 @@ msgid ""
"After this stage, the Debian Installer continues as normal, installing and "
"configuring items such as bootloaders and local users, etc."
msgstr ""
-"Après cette étape, l'installateur Debian se poursuit normalement, en "
-"installant et configurant des éléments tels que chargeurs de démarrage et "
-"les utilisateurs locaux, etc"
+"Après cette étape, l'installateur Debian continue normalement, en installant "
+"et configurant des éléments tels que les chargeurs d'amorçage et les "
+"utilisateurs locaux, etc"
#. type: Plain text
#: en/user_customization-installer.ssi:26
-msgid ""
-"Note: to support both normal and live installer entries in the bootloader of "
-"the same live media, you must disable live-installer by preseeding #{live-"
-"installer/enable=false}#."
-msgstr ""
-"Remarque: Pour soutenir les deux options: installateur normal et live dans "
-"le chargeur d'amorçage du même support live, vous devez désactiver «live-"
-"installer» en utilisant la préconfiguration #{live-installer/enable=false}#."
+#, no-wrap
+msgid "*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.\n"
+msgstr "*{Remarque:}* Pour soutenir les deux options: installateur normal et live dans le chargeur d'amorçage du même support live, vous devez désactiver live-installer en utilisant la préconfiguration #{live-installer/enable=false}#.\n"
#. type: Plain text
#: en/user_customization-installer.ssi:28
@@ -288,7 +286,7 @@ msgid ""
"architecture. For example:"
msgstr ""
"Notez que par défaut, live-build n'inclut pas les images de l'installateur "
-"Debian dans les images, il doit être spécifiquement activée avec #{lb config}"
+"Debian dans les images, il doit être spécifiquement activé avec #{lb config}"
"#. Aussi, s'il vous plaît noter que pour que l'installateur \"de bureau\" "
"fonctionne le noyau du système live doit correspondre au noyau que #{d-i}# "
"utilise pour l'architecture spécifiée. Par exemple:"
@@ -322,11 +320,11 @@ msgid ""
msgstr ""
"Comme décrit dans le Debian Installer Manual, Appendix B at http://www."
"debian.org/releases/stable/i386/apb.html,\n"
-"\"La préconfiguration est une façon de donner des réponses aux questions "
-"posées durant le processus d'installation, sans avoir à entrer manuellement "
+"«La préconfiguration est une façon de donner des réponses aux questions "
+"posées pendant le processus d'installation, sans avoir à entrer manuellement "
"les réponses alors que l'installation est en marche. Cela permet "
-"d'automatiser entièrement la plupart des types d'installation et propose "
-"même quelques fonctionnalités ne sont pas disponibles pendant les "
+"d'automatiser entièrement la plupart des types d'installation et elle offre "
+"certaines fonctionnalités que ne sont pas disponibles pendant les "
"installations normales ». Ce type de personnalisation se fait mieux avec "
"live-build en plaçant la configuration dans un fichier #{preseed.cfg}# "
"inclus dans #{config/binary_debian-installer/}#. Par exemple, pour "
@@ -353,12 +351,12 @@ msgid ""
"binary/}# to include them in the image. Additional or replacement files and "
"directories may be included in the installer initrd as well, in a similar "
"fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
-"placing the material in #{config/binary_debian-installer-includes/}#."
+"placing the material in #{config/includes.binary_debian-installer/}#."
msgstr ""
"Pour des fins expérimentales ou de débogage, vous pouvez inclure paquets "
-"udeb #{d-i}# construits localement. Les placer dans #{config/packages."
-"binary/}# pour les inclure dans l'image. Fichiers supplémentaires ou de "
-"remplacement et répertoires peuvent être inclus dans l'initrd de "
-"l'installateur ainsi, d'une manière similaire à {Live/chroot local includes}"
-"#live-chroot-local-includes en plaçant le matériau dans #{config/"
-"binary_debian-installer-includes/}#. "
+"udeb #{d-i}# construits localement. Et les placer dans #{config/packages."
+"binary/}# pour les inclure dans l'image. Plusieurs fichiers supplémentaires "
+"ou de remplacement et plusieurs répertoires peuvent être inclus dans "
+"l'initrd de l'installateur ainsi, d'une manière similaire à {Live/chroot "
+"local includes}#live-chroot-local-includes en plaçant le matériau dans #"
+"{config/includes.binary_debian-installer/}#. "
diff --git a/manual/po/fr/user_customization-overview.ssi.po b/manual/po/fr/user_customization-overview.ssi.po
index c79e8c7..fe1f2ad 100644
--- a/manual/po/fr/user_customization-overview.ssi.po
+++ b/manual/po/fr/user_customization-overview.ssi.po
@@ -1,13 +1,12 @@
# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: 2012-03-17 20:27+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -58,8 +57,8 @@ msgid ""
"locale and language}#customizing-locale-and-language, for example."
msgstr ""
"Les options de configuration d'un système live sont divisés en options au "
-"moment de la construction, ces options sont appliqués pendant la création et "
-"des options au moment du démarrage, qui sont appliqués au moment du "
+"moment de la construction, ces options sont appliquées pendant la création "
+"et des options au moment du démarrage, qui sont appliquées au moment du "
"démarrage. Les options au moment du démarrage sont divisées en celles qui "
"surviennent au début, appliquées par le paquet live-boot, et ceux qui "
"arrivent plus tard, appliquées par live-config. Toute option d'amorçage peut "
@@ -68,10 +67,10 @@ msgstr ""
"défaut et alors les utilisateurs peuvent normalement démarrer directement au "
"système live sans spécifier aucune option lorsque toutes les valeurs par "
"défaut sont appropriées. En particulier, l'argument #{lb --bootappend-live}# "
-"se compose de toutes les options de ligne de commande du kernel par défaut "
-"pour le système live, comme la persistance, claviers, ou de fuseau horaire. "
-"Voir {Personnalisation des paramètres régionaux et la langue}#customizing-"
-"locale-and-language, par exemple."
+"se compose de toutes les options de ligne de commande du noyau par défaut "
+"pour le système live, comme la persistance, les claviers, ou le fuseau "
+"horaire. Voir {Personnalisation des paramètres régionaux et la langue}"
+"#customizing-locale-and-language, par exemple."
#. type: Plain text
#: en/user_customization-overview.ssi:12
@@ -121,14 +120,14 @@ msgstr ""
"de peupler le répertoire chroot avec des paquets pour faire un système "
"Debian de base. Il est suivi par l'étape *{chroot}*, qui complète la "
"construction du répertoire chroot, le peuplant de tous les paquets listés "
-"dans la configuration, ainsi que tout autre matériel. La plupart de "
-"personnalisation de contenu se produit à ce stade. La dernière étape de la "
+"dans la configuration, ainsi que tout autre matériel. La plupart de la "
+"personnalisation du contenu se produit à ce stade. La dernière étape de la "
"préparation de l'image live est l'étape *{binary}*, qui construit une image "
"démarrable, en utilisant le contenu du répertoire chroot pour construire le "
-"système de fichiers racine pour le système Live, et dont l'installateur et "
-"tout autre matériel supplémentaire sur les supports objectif en dehors du "
+"système de fichiers racine pour le système Live, il comprend l'installateur "
+"et tout autre matériel supplémentaire sur les supports objectif en dehors du "
"système de fichiers du système live. Après l'image live est construite, s'il "
-"est activé, l'archive source est construit dans l'étape *{source}*."
+"est activé, le tarball des sources est construit dans l'étape *{source}*."
#. type: Plain text
#: en/user_customization-overview.ssi:18
@@ -142,12 +141,13 @@ msgid ""
"in place."
msgstr ""
"Dans chacune de ces étapes, il ya une séquence particulière dans laquelle "
-"les commandes sont appliquées. Ce sont disposées de telle manière à assurer "
-"que les personnalisations peuvent être superposées de manière raisonnable. "
-"Par exemple, dans l'étape *{chroot}*, preseeds sont appliqués avant tous les "
-"paquets sont installés, les paquets sont installés avant tout les fichiers "
-"localement inclus ou les patches sont appliqués, et les hooks sont exécutés "
-"plus tard, après que tous les matériaux sont en place."
+"les commandes sont appliquées. Ceux-ci sont disposées de telle manière à "
+"assurer que les personnalisations peuvent être superposées de manière "
+"raisonnable. Par exemple, dans l'étape *{chroot}*, les preseeds sont "
+"appliqués avant tous les paquets sont installés, les paquets sont installés "
+"avant tous les fichiers locaux inclus ou les correctifs soient appliqués, et "
+"les hooks sont exécutés plus tard, après que tous les matériaux sont en "
+"place."
#. type: Plain text
#: en/user_customization-overview.ssi:20
@@ -157,7 +157,7 @@ msgstr "2~ Supplément lb config avec des fichiers"
#. type: Plain text
#: en/user_customization-overview.ssi:22
msgid ""
-"Although #{lb config}# does create a skeletal configuration in the config/ "
+"Although #{lb config}# creates a skeletal configuration in the config/ "
"directory, to accomplish your goals, you may need to provide additional "
"files in subdirectories of config/. Depending on where the files are stored "
"in the configuration, they may be copied into the live system's filesystem "
@@ -168,7 +168,7 @@ msgid ""
"boosting the already considerable flexibility of debian-live with code of "
"your own."
msgstr ""
-"Bien que #{lb config}# crée une configuration du squelette dans le "
+"Bien que #{lb config}# crée une arborescence de configuration dans le "
"répertoire config/, pour accomplir vos objectifs, vous pourriez avoir besoin "
"de fournir des fichiers supplémentaires dans les sous-répertoires de "
"config/. Selon l'endroit où les fichiers sont stockés dans la configuration, "
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index 3a07cbc..8ba3b76 100644
--- a/manual/po/fr/user_customization-packages.ssi.po
+++ b/manual/po/fr/user_customization-packages.ssi.po
@@ -1,13 +1,12 @@
# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-14 22:45+0300\n"
"PO-Revision-Date: 2012-03-17 19:13+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -18,28 +17,29 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -63,21 +63,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -86,28 +87,29 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -131,21 +133,22 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -177,31 +180,32 @@ msgid ""
"distribution mirror. You can also add your own repositories for backports, "
"experimental or custom packages, or include packages directly as files. You "
"can define your own lists of packages to include, use live-build's "
-"predefined lists, use #{tasksel}# tasks, or a combination of all three. "
-"Finally, a number of options give some control over apt, or if you prefer, "
-"aptitude, at build time when packages are installed. You may find these "
-"handy if you use a proxy, want to disable installation of recommended "
-"packages to save space, or need to control which versions of packages are "
-"installed via APT pinning, to name a few possibilities."
+"predefined lists, use /{tasksel}/ tasks, or a combination of all three. "
+"Finally, a number of options give some control over /{apt}/, or if you "
+"prefer, /{aptitude}/, at build time when packages are installed. You may "
+"find these handy if you use a proxy, want to disable installation of "
+"recommended packages to save space, or need to control which versions of "
+"packages are installed via APT pinning, to name a few possibilities."
msgstr ""
"La personnalisation la plus fondamentale d'un système Debian Live peut-être "
"la sélection de paquets à inclure dans l'image. Ce chapitre vous guide tout "
"au long des différentes options dans certains moments de la construction "
"pour personnaliser l'installation des paquets avec live-build. Le plus large "
"choix influençant les paquets qui sont disponibles pour l'installation dans "
-"l'image sont les zones de distribution et archive areas. Afin de garantir "
-"des vitesses de téléchargement décent, vous devez choisir un miroir de "
-"distribution proche. Vous pouvez également ajouter vos propres dépôts pour "
-"les backports, paquets expérimentaux ou personnalisés, ou inclure des "
-"paquets directement en tant que fichiers. Vous pouvez définir vos propres "
-"listes de paquets à inclure, utilisez des listes prédéfinies de live-build, "
-"utilisez tâches #{tasksel}#, ou une combinaison des trois. Enfin, un certain "
-"nombre d'options donnent un certain contrôle sur apt, ou si vous préférez, "
-"aptitude, au moment de la construction quand les paquets sont installés. "
-"Vous pouvez trouver ces très pratique si vous utilisez un proxy, vous voulez "
-"désactiver l'installation des paquets recommandés pour économiser l'espace, "
-"ou avez besoin de contrôler quels versions des paquets sont installés via "
-"APT pinning, pour n'en nommer quelques possibilités."
+"l'image sont les zones de distribution et les sections (archive areas). Afin "
+"de garantir des vitesses de téléchargement décentes, vous devez choisir un "
+"miroir de distribution proche. Vous pouvez également ajouter vos propres "
+"dépôts pour les backports, paquets expérimentaux ou personnalisés, ou "
+"inclure des paquets directement en tant que fichiers. Vous pouvez définir "
+"vos propres listes de paquets à inclure, utiliser des listes prédéfinies de "
+"live-build, utiliser tâches /{tasksel}/, ou une combinaison des trois. "
+"Enfin, un certain nombre d'options donnent un certain contrôle sur /{apt}/, "
+"ou si vous préférez, /{aptitude}/, au moment de la construction quand les "
+"paquets sont installés. Vous pouvez trouver ces très pratique si vous "
+"utilisez un proxy, vous voulez désactiver l'installation des paquets "
+"recommandés pour économiser l'espace, ou avez besoin de contrôler quels "
+"versions des paquets sont installés via APT pinning, pour n'en nommer "
+"quelques possibilités."
#. type: Plain text
#: en/user_customization-packages.ssi:8
@@ -218,23 +222,22 @@ msgstr "3~ Distribution, archive areas et mode"
msgid ""
"The distribution you choose has the broadest impact on which packages are "
"available to include in your live image. Specify the codename, which "
-"defaults to #{wheezy}# for the Wheezy version of live-build. Any current "
+"defaults to wheezy for the wheezy version of live-build. Any current "
"distribution carried in the Debian archive may be specified by its codename "
"here. (See {Terms}#terms for more details.) The #{--distribution}# option "
"not only influences the source of packages within the archive, but also "
-"instructs #{live-build}# to behave as needed to build each supported "
-"distribution. For example, to build against the *{unstable}* release, Sid, "
+"instructs live-build to behave as needed to build each supported "
+"distribution. For example, to build against the *{unstable}* release, sid, "
"specify:"
msgstr ""
"La distribution que vous choisissez a le plus large impact sur les paquets "
"qui sont disponibles à inclure dans votre image live. Indiquez le nom de "
-"code, qui est par défaut #{wheezy}# pour la version de live-build dans "
-"Wheezy. Toute distribution actuelle dans l'archive Debian peut être spécifié "
-"par son nom de code ici. (Voir {Termes}#terms pour plus de détails.) "
-"L'option #{--distribution}# non seulement influence la source des paquets "
-"dans l'archive, mais aussi dit #{live-build}# comme it doit construire "
-"chaque distribution soutenue. Par exemple, pour construire contre *{unstable}"
-"*, Sid, précisez: "
+"code, qui est par défaut wheezy pour la version de live-build dans wheezy. "
+"Toute distribution actuelle dans l'archive Debian peut être spécifié par son "
+"nom de code ici. (Voir {Termes}#terms pour plus de détails.) L'option #{--"
+"distribution}# non seulement influence la source des paquets dans l'archive, "
+"mais aussi dit live-build comme it doit construire chaque distribution "
+"soutenue. Par exemple, pour construire contre *{unstable}*, sid, précisez: "
#. type: Plain text
#: en/user_customization-packages.ssi:16
@@ -272,7 +275,7 @@ msgid ""
"derivative are supported instead of the ones for Debian. The mode also "
"modifies live-build behaviour to suit the derivatives."
msgstr ""
-"Soutien expérimental est disponible pour certains dérivés de Debian par "
+"Soutien expérimental est disponible pour certains dérivés de Debian grâce à "
"l'option #{--mode}#. L'option #{debian}# est définie par défaut, même si "
"vous êtes en créant sur un système non-Debian. Si vous spécifiez #{--mode "
"ubuntu}# ou #{--mode emdebian}#, les noms de distribution et des areas des "
@@ -284,7 +287,7 @@ msgstr ""
#: en/user_customization-packages.ssi:30
#, no-wrap
msgid "*{Note:}* The projects for whom these modes were added are primarily responsible for supporting users of these options. The Debian live project, in turn, provides development support on a best-effort basis only, based on feedback from the derivative projects as we do not develop or support these derivatives ourselves.\n"
-msgstr "*{Remarque:}* Les projets pour lesquels ces modes ont été ajoutés sont principalement responsables de aider les utilisateurs de ces options. Le projet Debian Live, à son tour, fournit un soutien de développement sur une base des meilleurs efforts seulement, en fonction des commentaires sur les projets dérivés que nous n'avons pas développé ou soutenu nous-mêmes.\n"
+msgstr "*{Remarque:}* Les projets pour lesquels ces modes ont été ajoutés sont principalement responsables d'aider les utilisateurs de ces options. Le projet Debian Live, à son tour, fournit un soutien de développement sur une base des meilleurs efforts seulement, en fonction des commentaires sur les projets dérivés que nous n'avons pas développé ou soutenu nous-mêmes.\n"
#. type: Plain text
#: en/user_customization-packages.ssi:32
@@ -299,22 +302,22 @@ msgid ""
"download speed. Each of the #{--mirror-*}# options governs which "
"distribution mirror is used at various stages of the build. Recall from "
"{Stages of the build}#stages-of-the-build that the *{bootstrap}* stage is "
-"when the chroot is initially populated by debootstrap with a minimal system, "
-"and the *{chroot}* stage is when the chroot used to construct the live "
-"system's filesystem is built. Thus, the corresponding mirror switches are "
-"used for those stages, and later, in the *{binary}* stage, the #{--mirror-"
-"binary}# and #{--mirror-binary-security}# values are used, superceding any "
-"mirrors used in an earlier stage."
-msgstr ""
-"L'archive Debian est répliqué à travers un large réseau de miroirs autour du "
-"monde pour que les gens dans chaque région peuvent choisir un miroir proche "
+"when the chroot is initially populated by /{debootstrap}/ with a minimal "
+"system, and the *{chroot}* stage is when the chroot used to construct the "
+"live system's filesystem is built. Thus, the corresponding mirror switches "
+"are used for those stages, and later, in the *{binary}* stage, the #{--"
+"mirror-binary}# and #{--mirror-binary-security}# values are used, "
+"superceding any mirrors used in an earlier stage."
+msgstr ""
+"L'archive Debian est répliqué sur un grand réseau de miroirs autour du monde "
+"pour que les habitants dans chaque région puissent choisir un miroir proche "
"avec la meilleur vitesse de téléchargement. Chacune des options #{--mirror-*}"
-"# qui régissent quel miroir de distribution est utilisée à différentes "
-"étapes de la construction. Rappelez-vous de {Étapes de la construction}"
-"#stages-of-the-build que l'étape *{bootstrap}* c'est quand le chroot est "
-"initialement peuplée par debootstrap avec un système minimal, et l'étape *"
-"{chroot}* c'est quand le chroot utilisé pour construire le système de "
-"fichiers du système live est construit. Ainsi, les commutateurs des miroirs "
+"# régissent quel miroir de distribution est utilisée à différentes étapes de "
+"la construction. Rappelez-vous de {Étapes de la construction}#stages-of-the-"
+"build que l'étape *{bootstrap}* c'est quand le chroot est initialement "
+"peuplée par /{debootstrap}/ avec un système minimal, et l'étape *{chroot}* "
+"c'est quand le chroot utilisé pour construire le système de fichiers du "
+"système live est construit. Ainsi, les commutateurs des miroirs "
"correspondants sont utilisées pour ces étapes, et plus tard, dans l'étape *"
"{binary}* les valeurs #{--mirror-binary}# et #{--mirror-binary-security}# "
"sont utilisées, remplaçant tout miroir utilisé dans une étape antérieure. "
@@ -353,7 +356,7 @@ msgid ""
"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
"mirror-bootstrap}# value."
msgstr ""
-"Le miroir chroot, spécifiée par #{--mirror-chroot}#, par défaut, c'est la "
+"Le miroir chroot, spécifié par #{--mirror-chroot}#, par défaut, c'est la "
"valeur #{--mirror-bootstrap}#."
#. type: Plain text
@@ -381,8 +384,8 @@ msgstr ""
"choix approprié lorsque vous ne pouvez pas prédire quel miroir sera mieux "
"pour tous vos utilisateurs. Ou vous pouvez spécifier vos propres valeurs, "
"comme indiqué dans l'exemple ci-dessous. Une image construite avec cette "
-"configuration seulement serait approprié pour les utilisateurs sur un réseau "
-"où \"#{mirror}#\" est accessible."
+"configuration seulement serait appropriée pour les utilisateurs sur un "
+"réseau où \"#{mirror}#\" est accessible."
#. type: Plain text
#: en/user_customization-packages.ssi:57
@@ -416,8 +419,8 @@ msgstr ""
"your-repository.list.chroot}#, et/ou #{config/archives/your-repository.list."
"binary}#. Comme avec les options #{--mirror-*}#, elles gouvernent les dépôts "
"utilisés dans l'étape *{chroot}* lors de la construction de l'image, et dans "
-"l'étape *{binary}*, c'est à dire pour une utilisation au moment de "
-"l'exécution du système live."
+"l'étape *{binary}*, c'est à dire pour les utiliser au moment de l'exécution "
+"du système live."
#. type: Plain text
#: en/user_customization-packages.ssi:65
@@ -464,7 +467,7 @@ msgstr ""
#: en/user_customization-packages.ssi:79
#, no-wrap
msgid "*{Note:}* some preconfigured package repositories are available for easy selection through the #{--archives}# option, e.g. for enabling live snapshots, a simple command is enough to enable it:\n"
-msgstr "*{Remarque:}* certains dépôts de paquets préconfigurés sont disponibles pour une sélection facile grâce à l'option #{--archives}#, par exemple pour permettre des instantanés live, une simple commande suffit pour l'activer:\n"
+msgstr "*{Remarque:}* certains dépôts de paquets préconfigurés sont disponibles pour une sélection facile grâce à l'option #{--archives}#, par exemple pour activer les instantanés live, il suffit une simple commande:\n"
#. type: Plain text
#: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
@@ -491,7 +494,7 @@ msgstr ""
"installer dans votre image, couvrant une variété de besoins différents. Vous "
"pouvez tout simplement nommer les paquets individuels à installer dans une "
"liste de paquets. Vous pouvez également choisir grandes listes prédéfinies "
-"de paquets, ou utilisez des tâches APT. Et enfin, vous pouvez placer paquets "
+"de paquets, ou utiliser des tâches APT. Et enfin, vous pouvez placer paquets "
"dans votre arbre #{config/}# qui est bien adapté aux essais de nouveaux "
"paquets ou expérimentaux avant qu'ils ne soient disponibles sur un dépôt."
@@ -517,7 +520,7 @@ msgstr ""
"et sections conditionnelles qui les rend facile de construire à partir "
"d'autres listes et de les adapter pour une utilisation dans configurations "
"multiples. Vous pouvez utiliser des listes de paquets prédéfinies, offrant "
-"une sélection modulaire de paquets provenantes de chacun des environnements "
+"une sélection modulaire de paquets provenants de chacun des environnements "
"de bureau majeurs et certaines listes de but spécial, ainsi que les autres "
"listes standard sont basées sur elles. Vous pouvez également fournir votre "
"propre liste de paquets, ou utiliser une combinaison des deux."
@@ -592,7 +595,7 @@ msgstr ""
#: en/user_customization-packages.ssi:115
#, no-wrap
msgid "*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.\n"
-msgstr "*{Remarque:}* Si vous ne spécifiez pas le suffixe de l'étape, la liste sera utilisée pour les deux étapes. Normalement, vous voulez spécifier #{.list.chroot}# de sorte que les paquets seront seulement installés dans le système de fichiers live et ne pas avoir une copie supplémentaire des #{.deb}# placé sur le support.\n"
+msgstr "*{Remarque:}* Si vous ne spécifiez pas le suffixe de l'étape, la liste sera utilisée pour les deux étapes. Normalement, vous voulez spécifier #{.list.chroot}# de sorte que les paquets seront seulement installés dans le système de fichiers live et ne pas avoir une copie supplémentaire des #{.deb}# placée sur le support.\n"
#. type: Plain text
#: en/user_customization-packages.ssi:117
@@ -614,7 +617,7 @@ msgstr ""
"installés dans le système de fichiers live, mais sont inclus sur les "
"supports live sous #{pool/}#. Vous utiliserez généralement cette liste avec "
"une des variantes d'installation non-live. Comme mentionné ci-dessus, si "
-"vous voulez que cette liste soit le même que votre liste pour l'étape "
+"vous voulez que cette liste soit la même que votre liste pour l'étape "
"chroot, utilisez simplement le suffixe #{.list}#. "
#. type: Plain text
@@ -630,19 +633,19 @@ msgid ""
"directory, as they serve as good examples of how to write your own lists."
msgstr ""
"Les listes de paquets qui sont incluses avec live-build font un grand usage "
-"des «includes». Reportez-vous à ceux-ci dans le répertoire #{/usr/share/live/"
-"build/package-lists/}#, car ils servent d'exemples pour savoir comment "
-"écrire vos propres listes."
+"des «includes». Reportez-vous à celles-ci dans le répertoire #{/usr/share/"
+"live/build/package-lists/}#, car elles servent d'exemples pour savoir "
+"comment écrire vos propres listes."
#. type: Plain text
#: en/user_customization-packages.ssi:125
msgid ""
-"For example, to make a list that includes the predefined #{gnome}# list plus "
-"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
-"contents:"
+"For example, to make a list that includes the predefined #{gnome}# list "
+"plus /{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the "
+"following contents:"
msgstr ""
"Par exemple, pour faire une liste qui comprend la liste prédéfinie #{gnome}"
-"#, plus iceweasel, créer #{config/package-lists/my.list.chroot}# avec le "
+"#, plus /{iceweasel}/, créer #{config/package-lists/my.list.chroot}# avec le "
"contenu suivant:"
#. type: Plain text
@@ -669,9 +672,9 @@ msgid ""
"# or #{ARCHIVE_AREAS}#."
msgstr ""
"Toutes les variables de configuration de live-build stockées dans #{config/*}"
-"# (sans le préfixe #{LB_}#) peuvent être utilisés dans instructions "
+"# (sans le préfixe #{LB_}#) peuvent être utilisées dans instructions "
"conditionnelles dans les listes de paquets. Généralement, cela signifie une "
-"option #{lb config}# majuscule et avec tirets changées en caractères de "
+"option #{lb config}# majuscule et avec tirets changés en caractères de "
"soulignement. Mais en pratique, c'est seulement ceux qui influencent la "
"sélection des paquets qui font sens, comme #{DISTRIBUTION}#, #{ARCHITECTURES}"
"# ou #{ARCHIVE_AREAS}#."
@@ -682,8 +685,8 @@ msgid ""
"For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
"specified:"
msgstr ""
-"Par exemple, pour installer #{ia32-libs}# si la #{--architectures amd64}# "
-"est spécifié:"
+"Par exemple, pour installer #{ia32-libs}# si #{--architectures amd64}# est "
+"spécifié:"
#. type: Plain text
#: en/user_customization-packages.ssi:144
@@ -697,12 +700,12 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:148
msgid ""
-"You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architectures i386}# or #{--architectures amd64}# is "
-"specified:"
+"You may test for any one of a number of values, e.g. to install /"
+"{memtest86+}/ if either #{--architectures i386}# or #{--architectures amd64}"
+"# is specified:"
msgstr ""
"Vous pouvez tester pour un certain nombre de valeurs, par exemple pour "
-"installer #{memtest86+}# si #{--architectures i386}# ou #{--architectures "
+"installer /{memtest86+}/ si #{--architectures i386}# ou #{--architectures "
"amd64}# est spécifié:"
#. type: Plain text
@@ -718,11 +721,11 @@ msgstr ""
#: en/user_customization-packages.ssi:158
msgid ""
"You may also test against variables that may contain more than one value, e."
-"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
+"g. to install /{vrms}/ if either #{contrib}# or #{non-free}# is specified "
"via #{--archive-areas}#:"
msgstr ""
"Vous pouvez également tester contre des variables qui peuvent contenir plus "
-"d'une valeur, par exemple pour installer #{vrms}# si #{contrib}# ou #{non-"
+"d'une valeur, par exemple pour installer /{vrms}/ si #{contrib}# ou #{non-"
"free}# est spécifié via #{--archive-areas}#:"
#. type: Plain text
@@ -770,10 +773,10 @@ msgid ""
"example below."
msgstr ""
"L'installateur Debian offre l'utilisateur le choix d'un certain nombre de "
-"listes présélectionnées de paquets, chacun centré sur un type particulier de "
-"système ou d'une tâche pour laquelle un système peut être utilisé, comme "
+"listes présélectionnées de paquets, chacune centrée sur un type particulier "
+"de système ou d'une tâche pour laquelle un système peut être utilisé, comme "
"«environnement de bureau graphique», «serveur de messagerie» ou «portable». "
-"Ces listes sont appelés «tâches» (Tasks) et sont soutenus par APT grâce à "
+"Ces listes sont appelés «tâches» (Tasks) et sont soutenues par APT grâce à "
"l'option «Task:» Vous pouvez spécifier une ou plusieurs tâches à live-build "
"en les plaçant dans une liste dans #{config/task-lists/}#, comme dans "
"l'exemple ci-dessous."
@@ -791,13 +794,13 @@ msgstr ""
msgid ""
"The primary tasks available in the Debian Installer can be listed with #"
"{tasksel --list-tasks}# in the live system. The contents of any task, "
-"including ones not included in this list, may be examined with #{tasksel --"
-"task-packages}#."
+"including the ones not included in this list, may be examined with #{tasksel "
+"--task-packages}#."
msgstr ""
"Les tâches principales disponibles dans l'installateur Debian peuvent être "
-"listés avec #{tasksel --list-tasks}# dans le système live. Le contenu de "
-"n'importe quelle tâche, y compris ceux non inclus dans cette liste, peuvent "
-"être examinées avec #{tasksel --task-packages}#."
+"listées avec #{tasksel --list-tasks}# dans le système live. Le contenu de "
+"n'importe quelle tâche, y compris celles non incluses dans cette liste, "
+"peuvent être examinées avec #{tasksel --task-packages}#."
#. type: Plain text
#: en/user_customization-packages.ssi:193
@@ -824,8 +827,8 @@ msgstr ""
"automatiquement installée. Ainsi, il y a tâches internes #{gnome-desktop}#, #"
"{kde-desktop}#, #{lxde-desktop}# et #{xfce-desktop}#, dont aucun n'est "
"offert dans le menu #{tasksel}#. De même, il n'y a pas éléments de menu pour "
-"les tâches de les langues, mais le choix de la langue de l'utilisateur lors "
-"de l'installation influence le choix des tâches de la langue correspondante."
+"les tâches des langues, mais le choix de la langue de l'utilisateur lors de "
+"l'installation influence le choix des tâches de la langue correspondante."
#. type: Plain text
#: en/user_customization-packages.ssi:197
@@ -841,7 +844,7 @@ msgstr ""
"amorce directement à un bureau de travail, le choix du environnement de "
"bureau et la langue par défaut ayant été fait au moment de la construction, "
"non pas au moment de l'exécution comme dans le cas de l'installateur de "
-"Debian. Cela ne veut pas dire qu'une image live ne pouvait être construite "
+"Debian. Cela ne veut pas dire qu'une image live ne pourrait être construite "
"pour soutenir plusieurs environnements de bureau ou de plusieurs langues et "
"offrir à l'utilisateur un choix, mais ce n'est pas le comportement par "
"défaut de live-build."
@@ -855,7 +858,7 @@ msgid ""
"a GNOME desktop image containing support for Japanese might include these "
"tasks:"
msgstr ""
-"Parce qu'il n'ya pas aucune disposition faite automatiquement pour les "
+"Parce qu'il n'y a pas aucune disposition faite automatiquement pour les "
"tâches de la langue, qui comprennent des éléments tels que des polices "
"spécifiques de la langue et des paquets de méthodes de saisie, si vous les "
"voulez, vous devez les spécifier dans votre configuration. Par exemple, une "
@@ -880,8 +883,8 @@ msgid ""
"variable or else tasksel will not recognize and install it. Thus:"
msgstr ""
"Comme les tâches de bureau sont des tâches «internes», pour chaque tâche de "
-"saveur de bureau inclus dans l'image, la valeur correspondante, si elle "
-"diffère de la valeur par défaut, \"gnome\", doit être préconfiguré dans la "
+"saveur de bureau incluse dans l'image, la valeur correspondante, si elle "
+"diffère de la valeur par défaut, \"gnome\", doit être préconfigurée dans la "
"variable debconf «tasksel/desktop\", ou bien tasksel ne la reconnaîtra pas "
"et ne l'installera pas. Ainsi:"
@@ -943,8 +946,8 @@ msgstr ""
"maintenance des paquets modifiés. La méthode de Joachim Breitner 'How to "
"fork privately' http://www.joachim-breitner.de/blog/archives/282-How-to-fork-"
"privately.html peut, cependant, être d'intérêt. La création de paquets sur "
-"mesure sont couverts dans le Debian New Maintainers' Guide at http://www."
-"debian.org/doc/maint-guide/ et ailleurs"
+"mesure est traité dans le Debian New Maintainers' Guide at http://www.debian."
+"org/doc/maint-guide/ et ailleurs"
#. type: Plain text
#: en/user_customization-packages.ssi:226
@@ -970,8 +973,7 @@ msgid ""
msgstr ""
"Utilisant #{packages.chroot}# est plus simple à réaliser et utile pour les "
"personnalisations ponctuels mais a un certain nombre d'inconvénients, tout "
-"en utilisant un réferéntiel personnalisé APT est plus fastidieux à mettre en "
-"place."
+"en utilisant un dépôt personnalisé APT est plus fastidieux à mettre en place."
#. type: Plain text
#: en/user_customization-packages.ssi:234
@@ -1045,9 +1047,9 @@ msgid ""
"to install}#choosing-packages-to-install for details."
msgstr ""
"Contrairement à l'utilisation de #{packages.chroot}#, lorsque vous utilisez "
-"un réferéntiel personnalisé APT vous devez vous assurer que vous spécifiez "
-"les paquets ailleurs. Voir {Choisir les paquets à installer}#choosing-"
-"packages-to-install pour plus de détails."
+"un dépôt personnalisé APT vous devez vous assurer que vous spécifiez les "
+"paquets ailleurs. Voir {Choisir les paquets à installer}#choosing-packages-"
+"to-install pour plus de détails."
#. type: Plain text
#: en/user_customization-packages.ssi:252
@@ -1093,7 +1095,7 @@ msgstr ""
"fichiers #{debian/changelog}# de vos paquets personnalisés pour s'assurer "
"que votre version modifiée est installée en lieu d'une dans les dépôts "
"officiels Debian. Cela peut aussi être atteint en modifiant les préférences "
-"de pinning d'APT dans le système live - voir {APT pinning}#apt-pinning pour "
+"d'APT pinning dans le système live - voir {APT pinning}#apt-pinning pour "
"plus d'informations."
#. type: Plain text
@@ -1126,16 +1128,16 @@ msgstr "3~choosing-apt-or-aptitude Choisir apt ou aptitude"
#. type: Plain text
#: en/user_customization-packages.ssi:266
msgid ""
-"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
+"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 "
"to #{lb config}#. Choose the method implementing the preferred behaviour for "
"package installation, the notable difference being how missing packages are "
"handled."
msgstr ""
-"Vous pouvez choisir d'utiliser soit #{apt}# ou #{aptitude}# Quel logiciel "
+"Vous pouvez choisir d'utiliser soit /{apt}/ ou /{aptitude}/. Quel logiciel "
"est utilisé est régi par l'argument #{--apt}# de #{lb config}#. Choisissez "
"la méthode du comportement préférée pour l'installation de paquets, la "
-"différence notable étant la manière dont les paquets manquants sont traitées."
+"différence notable étant la manière dont les paquets manquants sont traités."
#. type: Plain text
#: en/user_customization-packages.ssi:268
@@ -1144,7 +1146,7 @@ msgid ""
"installation will fail. This is the default setting."
msgstr ""
"_* #{apt}#: Avec cette méthode, si un paquet manquant est spécifié, "
-"l'installation va échouer. C'est le paramètre par défaut."
+"l'installation va échouer. C'est le réglage par défaut."
#. type: Plain text
#: en/user_customization-packages.ssi:270
@@ -1200,7 +1202,7 @@ msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
msgstr ""
-"Si vous ne voulez pas inclure les indices de l'APT dans l'image, vous les "
+"Si vous ne voulez pas inclure les indices d'APT dans l'image, vous les "
"pouvez omettre avec:"
#. type: Plain text
@@ -1212,16 +1214,16 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:294
msgid ""
-"This will not influence the entries in /etc/apt/sources.list, but merely "
-"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
-"APT needs those indices in order to operate in the live system, so before "
-"performing #{apt-cache search}# or #{apt-get install}#, for instance, the "
-"user must #{apt-get update}# first to create those indices."
+"This will not influence the entries in #{/etc/apt/sources.list}#, but merely "
+"whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is "
+"that APT needs those indices in order to operate in the live system, so "
+"before performing #{apt-cache search}# or #{apt-get install}#, for instance, "
+"the user must #{apt-get update}# first to create those indices."
msgstr ""
-"Cela ne influencera les entrées dans /etc/apt/sources.list, mais simplement "
-"de savoir si /var/lib/apt contient les fichiers indices ou non. La "
-"contrepartie est que APT a besoin de ces indices afin d'opérer dans le "
-"système live, alors avant de procéder à #{apt-cache search}# or #{apt-get "
+"Cela ne influencera les entrées dans #{/etc/apt/sources.list}#, mais "
+"simplement de savoir si #{/var/lib/apt}# contient les fichiers indices ou "
+"non. La contrepartie est que APT a besoin de ces indices afin d'opérer dans "
+"le système live, alors avant de procéder à #{apt-cache search}# ou #{apt-get "
"install}#, par exemple, l'utilisateur doit faire #{apt-get update}# pour "
"créer ces indices."
@@ -1262,8 +1264,8 @@ msgstr ""
"nous vous suggérons d'examiner la différence que désactiver recommends rend "
"à votre liste de paquets (voir le fichier #{binary.packages}# généré par #"
"{lb build}#) et re-incluez dans votre liste tous les paquets manquants que "
-"vous souhaitez toujours installées. Alternativement, si vous trouvez que "
-"vous voulez seulement un petit nombre de paquets recommandés exclus, laissez "
+"vous souhaitez toujours installés. Alternativement, si vous trouvez que vous "
+"voulez seulement un petit nombre de paquets recommandés exclus, laissez "
"recommends activé et définissez une priorité APT pin négative sur les "
"paquets sélectionnés pour éviter les installér, comme expliqué dans {APT "
"pinning}#apt-pinning."
@@ -1283,9 +1285,8 @@ msgid ""
msgstr ""
"S'il n'y a pas une option #{lb config}# pour modifier le comportement d'APT "
"dans la façon dont vous avez besoin, utiliser #{--apt-options}# ou #{--"
-"aptitude-options}# pour passer des options grâce à votre outil APT "
-"configuré. Voir les pages de manuel #{apt}# et #{aptitude}# pour plus de "
-"détails"
+"aptitude-options}# pour passer des options à votre outil APT configuré. Voir "
+"les pages de manuel #{apt}# et #{aptitude}# pour plus de détails"
#. type: Plain text
#: en/user_customization-packages.ssi:310
@@ -1301,27 +1302,27 @@ msgid ""
"#{config/includes.chroot/etc/apt/preferences}#."
msgstr ""
"Pour le contexte, s'il vous plaît lire d'abord la page de manuel #"
-"{apt_preferences(5)}#. APT pinning peut être configuré soit pour le temps de "
+"{apt_preferences(5)}#. APT pinning peut être configuré soit au temps de "
"construction, ou encore pendant l'exécution. Pour le premier, créez #{config/"
-"chroot_apt/preferences}#. Pour ce dernier, créez #{config/includes.chroot/"
+"chroot_apt/preferences}#. Pour ce dernier, créez #{config/includes.chroot/"
"etc/apt/preferences}#."
#. type: Plain text
#: en/user_customization-packages.ssi:314
msgid ""
-"Let's say you are building a Wheezy 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 "
+"Let's say you are building a wheezy 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, Wheezy. The following will "
+"taken from the target system distribution, wheezy. The following will "
"accomplish this:"
msgstr ""
-"Imaginons que vous voulez construire un système live Wheezy mais il faut "
-"installer tous les paquets live qui finissent dans l'image binaire de Sid au "
-"moment de la construction. Vous devez ajouter Sid à votre APT sources et le "
+"Imaginons que vous voulez construire un système live wheezy mais il faut "
+"installer tous les paquets live qui finissent dans l'image binaire de sid au "
+"moment de la construction. Vous devez ajouter sid à votre APT sources et le "
"fixer de sorte que seulement les paquets que vous voulez sont installés au "
"temps de construction et tous les autres sont de la distribution du système "
-"cible, Wheezy. Ce qui suit devrait accomplir ça:"
+"objectif, wheezy. Ce qui suit devrait accomplir ça:"
#. type: Plain text
#: en/user_customization-packages.ssi:322
@@ -1347,8 +1348,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:331
#, no-wrap
-msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with Wheezy using:\n"
-msgstr "*{Remarque:}* Caractères génériques peuvent être utilisés dans les noms des paquets (par exemple *{Package: live-*}*) avec la version 0.8.14 ou supérieure d'Apt. Cela signifie qu'il fonctionne avec Wheezy en utilisant:\n"
+msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:\n"
+msgstr "*{Remarque:}* Caractères génériques peuvent être utilisés dans les noms des paquets (par exemple *{Package: live-*}*) avec la version 0.8.14 ou supérieure d'Apt. Cela signifie qu'il fonctionne avec wheezy en utilisant:\n"
#. type: Plain text
#: en/user_customization-packages.ssi:335
@@ -1362,9 +1363,9 @@ msgid ""
"the case where you do not want a package that is recommended by another "
"package. Suppose you are building an LXDE image using #{--package-lists lxde}"
"# option, but don't want the user prompted to store wifi passwords in the "
-"keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
-"turn recommends #{gnome-keyring}#. So you want to omit the recommended #"
-"{gnome-keyring}# package. This can be done by adding the following stanza to "
+"keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in "
+"turn recommends /{gnome-keyring}/. So you want to omit the recommended /"
+"{gnome-keyring}/ package. This can be done by adding the following stanza to "
"#{config/chroot_apt/preferences}#:"
msgstr ""
"Une priorité pin négative évitera installér un paquet, comme dans le cas où "
@@ -1372,8 +1373,8 @@ msgstr ""
"Supposons que vous construisez une image LXDE en utilisant l'option #{--"
"package-lists lxde}# mais ne veulez pas que l'utilisateur soit invité à "
"stocker les mots de passe wifi dans le trousseau de clés. Cette liste "
-"comprend #{gdm}#, que dépend de #{gksu}#, que à son tour recommends #{gnome-"
-"keyring}#. Donc, vous voulez omettre le paquet recommandé #{gnome-keyring}#. "
+"comprend /{gdm}/, que dépend de /{gksu}/, que à son tour recommande /{gnome-"
+"keyring}/. Donc, vous voulez omettre le paquet recommandé /{gnome-keyring}/. "
"Cela peut être fait en ajoutant la strophe suivante à #{config/chroot_apt/"
"preferences}#:"
diff --git a/manual/po/fr/user_customization-runtime.ssi.po b/manual/po/fr/user_customization-runtime.ssi.po
index 616c2b5..e87400d 100644
--- a/manual/po/fr/user_customization-runtime.ssi.po
+++ b/manual/po/fr/user_customization-runtime.ssi.po
@@ -1,45 +1,45 @@
# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-24 15:08+0100\n"
-"PO-Revision-Date: 2012-03-24 17:38+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-06-03 20:02+0300\n"
+"PO-Revision-Date: 2012-04-29 15:48+0200\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"
-
-#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. 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:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -87,28 +87,29 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -232,16 +233,16 @@ msgid ""
"password \"live\". If you want to do that for any reason, you can easily "
"achieve it as follows:"
msgstr ""
-"Il est également possible de changer le nom d'utilisateur par défaut «user» "
-"et du mot de passe par défaut \"live\". Si vous voulez pour quelque raison, "
-"vous pouvez facilement faire ça comme suit:"
+"Il est également possible de changer le nom de l'utilisateur par défaut "
+"«user» et du mot de passe par défaut \"live\". Si vous voulez pour quelque "
+"raison, vous pouvez facilement faire ça comme suit:"
#. type: Plain text
#: en/user_customization-runtime.ssi:25
msgid ""
"To change the default username you can simply specify it in your config:"
msgstr ""
-"Pour modifier le nom d'utilisateur par défaut, vous pouvez simplement le "
+"Pour modifier le nom de l'utilisateur par défaut, vous pouvez simplement le "
"spécifier dans votre config:"
#. type: Plain text
@@ -270,13 +271,13 @@ msgstr ""
msgid "2~customizing-locale-and-language Customizing locale and language"
msgstr ""
"2~customizing-locale-and-language Personnalisation des paramètres régionaux "
-"et la langue"
+"et de la langue"
#. type: Plain text
#: en/user_customization-runtime.ssi:37
msgid "When the live system boots, language is involved in three steps:"
msgstr ""
-"Au démarrage du système live, la langue est impliqué dans trois étapes:"
+"Au démarrage du système live, la langue est impliquée dans trois étapes:"
#. type: Plain text
#: en/user_customization-runtime.ssi:39
@@ -332,12 +333,12 @@ msgid ""
"of the nation where the language is spoken, e.g:"
msgstr ""
"Tant la console et la configuration du clavier X dépendent du paramètre #"
-"{keyboard-layouts}# de l'option #{--bootappend-live}#. Options valides pour "
-"les dispositions des claviers X peuvent être trouvés dans #{/usr/share/X11/"
-"xkb/rules/base.xml}# (plutôt limitées à des codes des pays à deux lettres). "
-"Pour trouver la valeur (les deux caractères), correspondant à une langue "
-"essayez de rechercher le nom anglais de la nation où la langue est parlée, "
-"par exemple:"
+"{keyboard-layouts}# de l'option #{--bootappend-live}#. Les options valides "
+"pour les dispositions des claviers X peuvent être trouvés dans #{/usr/share/"
+"X11/xkb/rules/base.xml}# (plutôt limitées à des codes des pays à deux "
+"lettres). Pour trouver la valeur (les deux caractères), correspondante à une "
+"langue essayez de rechercher le nom anglais de la nation où la langue est "
+"parlée, par exemple:"
#. type: Plain text
#: en/user_customization-runtime.ssi:60
@@ -367,7 +368,7 @@ msgid ""
"A list of the valid values of the keyboards for the console can be figured "
"with the following command:"
msgstr ""
-"Une liste des valeurs valides des claviers pour la console peut être figuré "
+"Une liste des valeurs valides des claviers pour la console peut être figurée "
"avec la commande suivante:"
#. type: Plain text
@@ -390,7 +391,7 @@ msgid ""
"both in console and X11, use:"
msgstr ""
"Alternativement, vous pouvez utiliser le paquet #{console-setup}#, un outil "
-"pour vous permettre de configurer la disposition de la console en utilisant "
+"pour vous aider à configurer la disposition de la console en utilisant "
"définitions X (XKB), vous pouvez alors définir votre clavier plus "
"précisément avec variables #{keyboard-layouts}#, #{keyboard-variant}#, #"
"{keyboard-options}# et #{keyboard-model}#; live-boot pourra également "
@@ -439,15 +440,15 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:96
msgid ""
-"Persistence is a common name for different kinds of solutions for saving "
+"'Persistence' is a common name for different kinds of solutions for saving "
"across reboots some, or all, of this run-time evolution of the system. To "
"understand how it could work it could be handy to know that even if the "
"system is booted and run from read-only media, modification to the files and "
"directories are written on writable media, typically a ram disk (tmpfs) and "
"ram disks' data do not survive reboots."
msgstr ""
-"La persistance est un nom commun pour les différents types de solutions pour "
-"sauver, après un redémarrage, certaines ou toutes les données, de cette "
+"La «persistance» est un nom commun pour les différents types de solutions "
+"pour sauver, après un redémarrage, certaines ou toutes les données, de cette "
"évolution pendant l'exécution du système. Pour comprendre comment cela "
"pourrait fonctionner il pourrait être utile de savoir que même si le système "
"est démarré et exécuté à partir d'un support en lecture seule, la "
@@ -462,23 +463,24 @@ msgid ""
"medium like local storage media, a network share or even a session of a "
"multisession (re)writable CD/DVD. All these media are supported in Debian "
"Live in different ways, and all but the last one require a special boot "
-"parameter to be specified at boot time: #{persistent}#."
+"parameter to be specified at boot time: #{persistence}#."
msgstr ""
"Les données stockées sur ce disque virtuel doivent être enregistrées sur un "
"support inscriptible persistant comme supports de stockage locaux, un "
"partage réseau ou même une séance d'un CD/DVD multisession (ré)inscriptible. "
"Tous ces supports sont pris en charge dans Debian Live de différentes "
-"manières, et tous, moins le dernier, nécessitent un paramètre d'amorçáge "
-"spéciale à préciser au moment du démarrage: #{persistent}#."
+"manières, et tous, moins le dernier, nécessitent un paramètre d'amorçage "
+"spéciale à préciser au moment du démarrage: #{persistence}#."
#. type: Plain text
#: en/user_customization-runtime.ssi:100
msgid ""
-"If the boot parameter #{persistent}# is set (and #{nopersistent}# is not "
+"If the boot parameter #{persistence}# is set (and #{nopersistence}# is not "
"set), local storage media (e.g. hard disks, USB drives) will be probed for "
-"persistent volumes during boot. A persistent volume is any of the following:"
+"persistence volumes during boot. A persistence volume is any of the "
+"following:"
msgstr ""
-"Si le paramètre de démarrage #{persistent}# est réglé (et #{nopersistent}# "
+"Si le paramètre de démarrage #{persistence}# est réglé (et #{nopersistence}# "
"n'est pas utilisé), les supports de stockage locaux (par exemple les disques "
"durs, clés USB) seront examinés pour trouver des volumes persistants pendant "
"le démarrage. Un volume persistant est un des éléments suivants:"
@@ -501,18 +503,18 @@ msgid ""
"_* an image/archive file located on the root of any readable filesystem "
"(even an NTFS partition of a foreign OS), identified by its file name. In "
"this case the file name must also use the containing filesystem as the file "
-"extension, e.g. \"<label>.ext3\"."
+"extension, e.g. \"<label>.ext4\"."
msgstr ""
"_* un fichier image/archive situé sur la racine de tout système de fichiers "
"en lecture (même une partition NTFS d'un système d'exploitation étranger), "
"identifié par son nom de fichier. Dans ce cas, le nom du fichier doit "
-"également utiliser le système de fichiers contenant l'extension de fichier, "
-"par exemple, \"<label>.ext3\"."
+"contenir le nom du système de fichiers comme extension, par exemple, "
+"\"<label>.ext4\"."
#. type: Plain text
#: en/user_customization-runtime.ssi:108
msgid ""
-"It is possible to restrict which types of persistent volumes to use by "
+"It is possible to restrict which types of persistence volumes to use by "
"specifying certain boot parameters described in the live-boot(7) man page. "
"The \"identifying labels\" referred to above can be any of the following:"
msgstr ""
@@ -523,7 +525,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:110
-msgid "_* #{full-ov}# for full persistent overlays."
+msgid "_* #{full-ov}# for full persistence overlays."
msgstr "_* #{full-ov}# pour couches de persistance pleine."
#. type: Plain text
@@ -543,7 +545,7 @@ msgstr "_* #{home-sn}# pour instantanés du /home."
#. type: Plain text
#: en/user_customization-runtime.ssi:118
-msgid "3~ Full persistent overlays"
+msgid "3~ Full persistence overlays"
msgstr "3~ Couches de persistance pleine"
#. type: Plain text
@@ -551,21 +553,21 @@ msgstr "3~ Couches de persistance pleine"
msgid ""
"By 'full persistence' it is meant that instead of using a tmpfs for storing "
"modifications to the read-only media (with the copy-on-write, COW, system) a "
-"persistent volume is used. For this type of persistence the volume label "
-"must be #{full-ov}#. This could, for instance, be an ext2 partition on a "
+"persistence volume is used. For this type of persistence the volume label "
+"must be #{full-ov}#. This could, for instance, be an ext4 partition on a "
"hard disk or on a usb key created with, e.g.:"
msgstr ""
"Par «persistance pleine» on entend que au lieu d'utiliser un tmpfs pour le "
-"stockage des modifications au support en lecture seule (avec le système copy-"
-"on-write, COW) une partition accessible en écriture est utilisée. Pour ce "
-"type de persistance le nom du volume doit être #{full-ov}#. Cela pourrait, "
-"par exemple, être une partition ext2 sur un disque dur ou sur une clé usb "
-"créée avec, par exemple:"
+"stockage des modifications dans le support en lecture seule (avec le système "
+"copy-on-write, COW) une partition accessible en écriture est utilisée. Pour "
+"ce type de persistance le nom du volume doit être #{full-ov}#. Cela "
+"pourrait, par exemple, être une partition ext4 sur un disque dur ou sur une "
+"clé usb créée avec, par exemple:"
#. type: Plain text
#: en/user_customization-runtime.ssi:124
#, no-wrap
-msgid " # mkfs.ext2 -L full-ov /dev/sdb1\n"
+msgid " # mkfs.ext4 -L full-ov /dev/sdb1\n"
msgstr ""
#. type: Plain text
@@ -593,10 +595,10 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:138
msgid ""
-"Here's an example of how to create an ext2-based image file used for full "
+"Here's an example of how to create an ext4-based image file used for full "
"persistence:"
msgstr ""
-"Voici un exemple de comment créer un fichier image ext2 utilisé pour la "
+"Voici un exemple de comment créer un fichier image ext4 utilisé pour la "
"persistance pleine:"
#. type: Plain text
@@ -604,7 +606,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file\n"
-" $ /sbin/mkfs.ext2 -F full-ov\n"
+" $ /sbin/mkfs.ext4 -F full-ov\n"
msgstr ""
#. type: Plain text
@@ -625,82 +627,83 @@ msgstr "3~ Couches personnalisées"
#: en/user_customization-runtime.ssi:151
msgid ""
"A volume with the label #{custom-ov}# can be configured to make arbitrary "
-"directories persistent. The file #{live.persist}#, located on the volume's "
-"filesystem root, controls which directories it makes persistent, and in "
-"which way."
+"directories persistent. The file #{live-persistence.conf}#, located on the "
+"volume's filesystem root, controls which directories it makes persistent, "
+"and in which way."
msgstr ""
"Un volume avec l'étiquette #{custom-ov}# peut être configuré pour créer des "
-"répertoires arbitraires persistants. Le fichier #{live.persist}#, situé sur "
-"le système de fichiers racine du volume, contrôle quels répertoires il fait "
-"persistants, et de quelle manière."
+"répertoires persistants arbitraires. Le fichier #{live-persistence.conf}#, "
+"situé sur le système de fichiers racine du volume, contrôle quels "
+"répertoires il fait persistants, et de quelle manière."
#. type: Plain text
#: en/user_customization-runtime.ssi:153
msgid ""
"How custom overlay mounts are configured is described in full detail in the "
-"live.persist(5) man page, but a simple example should be sufficient for most "
-"uses. Let's say we want to make our home directory and APT cache persistent "
-"in an ext3 filesystem on the /dev/sdb1 partition:"
+"live-persistence.conf(5) man page, but a simple example should be sufficient "
+"for most uses. Let's say we want to make our home directory and APT cache "
+"persistent in an ext4 filesystem on the /dev/sdb1 partition:"
msgstr ""
-"Comment on configure monter des couches personnalisés est décrit en détail "
-"dans la page de manuel live.persist(5), mais un simple exemple devrait être "
-"suffisant pour la plupart des utilisations. Imaginons que nous voulons faire "
-"notre répertoire personnel et APT cache persistants dans un système de "
-"fichiers ext3 sur la partition /dev/sdb1:"
+"Comment on configure monter des couches personnalisées est décrit en détail "
+"dans la page de manuel live-persistence.conf(5), mais un simple exemple "
+"devrait être suffisant pour la plupart des utilisations. Imaginons que nous "
+"voulons faire notre répertoire personnel et APT cache persistants dans un "
+"système de fichiers ext4 sur la partition /dev/sdb1:"
#. type: Plain text
#: en/user_customization-runtime.ssi:160
#, no-wrap
msgid ""
-" $ mkfs.ext3 -L custom-ov /dev/sdb1\n"
-" $ mount -t ext3 /dev/sdb1 /mnt\n"
-" $ echo \"/home\" >> /mnt/live.persist\n"
-" $ echo \"/var/cache/apt\" >> /mnt/live.persist\n"
+" $ mkfs.ext4 -L custom-ov /dev/sdb1\n"
+" $ mount -t ext4 /dev/sdb1 /mnt\n"
+" $ echo \"/home\" >> /mnt/live-persistence.conf\n"
+" $ echo \"/var/cache/apt\" >> /mnt/live-persistence.conf\n"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:164
msgid ""
-"Then we reboot. During the first boot the contents of /home and /var/cache/"
-"apt will be copied into the persistent volume, and from then on all changes "
-"to these directories will live in the persistent volume. Please note that "
-"any paths listed in the #{live.persist}# file cannot contain white spaces or "
-"the special \".\" and \"..\" path components. Also, neither \"/live\" (or "
-"any of its sub-directories) nor \"/\" can be made persistent using custom "
-"mounts (for the latter, use the #{full-ov}# type persistence described "
-"above)."
-msgstr ""
-"Alors nous redémarrons. Lors du premier démarrage les contenus du /home et /"
-"var/cache/apt seront copiés dans le volume persistant, et à partir de ce "
-"moment tous les changements dans ces répertoires seront stockés dans le "
-"volume persistant. S'il vous plaît souligner que les chemins d'accès aux "
-"répertoriés dans le fichier #{live.persist}# ne peuvent pas contenir "
-"d'espaces blancs ou les éléments spéciaux \".\" et \"..\". En outre, ni \"/"
-"live\" (ou un de ses sous-répertoires), ni \"/\" peuvent être rendus "
-"persistants en utilisant custom mounts (pour ce dernier, utilisez la "
+"Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
+"cache/apt}# will be copied into the persistence volume, and from then on all "
+"changes to these directories will live in the persistence volume. Please "
+"note that any paths listed in the #{live-persistence.conf}# file cannot "
+"contain white spaces or the special #{.}# and #{..}# path components. Also, "
+"neither #{/live}# (or any of its sub-directories) nor #{/}# can be made "
+"persistent using custom mounts (for the latter, use the #{full-ov}# type "
+"persistence described above)."
+msgstr ""
+"Alors nous redémarrons. Lors du premier démarrage les contenus du #{/home}# "
+"et #{/var/cache/apt}# seront copiés dans le volume persistant, et à partir "
+"de ce moment tous les changements dans ces répertoires seront stockés dans "
+"le volume persistant. S'il vous plaît souligner que les chemins d'accès aux "
+"répertoriés dans le fichier #{live-persistence.conf}# ne peuvent pas "
+"contenir d'espaces blancs ou les éléments spéciaux #{.}# et #{..}#. En "
+"outre, ni #{/live}# (ou un de ses sous-répertoires), ni #{/}# peuvent être "
+"rendus persistants en utilisant custom mounts (pour ce dernier, utilisez la "
"persistance #{full-ov}# décrite ci-dessus)."
#. type: Plain text
#: en/user_customization-runtime.ssi:166
msgid ""
-"Several different custom overlay volumes (with their own #{live.persist}# "
-"files) can be used at the same time, but if several volumes make the same "
-"directory persistent, only one of them will be used. If any two mounts are "
-"\"nested\" (i.e. one is a sub-directory of the other) the parent will be "
+"Several different custom overlay volumes (with their own #{live-persistence."
+"conf}# files) can be used at the same time, but if several volumes make the "
+"same directory persistent, only one of them will be used. If any two mounts "
+"are \"nested\" (i.e. one is a sub-directory of the other) the parent will be "
"mounted before the child so no mount will be hidden by the other. Nested "
-"custom mounts are problematic if they are listed in the same #{live.persist}"
-"# file. See the live.persist(5) man page for how to handle that case if you "
-"really need it (hint: you usually don't)."
-msgstr ""
-"Plusieurs différents volumes de couches personnalisés (avec leurs propres "
-"fichiers #{live.persist}#) peuvent être utilisés au même temps, mais si "
-"plusieurs volumes font le même répertoire persistant, un seul d'entre eux "
-"sera utilisé. Si les deux sont «imbriqués» (un est un sous-répertoire de "
-"l'autre) le premier sera monté avant que le secondaire de sorte que aucun "
-"sera caché par l'autre. Monter des éléments personnalisés imbriqués est "
-"problématique s'ils sont énumérés dans le même fichier #{live.persist}#. "
-"Voir la page de manuel live.persist(5) pour savoir comment gérer ce cas, si "
-"vous avez vraiment besoin (remarque: vous n'avez généralement pas)."
+"custom mounts are problematic if they are listed in the same #{live-"
+"persistence.conf}# file. See the live-persistence.conf(5) man page for how "
+"to handle that case if you really need it (hint: you usually don't)."
+msgstr ""
+"Plusieurs volumes de couches personnalisées différents (avec leurs propres "
+"fichiers #{live-persistence.conf}#) peuvent être utilisées au même temps, "
+"mais si plusieurs volumes font le même répertoire persistant, un seul "
+"d'entre eux sera utilisé. Si les deux sont «imbriqués» (un est un sous-"
+"répertoire de l'autre) le premier sera monté avant que le secondaire de "
+"sorte que aucun sera caché par l'autre. Monter des éléments personnalisés "
+"imbriqués est problématique s'ils sont énumérés dans le même fichier #{live-"
+"persistence.conf}#. Voir la page de manuel live-persistence.conf(5) pour "
+"savoir comment gérer ce cas, si vous avez vraiment besoin (remarque: vous "
+"n'avez généralement pas)."
#. type: Plain text
#: en/user_customization-runtime.ssi:168
@@ -711,13 +714,13 @@ msgstr "3~ Instantanés"
#: en/user_customization-runtime.ssi:170
msgid ""
"Snapshots are collections of files and directories which are not mounted "
-"while running but which are copied from a persistent volume to the system "
+"while running but which are copied from a persistence volume to the system "
"(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The "
"volume must be labeled #{live-sn}#, and it defaults to a simple cpio archive "
"named #{live-sn.cpio.gz}#. A power interruption during run time could lead "
"to data loss, hence, if you have important changes, invoke #{live-snapshot --"
"refresh}# as often as needed. This type of persistence, since it does not "
-"write continuously to the persistent media, is the most flash-based device "
+"write continuously to the persistence media, is the most flash-based device "
"friendly and the fastest of all the persistence systems, but it occupies as "
"much RAM as the size of the uncompressed snapshot."
msgstr ""
@@ -725,14 +728,14 @@ msgstr ""
"sont pas montés lors de l'exécution, mais qui sont copiés à partir d'un "
"périphérique persistant à le système (tmpfs) au démarrage et qui sont "
"resynchronisés au redémarrage/arrêt du système. Le volume doit être étiqueté "
-"#{live-sn}#. Il est par défaut une simple archive cpio appelé #{live-sn.cpio."
-"gz}#. Une coupure de courant pendant l'exécution pourrait conduire à la "
+"#{live-sn}#. Il est par défaut une simple archive cpio appelée #{live-sn."
+"cpio.gz}#. Une coupure de courant pendant l'exécution pourrait conduire à la "
"perte de données, donc un outil appelé #{live-snapshot --refresh}# pourrait "
"être appelé pour synchroniser des changements importants. Ce type de "
"persistance, car elle n'écrit pas continuellement dans les supports "
"persistants, est la plus respectuese avec les dispositifs flash et la plus "
"rapide de tous les systèmes de persistance, mais elle occupe autant RAM que "
-"la taille de l'instantané non compressé."
+"la taille de l'instantané non compressée."
#. type: Plain text
#: en/user_customization-runtime.ssi:172
@@ -741,8 +744,8 @@ msgid ""
"works the same as the main snapshot but it is only applied to /home."
msgstr ""
"Une version d'instantané de /home existe aussi, et son étiquette est #{home-"
-"sn.*}#; elle travaille le même que l'instantané principale, mais il est "
-"seulement appliquée à /home."
+"sn.*}#; elle fonctionne le même que l'instantané principal, mais c'est "
+"seulement appliqué à /home."
#. type: Plain text
#: en/user_customization-runtime.ssi:174
@@ -752,28 +755,28 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:176
-msgid "3~ Persistent SubText"
+msgid "3~ Persistence SubText"
msgstr "3~ SubText persistant"
#. type: Plain text
#: en/user_customization-runtime.ssi:178
msgid ""
-"If a user would need multiple persistent storage of the same type for "
+"If a user would need multiple persistence storage of the same type for "
"different locations or testing, such as #{full-ov-nonwork}# and #{full-ov-"
-"work}#, the boot parameter #{persistent-subtext}# used in conjunction with "
-"the boot parameter #{persistent}# will allow for multiple but unique "
-"persistent media. An example would be if a user wanted to use a persistent "
+"work}#, the boot parameter #{persistence-subtext}# used in conjunction with "
+"the boot parameter #{persistence}# will allow for multiple but unique "
+"persistence media. An example would be if a user wanted to use a persistence "
"partition labeled #{live-sn-subText}# they would use the boot parameters of: "
-"#{persistent}# #{persistent-subtext=subText}#."
+"#{persistence}# #{persistence-subtext=subText}#."
msgstr ""
-"Si un utilisateur a besoin de multiples stockages persistants du même type "
+"Si un utilisateur a besoin de stockages persistants multiples du même type "
"pour différents endroits ou l'essai, tel que #{full-ov-nonwork}# et #{full-"
-"ov-work}#, le paramètre de démarrage #{persistent-subtext}# utilisé en "
-"conjonction avec le paramètre de démarrage #{persistent}# permettra "
-"multiples mais uniques supports persistants. Un exemple serait le cas si un "
-"utilisateur voudrait utiliser une partition persistante étiqueté #{live-sn-"
-"subText}# il utiliserait les paramètres de démarrage: #{persistent}# #"
-"{persistent-subtext=subText}#."
+"ov-work}#, le paramètre de démarrage #{persistence-subtext}# utilisé en "
+"conjonction avec le paramètre de démarrage #{persistence}# permettra "
+"multiples, mais uniques, supports persistants. Un exemple serait le cas si "
+"un utilisateur voudrait utiliser une partition persistante étiquetée #{live-"
+"sn-subText}# il utiliserait les paramètres de démarrage: #{persistence}# #"
+"{persistence-subtext=subText}#."
#. type: Plain text
#: en/user_customization-runtime.ssi:180
@@ -789,7 +792,7 @@ msgid ""
"mounts all /live filesystem in order or with the module boot parameter."
msgstr ""
"Les modifications de l'exécution du tmpfs pourraient être recueillies à "
-"l'aide de live-snapshot dans une squashfs et ajoutés au CD en remasterisant "
+"l'aide de live-snapshot dans une squashfs et ajoutées au CD en remasterisant "
"l'ISO dans le cas des CD-R ou en ajoutant une session à un cd/dvd(rw) "
"multisession; live-boot monte tous les systèmes de fichiers /live dans "
"l'ordre ou avec le paramètre de démarrage du module."
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index c733337..e353f71 100644
--- a/manual/po/fr/user_examples.ssi.po
+++ b/manual/po/fr/user_examples.ssi.po
@@ -1,13 +1,12 @@
# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-13 14:44+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
"PO-Revision-Date: 2012-03-17 18:13+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -23,26 +22,27 @@ msgid ":B~ Examples"
msgstr ":B~ Exemples"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 en/user_customization-contents.ssi:26
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -68,49 +68,51 @@ msgstr ":B~ Exemples"
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 en/user_customization-contents.ssi:31
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -136,25 +138,26 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -166,7 +169,7 @@ msgid " # lb build\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#: en/user_customization-binary.ssi:41 en/user_examples.ssi:95
#, no-wrap
msgid " #!/bin/sh\n"
msgstr ""
@@ -184,11 +187,11 @@ msgid ""
"first look at the three tutorials in sequence, as each one teaches new "
"techniques that will help you use and understand the remaining examples."
msgstr ""
-"Ce chapitre s'occupe d'exemples de constructions pour les cas d'utilisation "
+"Ce chapitre s'occupe d'exemples de constructions pour des cas d'utilisation "
"spécifiques avec Debian Live. Si vous êtes nouveau avec la construction de "
"vos propres images Debian Live, nous vous recommandons d'abord regarder les "
-"trois tutoriels en séquence, comme chacun apprend nouvelles techniques qui "
-"vous aideront à utiliser et à comprendre les exemples restants."
+"trois tutoriels en séquence, parce que chacun enseigne nouvelles techniques "
+"qui vous aideront à utiliser et à comprendre les exemples restants."
#. type: Plain text
#: en/user_examples.ssi:8
@@ -266,7 +269,7 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:28
msgid "You can't get much simpler than this:"
-msgstr "Vous ne pouvez pas obtenir beaucoup plus simple que cela:"
+msgstr "Vous ne pouvez pas obtenir rien plus simple que cela:"
#. type: Plain text
#: en/user_examples.ssi:32
@@ -282,8 +285,9 @@ msgid ""
"use immediately to build a default image."
msgstr ""
"Examinez le contenu du répertoire #{config/}# si vous le souhaitez. Vous "
-"verrez stockés ici une configuration du squelette, pour être personnalise "
-"ou, dans ce cas, utiliser immédiatement pour construire une image par défaut."
+"verrez stockés ici une arborescence de configuration, pour être "
+"personnalisee ou, dans ce cas, utiliser immédiatement pour construire une "
+"image par défaut."
#. type: Plain text
#: en/user_examples.ssi:38
@@ -303,7 +307,7 @@ msgstr ""
#: en/user_examples.ssi:46
msgid ""
"Assuming all goes well, after a while, the current directory will contain #"
-"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+"{binary.hybrid.iso}#. This ISO hybrid image can be booted directly in a "
"virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-"
"with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
"virtualbox, or else imaged onto optical media or a USB flash device as "
@@ -312,13 +316,13 @@ msgid ""
"respectively."
msgstr ""
"En supposant que tout se passe bien, après un certain temps, le répertoire "
-"courant contient #{binary-hybrid.iso}#. Cette image ISO hybride peut être "
-"démarré directement dans une machine virtuelle comme décrit dans {Test d'une "
-"image ISO avec QEMU}#testing-iso-with-qemu et {Test d'une image ISO avec "
-"virtualbox-ose}#testing-iso-with-virtualbox, ou bien copiés sur un support "
-"optique ou un périphérique USB comme décrit dans {Graver une image ISO sur "
-"un support physique}#burning-iso-image et {Copie d'un image ISO hybride sur "
-"une clé USB}#copying-iso-hybrid-to-usb, respectivement."
+"courant contiendra #{binary.hybrid.iso}#. Cette image ISO hybride peut être "
+"démarrée directement dans une machine virtuelle comme décrit dans {Test "
+"d'une image ISO avec QEMU}#testing-iso-with-qemu et {Test d'une image ISO "
+"avec virtualbox-ose}#testing-iso-with-virtualbox, ou bien copiée sur un "
+"support optique ou un périphérique USB comme décrit dans {Graver une image "
+"ISO sur un support physique}#burning-iso-image et {Copie d'un image ISO "
+"hybride sur une clé USB}#copying-iso-hybrid-to-usb, respectivement."
#. type: Plain text
#: en/user_examples.ssi:48
@@ -363,11 +367,11 @@ msgid ""
msgstr ""
"Notre choix de LXDE pour cet exemple reflète notre volonté de fournir un "
"environnement de bureau minime, puisque le point de l'image est "
-"l'utilisation unique, nous avons à l'esprit, le navigateur web. On pourrait "
-"aller encore plus loin et offrir une configuration par défaut pour le "
-"navigateur web dans #{config/includes.chroot/etc/iceweasel/profile/}#, ou "
+"l'utilisation unique que nous avons à l'esprit, le navigateur web. On "
+"pourrait aller encore plus loin et offrir une configuration par défaut pour "
+"le navigateur web dans #{config/includes.chroot/etc/iceweasel/profile/}#, ou "
"des paquets de soutien supplémentaires pour visualiser différents types de "
-"contenu web, mais nous laissons cela comme une exercice pour le lecteur."
+"contenu web, mais nous laissons cela comme un exercice pour le lecteur."
#. type: Plain text
#: en/user_examples.ssi:65
@@ -375,7 +379,7 @@ msgid ""
"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
"#tutorial-1:"
msgstr ""
-"Construire l'image, encore une fois en tant que superutilisateur, tenir un "
+"Construire l'image, encore une fois en tant que superutilisateur, garder un "
"journal comme dans {Tutoriel 1}#tutorial-1:"
#. type: Plain text
@@ -461,17 +465,18 @@ msgid ""
"First, #{--architectures i386}# ensures that on our #{amd64}# build system, "
"we build a 32-bit version suitable for use on most machines. Second, we use #"
"{--linux-flavours 686-pae}# because we don't anticipate using this image on "
-"much older systems. Third, we've chosen the #{lxde}# package list to give us "
+"much older systems. Third, we've chosen the /{lxde}/ package list to give us "
"a minimal desktop. And finally, we have added two initial favourite "
-"packages: #{iceweasel}# and #{xchat}#."
+"packages: /{iceweasel}/ and /{xchat}/."
msgstr ""
"Tout d'abord, #{--architectures i386}# assure que sur notre système de "
"construction #{amd64}#, nous construisons une version 32 bits qui peut être "
-"utilisé sur la plupart des machines. Deuxièmement, nous utilisons #{--linux-"
-"flavours 686-pae}# parce que nous ne prévoyons pas utiliser cette image sur "
-"des systèmes beaucoup plus anciens. Troisièmement, nous avons choisi la "
-"liste des paquets #{lxde}# pour nous donner un bureau minimal. Et enfin, "
-"nous avons ajouté deux premiers paquets préférés: #{iceweasel}# et #{xchat}#."
+"utilisée sur la plupart des machines. En seconde place, nous utilisons #{--"
+"linux-flavours 686-pae}# parce que nous ne prévoyons pas utiliser cette "
+"image sur des systèmes beaucoup plus anciens. En troisième lieu, nous avons "
+"choisi la liste de paquets /{lxde}/ pour nous donner un bureau minimal. Et "
+"enfin, nous avons ajouté deux premiers paquets préférés: /{iceweasel}/ et /"
+"{xchat}/."
#. type: Plain text
#: en/user_examples.ssi:115
@@ -496,8 +501,8 @@ msgid ""
"only the auto scripts we just created, and then make the first commit:"
msgstr ""
"Une fois que vous avez testé l'image (comme dans {Tutoriel 1}#tutorial-1) et "
-"êtes satisfait avec son fonctionnement, il est temps pour initialiser notre "
-"référentiel #{git}#, ajoutant que les scripts d'auto que nous avons juste "
+"vous êtes satisfait avec son fonctionnement, il est temps pour initialiser "
+"notre dépôt #{git}#, ajoutant que les scripts d'auto que nous avons juste "
"créé, et ensuite faire le premier commit: "
#. type: Plain text
@@ -517,11 +522,11 @@ msgstr "3~ Deuxième révision"
#. type: Plain text
#: en/user_examples.ssi:137
msgid ""
-"In this revision, we're going to clean up from the first build, add the #"
-"{vlc}# package to our configuration, rebuild, test and commit."
+"In this revision, we're going to clean up from the first build, add the /"
+"{vlc}/ package to our configuration, rebuild, test and commit."
msgstr ""
"Dans cette révision, nous allons nettoyer à partir de la première "
-"construction, ajouter le paquet #{vlc}# à notre configuration, reconstruire, "
+"construction, ajouter le paquet /{vlc}/ à notre configuration, reconstruire, "
"tester et faire le commit."
#. type: Plain text
@@ -534,7 +539,7 @@ msgid ""
msgstr ""
"La commande #{lb clean}# va nettoyer tous les fichiers générés par la "
"construction précédente à l'exception du cache, ça évite d'avoir à re-"
-"télécharger les paquets. Cela garantit que le #{lb build}# postérieure ré-"
+"télécharger les paquets. Cela garantit que la #{lb build}# suivante ré-"
"exécutera toutes les étapes pour régénérer les fichiers de notre nouvelle "
"configuration."
@@ -547,10 +552,10 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:147
msgid ""
-"Now append the #{vlc}# package to our local package list in #{config/package-"
+"Now append the /{vlc}/ package to our local package list in #{config/package-"
"lists/my.list.chroot}#:"
msgstr ""
-"Maintenant ajouter le paquet #{vlc}# à votre liste de paquets local dans #"
+"Maintenant ajouter le paquet /{vlc}/ à votre liste de paquets locaux dans #"
"{config/package-lists/my.list.chroot}#:"
#. type: Plain text
@@ -572,7 +577,7 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:163
msgid "Test, and when you're satisfied, commit the next revision:"
-msgstr "Tester, et quand vous êtes satisfaits, commit la prochaine révision:"
+msgstr "Tester, et quand vous soyez satisfaits, commit la prochaine révision:"
#. type: Plain text
#: en/user_examples.ssi:167
@@ -594,9 +599,9 @@ msgstr ""
"peut-être l'ajout de fichiers dans les sous-répertoires de #{config/}#. "
"Quand vous livrez des nouvelles révisions, on doit prendre soin de ne pas "
"modifier à la main ou envoyer au dépôt les fichiers de niveau supérieur dans "
-"#{config}# contenant variables #{LB_*}#, car ce sont des produits de "
-"creation, aussi, et sont toujours nettoyés par #{lb clean}# et re-créés avec "
-"#{lb config}# via leur respectives #{auto}# scripts."
+"#{config}# contenant variables #{LB_*}#, car ce sont aussi des produits de "
+"creation et sont toujours nettoyés par #{lb clean}# et re-créés avec #{lb "
+"config}# via leur respectives #{auto}# scripts."
#. type: Plain text
#: en/user_examples.ssi:173
@@ -629,12 +634,12 @@ msgstr "*{Cas d'utilisation:}* Créer une image avec live-build pour démarrer d
#: en/user_examples.ssi:179
msgid ""
"Make a build directory and create a skeletal configuration in it built "
-"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
-"{xvnc4viewer}#, disabling recommends to make a minimal system:"
+"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
+"{xvnc4viewer}/, disabling recommends to make a minimal system:"
msgstr ""
-"Faire un répertoire de construction et créer une configuration du squelette "
-"construit autour de la liste standard x11, avec #{gdm3}#, #{metacity}# et #"
-"{xvnc4viewer}#, désactivant «recommends» pour faire un système minimal:"
+"Faire un répertoire de construction et créer une arborescence de fichiers "
+"construite autour de la liste standard x11, avec /{gdm3}/, /{metacity}/ et /"
+"{xvnc4viewer}/, désactivant «recommends» pour faire un système minimal:"
#. type: Plain text
#: en/user_examples.ssi:187
@@ -651,12 +656,12 @@ msgstr ""
#: en/user_examples.ssi:191
msgid ""
"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
-"the default user that will launch metacity and start xvncviewer, connecting "
-"to port #{5901}# on a server at #{192.168.1.2}#:"
+"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
+"connecting to port #{5901}# on a server at #{192.168.1.2}#:"
msgstr ""
"Créez le répertoire #{/etc/skel}# avec une #{.xsession}# personnalisée pour "
-"l'utilisateur par défaut qui va lancer metacity et commencer xvncviewer, en "
-"reliant le port #{5901}# sur un serveur à #{192.168.1.2}#:"
+"l'utilisateur par défaut qui va lancer /{metacity}/ et commencer /"
+"{xvncviewer}/, en reliant le port #{5901}# sur un serveur à #{192.168.1.2}#:"
#. type: Plain text
#: en/user_examples.ssi:197
@@ -702,7 +707,7 @@ msgstr "2~ Une image de base pour une clé USB de 128M"
#: en/user_examples.ssi:219
#, no-wrap
msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
-msgstr "*{Cas d'utilisation:}* Créer une image standard avec certains composants éliminés afin de s'adapter sur une clé USB avec 128M avec espace laissé pour l'utiliser à votre convenance.\n"
+msgstr "*{Cas d'utilisation:}* Créer une image standard avec certains composants éliminés afin de l'adapter sur une clé USB de 128M avec espace laissé pour l'utiliser à votre convenance.\n"
#. type: Plain text
#: en/user_examples.ssi:221
@@ -711,22 +716,22 @@ msgid ""
"the tradeoffs you are making between size and functionality. In this "
"example, we trim only so much as to make room for additional material within "
"a 128M media size, but without doing anything to destroy integrity of the "
-"packages contained within, such as the purging of locale data via the #"
-"{localepurge}# package, or other such \"intrusive\" optimizations. Of "
+"packages contained within, such as the purging of locale data via the /"
+"{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
"particular note, you should not use #{--bootstrap-flavour minimal}# unless "
-"you really know what you're doing, as omitting priority #{important}# "
+"you really know what you're doing, as omitting priority *{important}* "
"packages will most likely produce a broken live system."
msgstr ""
-"Lorsque l'optimisation d'une image adaptée à une dimension des certains "
+"Pour l'optimisation d'une image adaptée à la dimension des certains "
"supports, vous avez besoin de comprendre le compromis que vous faites entre "
-"la taille et la fonctionnalité. Dans cet exemple, nous réduisons uniquement "
-"que pour faire place à du matériel supplémentaire au sein d'une taille de "
-"128M, mais sans rien faire pour détruire l'intégrité des paquets contenus, "
-"telles que la purge des données de localisation via le paquet #{localepurge}"
-"#, ou d'autres tels optimisations \"intrusives\". On notera en particulier, "
-"vous ne devriez pas utiliser #{--bootstrap-flavour minimal}# sauf si vous "
-"savez vraiment ce que vous faites, que l'omission de paquets de priorité #"
-"{importants}# produira probablement un système live cassé."
+"la taille et la fonctionnalité. Dans cet exemple, nous réduisons la taille "
+"uniquement que pour faire place au matériel supplémentaire au sein d'une "
+"taille de 128M, mais sans faire rien pour détruire l'intégrité des paquets "
+"contenus, telle que la purge des données de localisation via le paquet /"
+"{localepurge}/, ou d'autres optimisations \"intrusives\". On notera en "
+"particulier que vous ne devriez pas utiliser #{--bootstrap-flavour minimal}# "
+"sauf si vous savez vraiment ce que vous faites et que l'omission des paquets "
+"de priorité *{importante}* produira probablement un système live cassé."
#. type: Plain text
#: en/user_examples.ssi:226
@@ -749,7 +754,7 @@ msgid ""
"by the default configuration in {Tutorial 1}#tutorial-1."
msgstr ""
"Sur le système de l'auteur au moment de l'écriture, la configuration ci-"
-"dessus produit une image de 78Mbyte. Cela se compare favorablement avec "
+"dessus produisait une image de 78Mbyte. Cela se compare favorablement avec "
"l'image de 166Mbyte produite par la configuration par défaut dans {Tutoriel "
"1}#tutorial-1."
@@ -764,8 +769,8 @@ msgid ""
"system. Choosing the #{minimal}# package list leaves out the large #{locales}"
"# package and associated utilities. Dropping recommended packages with #{--"
"apt-recommends false}# saves some additional space, at the expense of "
-"omitting some packages you might otherwise expect to be there, such as #"
-"{firmware-linux-free}# which may be needed to support certain hardware. The "
+"omitting some packages you might otherwise expect to be there, such as /"
+"{firmware-linux-free}/ which may be needed to support certain hardware. The "
"remaining options shave off additional small amounts of space. It's up to "
"you to decide if the functionality that is sacrificed with each optimization "
"is worth the loss in functionality."
@@ -773,17 +778,17 @@ msgstr ""
"Le plus grand espace-économiseur ici, par rapport à la construction d'une "
"image standard sur une architecture #{i386}#, est de sélectionner uniquement "
"le saveur du noyau #{486}# au lieu de la valeur par défaut #{-k \"486 686-pae"
-"\"}#. Laissant hors indices APT avec #{--apt-indices false}# permet aussi "
-"d'économiser une bonne quantité d'espace, le compromis étant que vous devez "
-"faire #{apt-get update}# avant d'utiliser apt dans le système live. Le "
+"\"}#. Laissant hors «APT's indices» avec #{--apt-indices false}# permet "
+"aussi d'économiser une bonne quantité d'espace, le compromis étant que vous "
+"devez faire #{apt-get update}# avant d'utiliser apt dans le système live. Le "
"choix de la liste #{minimal}# laisse de côté les grands paquets de #{locales}"
"# et les services associés. Laissant hors les paquets recommandés avec #{--"
-"apt-recommends false}# économise de l'espace supplémentaire, au détriment "
-"d'omettre certains paquets vous pourriez autrement attendre à être là, tel "
-"que #{firmware-linux-free}# qui peuvent être nécessaires pour soutenir "
+"apt-recommends false}# économise d'espace supplémentaire, au détriment "
+"d'omettre certains paquets que vous pourriez autrement attendre à être là, "
+"tel que /{firmware-linux-free}/ qui peuvent être nécessaires pour soutenir "
"certains supports matériels. Les options restantes économisent petites "
-"quantités d'espace supplémentaires. C'est à vous de décider si la "
-"fonctionnalité qui est sacrifié avec chaque optimisation est en vaut la "
+"quantités d'espace supplémentaire. C'est à vous de décider si la "
+"fonctionnalité qui est sacrifiée avec chaque optimisation est en vaut la "
"perte de fonctionnalité."
#. type: Plain text
@@ -795,7 +800,7 @@ msgstr "2~ Un bureau KDE localisé et installateur "
#: en/user_examples.ssi:244
#, no-wrap
msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
-msgstr "*{Cas d'utilisation:}* Créer une image de bureau KDE, localisé pour le portugais brésilien et incluant un installateur.\n"
+msgstr "*{Cas d'utilisation:}* Créer une image de bureau KDE, localisée pour le portugais brésilien et incluant un installateur.\n"
#. type: Plain text
#: en/user_examples.ssi:246
@@ -804,9 +809,9 @@ msgid ""
"preferred desktop, in this case KDE, containing all of the same packages "
"that would be installed by the standard Debian installer for KDE."
msgstr ""
-"Nous voulons faire une image iso-hybride pour l'architecture i386 en "
+"Nous voulons faire une image iso-hybrid pour l'architecture i386 en "
"utilisant notre bureau préféré, dans ce cas, KDE, contenant tous les paquets "
-"mêmes qui seraient installés par l'installateur Debian standard pour KDE."
+"qui seraient installés par l'installateur Debian standard pour KDE."
#. type: Plain text
#: en/user_examples.ssi:248
@@ -818,11 +823,11 @@ msgid ""
"to prepare, make sure you have both of those things:"
msgstr ""
"Notre premier problème est la découverte des noms des tâches appropriées. "
-"Actuellement, live-build ne peut pas aider. Alors que nous pourrions être "
-"chanceux et trouver ce par essais et erreurs, il y a un outil, #{grep-dctrl}"
-"#, qui peut être utilisé pour découvrir des descriptions de tâches dans "
-"tasksel-data, de sorte à préparer, assurez-vous que vous avez ces deux "
-"choses:"
+"Actuellement, live-build ne peut pas aider à faire ça. Alors que nous "
+"pourrions être chanceux et trouver ce par essais et erreurs, il y a un "
+"outil, #{grep-dctrl}#, qui peut être utilisé pour découvrir les descriptions "
+"des tâches dans tasksel-data, de sorte à préparer, assurez-vous que vous "
+"avez ces deux choses:"
#. type: Plain text
#: en/user_examples.ssi:252
@@ -850,8 +855,8 @@ msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
msgstr ""
-"Par cette commande, nous découvrons la tâche est appelée, assez clairement, "
-"brazilian-portuguese. Maintenant, pour trouver les tâches liées:"
+"Par cette commande, nous découvrons que la tâche est appelée, assez "
+"clairement, brazilian-portuguese. Maintenant, pour trouver les tâches liées:"
#. type: Plain text
#: en/user_examples.ssi:271
@@ -898,13 +903,13 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:292
msgid ""
-"Note that we have included the #{debian-installer-launcher}# package to "
-"launch the installer from the live desktop, and have also specified the 486 "
-"flavour kernel, as it is currently necessary to make the installer and live "
-"system kernels match for the launcher to work properly."
+"Note that we have included the debian-installer-launcher package to launch "
+"the installer from the live desktop, and have also specified the 486 flavour "
+"kernel, as it is currently necessary to make the installer and live system "
+"kernels match for the launcher to work properly."
msgstr ""
-"Notez que nous avons inclus le paquet #{debian-installer-launcher}# pour "
-"lancer l'installateur à partir du bureau live, nous avons également précisé "
-"le noyau 486, parce qu'il est actuellement nécessaire faire que "
-"l'installateur et le noyau du systéme live coïncident pour que le lanceur "
-"fonctionne correctement."
+"Notez que nous avons inclus le paquet debian-installer-launcher pour lancer "
+"l'installateur à partir du bureau live, nous avons également précisé le "
+"noyau 486, parce qu'il est actuellement nécessaire faire que l'installateur "
+"et le noyau du systéme live coïncident pour que le lanceur fonctionne "
+"correctement."
diff --git a/manual/po/fr/user_installation.ssi.po b/manual/po/fr/user_installation.ssi.po
index dc97c48..3f162bb 100644
--- a/manual/po/fr/user_installation.ssi.po
+++ b/manual/po/fr/user_installation.ssi.po
@@ -1,13 +1,12 @@
# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-31 16:32+0300\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
"PO-Revision-Date: 2012-03-17 20:00+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -18,29 +17,30 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -88,29 +88,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -371,7 +372,7 @@ msgid ""
msgstr ""
"Si vous ne souhaitez pas de créer ou d'installer live-build à partir des "
"sources, vous pouvez utiliser des instantanés. Ils sont construits "
-"automatiquement à partir de la dernière version du Git et ils sont "
+"automatiquement à partir de la dernière version du dépôt Git et ils sont "
"disponibles à http://live.debian.net/debian/."
#. type: Plain text
@@ -392,7 +393,7 @@ msgid ""
"per {Installing live-build}#installing-live-build."
msgstr ""
"Tous deux live-boot et live-config sont disponibles dans le dépôt Debian "
-"comme {Installation de live-build}#installing-live-build."
+"comme expliqué dans {Installation de live-build}#installing-live-build."
#. type: Plain text
#: en/user_installation.ssi:110
@@ -436,30 +437,30 @@ msgstr "_* Créer les fichiers .deb de live-boot et live-config"
#: en/user_installation.ssi:125
msgid ""
"You must build either on your target distribution or in a chroot containing "
-"your target platform: this means if your target is Wheezy then you should "
-"build against Wheezy."
+"your target platform: this means if your target is wheezy then you should "
+"build against wheezy."
msgstr ""
"Vous devez créer sur votre distribution objectif ou en chroot contenant "
-"votre plateforme objectif: cela signifie que si votre objectif est Wheezy "
-"alors vous devez créer sur Wheezy."
+"votre plateforme objectif: cela signifie que si votre objectif est wheezy "
+"alors vous devez créer sur wheezy."
#. type: Plain text
#: en/user_installation.ssi:127
msgid ""
"Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
-"build #{live-boot}# for a target distribution that differs from your build "
-"system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy "
+"build live-boot for a target distribution that differs from your build "
+"system. For example, for wheezy live images, build live-boot in a wheezy "
"chroot. If your target distribution happens to match your build system "
"distribution, you may build directly on the build system using #{dpkg-"
"buildpackage}# (provided by the /{dpkg-dev}/ package):"
msgstr ""
-"Utilisez un système de construction automatique personnel tels que /"
-"{pbuilder}/ ou /{sbuild}/ si vous avez besoin pour créer #{live-boot}# pour "
-"une distribution objectif qui diffère de votre système de construction. Par "
-"exemple, pour les images live de Wheezy, créez #{live-boot}# dans un chroot "
-"Wheezy. Si votre distribution objectif correspond à votre distribution vous "
+"Utilisez un système de construction automatique personnel tel que /"
+"{pbuilder}/ ou /{sbuild}/ si vous avez besoin pour créer live-boot pour une "
+"distribution objectif qui diffère de votre système de construction. Par "
+"exemple, pour les images live de wheezy, créez live-boot dans un chroot "
+"wheezy. Si votre distribution objectif correspond à votre distribution vous "
"pouvez créer directement sur le système de construction en utilisant #{dpkg-"
-"buildpackage}# (fournis par le paquet /{dpkg-dev}/):"
+"buildpackage}# (fourni par le paquet /{dpkg-dev}/):"
#. type: Plain text
#: en/user_installation.ssi:134
@@ -503,7 +504,7 @@ msgid ""
"tree in the current directory with #{lb config}#:"
msgstr ""
"Vous pouvez laisser live-build utiliser automatiquement les derniers "
-"instantanés de live-boot et live-config configurant un dépôt de tierce "
-"partie dans votre répertoire de configuration de live-build. En supposant "
-"que vous avez déjà créé un arbre de configuration dans le répertoire courant "
-"avec #{lb config}#:"
+"instantanés de live-boot et live-config configurant un dépôt de tiers dans "
+"votre répertoire de configuration de live-build. En supposant que vous avez "
+"déjà créé un arbre de configuration dans le répertoire courant avec #{lb "
+"config}#:"
diff --git a/manual/po/fr/user_managing_a_configuration.ssi.po b/manual/po/fr/user_managing_a_configuration.ssi.po
index 0a7335f..87a551c 100644
--- a/manual/po/fr/user_managing_a_configuration.ssi.po
+++ b/manual/po/fr/user_managing_a_configuration.ssi.po
@@ -1,13 +1,12 @@
# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: 2012-03-19 21:02+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -18,28 +17,30 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -63,21 +64,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -86,28 +88,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -131,21 +135,22 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -172,7 +177,7 @@ msgid ""
msgstr ""
"Ce chapitre explique comment gérer une configuration d'un système live à "
"partir d'une création initiale, à travers des révisions successives et des "
-"versions successives du logiciel live-build et de l'image live lui-même."
+"versions successives du logiciel live-build et de l'image live elle-même."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:8
@@ -193,9 +198,9 @@ msgstr ""
"probablement besoin de faire une série de révisions jusqu'à ce que vous êtes "
"satisfait. Cependant, des incohérences peuvent se glisser dans votre "
"configuration d'une révision à la prochaine si vous ne faites pas attention. "
-"Le principal problème est, une fois qu'une variable est donné une valeur par "
-"défaut, cette valeur ne sera pas recalculé à partir d'autres variables qui "
-"peuvent changer dans les révisions ultérieures."
+"Le principal problème est, une fois qu'une variable est donnée une valeur "
+"par défaut, cette valeur ne sera pas recalculée à partir d'autres variables "
+"qui peuvent changer dans les révisions ultérieures."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:12
@@ -221,8 +226,8 @@ msgid ""
"option again."
msgstr ""
"Un deuxième problème lié est que si vous exécutez #{lb config}# et ensuite "
-"mettez à jour une nouvelle version de live-build qui a changé l'un des noms "
-"de variables, vous découvrirez ce que par un examen manuel des variables "
+"mettez à jour une nouvelle version de live-build qui a changée l'un des noms "
+"des variables, vous découvrirez ce que par un examen manuel des variables "
"dans votre fichiers dans #{config/*}#, que vous devrez ensuite utiliser pour "
"définir l'option appropriée à nouveau."
@@ -237,12 +242,12 @@ msgid ""
"variable values, and each time you run #{lb config}# and #{lb clean}#, these "
"files will be executed. This will ensure that your configuration is kept "
"internally consistent from one revision to the next and from one live-build "
-"release to the next (though you will still have to take care and read the "
+"release to the next (Although you will still have to take care and read the "
"documentation when you upgrade live-build and make adjustments as needed)."
msgstr ""
"Tout cela serait une nuisance terrible si ce n'était pas pour les scripts "
-"auto/* simples emballages pour les commandes #{lb config}#, #{lb build}# et #"
-"{lb clean}# qui sont conçus pour vous aider gérer votre configuration. Il "
+"auto/*, simples emballages pour les commandes #{lb config}#, #{lb build}# et "
+"#{lb clean}# qui sont conçus pour vous aider à gérer votre configuration. Il "
"suffit de créer un script auto/config contenant la commande #{lb config}# "
"avec toutes les options désirées, et un auto/clean qui supprime les fichiers "
"contenant les valeurs des variables de configuration, et chaque fois que "
@@ -250,7 +255,7 @@ msgstr ""
"Cela permettra d'assurer que votre configuration a une cohérence interne "
"d'une révision à l'autre et d'une version de live-build à la suivante (bien "
"que vous aurez encore de prendre soin et lire la documentation lorsque vous "
-"mettez live-build à niveau pour faire les ajustements nécessaires )."
+"mettez live-build à niveau pour faire les ajustements nécessaires)."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:18
@@ -268,12 +273,12 @@ msgid ""
"auto/*}#)."
msgstr ""
"Utiliser des exemples de scripts auto tels que les suivants comme point de "
-"départ pour votre nouveau configuration de live-build. Prenez note que "
-"lorsque vous appelez la commande #{lb}# que votre script auto emballage vous "
-"devez spécifier #{noauto}# comme paramètre afin de s'assurer que le script "
-"automatique n'est pas appelé à nouveau, de façon récursive. Aussi, n'oubliez "
-"pas de s'assurer que les scripts sont exécutables (par exemple #{chmod 755 "
-"auto/*}#)."
+"départ pour votre nouvelle configuration de live-build. Prenez note que "
+"lorsque vous appelez la commande #{lb}# que votre script auto emballage, "
+"vous devez spécifier #{noauto}# comme paramètre afin de s'assurer que le "
+"script automatique n'est pas appelé à nouveau, de façon récursive. Aussi, "
+"n'oubliez pas de s'assurer que les scripts sont exécutables (par exemple #"
+"{chmod 755 auto/*}#)."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:22
diff --git a/manual/po/fr/user_overview.ssi.po b/manual/po/fr/user_overview.ssi.po
index 5298f33..f652de7 100644
--- a/manual/po/fr/user_overview.ssi.po
+++ b/manual/po/fr/user_overview.ssi.po
@@ -1,13 +1,12 @@
# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-19 18:09+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: 2012-03-17 20:12+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -18,28 +17,30 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -63,21 +64,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -86,28 +88,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -131,21 +135,22 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -200,25 +205,25 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:14
msgid ""
-"Many concepts are similar to those in the debhelper Debian package tools "
+"Many concepts are similar to those in the /{debhelper}/ Debian package tools "
"written by Joey Hess:"
msgstr ""
-"Plusieurs concepts sont similaires à celles ceux dans le paquet Debian "
-"debhelper écrit par Joey Hess:"
+"Plusieurs concepts sont similaires à ceux dans le paquet Debian /"
+"{debhelper}/ écrit par Joey Hess:"
#. type: Plain text
#: en/user_overview.ssi:16
msgid ""
-"_* The scripts have a central location for configuring their operation. In "
-"debhelper, this is the #{debian/}# subdirectory of a package tree. For "
+"_* The scripts have a central location for configuring their operation. In /"
+"{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For "
"example, dh_install will look, amongst others, for a file called #{debian/"
"install}# to determine which files should exist in a particular binary "
"package. In much the same way, live-build stores its configuration entirely "
"under a #{config/}# subdirectory."
msgstr ""
"_* Les scripts ont un emplacement central pour la configuration de leur "
-"fonctionnement. Avec debhelper, c'est le sous-répertoire #{debian/}# d'un "
-"arbre de paquets. Par exemple, dh_install cherchera, entre autres, un "
+"fonctionnement. Avec /{debhelper}/, c'est le sous-répertoire #{debian/}# "
+"d'un arbre de paquets. Par exemple, dh_install cherchera, entre autres, un "
"fichier appelé #{debian/install}# pour déterminer quels fichiers doivent "
"exister dans un paquet binaire particulier. De la même manière, live-build "
"enregistre son configuration entièrement sous un sous-répertoire #{config/}#."
@@ -235,16 +240,16 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:20
msgid ""
-"Unlike debhelper, live-build contains a tool to generate a skeleton "
+"Unlike /{debhelper}/, live-build contains a tool to generate a skeleton "
"configuration directory, #{lb config}#. This could be considered to be "
-"similar to tools such as #{dh-make}#. For more information about #{lb config}"
+"similar to tools such as /{dh-make}/. For more information about #{lb config}"
"#, please see {The lb config command}#lb-config."
msgstr ""
-"Contrairement à debhelper, live-build contient un outil pour générer un "
-"répertoire de configuration en squelette, #{lb config}#. Cela pourrait être "
-"considéré comme similaire à des outils tels que #{dh-make}#. Pour plus "
-"d'informations à propos de #{lb config}#, s'il vous plaît voir {La commande "
-"lb config}#lb-config."
+"Contrairement à /{debhelper}/, live-build contient un outil pour générer une "
+"arborescence de configuration, #{lb config}#. Cela pourrait être considéré "
+"comme similaire à des outils tels que /{dh-make}/. Pour plus d'informations "
+"à propos de #{lb config}#, s'il vous plaît voir {La commande lb config}#lb-"
+"config."
#. type: Plain text
#: en/user_overview.ssi:22
@@ -300,7 +305,7 @@ msgstr ""
"build lisent leur configuration avec la commande #{source}# à partir d'un "
"seul répertoire nommé #{config/}#. Comme la construction de ce répertoire à "
"la main serait fastidieux et source d'erreurs, la commande #{lb config}# "
-"peut être utilisée pour créer des répertoires de configuration de squelette."
+"peut être utilisée pour créer une arborescence de configuration."
#. type: Plain text
#: en/user_overview.ssi:34
@@ -310,8 +315,8 @@ msgid ""
"{auto/}# subdirectory tree."
msgstr ""
"Exécuter #{lb config}# sans aucun argument crée un sous-répertoire #{config/}"
-"# dont il remplit avec certains paramètres, et un sous-répertoire en "
-"squelette #{auto/}#."
+"# dont il remplit avec certains paramètres, et un sous-répertoire #{auto/}# "
+"avec une arborescence de fichiers."
#. type: Plain text
#: en/user_overview.ssi:41
@@ -406,10 +411,11 @@ msgstr ""
"d'une construction afin que autres compilations ultérieures puissent "
"commencer à partir d'un état propre. Par défaut, les étapes #{chroot}#, #"
"{binary}# et #{source}# sont nettoyées, mais le cache est laissé intact. En "
-"outre, les étapes individuelles peuvent être nettoyées. Par exemple, si vous "
-"avez effectué des changements qui affectent uniquement la phase binaire, "
-"utilisez #{lb clean --binary}# avant de construire un nouveau binaire. Voir "
-"la page de manuel de #{lb_clean}# pour une liste complète des options."
+"outre, les étapes peuvent être nettoyées individuellement. Par exemple, si "
+"vous avez effectué des changements qui affectent uniquement la phase "
+"binaire, utilisez #{lb clean --binary}# avant de construire un nouveau "
+"binary. Voir la page de manuel de #{lb_clean}# pour une liste complète des "
+"options."
#. type: Plain text
#: en/user_overview.ssi:73
@@ -439,7 +445,7 @@ msgid ""
msgstr ""
"Au démarrage il va chercher un support en lecture seule qui contient un "
"répertoire #{/live/}# où un système de fichiers racine (souvent une image du "
-"système de fichiers compressé comme squashfs) est stocké. S'il est trouvé, "
+"système de fichiers compressée comme squashfs) est stocké. S'il est trouvé, "
"il va créer un environnement accessible en écriture, en utilisant aufs, afin "
"que systémes similaires à Debian puissent démarrer à partir de ça."
@@ -450,7 +456,7 @@ msgid ""
"Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
"on initramfs."
msgstr ""
-"Plus d'information sur ramfs initial dans Debian peut être trouvé dans le "
+"Plus d'information sur initial ramfs dans Debian peut être trouvé dans le "
"Debian Linux Kernel Handbook à http://kernel-handbook.alioth.debian.org/ "
"dans le chapitre sur initramfs."
diff --git a/manual/po/it/about_manual.ssi.po b/manual/po/it/about_manual.ssi.po
index cf7f8b4..4123594 100644
--- a/manual/po/it/about_manual.ssi.po
+++ b/manual/po/it/about_manual.ssi.po
@@ -1,14 +1,13 @@
# Italian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# Carlo Stemberger <carlo.stemberger at gmail.com>, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-07 08:59-0400\n"
-"PO-Revision-Date: 2012-04-02 19:39+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-18 19:35+0300\n"
+"PO-Revision-Date: 2012-04-03 20:21+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
"Language: it\n"
@@ -29,23 +28,35 @@ msgstr "1~about-manual A proposito di questo manuale"
#. type: Plain text
#: en/about_manual.ssi:6
+#, fuzzy
+#| msgid ""
+#| "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 7.0 \"wheezy\" release."
msgid ""
"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 7.0 \"Wheezy\" 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."
+"by the project for the Debian 7.0 \"wheezy\" release. An up-to-date version "
+"can always be found at http://live.debian.net/"
msgstr ""
"Questo manuale funge da unico punto d'accesso a tutta la documentazione "
"relativa al progetto Debian Live e si applica in particolare al software "
-"prodotto per il rilascio di Debian 7.0 \"Wheezy\". Sebbene sia "
-"principalmente focalizzato nell'aiutare a costruire un sistema live e non su "
-"argomenti per l'utente finale, è comunque possibile trovare alcune "
-"informazioni utili in queste sezioni: le {Nozioni di base}#the-basics "
+"prodotto per il rilascio di Debian 7.0 \"wheezy\"."
+
+#. type: Plain text
+#: en/about_manual.ssi:8
+msgid ""
+"While live-manual 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 ""
+"Sebbene sia principalmente focalizzato nell'aiutare a costruire un sistema "
+"live e non su argomenti per l'utente finale, è comunque possibile trovare "
+"alcune informazioni utili in queste sezioni: le {Nozioni di base}#the-basics "
"coprono la preparazione delle immagini da avviare da un supporto o dalla "
"rete, mentre {Personalizzare i comportamenti durante l'esecuzione}"
"#customizing-run-time-behaviours descrive alcune opzioni specificabili al "
@@ -53,7 +64,7 @@ msgstr ""
"l'utilizzo della persistenza."
#. type: Plain text
-#: en/about_manual.ssi:8
+#: en/about_manual.ssi:10
msgid ""
"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 "
@@ -70,59 +81,51 @@ msgstr ""
"Questi simboli non fanno parte del comando."
#. type: Plain text
-#: en/about_manual.ssi:10
+#: en/about_manual.ssi:12
msgid "2~ For the impatient"
msgstr "2~ Per gli impazienti"
#. type: Plain text
-#: en/about_manual.ssi:12
+#: en/about_manual.ssi:14
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 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, "
+"the details. Therefore, we suggest reading in the following order."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:16
+msgid ""
+"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 "
-"trattare e che si potrebbe voler provare il software prima di entrare nei "
-"dettagli; pertanto suggeriamo di leggerlo nel seguente ordine. Per iniziare "
-"leggere questo capitolo, {A proposito di questo manuale}#about-manual, da "
-"cima a fondo insieme alla sezione {Glossario}#terms, quindi passare ai tre "
-"tutorial all'inizio della sezione {Esempi}#examples progettati per insegnare "
-"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 le {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."
+"a taste of what can be done with Debian Live."
+msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:14
+#: en/about_manual.ssi:18
+msgid ""
+"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
+#: en/about_manual.ssi:20
msgid "2~terms Terms"
msgstr "2~terms Glossario"
#. type: Plain text
-#: en/about_manual.ssi:16
+#: en/about_manual.ssi:22
msgid ""
"_* *{Live system}*: An operating system that can boot without installation "
"to a hard drive. Live systems do not alter local operating system(s) or file"
@@ -138,7 +141,7 @@ msgstr ""
"anche avviarsi via rete."
#. type: Plain text
-#: en/about_manual.ssi:18
+#: en/about_manual.ssi:24
msgid ""
"_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, "
"live-build, live-config, and live-manual packages."
@@ -147,7 +150,7 @@ msgstr ""
"boot, live-build, live-config e live-manual."
#. type: Plain text
-#: en/about_manual.ssi:20
+#: en/about_manual.ssi:26
msgid ""
"_* *{Debian Live system}*: A live system that uses software from the Debian "
"operating system that may be booted from CDs, DVDs, USB sticks, over the "
@@ -160,47 +163,48 @@ msgstr ""
"boot #{fetch=URL}#)."
#. type: Plain text
-#: en/about_manual.ssi:22
+#: en/about_manual.ssi:28
msgid "_* *{Host system}*: The environment used to create the live system."
msgstr "_* *{Host system}*: L'ambiente utilizzato per creare il sistema live."
#. type: Plain text
-#: en/about_manual.ssi:24
+#: en/about_manual.ssi:30
msgid "_* *{Target system}*: The environment used to run the live system."
msgstr "_* *{Target system}*: L'ambiente usato per eseguire il sistema live."
#. type: Plain text
-#: en/about_manual.ssi:26
+#: en/about_manual.ssi:32
msgid ""
"_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
-"boot was formerly a part of live-initramfs."
+"boot was formerly a part of /{live-initramfs}/."
msgstr ""
"_* *{live-boot}*: Una raccolta di script usati per avviare sistemi live. "
-"live-boot era una parte di live-initramfs."
+"live-boot era una parte di /{live-initramfs}/."
#. type: Plain text
-#: en/about_manual.ssi:28
+#: en/about_manual.ssi:34
msgid ""
"_* *{live-build}*: A collection of scripts used to build customized Debian "
-"Live systems. live-build was formerly known as live-helper, and even earlier "
-"known as live-package."
+"Live systems. live-build was formerly known as /{live-helper}/, and even "
+"earlier known as /{live-package}/."
msgstr ""
"_* *{live-build}*: Una raccolta di script usati per creare sistemi Debian "
-"Live personalizzati. live-build era conosciuto come live-helper, ed ancora "
-"prima come live-package."
+"Live personalizzati. live-build era conosciuto come /{live-helper}/, ed "
+"ancora prima come /{live-package}/."
#. type: Plain text
-#: en/about_manual.ssi:30
+#: en/about_manual.ssi:36
msgid ""
"_* *{live-config}*: A collection of scripts used to configure a live system "
-"during the boot process. live-config was formerly a part of live-initramfs."
+"during the boot process. live-config was formerly a part of /{live-"
+"initramfs}/."
msgstr ""
"_* *{live-config}*: Una raccolta di script usati per configurare un sistema "
-"live durante il processo di inizializzazione. live-config era una parte di "
-"live-initramfs."
+"live durante il processo di inizializzazione. live-config era una parte di /"
+"{live-initramfs}/."
#. type: Plain text
-#: en/about_manual.ssi:32
+#: en/about_manual.ssi:38
msgid ""
"_* *{live-manual}*: This document is maintained in a package called live-"
"manual."
@@ -209,7 +213,7 @@ msgstr ""
"manual."
#. type: Plain text
-#: en/about_manual.ssi:34
+#: en/about_manual.ssi:40
msgid ""
"_* *{Debian Installer (d-i)}*: The official installation system for the "
"Debian distribution."
@@ -218,7 +222,7 @@ msgstr ""
"distribuzione Debian."
#. type: Plain text
-#: en/about_manual.ssi:36
+#: en/about_manual.ssi:42
msgid ""
"_* *{Boot parameters}*: Parameters that can be entered at the bootloader "
"prompt to influence the kernel or live-config."
@@ -227,18 +231,18 @@ msgstr ""
"boot loader per modificare il comportamento del kernel o di live-config."
#. type: Plain text
-#: en/about_manual.ssi:38
+#: en/about_manual.ssi:44
msgid ""
-"_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+"_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run "
"different instances of the GNU/Linux environment on a single system "
"simultaneously without rebooting."
msgstr ""
-"_* *{chroot}*: Il programma chroot, #{chroot(8)}#, rende possibile eseguire "
-"diverse istanze dell'ambiente GNU/Linux su un singolo sistema "
+"_* *{chroot}*: Il programma /{chroot}/, #{chroot(8)}#, rende possibile "
+"eseguire diverse istanze dell'ambiente GNU/Linux su un singolo sistema "
"simultaneamente senza riavviare."
#. type: Plain text
-#: en/about_manual.ssi:40
+#: en/about_manual.ssi:46
msgid ""
"_* *{Binary image}*: A file containing the live system, such as binary.iso "
"or binary.img."
@@ -247,7 +251,7 @@ msgstr ""
"binary.img."
#. type: Plain text
-#: en/about_manual.ssi:42
+#: en/about_manual.ssi:48
msgid ""
"_* *{Target distribution}*: The distribution upon which your live system "
"will be based. This can differ from the distribution of your host system."
@@ -256,31 +260,26 @@ msgstr ""
"live. Può differire dalla distribuzione presente sul proprio computer."
#. type: Plain text
-#: en/about_manual.ssi:44
-msgid ""
-"_* *{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."
-msgstr ""
-"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Nomi in codice per i "
-"rilasci Debian; al momento Squeeze è l'attuale *{stable}* e Wheezy l'attuale "
-"*{testing}*. Sid sarà sempre il sinonimo della *{unstable}*. In tutto il "
-"manuale si tende ad usare i nomi in codice dei rilasci, in quanto questo è "
-"ciò che è previsto dagli strumenti stessi."
-
-#. type: Plain text
-#: en/about_manual.ssi:46
-msgid ""
-"The *{stable}* distribution contains the latest officially released "
-"distribution of Debian. The *{testing}* distribution is the staging area for "
-"the next *{stable}* release. A major advantage of using this distribution is "
-"that it has more recent versions of software relative to the *{stable}* "
-"release. The *{unstable}* distribution is where active development of Debian "
-"occurs. Generally, this distribution is run by developers and those who like "
-"to live on the edge."
+#: en/about_manual.ssi:50
+#, fuzzy
+#| msgid ""
+#| "The *{stable}* distribution contains the latest officially released "
+#| "distribution of Debian. The *{testing}* distribution is the staging area "
+#| "for the next *{stable}* release. A major advantage of using this "
+#| "distribution is that it has more recent versions of software relative to "
+#| "the *{stable}* release. The *{unstable}* distribution is where active "
+#| "development of Debian occurs. Generally, this distribution is run by "
+#| "developers and those who like to live on the edge."
+msgid ""
+"_* *{stable/testing/unstable}*: The *{stable}* distribution contains the "
+"latest officially released distribution of Debian. The *{testing}* "
+"distribution is the staging area for the next *{stable}* release. A major "
+"advantage of using this distribution is that it has more recent versions of "
+"software relative to the *{stable}* release. The *{unstable}* distribution "
+"is where active development of Debian occurs. Generally, this distribution "
+"is run by developers and those who like to live on the edge. Throughout the "
+"manual, we tend to use codenames for the releases, such as wheezy or sid, as "
+"that is what is supported by the tools themselves."
msgstr ""
"La distribuzione *{stable}* contiene l'ultima distribuzione ufficialmente "
"rilasciata da Debian; la *{testing}* è il punto di raccolta per i pacchetti "
@@ -290,82 +289,82 @@ msgstr ""
"viene generalmente usata dagli sviluppatori o da coloro che amano l'azzardo."
#. type: Plain text
-#: en/about_manual.ssi:48
+#: en/about_manual.ssi:52
msgid "2~ Authors"
msgstr "2~ Autori"
#. type: Plain text
-#: en/about_manual.ssi:50
+#: en/about_manual.ssi:54
msgid "A list of authors (in alphabetical order):"
msgstr "Lista degli autori (in ordine alfabetico):"
#. type: Plain text
-#: en/about_manual.ssi:52
+#: en/about_manual.ssi:56
msgid "_* Ben Armstrong"
msgstr "_* Ben Armstrong"
#. type: Plain text
-#: en/about_manual.ssi:54
+#: en/about_manual.ssi:58
msgid "_* Brendan Sleight"
msgstr "_* Brendan Sleight"
#. type: Plain text
-#: en/about_manual.ssi:56
+#: en/about_manual.ssi:60
msgid "_* Chris Lamb"
msgstr "_* Chris Lamb"
#. type: Plain text
-#: en/about_manual.ssi:58
+#: en/about_manual.ssi:62
msgid "_* Daniel Baumann"
msgstr "_* Daniel Baumann"
#. type: Plain text
-#: en/about_manual.ssi:60
+#: en/about_manual.ssi:64
msgid "_* Franklin Piat"
msgstr "_* Franklin Piat"
#. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:66
msgid "_* Jonas Stein"
msgstr "_* Jonas Stein"
#. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:68
msgid "_* Kai Hendry"
msgstr "_* Kai Hendry"
#. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:70
msgid "_* Marco Amadori"
msgstr "_* Marco Amadori"
#. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:72
msgid "_* Mathieu Geli"
msgstr "_* Mathieu Geli"
#. type: Plain text
-#: en/about_manual.ssi:70
+#: en/about_manual.ssi:74
msgid "_* Matthias Kirschner"
msgstr "_* Matthias Kirschner"
#. type: Plain text
-#: en/about_manual.ssi:72
+#: en/about_manual.ssi:76
msgid "_* Richard Nelson"
msgstr "_* Richard Nelson"
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:78
msgid "_* Trent W. Buck"
msgstr "_* Trent W. Buck"
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:80
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
+#: en/about_manual.ssi:82
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -378,7 +377,7 @@ msgstr ""
"{Contatti}#contact."
#. type: Plain text
-#: en/about_manual.ssi:80
+#: en/about_manual.ssi:84
msgid ""
"When submitting a contribution, please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted, the "
@@ -391,7 +390,7 @@ msgstr ""
"resto del documento, ovvero la GPL versione 3 o successiva."
#. type: Plain text
-#: en/about_manual.ssi:82
+#: en/about_manual.ssi:86
msgid ""
"The sources for this manual are maintained using the Git version control "
"system. You can check out the latest copy by executing:"
@@ -400,28 +399,29 @@ msgstr ""
"controllo Git. Si può visionare la copia più recente eseguendo:"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -445,56 +445,58 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:86
+#: en/about_manual.ssi:90
msgid "$ git clone git://live.debian.net/git/live-manual.git"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -518,30 +520,31 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/about_manual.ssi:90
+#: en/about_manual.ssi:94
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -552,13 +555,13 @@ msgstr ""
"avere installati i pacchetti necessari per la sua compilazione eseguendo:"
#. type: Plain text
-#: en/about_manual.ssi:94
+#: en/about_manual.ssi:98
#, no-wrap
msgid " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:98
+#: en/about_manual.ssi:102
msgid ""
"You may build the live-manual from the top level directory of your Git "
"checkout by executing:"
@@ -567,13 +570,13 @@ msgstr ""
"Git eseguendo:"
#. type: Plain text
-#: en/about_manual.ssi:102
+#: en/about_manual.ssi:106
#, no-wrap
msgid " $ make build\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:110
msgid ""
"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 "
@@ -584,40 +587,40 @@ msgstr ""
"eseguendo:"
#. type: Plain text
-#: en/about_manual.ssi:110
+#: en/about_manual.ssi:114
#, no-wrap
msgid " $ make build LANGUAGES=en\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:114
+#: en/about_manual.ssi:118
msgid "It is also possible to build by document type, e.g:"
msgstr "È inoltre possibile compilare in base al tipo di documento, esempio:"
#. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:122
#, no-wrap
msgid " $ make build FORMATS=pdf\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:122
+#: en/about_manual.ssi:126
msgid "Or combine both, e.g:"
msgstr "O entrambi:"
#. type: Plain text
-#: en/about_manual.ssi:126
+#: en/about_manual.ssi:130
#, no-wrap
msgid " $ make build FORMATS=html LANGUAGES=it\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:130
+#: en/about_manual.ssi:134
msgid "3~ Applying changes"
msgstr "3~ Applicare le modifiche"
#. type: Plain text
-#: en/about_manual.ssi:132
+#: en/about_manual.ssi:136
msgid ""
"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 "
@@ -629,12 +632,12 @@ msgstr ""
"questa procedura:"
#. type: Plain text
-#: en/about_manual.ssi:134
+#: en/about_manual.ssi:138
msgid "_* Fetch the public commit key:"
msgstr "_* Prelevare la chiave pubblica:"
#. type: Plain text
-#: en/about_manual.ssi:143
+#: en/about_manual.ssi:147
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
@@ -646,14 +649,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:147
+#: en/about_manual.ssi:151
msgid "_* Add the following section to your openssh-client config:"
msgstr ""
"_* Aggiungere la seguente sezione alla propria configurazione di openssh-"
"client:"
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:160
#, no-wrap
msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
@@ -665,12 +668,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:164
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:165
+#: en/about_manual.ssi:169
#, no-wrap
msgid ""
" $ git clone git at live.debian.net:/live-manual.git\n"
@@ -680,7 +683,7 @@ msgstr ""
" $ cd live-manual && git checkout debian-next\n"
#. type: Plain text
-#: en/about_manual.ssi:169
+#: en/about_manual.ssi:173
msgid ""
"_* Note that you should commit any changes on the debian-next branch, not on "
"the debian branch."
@@ -689,92 +692,80 @@ msgstr ""
"su quello debian."
#. type: Plain text
-#: en/about_manual.ssi:171
-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 ""
-"_* Dopo aver modificato i file in #{manual/en/}#, chiamare il target \"commit"
-"\" nella directory superiore per bonificare i file ed aggiornare i file di "
-"traduzione:"
-
-#. type: Plain text
#: en/about_manual.ssi:175
-#, no-wrap
-msgid " $ make commit\n"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:179
-msgid "_* Then"
-msgstr "quindi"
-
-#. type: Plain text
-#: en/about_manual.ssi:183
-#, no-wrap
-msgid " $ git add .\n"
+msgid ""
+"_* Do not use #{make commit}# unless you are updating translations in this "
+"commit, and in that case, do not mix changes to the English manual and "
+"translations in the same commit, but use separate commits for each. See the "
+"{Translation}#translation section for more details."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:187
+#: en/about_manual.ssi:177
+#, fuzzy
+#| msgid ""
+#| "_* 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."
msgid ""
-"_* 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."
+"_* Write commit messages that consist of complete, meaningful 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 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."
+"Translating\", ad esempio:"
#. type: Plain text
-#: en/about_manual.ssi:191
+#: en/about_manual.ssi:181
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:195
+#: en/about_manual.ssi:185
msgid "_* Push the commit to the server:"
msgstr "_* Inviare il commit al server:"
#. type: Plain text
-#: en/about_manual.ssi:199
+#: en/about_manual.ssi:189
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:203
+#: en/about_manual.ssi:193
msgid "3~translation Translation"
msgstr "3~translation Traduzione"
#. type: Plain text
-#: en/about_manual.ssi:205
+#: en/about_manual.ssi:195
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:207
+#: en/about_manual.ssi:197
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). "
-"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."
+"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."
msgstr ""
"_* Tradurre i file about_manual.ssi.pot, about_project.ssi.pot e index.html."
-"in.pot nella propria lingua con il proprio editor preferito (tipo poedit). "
-"Inviare i file tradotti alla mailing list. Una volta che abbiamo ricevuto il "
-"contributo, aggiungeremo la nuova lingua al manuale (fornendo i file po) e "
-"la attiveremo per la procedura di compilazione automatica."
+"in.pot nella propria lingua con il proprio editor preferito (tipo /"
+"{poedit}/). Inviare i file tradotti alla mailing list. Una volta che abbiamo "
+"ricevuto il contributo, aggiungeremo la nuova lingua al manuale (fornendo i "
+"file po) e la attiveremo per la procedura di compilazione automatica."
#. type: Plain text
-#: en/about_manual.ssi:209
+#: en/about_manual.ssi:199
msgid ""
"_* Once the new language is added, you can randomly start translating all po "
"files in #{manual/po/}#."
@@ -784,7 +775,7 @@ msgstr ""
"preferisce."
#. type: Plain text
-#: en/about_manual.ssi:211
+#: en/about_manual.ssi:201
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
"are updated from the po files and then you can review your changes launching "
@@ -794,10 +785,10 @@ 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}#."
+"{git commit -a -m \"Translating...\"}# e #{git push}#."
#. type: Plain text
-#: en/about_manual.ssi:212
+#: en/about_manual.ssi:202
#, 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 "*{Nota:}* anche se #{make commit}# e #{make build}# rimuovono entrambi la directory di compilazione, se si compila il manuale per rivedere le modifiche come consigliato, si consiglia di pulire l'albero git prima del push; per fare ciò si puà usare il comando #{make clean}#. Grazie al file .gitignore, quest'ultimo passaggio non è obbligatorio ma è una buona abitudine che evita di fare involontariamente il commit di certi file.\n"
diff --git a/manual/po/it/about_project.ssi.po b/manual/po/it/about_project.ssi.po
index 26cdc43..0d89091 100644
--- a/manual/po/it/about_project.ssi.po
+++ b/manual/po/it/about_project.ssi.po
@@ -1,14 +1,13 @@
# Italian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# skizzhg <skizzhg at gmx.com>, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-19 22:16+0100\n"
-"PO-Revision-Date: 2011-09-10 23:03+0200\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-05-25 14:30+0300\n"
+"PO-Revision-Date: 2012-04-03 20:25+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
"Language: it\n"
@@ -79,7 +78,7 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:20
msgid "_* They include packages from outside of the Debian archive."
-msgstr ""
+msgstr "_* Includono pacchetti esterni all'archivio Debian."
#. type: Plain text
#: en/about_project.ssi:22
@@ -119,13 +118,13 @@ msgid ""
"around and to accurately represent the Debian system with the following main "
"advantages:"
msgstr ""
-"Debian è il Sistema Operativo Universale: ha un sistema live per mostraree "
+"Debian è il Sistema Operativo Universale, ha un sistema live per mostrare e "
"rappresentare accuratamente il sistema con i seguenti vantaggi:"
#. type: Plain text
#: en/about_project.ssi:32
-msgid "_* It would be a subproject of Debian."
-msgstr "_* Sarebbe un sottoprogetto di Debian."
+msgid "_* It is a subproject of Debian."
+msgstr "_* È un sottoprogetto di Debian."
#. type: Plain text
#: en/about_project.ssi:34
@@ -227,31 +226,29 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:60
msgid ""
-"A system for configuring packages is provided using debconf in #{lb config}# "
-"(use --preseed FILE) allowing custom configured packages to be installed in "
-"your custom produced Debian Live images, but for official live images only "
-"default configuration will be used. For more information, please see "
-"{Customization overview}#customization-overview."
+"A system for configuring packages is provided using debconf allowing custom "
+"configured packages to be installed in your custom produced Debian Live "
+"images, but for official live images only default configuration will be "
+"used. For more information, please see {Customization overview}"
+"#customization-overview."
msgstr ""
-"Viene fornito un sistema per configurare i pacchetti tramite debconf nel #"
-"{lb config}# (use --preseed FILE) consentendo di installare pacchetti "
-"configurati secondo le proprie preferenze nell'immagine Debian Live "
-"personalizzata, ma per le immagini ufficiali verrà usata la configurazione "
-"predefinita. Per ulteriori informazioni si veda {Panoramica sulla "
-"personalizzazione}#customization-overview."
+"Viene fornito un sistema per configurare i pacchetti tramite debconf "
+"consentendo di installare pacchetti configurati secondo le proprie "
+"preferenze nell'immagine Debian Live personalizzata, ma per le immagini "
+"ufficiali verrà usata la configurazione predefinita. Per ulteriori "
+"informazioni si veda {Panoramica sulla personalizzazione}#customization-"
+"overview."
#. type: Plain text
#: en/about_project.ssi:62
msgid ""
"Exception: There are a few essential changes needed to bring a live system "
-"to life (e.g. configuring pam to allow empty passwords). These essential "
-"changes have to be kept as minimal as possible and should be merged within "
-"the Debian repository if possible."
+"to life. These essential changes have to be kept as minimal as possible and "
+"should be merged within the Debian repository if possible."
msgstr ""
"Eccezione: ci sono alcuni cambiamenti essenziali per far nascere un sistema "
-"live (ad esempio configurare pam per permettere le password vuote). Queste "
-"modifiche essenziali devono essere tenute al minimo possibile e saranno "
-"eventualmente aggiunte ai repository Debian."
+"live. Queste modifiche essenziali devono essere tenute al minimo possibile e "
+"saranno eventualmente aggiunte ai repository Debian."
#. type: Plain text
#: en/about_project.ssi:64
@@ -287,12 +284,13 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:69
msgid ""
-"_* *{BTS}*: The Debian Bug Tracking System (BTS) contains details of bugs "
-"reported by users and developers. Each bug is given a number, and is kept on "
-"file until it is marked as having been dealt with. For more information, "
-"please see {Reporting bugs}#bugs."
+"_* *{BTS}*: The {Debian Bug Tracking System}http://www.debian.org/Bugs/ "
+"(BTS) contains details of bugs reported by users and developers. Each bug is "
+"given a number, and is kept on file until it is marked as having been dealt "
+"with. For more information, please see {Reporting bugs}#bugs."
msgstr ""
-"_* *{BTS}*: Il Debian Bug Tracking System (BTS) contiene i dettagli dei bug "
-"riportati dagli utenti e dagli sviluppatori. A ciascun bug viene assegnato "
-"un numero, e viene mantenuto finché non è segnato come risolto. Per "
-"ulteriori informazioni si veda {Segnalare bug}#bugs."
+"_* *{BTS}*: Il {Debian Bug Tracking System}http://www.debian.org/Bugs/ (BTS) "
+"contiene i dettagli dei bug riportati dagli utenti e dagli sviluppatori. A "
+"ciascun bug viene assegnato un numero, e viene mantenuto finché non è "
+"segnato come risolto. Per ulteriori informazioni si veda {Segnalare bug}"
+"#bugs."
diff --git a/manual/po/it/index.html.in.po b/manual/po/it/index.html.in.po
index 3c1be44..caf07ed 100644
--- a/manual/po/it/index.html.in.po
+++ b/manual/po/it/index.html.in.po
@@ -1,5 +1,4 @@
# Italian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# Carlo Stemberger <carlo.stemberger at gmail.com>, 2010.
@@ -8,8 +7,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-07 16:03+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-06-02 18:16+0300\n"
"PO-Revision-Date: 2011-12-26 19:08+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -43,7 +42,7 @@ msgstr ""
#. type: Content of: <html><body><p>
#: en/index.html.in:17
msgid ""
-"Please report errors, omissions, patches and suggestions to our mailinglist "
+"Please report errors, omissions, patches and suggestions to our mailing list "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
"org</a> and read about <a href=\"html/live-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
@@ -113,7 +112,7 @@ msgstr "Sorgente"
#. type: Content of: <html><body><p>
#: en/index.html.in:38
msgid ""
-"The sources for this manual is available in a <a href=\"http://git.or.cz/"
+"The sources for this manual are available in a <a href=\"http://git.or.cz/"
"\">Git</a> repository at live.debian.net."
msgstr ""
"I sorgenti di questo manuale sono disponibili nel repository <a href="
diff --git a/manual/po/it/live-manual.ssm.po b/manual/po/it/live-manual.ssm.po
index 3fe1516..3cfc006 100644
--- a/manual/po/it/live-manual.ssm.po
+++ b/manual/po/it/live-manual.ssm.po
@@ -1,13 +1,12 @@
# Italian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# lillo sciascia <lillosciascia at gmail.com>, 2010.
# Carlo Stemberger <carlo.stemberger at gmail.com>, 2011.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-03 00:19+0300\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-06-04 12:21+0300\n"
"PO-Revision-Date: 2011-03-11 10:33+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -49,8 +48,10 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-04-03\n"
+" :published: 2012-06-04\n"
msgstr ""
+"@date:\n"
+" :published: 04.06.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
@@ -62,8 +63,8 @@ msgstr ""
#, no-wrap
msgid ""
"@make:\n"
-" :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/\n"
-" :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
+" :bold: /squeeze|wheezy|sid/\n"
+" :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
msgstr ""
diff --git a/manual/po/it/project_bugs.ssi.po b/manual/po/it/project_bugs.ssi.po
index b36b8de..38f05e8 100644
--- a/manual/po/it/project_bugs.ssi.po
+++ b/manual/po/it/project_bugs.ssi.po
@@ -1,13 +1,12 @@
# Italian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# skizzhg <skizzhg at gmx.com>, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-24 14:17-0400\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
"PO-Revision-Date: 2011-03-11 10:40+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -18,130 +17,144 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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/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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: 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-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
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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/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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: 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-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
-#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -346,9 +359,9 @@ msgstr "_* Versione di live-config sul sistema live"
#. type: Plain text
#: en/project_bugs.ssi:50
msgid ""
-"_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system"
+"_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system"
msgstr ""
-"_* Versione di #{debootstrap}# o #{cdebootstrap}# sul sistema ospitante"
+"_* Versione di /{debootstrap}/ o /{cdebootstrap}/ sul sistema ospitante"
#. type: Plain text
#: en/project_bugs.ssi:52
@@ -468,14 +481,14 @@ msgstr "3~ Durante la compilazione mentre esegue il bootstrap"
#. type: Plain text
#: en/project_bugs.ssi:82
msgid ""
-"live-build first bootstraps a basic Debian system with #{debootstrap}# or #"
-"{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
+"live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
+"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
"distribution it is bootstrapping, it may fail. If a bug appears here, check "
"if the error is related to a specific Debian package (most likely), or if it "
"is related to bootstrapping tool itself."
msgstr ""
-"live-build avvia inizialmente un sistema Debian di base con #{debootstrap}# "
-"o #{cdebootstrap}#; può fallire a seconda dello strumento utilizzato e della "
+"live-build avvia inizialmente un sistema Debian di base con /{debootstrap}/ "
+"o /{cdebootstrap}/; può fallire a seconda dello strumento utilizzato e della "
"distribuzione Debian che si sta avviando. Se il bug appare a questo punto "
"controllare che l'errore sia relativo ad uno specifico pacchetto Debian (più "
"probabile) o allo strumento di avvio stesso."
@@ -514,13 +527,13 @@ msgstr ""
#: en/project_bugs.ssi:90
msgid ""
"If this is the case, this is not a bug in Debian Live, but rather in Debian "
-"- please report it against the failing package. Running #{debootstrap}# "
+"- please report it against the failing package. Running /{debootstrap}/ "
"separately from the Live system build or running #{lb bootstrap --debug}# "
"will give you more information."
msgstr ""
"In questo caso non è un bug in Debian Live, ma piuttosto in Debian, inviare "
"una segnalazione sul pacchetto che ha fallito. Si otterranno maggiori "
-"informazioni eseguendo #{debootstrap}# separatamente dal sistema live o "
+"informazioni eseguendo /{debootstrap}/ separatamente dal sistema live o "
"eseguendo #{lb bootstrap --debug}#."
#. type: Plain text
diff --git a/manual/po/it/project_coding-style.ssi.po b/manual/po/it/project_coding-style.ssi.po
index e4db250..5411538 100644
--- a/manual/po/it/project_coding-style.ssi.po
+++ b/manual/po/it/project_coding-style.ssi.po
@@ -1,5 +1,4 @@
# Italian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# skizzhg <skizzhg at gmx.com>
@@ -7,8 +6,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-31 16:32+0300\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-07 22:16+0300\n"
"PO-Revision-Date: 2010-12-17 14:41+0100\n"
"Last-Translator: Carlo Stemberger <carlo.stemberger at gmail.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -19,29 +18,30 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -89,29 +89,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -204,37 +205,42 @@ msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:16
+msgid "_* Make sure all shell code runs with 'set -e'."
+msgstr ""
+
+#. type: Plain text
+#: en/project_coding-style.ssi:18
msgid "2~ Indenting"
msgstr "2~ Rientri"
#. type: Plain text
-#: en/project_coding-style.ssi:18
+#: en/project_coding-style.ssi:20
msgid "_* Always use tabs over spaces."
msgstr "_* Usare sempre i tab piuttosto che gli spazi."
#. type: Plain text
-#: en/project_coding-style.ssi:20
+#: en/project_coding-style.ssi:22
msgid "2~ Wrapping"
msgstr "2~ Ritorno a capo"
#. type: Plain text
-#: en/project_coding-style.ssi:22
+#: en/project_coding-style.ssi:24
msgid "_* Generally, lines are 80 chars at maximum."
msgstr "_* Generalmente le righe sono composte da un massimo di 80 caratteri."
#. type: Plain text
-#: en/project_coding-style.ssi:24
+#: en/project_coding-style.ssi:26
msgid "_* Use the \"Linux style\" of line breaks:"
msgstr "_* Utilizzare lo \"stile Linux\" per le interruzioni di riga:"
#. type: Plain text
-#: en/project_coding-style.ssi:26 en/project_coding-style.ssi:49
-#: en/project_coding-style.ssi:90 en/project_coding-style.ssi:108
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:51
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:110
msgid "Bad:"
msgstr "Sbagliato:"
#. type: Plain text
-#: en/project_coding-style.ssi:32
+#: en/project_coding-style.ssi:34
#, no-wrap
msgid ""
" if foo; then\n"
@@ -243,13 +249,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:59
-#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:119
+#: en/project_coding-style.ssi:38 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:100 en/project_coding-style.ssi:121
msgid "Good:"
msgstr "Corretto:"
#. type: Plain text
-#: en/project_coding-style.ssi:43
+#: en/project_coding-style.ssi:45
#, no-wrap
msgid ""
" if foo\n"
@@ -259,41 +265,41 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:49
msgid "_* The same holds for functions:"
msgstr "_* Lo stesso vale per le funzioni:"
#. type: Plain text
-#: en/project_coding-style.ssi:55
+#: en/project_coding-style.ssi:57
#, no-wrap
msgid ""
-" foo () {\n"
+" Foo () {\n"
" bar\n"
" }\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:66
+#: en/project_coding-style.ssi:68
#, no-wrap
msgid ""
-" foo ()\n"
+" Foo ()\n"
" {\n"
" bar\n"
" }\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:72
msgid "2~ Variables"
msgstr "2~ Variabili"
#. type: Plain text
-#: en/project_coding-style.ssi:72
+#: en/project_coding-style.ssi:74
msgid "_* Variables are always in capital letters."
msgstr "_* Le variabili vanno sempre scritte in maiuscolo."
#. type: Plain text
-#: en/project_coding-style.ssi:74
+#: en/project_coding-style.ssi:76
msgid ""
"_* Variables that used in #{lb config}# always start with #{LB_}# prefix."
msgstr ""
@@ -301,7 +307,7 @@ msgstr ""
"#."
#. type: Plain text
-#: en/project_coding-style.ssi:76
+#: en/project_coding-style.ssi:78
msgid ""
"_* Internal temporary variables in live-build should start with the #{\\_LB_}"
"# prefix."
@@ -310,13 +316,13 @@ msgstr ""
"prefisso #{\\_LB_}#."
#. type: Plain text
-#: en/project_coding-style.ssi:78
+#: en/project_coding-style.ssi:80
msgid "_* Local variables start with live-build #{\\_\\_LB_}# prefix."
msgstr ""
"_* Le variabili locali iniziano con il prefisso live-build #{\\_\\_LB_}#."
#. type: Plain text
-#: en/project_coding-style.ssi:80
+#: en/project_coding-style.ssi:82
msgid ""
"_* Variables in connection to a boot parameter in live-config start with #"
"{LIVE_}#."
@@ -325,13 +331,13 @@ msgstr ""
"{LIVE_}#."
#. type: Plain text
-#: en/project_coding-style.ssi:82
+#: en/project_coding-style.ssi:84
msgid "_* All other variables in live-config start with #{_}# prefix."
msgstr ""
"_* Tutte le altre variabili in live-config iniziano con il prefisso #{_}#."
#. type: Plain text
-#: en/project_coding-style.ssi:84
+#: en/project_coding-style.ssi:86
msgid ""
"_* Use braces around variables; e.g. write #{${FOO}}# instead of #{$FOO}#."
msgstr ""
@@ -339,7 +345,7 @@ msgstr ""
"# invece di #{$FOO}#."
#. type: Plain text
-#: en/project_coding-style.ssi:86
+#: en/project_coding-style.ssi:88
msgid ""
"_* Always protect variables with quotes to respect potential whitespaces: "
"write #{\"${FOO}\"}# not #{${FOO}}#."
@@ -348,7 +354,7 @@ msgstr ""
"potenziali spaziature: scrivere #{\"${FOO}\"}# e non #{${FOO}}#."
#. type: Plain text
-#: en/project_coding-style.ssi:88
+#: en/project_coding-style.ssi:90
msgid ""
"_* For consistency reasons, always use quotes when assigning values to "
"variables:"
@@ -357,24 +363,24 @@ msgstr ""
"valori alle variabili:"
#. type: Plain text
-#: en/project_coding-style.ssi:94
+#: en/project_coding-style.ssi:96
#, no-wrap
msgid " FOO=bar\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:104
#, no-wrap
msgid " FOO=\"bar\"\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:108
msgid "_* If multiple variables are used, quote the full expression:"
msgstr "_* Utilizzando variabili multiple, quotare l'intera espressione:"
#. type: Plain text
-#: en/project_coding-style.ssi:115
+#: en/project_coding-style.ssi:117
#, no-wrap
msgid ""
" if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
@@ -384,7 +390,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:126
+#: en/project_coding-style.ssi:128
#, no-wrap
msgid ""
" if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
@@ -394,12 +400,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:130
+#: en/project_coding-style.ssi:132
msgid "2~ Miscellaneous"
msgstr "2~ Varie"
#. type: Plain text
-#: en/project_coding-style.ssi:132
+#: en/project_coding-style.ssi:134
msgid ""
"_* Use \"#{|}#\" (without the surround quotes) as a separator in calls to "
"sed, e.g. \"#{sed -e 's|foo|bar|'}#\" (without \"\")."
@@ -408,7 +414,7 @@ msgstr ""
"come separatore, ad esempio \"#{sed -e 's|foo|bar|'}#\" (senza \"\")."
#. type: Plain text
-#: en/project_coding-style.ssi:134
+#: en/project_coding-style.ssi:136
msgid ""
"_* Don't use the #{test}# command for comparisons or tests, use \"#{[}#\" \"#"
"{]}#\" (without \"\"); e.g. \"#{if [ -x /bin/foo ]; ...}#\" and not \"#{if "
@@ -419,10 +425,17 @@ msgstr ""
"{if test -x /bin/foo; ...}#\"."
#. type: Plain text
-#: en/project_coding-style.ssi:135
+#: en/project_coding-style.ssi:138
msgid ""
"_* Use #{case}# wherever possible over #{test}#, as it's easier to read and "
"faster in execution."
msgstr ""
"_* Ove possibile utilizzare #{case}# invece di #{test}#, essendo più facile "
"da leggere e più veloce in esecuzione."
+
+#. type: Plain text
+#: en/project_coding-style.ssi:139
+msgid ""
+"_* Use capitalized names for functions to limit messing with the users "
+"environment."
+msgstr ""
diff --git a/manual/po/it/project_procedures.ssi.po b/manual/po/it/project_procedures.ssi.po
index 09306de..50f8b6e 100644
--- a/manual/po/it/project_procedures.ssi.po
+++ b/manual/po/it/project_procedures.ssi.po
@@ -1,5 +1,4 @@
# Italian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# skizzhg <skizzhg at gmx.com>, 2010.
@@ -7,8 +6,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 20:37-0400\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-23 20:28+0300\n"
"PO-Revision-Date: 2010-12-17 17:13+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -19,130 +18,142 @@ msgstr ""
"Plural-Forms: nplurals=2: plural=(n !=1)\n"
#. 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:58
-#: 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: 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-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
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:62
-#: 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: 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-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
-#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -247,8 +258,12 @@ msgstr "2~ Rilasci minori"
#. type: Plain text
#: en/project_procedures.ssi:36
+#, fuzzy
+#| msgid ""
+#| "_* Again, we need updated mirror of debian, debian-security and debian-"
+#| "volatile."
msgid ""
-"_* Again, we need updated mirror of debian, debian-security and debian-"
+"_* Again, we need updated mirrors of debian, debian-security and debian-"
"volatile."
msgstr ""
"_* Bisogna nuovamente aggiornare i mirror di debian, debian-security e "
@@ -261,11 +276,27 @@ msgstr "_* Inviare email di annuncio."
#. type: Plain text
#: en/project_procedures.ssi:42
+#, fuzzy
+#| msgid "3~ Point release announcement template"
+msgid "3~ Last Point Release of a Debian Release"
+msgstr "3~ Modello per l'annuncio di un rilascio minore."
+
+#. type: Plain text
+#: en/project_procedures.ssi:47
+msgid ""
+"Remember to adjust both chroot and binary mirrors when building the last set "
+"of images for a Debian release after it has been moved away from ftp.debian."
+"org to archive.debian.org. That way, old prebuilt live images are still "
+"useful without user modifications."
+msgstr ""
+
+#. type: Plain text
+#: en/project_procedures.ssi:49
msgid "3~ Point release announcement template"
msgstr "3~ Modello per l'annuncio di un rilascio minore."
#. type: Plain text
-#: en/project_procedures.ssi:44
+#: en/project_procedures.ssi:51
msgid ""
"An annoucement mail for point releases can be generated using the template "
"below and the following command:"
@@ -274,7 +305,7 @@ msgstr ""
"sottostante e il seguente comando:"
#. type: Plain text
-#: en/project_procedures.ssi:52
+#: en/project_procedures.ssi:59
#, no-wrap
msgid ""
" $ sed \\\n"
@@ -285,7 +316,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:56
+#: en/project_procedures.ssi:63
msgid ""
"Please check the mail carefully before sending and pass it to others for "
"proof-reading."
@@ -294,13 +325,13 @@ msgstr ""
"altri per le correzioni."
#. type: Plain text
-#: en/project_procedures.ssi:60
+#: en/project_procedures.ssi:67
#, no-wrap
msgid " Debian Live images for Debian GNU/Linux %major% updated\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:64
+#: en/project_procedures.ssi:71
#, no-wrap
msgid ""
" The Debian Live project is pleased to announce the availability of\n"
@@ -309,19 +340,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:66
+#: en/project_procedures.ssi:73
#, no-wrap
msgid " The images are available for download at:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:68
+#: en/project_procedures.ssi:75
#, no-wrap
msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:73
+#: en/project_procedures.ssi:80
#, no-wrap
msgid ""
" This update incorporates the changes made in the %minor% point release,\n"
@@ -331,29 +362,29 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:75
+#: en/project_procedures.ssi:82
#, no-wrap
msgid " <http://lists.debian.org/debian-announce/%release_mail%>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:77
+#: en/project_procedures.ssi:84
#, no-wrap
msgid " It also includes the following Live-specific changes:\n"
msgstr ""
#. type: Bullet: ' * '
-#: en/project_procedures.ssi:81
+#: en/project_procedures.ssi:88
msgid "[INSERT LIVE-SPECIFIC CHANGE HERE]"
msgstr "[INSERT LIVE-SPECIFIC CHANGE HERE]"
#. type: Bullet: ' * '
-#: en/project_procedures.ssi:81
+#: en/project_procedures.ssi:88
msgid "[LARGER ISSUES MAY DESERVE THEIR OWN SECTION]"
msgstr "[LARGER ISSUES MAY DESERVE THEIR OWN SECTION]"
#. type: Plain text
-#: en/project_procedures.ssi:85
+#: en/project_procedures.ssi:92
#, no-wrap
msgid ""
" URLs\n"
@@ -361,67 +392,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:87
+#: en/project_procedures.ssi:94
#, no-wrap
msgid " Download location of updated images:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:89
+#: en/project_procedures.ssi:96
#, no-wrap
msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:91
+#: en/project_procedures.ssi:98
#, no-wrap
msgid " Debian Live project homepage:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:93
+#: en/project_procedures.ssi:100
#, no-wrap
msgid " <http://live.debian.net/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:95
+#: en/project_procedures.ssi:102
#, no-wrap
msgid " The current stable distribution:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:97
+#: en/project_procedures.ssi:104
#, no-wrap
msgid " <http://ftp.debian.org/debian/dists/stable>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:99
+#: en/project_procedures.ssi:106
#, no-wrap
msgid " stable distribution information (release notes, errata etc.):\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:101
+#: en/project_procedures.ssi:108
#, no-wrap
msgid " <http://www.debian.org/releases/stable/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:103
+#: en/project_procedures.ssi:110
#, no-wrap
msgid " Security announcements and information:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:105
+#: en/project_procedures.ssi:112
#, no-wrap
msgid " <http://www.debian.org/security/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:109
+#: en/project_procedures.ssi:116
#, no-wrap
msgid ""
" About Debian\n"
@@ -429,7 +460,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:113
+#: en/project_procedures.ssi:120
#, no-wrap
msgid ""
" The Debian Project is an association of Free Software developers who\n"
@@ -438,7 +469,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:117
+#: en/project_procedures.ssi:124
#, no-wrap
msgid ""
" About Debian Live\n"
@@ -446,7 +477,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:122
+#: en/project_procedures.ssi:129
#, no-wrap
msgid ""
" Debian Live is an official sub-project of Debian which produces Debian\n"
@@ -456,7 +487,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:126
+#: en/project_procedures.ssi:133
#, no-wrap
msgid ""
" Contact Information\n"
@@ -464,7 +495,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:130
+#: en/project_procedures.ssi:137
#, no-wrap
msgid ""
" For further information, please visit the Debian Live web pages at\n"
diff --git a/manual/po/it/style_guide.ssi.po b/manual/po/it/style_guide.ssi.po
index cf48ab5..41852c5 100644
--- a/manual/po/it/style_guide.ssi.po
+++ b/manual/po/it/style_guide.ssi.po
@@ -1,12 +1,11 @@
# Italian translations for live-manual package
-# Copyright (C) 2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-31 19:15+0300\n"
+"POT-Creation-Date: 2012-06-03 17:04+0300\n"
"PO-Revision-Date: 2012-02-11 16:42+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -22,17 +21,16 @@ msgid ":B~ Appendix"
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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
@@ -93,17 +91,16 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
@@ -832,15 +829,15 @@ msgstr ""
#. type: Plain text
#: en/style_guide.ssi:228
-msgid "_* /{New lines}/"
+msgid "_* /{Newlines}/"
msgstr ""
#. type: Plain text
#: en/style_guide.ssi:230
msgid ""
-"The translated texts need to have the exact same new lines as the original "
+"The translated texts need to have the exact same newlines as the original "
"texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
-"in the original files. These new lines often appear, for instance, in the "
+"in the original files. These newlines often appear, for instance, in the "
"code blocks."
msgstr ""
@@ -878,9 +875,7 @@ msgstr ""
#. type: Bullet: ' - '
#: en/style_guide.ssi:244
-msgid ""
-"Metadata (often between colons *{:metadata:}*) especially the date in /{live-"
-"manual.ssm.po}/ because it changes every time live-manual is updated."
+msgid "Metadata (often between colons *{:metadata:}*)"
msgstr ""
#. type: Bullet: ' - '
diff --git a/manual/po/it/user_basics.ssi.po b/manual/po/it/user_basics.ssi.po
index 290ac03..47e4bc8 100644
--- a/manual/po/it/user_basics.ssi.po
+++ b/manual/po/it/user_basics.ssi.po
@@ -1,5 +1,4 @@
# Italian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# Carlo Stemberger <carlo.stemberger at gmail.com>, 2010.
@@ -7,9 +6,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-12 08:28-0400\n"
-"PO-Revision-Date: 2012-02-06 18:33+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
+"PO-Revision-Date: 2012-04-03 17:59+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
"Language: it\n"
@@ -19,16 +18,18 @@ msgstr ""
"Plural-Forms: nplurals=2: plural=(n !=1)\n"
#. 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -36,8 +37,10 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -61,39 +64,42 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -101,8 +107,10 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -126,25 +134,26 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -363,12 +372,12 @@ msgstr ""
#: en/user_basics.ssi:48
msgid ""
"This process can take a while, depending on the speed of your network "
-"connection. When it is complete, there should be a #{binary-hybrid.iso}# "
+"connection. When it is complete, there should be a #{binary.hybrid.iso}# "
"image file, ready to use, in the current directory."
msgstr ""
"Questo processo può richiedere tempo, a seconda della velocità della "
"connessione di rete. Una volta completato, nell'attuale directory ci sarà un "
-"file immagine #{binary-hybrid.iso}# pronto da usare."
+"file immagine #{binary.hybrid.iso}# pronto da usare."
#. type: Plain text
#: en/user_basics.ssi:50
@@ -399,6 +408,8 @@ msgid ""
"Burning an ISO image is easy. Just install wodim and use it from the command-"
"line to burn the image. For instance:"
msgstr ""
+"Masterizzare un'immagine ISO è semplice, basta installare wodim e "
+"utilizzarlo da riga di comando; ad esempio:"
#. type: Plain text
#: en/user_basics.ssi:60
@@ -409,7 +420,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:62
#, no-wrap
-msgid " $ wodim binary-hybrid.iso\n"
+msgid " $ wodim binary.hybrid.iso\n"
msgstr ""
#. type: Plain text
@@ -454,7 +465,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:75
#, no-wrap
-msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
+msgid " $ dd if=binary.hybrid.iso of=${USBSTICK}\n"
msgstr ""
#. type: Plain text
@@ -489,13 +500,13 @@ msgid ""
"Once you've booted the media, you are presented with a boot menu. If you "
"just press enter here, the system will boot using the default entry, #{Live}"
"# and default options. For more information about boot options, see the "
-"\"help\" entry in the menu and also the #{live-boot}# and #{live-config}# "
-"man pages found within the live system."
+"\"help\" entry in the menu and also the live-boot and live-config man pages "
+"found within the live system."
msgstr ""
"Avviando il supporto si otterrà un menu, premendo il tasto enter il sistema "
"partirà utilizzando la voce #{Live}# e le opzioni predefinite. Per ulteriori "
"informazioni sulle opzioni di boot, si veda la voce \"help\" nel menu e le "
-"pagine di manuale di #{live-boot}# e #{live-config}# all'interno del sistema."
+"pagine di manuale di live-boot e live-config all'interno del sistema."
#. type: Plain text
#: en/user_basics.ssi:86
@@ -585,24 +596,24 @@ msgstr "3~testing-iso-with-qemu Provare un'immagine ISO con QEMU"
#: en/user_basics.ssi:104
msgid ""
"The most versatile VM in Debian is QEMU. If your processor has hardware "
-"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
+"support for virtualization, use the /{qemu-kvm}/ package; the /{qemu-kvm}/ "
"package description briefly lists the requirements."
msgstr ""
"Il programma più versatile in Debian è QEMU. Se il processore gestisce la "
-"virtualizzazione hardware utilizzare il pacchetto #{qemu-kvm}#; la "
+"virtualizzazione hardware utilizzare il pacchetto /{qemu-kvm}/; la "
"descrizione elenca brevemente i requisiti."
#. type: Plain text
#: en/user_basics.ssi:106
msgid ""
-"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
-"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
-"the following examples. The #{qemu-utils}# package is also valuable for "
+"First, install /{qemu-kvm}/ if your processor supports it. If not, install /"
+"{qemu}/, in which case the program name is #{qemu}# instead of #{kvm}# in "
+"the following examples. The /{qemu-utils}/ package is also valuable for "
"creating virtual disk images with #{qemu-img}#."
msgstr ""
-"Per prima cosa installare #{qemu-kvm}# o altrimenti #{qemu}#, nel qual caso "
+"Per prima cosa installare /{qemu-kvm}/ o altrimenti /{qemu}/, nel qual caso "
"il nome del programma nei successivi sarà #{qemu}# invece di #{kvm}#. Il "
-"pacchetto #{qemu-utils}# è inoltre utile per creare immagini di dischi "
+"pacchetto /{qemu-utils}/ è inoltre utile per creare immagini di dischi "
"virtuali con #{qemu-img}#."
#. type: Plain text
@@ -619,7 +630,7 @@ msgstr "Avviare un'immagine ISO è semplice:"
#. type: Plain text
#: en/user_basics.ssi:118
#, no-wrap
-msgid " $ kvm -cdrom binary-hybrid.iso\n"
+msgid " $ kvm -cdrom binary.hybrid.iso\n"
msgstr ""
#. type: Plain text
@@ -635,8 +646,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:126
-msgid "In order to test the ISO with #{virtualbox-ose}#:"
-msgstr "Per provare la ISO con #{virtualbox-ose}#:"
+msgid "In order to test the ISO with /{virtualbox-ose}/:"
+msgstr "Per provare la ISO con /{virtualbox-ose}/:"
#. type: Plain text
#: en/user_basics.ssi:130
@@ -653,25 +664,18 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:136
msgid ""
-"Create a new virtual machine, change the storage settings to use #{binary-"
+"Create a new virtual machine, change the storage settings to use #{binary."
"hybrid.iso}# as the CD/DVD device, and start the machine."
msgstr ""
"Creare una nuova macchina virtuale, modificare le impostazione di "
-"archiviazione in modo da usare #{binary-hybrid.iso}# come dispositivo CD/"
+"archiviazione in modo da usare #{binary.hybrid.iso}# come dispositivo CD/"
"DVD, e avviare la macchina."
#. type: Plain text
#: en/user_basics.ssi:138
-msgid ""
-"Note: For live systems containing X.org that you want to test with #"
-"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
-"package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. "
-"Otherwise, the resolution is limited to 800x600."
-msgstr ""
-"Nota: per sistemi live contenenti X.org che si vogliono provare con #"
-"{virtualbox-ose}#, si può voler includere il pacchetto dei driver per X.org "
-"di VirtualBox, #{virtualbox-ose-guest-x11}#, nella configurazione di live-"
-"build. In caso contrario la risoluzione è limitata a 800x600."
+#, no-wrap
+msgid "*{Note:}* For live systems containing X.org that you want to test with /{virtualbox-ose}/, you may wish to include the VirtualBox X.org driver package, /{virtualbox-ose-guest-x11}/, in your live-build configuration. Otherwise, the resolution is limited to 800x600.\n"
+msgstr "*{Nota:}* per sistemi live contenenti X.org che si vogliono provare con /{virtualbox-ose}/, si può voler includere il pacchetto dei driver per X.org di VirtualBox, /{virtualbox-ose-guest-x11}/, nella configurazione di live-build. In caso contrario la risoluzione è limitata a 800x600."
#. type: Plain text
#: en/user_basics.ssi:142
@@ -708,14 +712,9 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:150
-msgid ""
-"Note: if you created an ISO hybrid image with the previous example, you will "
-"need to clean up your working directory with the #{lb clean}# command (see "
-"{The lb clean command}#lb-clean):"
-msgstr ""
-"Nota: se si è creata un'immagine ISO ibrida con gli esempi precedenti, "
-"occorre pulire la directory di lavoro con il comando #{lb clean}# (vedere "
-"{Il comando lb clean}#lb-clean):"
+#, no-wrap
+msgid "*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):\n"
+msgstr "*{Nota:}* se si è creata un'immagine ISO ibrida con gli esempi precedenti, occorre pulire la directory di lavoro con il comando #{lb clean}# (vedere {Il comando lb clean}#lb-clean):"
#. type: Plain text
#: en/user_basics.ssi:154 en/user_basics.ssi:220
@@ -764,14 +763,14 @@ msgid ""
"bootloader, ready to be directly written on a USB stick. Since using an HDD "
"image is just like using an ISO hybrid image on USB, follow the instructions "
"in {Using an ISO hybrid live image}#using-iso-hybrid, except use the "
-"filename #{binary.img}# instead of #{binary-hybrid.iso}#."
+"filename #{binary.img}# instead of #{binary.hybrid.iso}#."
msgstr ""
"L'immagine binaria generata contiene una partizione VFAT e il bootloader "
"syslinux, pronti per essere scritti direttamente su una penna USB. Dal "
"momento che utilizzare un'immagine HDD è come utilizzare un'immagine ISO "
"ibrida via USB, seguire le istruzioni contenute in {Utilizzare un'immagine "
"live ISO ibrida}#using-iso-hybrid tenendo però conto che il nome del file "
-"sarà #{binary.img}# invece di #{binary-hybrid.iso}#."
+"sarà #{binary.img}# invece di #{binary.hybrid.iso}#."
#. type: Plain text
#: en/user_basics.ssi:180
@@ -781,15 +780,15 @@ msgstr "3~testing-hdd-with-qemu Provare un'immagine HDD con Qemu"
#. type: Plain text
#: en/user_basics.ssi:182
msgid ""
-"First, install QEMU as described above in {Testing an ISO image with QEMU}"
-"#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which "
-"version your host system needs, specifying #{binary.img}# as the first hard "
-"drive."
+"First, install /{qemu}/ as described above in {Testing an ISO image with "
+"QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on "
+"which version your host system needs, specifying #{binary.img}# as the first "
+"hard drive."
msgstr ""
-"Installare QEMU come descritto in {Provare un'immagine ISO con QEMU}#testing-"
-"iso-with-qemu; quindi eseguire #{kvm}# o #{qemu}#, a seconda di quale "
-"versione è necessaria al sistema ospitante, specificando #{binary.img}# come "
-"disco rigido principale."
+"Installare /{qemu}/ come descritto in {Provare un'immagine ISO con QEMU}"
+"#testing-iso-with-qemu; quindi eseguire #{kvm}# o #{qemu}#, a seconda di "
+"quale versione è necessaria al sistema ospitante, specificando #{binary.img}"
+"# come disco rigido principale."
#. type: Plain text
#: en/user_basics.ssi:186
@@ -806,13 +805,13 @@ msgstr "3~using-usb-extra-space Usare lo spazio rimanente su una penna USB"
#: en/user_basics.ssi:192
msgid ""
"To use the remaining free space after copying #{binary.img}# to a USB stick, "
-"use a partitioning tool such as #{gparted}# or #{parted}# to create a new "
+"use a partitioning tool such as /{gparted}/ or /{parted}/ to create a new "
"partition on the stick. The first partition will be used by the Debian Live "
"system."
msgstr ""
"Per utilizzare lo spazio libero che rimane dopo aver copiato il file #"
-"{binary.img}# su una penna USB, usare uno strumento di partizionamento come #"
-"{gparted}# o #{parted}# per creare una nuova partizione. La prima partizione "
+"{binary.img}# su una penna USB, usare uno strumento di partizionamento come /"
+"{gparted}/ o /{parted}/ per creare una nuova partizione. La prima partizione "
"verrà utilizzata dal sistema Debian Live."
#. type: Plain text
@@ -840,16 +839,9 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:208
-msgid ""
-"Note: If you want to use the extra space with Windows, apparently that OS "
-"cannot normally access any partitions but the first. Some solutions to this "
-"problem have been discussed on our {mailing list}#contact, but it seems "
-"there are no easy answers."
-msgstr ""
-"Nota: se si desidera utilizzare lo spazio extra con Windows pare che questo "
-"sistema operativo non possa accedere a nessuna partizione eccetto la prima. "
-"Alcune soluzioni a questo problema sono state discusse sulla nostra {mailing "
-"list}#contact, ma non sembrano esserci risposte semplici."
+#, no-wrap
+msgid "*{Note:}* If you want to use the extra space with Windows, apparently that OS cannot normally access any partitions but the first. Some solutions to this problem have been discussed on our {mailing list}#contact, but it seems there are no easy answers.\n"
+msgstr "*{Nota:}* se si desidera utilizzare lo spazio extra con Windows pare che questo sistema operativo non possa accedere a nessuna partizione eccetto la prima. Alcune soluzioni a questo problema sono state discusse sulla nostra {mailing list}#contact, ma non sembrano esserci risposte semplici."
#. type: Plain text
#: en/user_basics.ssi:210
@@ -875,12 +867,9 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:216
-msgid ""
-"Note: if you performed any previous examples, you will need to clean up your "
-"working directory with the #{lb clean}# command:"
-msgstr ""
-"Nota: se qualcuno tra gli esempi precedenti è stato seguito, bisogna pulire "
-"la directory di lavoro con il comando #{lb clean}#:"
+#, no-wrap
+msgid "*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:\n"
+msgstr "*{Nota:}* se qualcuno tra gli esempi precedenti è stato seguito, bisogna pulire la directory di lavoro con il comando #{lb clean}#:"
#. type: Plain text
#: en/user_basics.ssi:224
@@ -1038,14 +1027,15 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:280
msgid ""
-"You should install the tftpd-hpa package. It can serve all files contained "
-"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
-"#{/srv/debian-live/tftpboot}#, run as root the following command:"
+"You should install the /{tftpd-hpa}/ package. It can serve all files "
+"contained inside a root directory, usually #{/srv/tftp}#. To let it serve "
+"files inside #{/srv/debian-live/tftpboot}#, run as root the following "
+"command:"
msgstr ""
-"Si installi il pacchetto tftpd-hpa, che mette a disposizione tutti i file "
-"contenuti in una directory root, di solito #{/srv/tftp}#. Affinché si possa "
-"disporre dei file contenuti in #{/srv/debian-live/tftpboot}#, eseguire il "
-"seguente comando come utente root:"
+"Si installi il pacchetto /{tftpd-hpa}/, che mette a disposizione tutti i "
+"file contenuti in una directory root, di solito #{/srv/tftp}#. Affinché si "
+"possa disporre dei file contenuti in #{/srv/debian-live/tftpboot}#, eseguire "
+"il seguente comando come utente root:"
#. type: Plain text
#: en/user_basics.ssi:284
@@ -1076,8 +1066,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:294
-msgid "You need to install the #{nfs-kernel-server}# package."
-msgstr "Bisogna installare il pacchetto #{nfs-kernel-server}#."
+msgid "You need to install the /{nfs-kernel-server}/ package."
+msgstr "Bisogna installare il pacchetto /{nfs-kernel-server}/."
#. type: Plain text
#: en/user_basics.ssi:296
@@ -1153,8 +1143,8 @@ msgstr "3~ Qemu"
#. type: Plain text
#: en/user_basics.ssi:322
-msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
-msgstr "_* Installare #{qemu}#, #{bridge-utils}#, #{sudo}#."
+msgid "_* Install /{qemu}/, /{bridge-utils}/, /{sudo}/."
+msgstr "_* Installare /{qemu}/, /{bridge-utils}/, /{sudo}/."
#. type: Plain text
#: en/user_basics.ssi:324
diff --git a/manual/po/it/user_customization-binary.ssi.po b/manual/po/it/user_customization-binary.ssi.po
index 4640784..d055a09 100644
--- a/manual/po/it/user_customization-binary.ssi.po
+++ b/manual/po/it/user_customization-binary.ssi.po
@@ -1,13 +1,12 @@
# Italian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# lillo sciascia <lillosciascia at gmail.com>, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-25 21:42+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
"PO-Revision-Date: 2011-03-11 10:57+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -18,28 +17,30 @@ msgstr ""
"Plural-Forms: nplurals=2: plural=(n !=1)\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -63,51 +64,54 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -131,25 +135,26 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -240,7 +245,7 @@ msgid ""
" include menu.cfg\n"
" default vesamenu.c32\n"
" prompt 0\n"
-" timeout 5\n"
+" timeout 50\n"
msgstr ""
#. type: Plain text
@@ -260,7 +265,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:43
#, no-wrap
-msgid " sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg\n"
+msgid " sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/it/user_customization-contents.ssi.po b/manual/po/it/user_customization-contents.ssi.po
index 0042e90..590107e 100644
--- a/manual/po/it/user_customization-contents.ssi.po
+++ b/manual/po/it/user_customization-contents.ssi.po
@@ -1,14 +1,13 @@
# Italian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# lillo sciascia <lillosciascia at gmail.com>, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-15 16:28+0100\n"
-"PO-Revision-Date: 2012-02-06 18:47+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
+"PO-Revision-Date: 2012-04-03 18:21+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
"Language: it\n"
@@ -18,16 +17,19 @@ msgstr ""
"Plural-Forms: nplurals=2: plural=(n !=1)\n"
#. 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -35,9 +37,10 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -61,39 +64,43 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -101,9 +108,10 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -127,25 +135,26 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -267,14 +276,14 @@ msgstr ""
#: en/user_customization-contents.ssi:24
msgid ""
"To include files, simply add them to your #{config/includes.chroot}# "
-"directory. This directory corresponds to the root directory (#{/}#) of the "
+"directory. This directory corresponds to the root directory #{/}# of the "
"live system. For example, to add a file #{/var/www/index.html}# in the live "
"system, use:"
msgstr ""
"Per includere i file si aggiungano semplicemente alla directory #{config/"
-"includes.chroot}#. Questa corrisponde alla directory root (#{/}#) del "
-"sistema live. Per esempio, per aggiungere un file #{/var/www/index.html}# "
-"nel sistema live, si usi:"
+"includes.chroot}#. Questa corrisponde alla directory root #{/}# del sistema "
+"live. Per esempio, per aggiungere un file #{/var/www/index.html}# nel "
+"sistema live, si usi:"
#. type: Plain text
#: en/user_customization-contents.ssi:29
@@ -493,8 +502,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:93
msgid ""
-"For more information about debconf, please see debconf(7) in the #{debconf}# "
-"package."
+"For more information about debconf, please see #{debconf(7)}# in the /"
+"{debconf}/ package."
msgstr ""
-"Per ulteriori informazioni su debconf, vedere debconf(7) nel pacchetto #"
-"{debconf}#."
+"Per ulteriori informazioni su debconf, vedere #{debconf(7)}# nel pacchetto /"
+"{debconf}/."
diff --git a/manual/po/it/user_customization-installer.ssi.po b/manual/po/it/user_customization-installer.ssi.po
index c3b3a6a..ab558de 100644
--- a/manual/po/it/user_customization-installer.ssi.po
+++ b/manual/po/it/user_customization-installer.ssi.po
@@ -1,13 +1,12 @@
# Italian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# lillo sciascia <lillosciascia at gmail.com>, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
"PO-Revision-Date: 2011-12-06 00:05+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -18,28 +17,29 @@ msgstr ""
"Plural-Forms: nplurals=2: plural=(n !=1)\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -63,21 +63,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -86,28 +87,29 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -131,21 +133,22 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -207,12 +210,12 @@ msgstr "*{Installatore Debian \"normale\"}*: un'immagine Debian Live con un kern
#: en/user_customization-installer.ssi:16
msgid ""
"On such images, Debian is installed by fetching and installing .deb packages "
-"using #{debootstrap}# or #{cdebootstrap}#, from the local media or some "
+"using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some "
"network-based network, resulting in a standard Debian system being installed "
"to the hard disk."
msgstr ""
"In queste immagini, Debian è installata prendendo e installando i pacchetti ."
-"deb usando {debootstrap}# o #{cdebootstrap}#, da supporti locali o dalla "
+"deb usando /{debootstrap}/ o /{cdebootstrap}/, da supporti locali o dalla "
"rete, risultante in un sistema Debian standard installato sul disco rigido."
#. type: Plain text
@@ -240,13 +243,13 @@ msgstr "*{Installatore Debian \"live\"}*: un'immagine Debian Live con un kernel
msgid ""
"Installation will proceed in an identical fashion to the \"Regular\" "
"installation described above, but at the actual package installation stage, "
-"instead of using #{debootstrap}# to fetch and install packages, the live "
+"instead of using /{debootstrap}/ to fetch and install packages, the live "
"filesystem image is copied to the target. This is achieved with a special "
"udeb called live-installer."
msgstr ""
"L'installazione procederà nello stesso modo di un'installazione \"Normale\" "
"come descritto sopra, ma nella fase dell'installazione del pacchetto, invece "
-"di usare #{debootstrap}# per prelevare e installare i pacchetti, l'immagine "
+"di usare /{debootstrap}/ per prelevare e installare i pacchetti, l'immagine "
"del filesystem live viene copiata sulla destinazione. Questo si ottiene con "
"uno speciale udeb chiamato live-installer."
@@ -261,14 +264,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-installer.ssi:26
-msgid ""
-"Note: to support both normal and live installer entries in the bootloader of "
-"the same live media, you must disable live-installer by preseeding #{live-"
-"installer/enable=false}#."
-msgstr ""
-"Nota: per supportare nel bootloader sia la voce normale che quella live "
-"dell'installatore sullo stesso supporto si deve disabilitare live-installer "
-"preconfigurando #{live-installer/enable=false}#."
+#, no-wrap
+msgid "*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.\n"
+msgstr "*{Nota:}* per supportare nel bootloader sia la voce normale che quella live dell'installatore sullo stesso supporto si deve disabilitare live-installer preconfigurando #{live-installer/enable=false}#.\n"
#. type: Plain text
#: en/user_customization-installer.ssi:28
@@ -350,12 +348,12 @@ msgid ""
"binary/}# to include them in the image. Additional or replacement files and "
"directories may be included in the installer initrd as well, in a similar "
"fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
-"placing the material in #{config/binary_debian-installer-includes/}#."
+"placing the material in #{config/includes.binary_debian-installer/}#."
msgstr ""
"Si può voler includere pacchetti udeb compilati localmente come componenti "
"del #{d-i}# per scopi di sperimentazione o debug; per includerli "
"nell'immagine inserirli in #{config/packages.binary/}#. I file e le "
"directory aggiuntivi o di rimpiazzo si possono includere nell'initrd "
"dell'installatore in maniera simile agli {Include locali del Live/chroot}"
-"#live-chroot-local-includes, inserendo il materiale in #{config/"
-"binary_debian-installer-includes/}#."
+"#live-chroot-local-includes, inserendo il materiale in #{config/includes."
+"binary_debian-installer/}#."
diff --git a/manual/po/it/user_customization-overview.ssi.po b/manual/po/it/user_customization-overview.ssi.po
index 486f96d..14c14a4 100644
--- a/manual/po/it/user_customization-overview.ssi.po
+++ b/manual/po/it/user_customization-overview.ssi.po
@@ -1,13 +1,12 @@
# Italian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# skizzhg <skizzhg at gmx.com>, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: 2010-12-11 23:35-0400\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -155,7 +154,7 @@ msgstr "2~ Integrare la configurazione di lb con dei file"
#. type: Plain text
#: en/user_customization-overview.ssi:22
msgid ""
-"Although #{lb config}# does create a skeletal configuration in the config/ "
+"Although #{lb config}# creates a skeletal configuration in the config/ "
"directory, to accomplish your goals, you may need to provide additional "
"files in subdirectories of config/. Depending on where the files are stored "
"in the configuration, they may be copied into the live system's filesystem "
@@ -184,7 +183,7 @@ msgid "2~ Customization tasks"
msgstr "2~ Personalizzazione dei compiti"
#. type: Plain text
-#: en/user_customization-overview.ssi:26
+#: en/user_customization-overview.ssi:25
msgid ""
"The following chapters are organized by the kinds of customization task "
"users typically perform: {Customizing package installation}#customizing-"
diff --git a/manual/po/it/user_customization-packages.ssi.po b/manual/po/it/user_customization-packages.ssi.po
index 09ff35a..c9b6b9f 100644
--- a/manual/po/it/user_customization-packages.ssi.po
+++ b/manual/po/it/user_customization-packages.ssi.po
@@ -1,5 +1,4 @@
# Italian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# lillo sciascia <lillosciascia at gmail.com>, 2010.
@@ -7,9 +6,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
-"PO-Revision-Date: 2012-02-06 18:35+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-14 22:45+0300\n"
+"PO-Revision-Date: 2012-04-03 18:01+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
"Language: it\n"
@@ -19,28 +18,29 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -64,21 +64,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -87,28 +88,29 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -132,21 +134,22 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -178,12 +181,12 @@ msgid ""
"distribution mirror. You can also add your own repositories for backports, "
"experimental or custom packages, or include packages directly as files. You "
"can define your own lists of packages to include, use live-build's "
-"predefined lists, use #{tasksel}# tasks, or a combination of all three. "
-"Finally, a number of options give some control over apt, or if you prefer, "
-"aptitude, at build time when packages are installed. You may find these "
-"handy if you use a proxy, want to disable installation of recommended "
-"packages to save space, or need to control which versions of packages are "
-"installed via APT pinning, to name a few possibilities."
+"predefined lists, use /{tasksel}/ tasks, or a combination of all three. "
+"Finally, a number of options give some control over /{apt}/, or if you "
+"prefer, /{aptitude}/, at build time when packages are installed. You may "
+"find these handy if you use a proxy, want to disable installation of "
+"recommended packages to save space, or need to control which versions of "
+"packages are installed via APT pinning, to name a few possibilities."
msgstr ""
"Probabilmente la personalizzazione basilare di un sistema Debian Live è la "
"scelta dei pacchetti da includere nell'immagine. Questo capitolo vi guiderà "
@@ -195,13 +198,14 @@ msgstr ""
"inoltre aggiungere i propri repository per pacchetti di backport, "
"sperimentali o personalizzati, o aggiungere i pacchetti direttamente come "
"file. È possibile definire una propria lista di pacchetti da includere, "
-"usarne una predefinita di live-build, usare task di #{tasksel}#, o una "
+"usarne una predefinita di live-build, usare task di /{tasksel}/, o una "
"combinazione di tutti e tre. Infine una serie di opzioni fornisce un certo "
-"controllo su apt, o aptitude se si preferisce, in fase di compilazione "
-"quando i pacchetti sono installati. Ciò può tornare utile se si usa un "
-"proxy, se si vuole disabilitare l'installazione dei pacchetti raccomandati "
-"per risparmiare spazio o controllare quali versioni dei pacchetti vengono "
-"installate con il pinning, giusto per citare alcune possibilità."
+"controllo su /{apt}/, o /{aptitude}/ se si preferisce, in fase di "
+"compilazione quando i pacchetti sono installati. Ciò può tornare utile se si "
+"usa un proxy, se si vuole disabilitare l'installazione dei pacchetti "
+"raccomandati per risparmiare spazio o controllare quali versioni dei "
+"pacchetti vengono installate con il pinning, giusto per citare alcune "
+"possibilità."
#. type: Plain text
#: en/user_customization-packages.ssi:8
@@ -218,23 +222,23 @@ msgstr "3~ Distribuzione, le aree di archivio e le modalità"
msgid ""
"The distribution you choose has the broadest impact on which packages are "
"available to include in your live image. Specify the codename, which "
-"defaults to #{wheezy}# for the Wheezy version of live-build. Any current "
+"defaults to wheezy for the wheezy version of live-build. Any current "
"distribution carried in the Debian archive may be specified by its codename "
"here. (See {Terms}#terms for more details.) The #{--distribution}# option "
"not only influences the source of packages within the archive, but also "
-"instructs #{live-build}# to behave as needed to build each supported "
-"distribution. For example, to build against the *{unstable}* release, Sid, "
+"instructs live-build to behave as needed to build each supported "
+"distribution. For example, to build against the *{unstable}* release, sid, "
"specify:"
msgstr ""
"La distribuzione che viene scelta ha un ampio impatto su quali pacchetti "
"siano disponibili per essere inclusi nell'immagine live. Specificare il nome "
-"in codice, il predefinito per la versione Wheezy di live-build è #{wheezy}#; "
+"in codice, il predefinito per la versione wheezy di live-build è wheezy; "
"qualsiasi attuale distribuzione mantenuta negli archivi Debian può essere "
"qui specificata con il suo nome in codice. (Per ulteriori dettagli "
"consultare il {Glossario}#terms). L'opzione #{--distribution}# non solo "
-"influenza la sorgente dei pacchetti nell'archivio, ma indica a #{live-build}"
-"# di comportarsi secondo la necessità per compilare ciascuna distribuzione "
-"supportata. Ad esempio se si vuole costruire un rilascio *{unstable}*, Sid, "
+"influenza la sorgente dei pacchetti nell'archivio, ma indica a live-build di "
+"comportarsi secondo la necessità per compilare ciascuna distribuzione "
+"supportata. Ad esempio se si vuole costruire un rilascio *{unstable}*, sid, "
"specificare:"
#. type: Plain text
@@ -299,22 +303,22 @@ msgid ""
"download speed. Each of the #{--mirror-*}# options governs which "
"distribution mirror is used at various stages of the build. Recall from "
"{Stages of the build}#stages-of-the-build that the *{bootstrap}* stage is "
-"when the chroot is initially populated by debootstrap with a minimal system, "
-"and the *{chroot}* stage is when the chroot used to construct the live "
-"system's filesystem is built. Thus, the corresponding mirror switches are "
-"used for those stages, and later, in the *{binary}* stage, the #{--mirror-"
-"binary}# and #{--mirror-binary-security}# values are used, superceding any "
-"mirrors used in an earlier stage."
+"when the chroot is initially populated by /{debootstrap}/ with a minimal "
+"system, and the *{chroot}* stage is when the chroot used to construct the "
+"live system's filesystem is built. Thus, the corresponding mirror switches "
+"are used for those stages, and later, in the *{binary}* stage, the #{--"
+"mirror-binary}# and #{--mirror-binary-security}# values are used, "
+"superceding any mirrors used in an earlier stage."
msgstr ""
"L'archivio Debian è replicato attraverso una vasta rete di mirror in tutto "
"il mondo cosicché chiunque in ogni nazione può selezionare il mirror più "
"vicino per la migliore velocità di scaricamento. Ciascuna delle opzioni #{--"
"mirror-*}# determina quale mirror della distribuzione è usato nei vari stadi "
"della compilazione. Ricordando dalle {Fasi della creazione}#stages-of-the-"
-"build che la fase di *{avvio}* è quando il chroot è inizialmente popolato da "
-"debootstrap con un sistema minimale e quella di *{chroot}* è quando viene "
-"creato il chroot usato per costruire il file system del sistema live. Perciò "
-"per queste fasi vengono usati i corrispondenti cambi di mirror, e in "
+"build che la fase di *{avvio}* è quando il chroot è inizialmente popolato "
+"da /{debootstrap}/ con un sistema minimale e quella di *{chroot}* è quando "
+"viene creato il chroot usato per costruire il file system del sistema live. "
+"Perciò per queste fasi vengono usati i corrispondenti cambi di mirror, e in "
"seguito, nella fase *{binaria}* vengono usati i valori di #{--mirror-binary}"
"# e #{--mirror-binary-security}# sostituendo qualsiasi altro mirror usato "
"nelle fasi iniziali."
@@ -580,7 +584,7 @@ msgid ""
"in order to be processed, and then an additional stage suffix, #{.chroot}# "
"or #{.binary}# to indicate which stage the list is for."
msgstr ""
-"Per essere processate, gli elenchi dei pacchetti che si trovano in questa "
+"Per essere processati, gli elenchi dei pacchetti che si trovano in questa "
"directory devono avere un suffisso #{.list}# e un suffisso #{.chroot}# o #{."
"binary}# aggiuntivo per indicare per quale fase sia l'elenco."
@@ -588,7 +592,7 @@ msgstr ""
#: en/user_customization-packages.ssi:115
#, no-wrap
msgid "*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.\n"
-msgstr ""
+msgstr "*{Nota:}* se non si specifica il suffisso l'elenco sarà usato per entrambe le fasi. Normalmente è preferibile specificare #{.list.chroot}# in modo che i pacchetti vengono installati solo nel filesystem live evitando di avere una copia extra del #{.deb}# sul dispositivo.\n"
#. type: Plain text
#: en/user_customization-packages.ssi:117
@@ -605,6 +609,12 @@ msgid ""
"mentioned above, if you want this list to be the same as your chroot stage "
"list, simply use the #{.list}# suffix by itself."
msgstr ""
+"Per creare un elenco di binari inserire un file con suffisso #{.list.binary}"
+"# in #{config/package-lists/}#; questi pacchetti non sono installati nel "
+"filesystem ma inclusi sul dispositivo live sotto #{pool/}#. Solitamente "
+"questo elenco si usa con una delle varianti non-live dell'installatore; come "
+"detto sopra, se si vuole che questo sia identico all'elenco della fase "
+"chroot, usare semplicemente il suffisso #{.list}#."
#. type: Plain text
#: en/user_customization-packages.ssi:121
@@ -626,12 +636,12 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:125
msgid ""
-"For example, to make a list that includes the predefined #{gnome}# list plus "
-"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
-"contents:"
+"For example, to make a list that includes the predefined #{gnome}# list "
+"plus /{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the "
+"following contents:"
msgstr ""
"Per esempio, per creare un elenco che includa quello predefinito di #{gnome}"
-"#più iceweasel, creare #{config/package-lists/mio.elenco.chroot}# con i "
+"#più /{iceweasel}/, creare #{config/package-lists/mio.elenco.chroot}# con i "
"seguenti contenuti:"
#. type: Plain text
@@ -685,12 +695,12 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:148
msgid ""
-"You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architectures i386}# or #{--architectures amd64}# is "
-"specified:"
+"You may test for any one of a number of values, e.g. to install /"
+"{memtest86+}/ if either #{--architectures i386}# or #{--architectures amd64}"
+"# is specified:"
msgstr ""
"Si può verificare per ognuna di una serie di valori, ad esempio per "
-"installare #{memtest86+}# specificando sia #{--architectures i386}# sia #{--"
+"installare /{memtest86+}/ specificando sia #{--architectures i386}# sia #{--"
"architectures amd64}#:"
#. type: Plain text
@@ -706,11 +716,11 @@ msgstr ""
#: en/user_customization-packages.ssi:158
msgid ""
"You may also test against variables that may contain more than one value, e."
-"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
+"g. to install /{vrms}/ if either #{contrib}# or #{non-free}# is specified "
"via #{--archive-areas}#:"
msgstr ""
"È possibile provare altre variabili che contengano più di un valore, ad "
-"esempio per installare #{vrms}# specificando sia da #{contrib}# sia da #{non-"
+"esempio per installare /{vrms}/ specificando sia da #{contrib}# sia da #{non-"
"free}# tramite #{--archive-areas}#:"
#. type: Plain text
@@ -778,8 +788,8 @@ msgstr ""
msgid ""
"The primary tasks available in the Debian Installer can be listed with #"
"{tasksel --list-tasks}# in the live system. The contents of any task, "
-"including ones not included in this list, may be examined with #{tasksel --"
-"task-packages}#."
+"including the ones not included in this list, may be examined with #{tasksel "
+"--task-packages}#."
msgstr ""
"I task principali disponibili nell'installatore Debian possono essere "
"elencati nel sistema live con #{tasksel --list-tasks}#. I contenuti di ogni "
@@ -825,6 +835,13 @@ msgid ""
"multiple desktops or multiple languages and offer the user a choice, but "
"that is not live-build's default behaviour."
msgstr ""
+"Sviluppando un'immagine live per desktop, questa si avvia direttamente su "
+"un'area di lavoro, le scelte del desktop e della lingua predefinita sono "
+"state fatte al momento della compilazione e non al volo come nel caso "
+"dell'installatore Debian. Questo non per dire che un'immagine live non possa "
+"essere creata con un supporto per desktop o lingue multipli per offrire "
+"all'utente una scelta, ma che non è il comportamento predefinito nella "
+"creazione di una live."
#. type: Plain text
#: en/user_customization-packages.ssi:199
@@ -858,6 +875,10 @@ msgid ""
"default, \"gnome\", must be preseeded in the \"tasksel/desktop\" debconf "
"variable or else tasksel will not recognize and install it. Thus:"
msgstr ""
+"Dal momento che i task desktop sono \"interni\", bisogna preconfigurare ogni "
+"altro desktop da includere nell'immagine e diverso dal predefinito \"gnome\" "
+"nella variabile debconf \"tasksel/desktop\", altrimenti tasksel non li "
+"installerà:"
#. type: Plain text
#: en/user_customization-packages.ssi:214
@@ -873,6 +894,8 @@ msgid ""
"This parameter can take multiple values, e.g. \"lxde xfce\" instead of \"kde"
"\"."
msgstr ""
+"Questo parametro supporta valori multipli, ad esempio \"lxde xfce\" invece "
+"di \"kde\"."
#. type: Plain text
#: en/user_customization-packages.ssi:220
@@ -1097,17 +1120,17 @@ msgstr "3~choosing-apt-or-aptitude Scegliere apt o aptitude"
#. type: Plain text
#: en/user_customization-packages.ssi:266
msgid ""
-"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
+"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 "
"to #{lb config}#. Choose the method implementing the preferred behaviour for "
"package installation, the notable difference being how missing packages are "
"handled."
msgstr ""
-"Per installare pacchetti in fase di compilazione si può optare sia per #{apt}"
-"# sia per #{aptitude}#, l'argomento #{--apt}# di #{lb config}# determina "
-"quale usare. Sceglie il metodo implementando il comportamento preferito per "
-"l'installazione dei pacchetti, la notevole differenza è come vengono gestiti "
-"quelli mancanti."
+"Per installare pacchetti in fase di compilazione si può optare sia per /"
+"{apt}/ sia per /{aptitude}/, l'argomento #{--apt}# di #{lb config}# "
+"determina quale usare. Sceglie il metodo implementando il comportamento "
+"preferito per l'installazione dei pacchetti, la notevole differenza è come "
+"vengono gestiti quelli mancanti."
#. type: Plain text
#: en/user_customization-packages.ssi:268
@@ -1180,17 +1203,17 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:294
msgid ""
-"This will not influence the entries in /etc/apt/sources.list, but merely "
-"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
-"APT needs those indices in order to operate in the live system, so before "
-"performing #{apt-cache search}# or #{apt-get install}#, for instance, the "
-"user must #{apt-get update}# first to create those indices."
+"This will not influence the entries in #{/etc/apt/sources.list}#, but merely "
+"whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is "
+"that APT needs those indices in order to operate in the live system, so "
+"before performing #{apt-cache search}# or #{apt-get install}#, for instance, "
+"the user must #{apt-get update}# first to create those indices."
msgstr ""
-"Questo non influenzerà le voci in /etc/apt/sources.list, determina solo se /"
-"var/lib/apt contiene o meno i file degli indici. Il compromesso è che APT "
-"necessita di quegli indici per operar enel sistema live, perciò prima di "
-"eseguire #{apt-cache search}# o #{apt-get install}#, per esempio, l'utente "
-"deve usare prima #{apt-get update}# per crearli."
+"Questo non influenzerà le voci in #{/etc/apt/sources.list}#, determina solo "
+"se /#{var/lib/apt}# contiene o meno i file degli indici. Il compromesso è "
+"che APT necessita di quegli indici per operar enel sistema live, perciò "
+"prima di eseguire #{apt-cache search}# o #{apt-get install}#, per esempio, "
+"l'utente deve usare prima #{apt-get update}# per crearli."
#. type: Plain text
#: en/user_customization-packages.ssi:296
@@ -1273,18 +1296,18 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:314
msgid ""
-"Let's say you are building a Wheezy 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 "
+"Let's say you are building a wheezy 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, Wheezy. The following will "
+"taken from the target system distribution, wheezy. The following will "
"accomplish this:"
msgstr ""
-"Nell'ipotesi di creare un sistema live Wheezy e avendo la necessità di "
-"installare da Sid tutti i pacchetti live destinati all'immagine binaria "
-"questa fase, bisogna aggiungere Sid alle fonti di APT e farne il pinning "
+"Nell'ipotesi di creare un sistema live wheezy e avendo la necessità di "
+"installare da sid tutti i pacchetti live destinati all'immagine binaria "
+"questa fase, bisogna aggiungere sid alle fonti di APT e farne il pinning "
"affinché verranno installati da lì solo i pacchetti voluti, mentre per tutti "
-"gli altri si attingerà dalla distribuzione principale, Wheezy. Quanto segue "
+"gli altri si attingerà dalla distribuzione principale, wheezy. Quanto segue "
"servirà allo scopo:"
#. type: Plain text
@@ -1311,8 +1334,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:331
#, no-wrap
-msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with Wheezy using:\n"
-msgstr "*{Nota:}* con la versione 0.8.14 o superiore di Apt si possono utilizzare wildcard nei nomi dei pacchetti (*{Package: live-*}*). Ciò significa che funziona con Wheezy usando:\n"
+msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:\n"
+msgstr "*{Nota:}* con la versione 0.8.14 o superiore di Apt si possono utilizzare wildcard nei nomi dei pacchetti (*{Package: live-*}*). Ciò significa che funziona con wheezy usando:\n"
#. type: Plain text
#: en/user_customization-packages.ssi:335
@@ -1326,18 +1349,18 @@ msgid ""
"the case where you do not want a package that is recommended by another "
"package. Suppose you are building an LXDE image using #{--package-lists lxde}"
"# option, but don't want the user prompted to store wifi passwords in the "
-"keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
-"turn recommends #{gnome-keyring}#. So you want to omit the recommended #"
-"{gnome-keyring}# package. This can be done by adding the following stanza to "
+"keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in "
+"turn recommends /{gnome-keyring}/. So you want to omit the recommended /"
+"{gnome-keyring}/ package. This can be done by adding the following stanza to "
"#{config/chroot_apt/preferences}#:"
msgstr ""
"Un valore negativo della priorità evita che un pacchetto venga installato, "
"come nel caso in cui non se ne voglia uno raccomandato da un altro. Si "
"suppone di costruire un'immagine di LXDE utilizzando l'opzione #{--package-"
"lists lxde}# ma non si desidera che all'utente venga richiesto di salvare la "
-"password del wifi nel portachiavi. L'elenco include #{gdm}# che dipende da #"
-"{gksu}# che a sua volta raccomanda #{gnome-keyring}#, in questo caso si "
-"vorrà omettere il pacchetto #{gnome-keyring}# aggiungendo a #{config/"
+"password del wifi nel portachiavi. L'elenco include /{gdm}/ che dipende da /"
+"{gksu}/ che a sua volta raccomanda /{gnome-keyring}/, in questo caso si "
+"vorrà omettere il pacchetto /{gnome-keyring}/ aggiungendo a #{config/"
"chroot_apt/preferences}# la seguente definizione:"
#. type: Plain text
diff --git a/manual/po/it/user_customization-runtime.ssi.po b/manual/po/it/user_customization-runtime.ssi.po
index 5fa55b8..425e904 100644
--- a/manual/po/it/user_customization-runtime.ssi.po
+++ b/manual/po/it/user_customization-runtime.ssi.po
@@ -1,13 +1,12 @@
# Italian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# skizzhg <skizzhg at gmx.com>, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-24 15:08+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-06-03 20:02+0300\n"
"PO-Revision-Date: 2012-04-02 23:25+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -18,28 +17,29 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -87,28 +87,29 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -431,7 +432,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:96
msgid ""
-"Persistence is a common name for different kinds of solutions for saving "
+"'Persistence' is a common name for different kinds of solutions for saving "
"across reboots some, or all, of this run-time evolution of the system. To "
"understand how it could work it could be handy to know that even if the "
"system is booted and run from read-only media, modification to the files and "
@@ -452,24 +453,25 @@ msgid ""
"medium like local storage media, a network share or even a session of a "
"multisession (re)writable CD/DVD. All these media are supported in Debian "
"Live in different ways, and all but the last one require a special boot "
-"parameter to be specified at boot time: #{persistent}#."
+"parameter to be specified at boot time: #{persistence}#."
msgstr ""
"I dati immagazzinati su questo ramdisk andrebbero salvati un supporto "
"scrivibile persistente come un supporto di memorizzazione locale, una "
"condivisione di rete o anche una sessione di un CD/DVD riscrivibile "
"multisessione. Tutti questi supporti sono gestiti in Debian Live in modi "
"differenti, e tutti tranne l'ultimo richiedono un parametro d'avvio speciale "
-"da specificare all'avvio: #{persistent}#."
+"da specificare all'avvio: #{persistence}#."
#. type: Plain text
#: en/user_customization-runtime.ssi:100
msgid ""
-"If the boot parameter #{persistent}# is set (and #{nopersistent}# is not "
+"If the boot parameter #{persistence}# is set (and #{nopersistence}# is not "
"set), local storage media (e.g. hard disks, USB drives) will be probed for "
-"persistent volumes during boot. A persistent volume is any of the following:"
+"persistence volumes during boot. A persistence volume is any of the "
+"following:"
msgstr ""
-"Se il parametro di boot #{persistent}# è impostato (e non lo è #"
-"{nopersistent}#), i supporti di memorizzazione locali (hard disk, "
+"Se il parametro di boot #{persistence}# è impostato (e non lo è #"
+"{nopersistence}#), i supporti di memorizzazione locali (hard disk, "
"dispositivi USB) saranno rilevati come volumi persistenti durante l'avvio. "
"Un volume persistente è uno dei seguenti:"
@@ -490,18 +492,18 @@ msgid ""
"_* an image/archive file located on the root of any readable filesystem "
"(even an NTFS partition of a foreign OS), identified by its file name. In "
"this case the file name must also use the containing filesystem as the file "
-"extension, e.g. \"<label>.ext3\"."
+"extension, e.g. \"<label>.ext4\"."
msgstr ""
"_* un file immagine o archivio situato nella directory radice di un "
"qualsiasi filesystem leggibile (anche una partizione NTFS di un sistema "
"estraneo), identificato dal nome del file. In questo caso il nome del file "
"deve contenere anche il tipo di filesystem come estensione, ad esempio "
-"\"<label>.ext3\"."
+"\"<label>.ext4\"."
#. type: Plain text
#: en/user_customization-runtime.ssi:108
msgid ""
-"It is possible to restrict which types of persistent volumes to use by "
+"It is possible to restrict which types of persistence volumes to use by "
"specifying certain boot parameters described in the live-boot(7) man page. "
"The \"identifying labels\" referred to above can be any of the following:"
msgstr ""
@@ -511,7 +513,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:110
-msgid "_* #{full-ov}# for full persistent overlays."
+msgid "_* #{full-ov}# for full persistence overlays."
msgstr "_* #{full-ov}# per strati di persistenza completa."
#. type: Plain text
@@ -531,7 +533,7 @@ msgstr "_* #{home-sn}# per istantanee della /home."
#. type: Plain text
#: en/user_customization-runtime.ssi:118
-msgid "3~ Full persistent overlays"
+msgid "3~ Full persistence overlays"
msgstr "3~ Strati di persistenza completa"
#. type: Plain text
@@ -539,21 +541,21 @@ msgstr "3~ Strati di persistenza completa"
msgid ""
"By 'full persistence' it is meant that instead of using a tmpfs for storing "
"modifications to the read-only media (with the copy-on-write, COW, system) a "
-"persistent volume is used. For this type of persistence the volume label "
-"must be #{full-ov}#. This could, for instance, be an ext2 partition on a "
+"persistence volume is used. For this type of persistence the volume label "
+"must be #{full-ov}#. This could, for instance, be an ext4 partition on a "
"hard disk or on a usb key created with, e.g.:"
msgstr ""
"Con \"persistenza completa\" si intende l'uso di un volume persistente "
"invece di un filesystem temporaneo (tmpfs) per salvare le modifiche al "
"supporto in sola lettura (con il sistema COW, copy-on-write). Per questo "
"tipo di persistenza la label deve essere #{full-ov}#, che potrebbe essere "
-"una partizione di tipo ext2 su un hard disk o una penna USB creata ad "
+"una partizione di tipo ext4 su un hard disk o una penna USB creata ad "
"esempio con:"
#. type: Plain text
#: en/user_customization-runtime.ssi:124
#, no-wrap
-msgid " # mkfs.ext2 -L full-ov /dev/sdb1\n"
+msgid " # mkfs.ext4 -L full-ov /dev/sdb1\n"
msgstr ""
#. type: Plain text
@@ -581,10 +583,10 @@ msgstr " $ tune2fs -L full-ov /dev/sdb1 # per filesystems ext2,3,4\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:138
msgid ""
-"Here's an example of how to create an ext2-based image file used for full "
+"Here's an example of how to create an ext4-based image file used for full "
"persistence:"
msgstr ""
-"Ecco un esempio di come creare un file immagine ext2 da utilizzare per la "
+"Ecco un esempio di come creare un file immagine ext4 da utilizzare per la "
"persistenza completa:"
#. type: Plain text
@@ -592,10 +594,10 @@ msgstr ""
#, no-wrap
msgid ""
" $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file\n"
-" $ /sbin/mkfs.ext2 -F full-ov\n"
+" $ /sbin/mkfs.ext4 -F full-ov\n"
msgstr ""
" $ dd if=/dev/null of=full-ov bs=1G seek=1 # per un file immagine da 1GB\n"
-" $ /sbin/mkfs.ext2 -F full-ov\n"
+" $ /sbin/mkfs.ext4 -F full-ov\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:147
@@ -615,81 +617,81 @@ msgstr "3~ Strati personalizzati"
#: en/user_customization-runtime.ssi:151
msgid ""
"A volume with the label #{custom-ov}# can be configured to make arbitrary "
-"directories persistent. The file #{live.persist}#, located on the volume's "
-"filesystem root, controls which directories it makes persistent, and in "
-"which way."
+"directories persistent. The file #{live-persistence.conf}#, located on the "
+"volume's filesystem root, controls which directories it makes persistent, "
+"and in which way."
msgstr ""
"Un volume con una label #{custom-ov}# può essere configurato per creare "
-"directory persistenti arbitrarie. Il file #{live.persist}#, situato nella "
-"directory radice del filesystem del volume, controlla quali rendere "
+"directory persistenti arbitrarie. Il file #{live-persistence.conf}#, situato "
+"nella directory radice del filesystem del volume, controlla quali rendere "
"persistenti e in che modo."
#. type: Plain text
#: en/user_customization-runtime.ssi:153
msgid ""
"How custom overlay mounts are configured is described in full detail in the "
-"live.persist(5) man page, but a simple example should be sufficient for most "
-"uses. Let's say we want to make our home directory and APT cache persistent "
-"in an ext3 filesystem on the /dev/sdb1 partition:"
+"live-persistence.conf(5) man page, but a simple example should be sufficient "
+"for most uses. Let's say we want to make our home directory and APT cache "
+"persistent in an ext4 filesystem on the /dev/sdb1 partition:"
msgstr ""
-"Nella manpage di live.persist(5) è descritto dettagliatamente come è "
-"configurato il mount degli strati personalizzati, ma un semplice esempio "
+"Nella manpage di live-persistence.conf(5) è descritto dettagliatamente come "
+"è configurato il mount degli strati personalizzati, ma un semplice esempio "
"dovrebbe essere sufficiente per la maggior parte degli usi. Supponendo di "
"voler creare la directory home e quella della cache di APT in modo "
-"persistente in un filesystem ext3 sulla partizione /dev/sdb1:"
+"persistente in un filesystem ext4 sulla partizione /dev/sdb1:"
#. type: Plain text
#: en/user_customization-runtime.ssi:160
#, no-wrap
msgid ""
-" $ mkfs.ext3 -L custom-ov /dev/sdb1\n"
-" $ mount -t ext3 /dev/sdb1 /mnt\n"
-" $ echo \"/home\" >> /mnt/live.persist\n"
-" $ echo \"/var/cache/apt\" >> /mnt/live.persist\n"
+" $ mkfs.ext4 -L custom-ov /dev/sdb1\n"
+" $ mount -t ext4 /dev/sdb1 /mnt\n"
+" $ echo \"/home\" >> /mnt/live-persistence.conf\n"
+" $ echo \"/var/cache/apt\" >> /mnt/live-persistence.conf\n"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:164
msgid ""
-"Then we reboot. During the first boot the contents of /home and /var/cache/"
-"apt will be copied into the persistent volume, and from then on all changes "
-"to these directories will live in the persistent volume. Please note that "
-"any paths listed in the #{live.persist}# file cannot contain white spaces or "
-"the special \".\" and \"..\" path components. Also, neither \"/live\" (or "
-"any of its sub-directories) nor \"/\" can be made persistent using custom "
-"mounts (for the latter, use the #{full-ov}# type persistence described "
-"above)."
-msgstr ""
-"Quindi riavviare. Durante il primo avvio il contenuto di /home e /var/cache/"
-"apt saranno copiati nel volume persistente e da allora tutte le modifiche a "
-"queste directory risiederanno in modo persistente sul volume. C'è da "
-"considerare che tutti i path elencati nel file #{live.persist}# non possono "
-"contenere spazi o i caratteri speciali \".\" e \"..\"; inoltre, né \"/live"
-"\" (o nessuna delle sue sottodirectory) né \"/\" può essere resa persistente "
-"tramite i mount personalizzati (per l'ultimo usare la tipologia #{full-ov}# "
-"descritta prima)."
+"Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
+"cache/apt}# will be copied into the persistence volume, and from then on all "
+"changes to these directories will live in the persistence volume. Please "
+"note that any paths listed in the #{live-persistence.conf}# file cannot "
+"contain white spaces or the special #{.}# and #{..}# path components. Also, "
+"neither #{/live}# (or any of its sub-directories) nor #{/}# can be made "
+"persistent using custom mounts (for the latter, use the #{full-ov}# type "
+"persistence described above)."
+msgstr ""
+"Quindi riavviare. Durante il primo avvio il contenuto di #{/home}# e #{/var/"
+"cache/apt}# saranno copiati nel volume persistente e da allora tutte le "
+"modifiche a queste directory risiederanno in modo persistente sul volume. "
+"C'è da considerare che tutti i path elencati nel file #{live-persistence."
+"conf}# non possono contenere spazi o i caratteri speciali #{.}# e #{..}#; "
+"inoltre, né #{/live}# (o nessuna delle sue sottodirectory) né #{/}# può "
+"essere resa persistente tramite i mount personalizzati (per l'ultimo usare "
+"la tipologia #{full-ov}# descritta prima)."
#. type: Plain text
#: en/user_customization-runtime.ssi:166
msgid ""
-"Several different custom overlay volumes (with their own #{live.persist}# "
-"files) can be used at the same time, but if several volumes make the same "
-"directory persistent, only one of them will be used. If any two mounts are "
-"\"nested\" (i.e. one is a sub-directory of the other) the parent will be "
+"Several different custom overlay volumes (with their own #{live-persistence."
+"conf}# files) can be used at the same time, but if several volumes make the "
+"same directory persistent, only one of them will be used. If any two mounts "
+"are \"nested\" (i.e. one is a sub-directory of the other) the parent will be "
"mounted before the child so no mount will be hidden by the other. Nested "
-"custom mounts are problematic if they are listed in the same #{live.persist}"
-"# file. See the live.persist(5) man page for how to handle that case if you "
-"really need it (hint: you usually don't)."
+"custom mounts are problematic if they are listed in the same #{live-"
+"persistence.conf}# file. See the live-persistence.conf(5) man page for how "
+"to handle that case if you really need it (hint: you usually don't)."
msgstr ""
"Possono essere utilizzati svariati volumi di stratificazione personalizzati "
-"(con i rispettivi file #{live.persist}#) allo stesso tempo ma se questi "
-"creano la stessa directory persistente, ne verrà usata solo una. Se due "
-"directory montate sono \"nidificate\" (una è la sottodirectory dell'altra), "
-"la superiore sarà montata per prima, per cui nessuna operazione di mount "
-"verrà sovrastata dall'altra. I mount nidificati personalizzati sono "
-"problematici se sono elencati nello stesso file #{live.persist}. Se si ha "
-"davvero la necessità (in genere non si dovrebbe averla :), consultare la "
-"manpage di live.persist(5) per sapere come gestire questo caso."
+"(con i rispettivi file #{live-persistence.conf}#) allo stesso tempo ma se "
+"questi creano la stessa directory persistente, ne verrà usata solo una. Se "
+"due directory montate sono \"nidificate\" (una è la sottodirectory "
+"dell'altra), la superiore sarà montata per prima, per cui nessuna operazione "
+"di mount verrà sovrastata dall'altra. I mount nidificati personalizzati sono "
+"problematici se sono elencati nello stesso file #{live-persistence.conf}. Se "
+"si ha davvero la necessità (in genere non si dovrebbe averla), consultare la "
+"manpage di live-persistence.conf(5) per sapere come gestire questo caso."
#. type: Plain text
#: en/user_customization-runtime.ssi:168
@@ -700,13 +702,13 @@ msgstr "3~ Istantanee"
#: en/user_customization-runtime.ssi:170
msgid ""
"Snapshots are collections of files and directories which are not mounted "
-"while running but which are copied from a persistent volume to the system "
+"while running but which are copied from a persistence volume to the system "
"(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The "
"volume must be labeled #{live-sn}#, and it defaults to a simple cpio archive "
"named #{live-sn.cpio.gz}#. A power interruption during run time could lead "
"to data loss, hence, if you have important changes, invoke #{live-snapshot --"
"refresh}# as often as needed. This type of persistence, since it does not "
-"write continuously to the persistent media, is the most flash-based device "
+"write continuously to the persistence media, is the most flash-based device "
"friendly and the fastest of all the persistence systems, but it occupies as "
"much RAM as the size of the uncompressed snapshot."
msgstr ""
@@ -739,26 +741,26 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:176
-msgid "3~ Persistent SubText"
+msgid "3~ Persistence SubText"
msgstr "3~ Sottotesto persistente"
#. type: Plain text
#: en/user_customization-runtime.ssi:178
msgid ""
-"If a user would need multiple persistent storage of the same type for "
+"If a user would need multiple persistence storage of the same type for "
"different locations or testing, such as #{full-ov-nonwork}# and #{full-ov-"
-"work}#, the boot parameter #{persistent-subtext}# used in conjunction with "
-"the boot parameter #{persistent}# will allow for multiple but unique "
-"persistent media. An example would be if a user wanted to use a persistent "
+"work}#, the boot parameter #{persistence-subtext}# used in conjunction with "
+"the boot parameter #{persistence}# will allow for multiple but unique "
+"persistence media. An example would be if a user wanted to use a persistence "
"partition labeled #{live-sn-subText}# they would use the boot parameters of: "
-"#{persistent}# #{persistent-subtext=subText}#."
+"#{persistence}# #{persistence-subtext=subText}#."
msgstr ""
"Se un utente avesse bisogno di archiviazioni multiple dello stesso tipo per "
"differenti posti o per test, come #{full-ov-casa}# e #{full-ov-lavoro}#, il "
-"parametro d'avvio #{persistent-subtext}# usato in congiunzione con #"
+"parametro d'avvio #{persistence-subtext}# usato in congiunzione con #"
"{persistent}# permetterà supporti persistenti multipli ma univoci. Un "
"esempio potrebbe essere un utente che vuole usare una partizione etichettata "
-"come #{live-sn-sottotesto}#, userebbe: #{persistent}# #{persistent-"
+"come #{live-sn-sottotesto}#, userebbe: #{persistence}# #{persistence-"
"subtext=sottotesto}#."
#. type: Plain text
diff --git a/manual/po/it/user_examples.ssi.po b/manual/po/it/user_examples.ssi.po
index 7c90745..12feec7 100644
--- a/manual/po/it/user_examples.ssi.po
+++ b/manual/po/it/user_examples.ssi.po
@@ -1,5 +1,4 @@
# Italian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# lillo sciascia <lillosciascia at gmail.com>, 2010.
@@ -7,9 +6,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-13 14:44+0100\n"
-"PO-Revision-Date: 2012-02-06 18:43+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
+"PO-Revision-Date: 2012-03-04 18:43+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
"Language: it\n"
@@ -24,26 +23,27 @@ msgid ":B~ Examples"
msgstr ":B~ Esempi"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 en/user_customization-contents.ssi:26
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -69,49 +69,51 @@ msgstr ":B~ Esempi"
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 en/user_customization-contents.ssi:31
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -137,25 +139,26 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -167,7 +170,7 @@ msgid " # lb build\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#: en/user_customization-binary.ssi:41 en/user_examples.ssi:95
#, no-wrap
msgid " #!/bin/sh\n"
msgstr ""
@@ -301,7 +304,7 @@ msgstr ""
#: en/user_examples.ssi:46
msgid ""
"Assuming all goes well, after a while, the current directory will contain #"
-"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+"{binary.hybrid.iso}#. This ISO hybrid image can be booted directly in a "
"virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-"
"with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
"virtualbox, or else imaged onto optical media or a USB flash device as "
@@ -310,7 +313,7 @@ msgid ""
"respectively."
msgstr ""
"Presupponendo che tutto vada per il verso giusto, dopo un po' la directory "
-"corrente conterrà #{binary-hybrid.iso}#. Questa immagine ISO ibrida può "
+"corrente conterrà #{binary.hybrid.iso}#. Questa immagine ISO ibrida può "
"essere avviata direttamente in una macchina virtuale come descritto in "
"{Provare un'immagine ISO con Qemu}#testing-iso-with-qemu e {Provare "
"un'immagine ISO con virtualbox-ose}#testing-iso-with-virtualbox, oppure "
@@ -460,17 +463,17 @@ msgid ""
"First, #{--architectures i386}# ensures that on our #{amd64}# build system, "
"we build a 32-bit version suitable for use on most machines. Second, we use #"
"{--linux-flavours 686-pae}# because we don't anticipate using this image on "
-"much older systems. Third, we've chosen the #{lxde}# package list to give us "
+"much older systems. Third, we've chosen the /{lxde}/ package list to give us "
"a minimal desktop. And finally, we have added two initial favourite "
-"packages: #{iceweasel}# and #{xchat}#."
+"packages: /{iceweasel}/ and /{xchat}/."
msgstr ""
"Per prima cosa, #{--architectures i386}# assicura che sul nostro sistema #"
"{amd64}# costruiamo una versione a 32-bit utilizzabile sulla maggior parte "
"delle macchine. In secondo luogo, usiamo #{--linux-flavours 686-pae}# dato "
"che non prevediamo di usare questa immagine su sistemi troppo vecchi. Terzo, "
-"abbiamo scelto la lista di pacchetti #{lxde}# per avere un desktop minimale. "
-"Infine, abbiamo aggiunto due pacchetti preferiti per cominciare: #{iceweasel}"
-"# e #{xchat}#."
+"abbiamo scelto la lista di pacchetti /{lxde}/ per avere un desktop minimale. "
+"Infine, abbiamo aggiunto due pacchetti preferiti per cominciare: /"
+"{iceweasel}/ e /{xchat}/."
#. type: Plain text
#: en/user_examples.ssi:115
@@ -515,11 +518,11 @@ msgstr "3~ Seconda revisione"
#. type: Plain text
#: en/user_examples.ssi:137
msgid ""
-"In this revision, we're going to clean up from the first build, add the #"
-"{vlc}# package to our configuration, rebuild, test and commit."
+"In this revision, we're going to clean up from the first build, add the /"
+"{vlc}/ package to our configuration, rebuild, test and commit."
msgstr ""
"In questa revisione ripuliremo la prima compilazione, aggiungeremo il "
-"pacchetto #{vlc}# alla configurazione, dunque avverrà una ricompilazione, "
+"pacchetto /{vlc}/ alla configurazione, dunque avverrà una ricompilazione, "
"verifica e commit."
#. type: Plain text
@@ -544,9 +547,11 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:147
msgid ""
-"Now append the #{vlc}# package to our local package list in #{config/package-"
+"Now append the /{vlc}/ package to our local package list in #{config/package-"
"lists/my.list.chroot}#:"
msgstr ""
+"Ora inserire il pacchetto /{vlc}/ all'elenco locale dei pacchetti #{config/"
+"package-lists/my.list.chroot}#:"
#. type: Plain text
#: en/user_examples.ssi:151
@@ -626,12 +631,12 @@ msgstr "*{Caso d'uso:}* creazione di un'immagine con live-build per avviare dire
#: en/user_examples.ssi:179
msgid ""
"Make a build directory and create a skeletal configuration in it built "
-"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
-"{xvnc4viewer}#, disabling recommends to make a minimal system:"
+"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
+"{xvnc4viewer}/, disabling recommends to make a minimal system:"
msgstr ""
"Creare una directory con al suo interno una configurazione scheletrica "
-"costruita sulla base dell'elenco di standard-x11, tra cui #{gdm3}#, #"
-"{metacity}# e #{xvnc4viewer}#, disabilitando i raccomandati per ottenere un "
+"costruita sulla base dell'elenco di standard-x11, tra cui /{gdm3}/, /"
+"{metacity}/ e /{xvnc4viewer}/, disabilitando i raccomandati per ottenere un "
"sistema minimale:"
#. type: Plain text
@@ -649,12 +654,12 @@ msgstr ""
#: en/user_examples.ssi:191
msgid ""
"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
-"the default user that will launch metacity and start xvncviewer, connecting "
-"to port #{5901}# on a server at #{192.168.1.2}#:"
+"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
+"connecting to port #{5901}# on a server at #{192.168.1.2}#:"
msgstr ""
"Creare la directory #{/etc/skel}# e inserirvi un #{.xsession}# "
-"personalizzato per l'utente predefinito che lancerà metacity e avvierà "
-"xvncviewer, connesso alla porta #{5901}# su un server all'indirizzo #"
+"personalizzato per l'utente predefinito che lancerà /{metacity}/ e avvierà /"
+"{xvncviewer}/, connesso alla porta #{5901}# su un server all'indirizzo #"
"{192.168.1.2}#:"
#. type: Plain text
@@ -710,10 +715,10 @@ msgid ""
"the tradeoffs you are making between size and functionality. In this "
"example, we trim only so much as to make room for additional material within "
"a 128M media size, but without doing anything to destroy integrity of the "
-"packages contained within, such as the purging of locale data via the #"
-"{localepurge}# package, or other such \"intrusive\" optimizations. Of "
+"packages contained within, such as the purging of locale data via the /"
+"{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
"particular note, you should not use #{--bootstrap-flavour minimal}# unless "
-"you really know what you're doing, as omitting priority #{important}# "
+"you really know what you're doing, as omitting priority *{important}* "
"packages will most likely produce a broken live system."
msgstr ""
"Quando si cerca di ottimizzare un'immagine affinché sia contenuta in un "
@@ -721,10 +726,10 @@ msgstr ""
"dimensione e la funzionalità. In questo esempio, taglieremo solo quanto "
"basta per far sì che il tutto stia in 128M, senza fare nient'altro che "
"distrugga l'integrità dei pacchetti contenuti, come eliminare localizzazioni "
-"con il pacchetto #{localepurge}# o altre ottimizzazioni \"intrusive\". È da "
+"con il pacchetto /{localepurge}/ o altre ottimizzazioni \"intrusive\". È da "
"notare che non va usato #{--bootstrap-flavour minimal}# a meno che non si "
-"sappia cosa si sta facendo, come omettere la priorità dei pacchetti #"
-"{important}# che molto probabilmente produrrà un sistema live danneggiato."
+"sappia cosa si sta facendo, come omettere la priorità dei pacchetti *"
+"{important}* che molto probabilmente produrrà un sistema live danneggiato."
#. type: Plain text
#: en/user_examples.ssi:226
@@ -761,8 +766,8 @@ msgid ""
"system. Choosing the #{minimal}# package list leaves out the large #{locales}"
"# package and associated utilities. Dropping recommended packages with #{--"
"apt-recommends false}# saves some additional space, at the expense of "
-"omitting some packages you might otherwise expect to be there, such as #"
-"{firmware-linux-free}# which may be needed to support certain hardware. The "
+"omitting some packages you might otherwise expect to be there, such as /"
+"{firmware-linux-free}/ which may be needed to support certain hardware. The "
"remaining options shave off additional small amounts of space. It's up to "
"you to decide if the functionality that is sacrificed with each optimization "
"is worth the loss in functionality."
@@ -775,8 +780,8 @@ msgstr ""
"apt nel sistema live. Scegliendo la lista #{minima}# dei pacchetti si "
"esclude il grosso pacchetto #{locales}# e le utilità associate. Saltare i "
"pacchetti raccomandati con #{--apt-recommends false}# salva altro spazio, a "
-"scapito di alcuni pacchetti che ci si aspetta di trovare, come #{firmware-"
-"linux-free}# che potrebbe servire a supportare un certo hardware. Le "
+"scapito di alcuni pacchetti che ci si aspetta di trovare, come /{firmware-"
+"linux-free}/ che potrebbe servire a supportare un certo hardware. Le "
"restanti opzioni limano altre piccole quantità di spazio. Sta a voi decidere "
"se le funzionalità sacrificate con ciascuna ottimizzazione valgono la pena."
@@ -864,6 +869,11 @@ msgid ""
"from the default (see {Desktop and languages tasks}#desktop-and-language-"
"tasks). Now let's put the pieces together:"
msgstr ""
+"Durante l'avvio verrà generata la localizzazione pt_BR.UTF-8 e selezionato "
+"il layout di tastiera pt-latin1. Ci sarà anche bisogno di preconfigurare la "
+"nostra scelta desktop, \"kde\" cosicché tasksel installerà il task corretto, "
+"che differisce dal predefinito (vedere {Task per desktop e lingua}#desktop-"
+"and-language-tasks). È ora di mettere insieme i pezzi:"
#. type: Plain text
#: en/user_examples.ssi:289
@@ -885,13 +895,13 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:292
msgid ""
-"Note that we have included the #{debian-installer-launcher}# package to "
-"launch the installer from the live desktop, and have also specified the 486 "
-"flavour kernel, as it is currently necessary to make the installer and live "
-"system kernels match for the launcher to work properly."
+"Note that we have included the debian-installer-launcher package to launch "
+"the installer from the live desktop, and have also specified the 486 flavour "
+"kernel, as it is currently necessary to make the installer and live system "
+"kernels match for the launcher to work properly."
msgstr ""
-"Si noti che è stato incluso il pacchetto #{debian-installer-launcher}# in "
-"modo da poter lanciare l'installer dal desktop della live, e che è stato "
-"anche specificato il kernel 486, dato che attualmente è necessario che il "
-"kernel dell'installer e quello del sistema live coincidano affinché il "
-"launcher funzioni correttamente."
+"Si noti che è stato incluso il pacchetto debian-installer-launcher in modo "
+"da poter lanciare l'installer dal desktop della live, e che è stato anche "
+"specificato il kernel 486, dato che attualmente è necessario che il kernel "
+"dell'installer e quello del sistema live coincidano affinché il launcher "
+"funzioni correttamente."
diff --git a/manual/po/it/user_installation.ssi.po b/manual/po/it/user_installation.ssi.po
index b2cd872..732452d 100644
--- a/manual/po/it/user_installation.ssi.po
+++ b/manual/po/it/user_installation.ssi.po
@@ -1,5 +1,4 @@
# Italian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# Carlo Stemberger <carlo.stemberger at gmail.com>, 2010.
@@ -7,8 +6,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-31 16:32+0300\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
"PO-Revision-Date: 2011-06-21 13:11+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -19,29 +18,30 @@ msgstr ""
"Plural-Forms: nplurals=2: plural=(n !=1)\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -89,29 +89,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -435,27 +436,27 @@ msgstr "_* Costruire un .deb di live-boot e live-config"
#: en/user_installation.ssi:125
msgid ""
"You must build either on your target distribution or in a chroot containing "
-"your target platform: this means if your target is Wheezy then you should "
-"build against Wheezy."
+"your target platform: this means if your target is wheezy then you should "
+"build against wheezy."
msgstr ""
"È necessario compilare sulla distribuzione di destinazione, oppure in un "
"chroot contenente la piattaforma di destinazione: significa che se "
-"l'obiettivo è Wheezy allora bisogna compilare su Wheezy."
+"l'obiettivo è wheezy allora bisogna compilare su wheezy."
#. type: Plain text
#: en/user_installation.ssi:127
msgid ""
"Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
-"build #{live-boot}# for a target distribution that differs from your build "
-"system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy "
+"build live-boot for a target distribution that differs from your build "
+"system. For example, for wheezy live images, build live-boot in a wheezy "
"chroot. If your target distribution happens to match your build system "
"distribution, you may build directly on the build system using #{dpkg-"
"buildpackage}# (provided by the /{dpkg-dev}/ package):"
msgstr ""
-"Se si deve compilare #{live-boot}# per una distribuzione di destinazione "
-"diversa dal proprio sistema, utilizzare un compilatore tipo /{pbuilder}/ o /"
-"{sbuild}/. Ad esempio, per immagini live Wheezy, si generi #{live-boot}# in "
-"un chroot Wheezy. Se la distribuzione di destinazione corrisponde con la "
+"Se si deve compilare live-boot per una distribuzione di destinazione diversa "
+"dal proprio sistema, utilizzare un compilatore tipo /{pbuilder}/ o /"
+"{sbuild}/. Ad esempio, per immagini live wheezy, si generi live-boot in un "
+"chroot wheezy. Se la distribuzione di destinazione corrisponde con la "
"distribuzione del proprio sistema, si può costruire direttamente sul sistema "
"usando #{dpkg-buildpackage}# (fornito dal pacchetto /{dpkg-dev}/):"
diff --git a/manual/po/it/user_managing_a_configuration.ssi.po b/manual/po/it/user_managing_a_configuration.ssi.po
index 8ba8e91..28e39b3 100644
--- a/manual/po/it/user_managing_a_configuration.ssi.po
+++ b/manual/po/it/user_managing_a_configuration.ssi.po
@@ -1,13 +1,12 @@
# Italian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# lillo sciascia <lillosciascia at gmail.com>, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: 2011-12-05 23:01+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -18,28 +17,30 @@ msgstr ""
"Plural-Forms: nplurals=2: plural=(n !=1)\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -63,21 +64,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -86,28 +88,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -131,21 +135,22 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -235,7 +240,7 @@ msgid ""
"variable values, and each time you run #{lb config}# and #{lb clean}#, these "
"files will be executed. This will ensure that your configuration is kept "
"internally consistent from one revision to the next and from one live-build "
-"release to the next (though you will still have to take care and read the "
+"release to the next (Although you will still have to take care and read the "
"documentation when you upgrade live-build and make adjustments as needed)."
msgstr ""
"Tutto ciò potrebbe essere un fastidio terribile se non fosse per gli script "
diff --git a/manual/po/it/user_overview.ssi.po b/manual/po/it/user_overview.ssi.po
index 9f68063..4bcd0bc 100644
--- a/manual/po/it/user_overview.ssi.po
+++ b/manual/po/it/user_overview.ssi.po
@@ -1,13 +1,12 @@
# Italian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# skizzhg <skizzhg at gmx.com>, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-19 18:09+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: 2011-12-05 23:53+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -18,28 +17,30 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -63,21 +64,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -86,28 +88,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -131,21 +135,22 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -201,28 +206,28 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:14
msgid ""
-"Many concepts are similar to those in the debhelper Debian package tools "
+"Many concepts are similar to those in the /{debhelper}/ Debian package tools "
"written by Joey Hess:"
msgstr ""
-"Molti concetti sono simili a quelli negli strumenti del pacchetto Debian "
-"debhelper scritto da Joey Hess:"
+"Molti concetti sono simili a quelli negli strumenti del pacchetto Debian /"
+"{debhelper}/ scritto da Joey Hess:"
#. type: Plain text
#: en/user_overview.ssi:16
msgid ""
-"_* The scripts have a central location for configuring their operation. In "
-"debhelper, this is the #{debian/}# subdirectory of a package tree. For "
+"_* The scripts have a central location for configuring their operation. In /"
+"{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For "
"example, dh_install will look, amongst others, for a file called #{debian/"
"install}# to determine which files should exist in a particular binary "
"package. In much the same way, live-build stores its configuration entirely "
"under a #{config/}# subdirectory."
msgstr ""
"_* Gli script hanno una locazione centrale per configurare le loro "
-"operazioni, in debhelper questa è la sottodirectory #{debian/}# dell'albero "
-"di un pacchetto. Ad esempio dh_install cercherà, tra gli altri, un file "
-"chiamato #{debian/install}# per determinare quali file dovrebbero esistere "
-"in un certo pacchetto binario. Allo stesso modo, live-build salva la sua "
-"configurazione interamente in una sottodirectory #{config/}#."
+"operazioni, in /{debhelper}/ questa è la sottodirectory #{debian/}# "
+"dell'albero di un pacchetto. Ad esempio dh_install cercherà, tra gli altri, "
+"un file chiamato #{debian/install}# per determinare quali file dovrebbero "
+"esistere in un certo pacchetto binario. Allo stesso modo, live-build salva "
+"la sua configurazione interamente in una sottodirectory #{config/}#."
#. type: Plain text
#: en/user_overview.ssi:18
@@ -236,15 +241,15 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:20
msgid ""
-"Unlike debhelper, live-build contains a tool to generate a skeleton "
+"Unlike /{debhelper}/, live-build contains a tool to generate a skeleton "
"configuration directory, #{lb config}#. This could be considered to be "
-"similar to tools such as #{dh-make}#. For more information about #{lb config}"
+"similar to tools such as /{dh-make}/. For more information about #{lb config}"
"#, please see {The lb config command}#lb-config."
msgstr ""
-"Al contrario di debhelper, live-build contiene uno strumento per generare "
-"una directory scheletro di configurazione, #{lb config}#, che può essere "
-"considerato simile a utilità come #{dh-make}#. Per maggiori informazioni su #"
-"{lb config}# si veda {Il comando lb config}#lb-config."
+"Al contrario di /{debhelper}/, live-build contiene uno strumento per "
+"generare una directory scheletro di configurazione, #{lb config}#, che può "
+"essere considerato simile a utilità come /{dh-make}/. Per maggiori "
+"informazioni su #{lb config}# si veda {Il comando lb config}#lb-config."
#. type: Plain text
#: en/user_overview.ssi:22
diff --git a/manual/po/pt_BR/about_manual.ssi.po b/manual/po/pt_BR/about_manual.ssi.po
index 0392b51..6fd7ede 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.
+# 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: 2012-03-07 08:59-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"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-18 19:35+0300\n"
+"PO-Revision-Date: 2012-04-14 22:31+0200\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
@@ -30,18 +31,25 @@ msgstr "1~about-manual Sobre esse manual"
msgid ""
"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 7.0 \"Wheezy\" 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."
+"by the project for the Debian 7.0 \"wheezy\" release. An up-to-date version "
+"can always be found at http://live.debian.net/"
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:8
msgid ""
+"While live-manual 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
+#: en/about_manual.ssi:10
+msgid ""
"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 "
"using #{sudo}#. To distinguish between commands which may be executed by an "
@@ -57,40 +65,51 @@ msgstr ""
"respectivamente. Esse simbolo não é parte do comando."
#. type: Plain text
-#: en/about_manual.ssi:10
+#: en/about_manual.ssi:12
msgid "2~ For the impatient"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:12
+#: en/about_manual.ssi:14
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 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, "
+"the details. Therefore, we suggest reading in the following order."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:16
+msgid ""
+"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."
+"a taste of what can be done with Debian Live."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:14
+#: en/about_manual.ssi:18
+msgid ""
+"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
+#: en/about_manual.ssi:20
msgid "2~terms Terms"
msgstr "2~terms Terminologia"
#. type: Plain text
-#: en/about_manual.ssi:16
+#: en/about_manual.ssi:22
msgid ""
"_* *{Live system}*: An operating system that can boot without installation "
"to a hard drive. Live systems do not alter local operating system(s) or file"
@@ -106,7 +125,7 @@ msgstr ""
"(s). Alguns também podem inicializar através da rede."
#. type: Plain text
-#: en/about_manual.ssi:18
+#: en/about_manual.ssi:24
msgid ""
"_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, "
"live-build, live-config, and live-manual packages."
@@ -115,7 +134,7 @@ msgstr ""
"live-build, live-config, e live-manual."
#. type: Plain text
-#: en/about_manual.ssi:20
+#: en/about_manual.ssi:26
msgid ""
"_* *{Debian Live system}*: A live system that uses software from the Debian "
"operating system that may be booted from CDs, DVDs, USB sticks, over the "
@@ -128,47 +147,48 @@ msgstr ""
"(via parametro de boot #{fetch=URL}#)."
#. type: Plain text
-#: en/about_manual.ssi:22
+#: en/about_manual.ssi:28
msgid "_* *{Host system}*: The environment used to create the live system."
msgstr "_* *{Host system}*: O ambiente usado para criar o sistema live."
#. type: Plain text
-#: en/about_manual.ssi:24
+#: en/about_manual.ssi:30
msgid "_* *{Target system}*: The environment used to run the live system."
msgstr "_* *{Target system}*: O ambiente usado para rodar o sistema live."
#. type: Plain text
-#: en/about_manual.ssi:26
+#: en/about_manual.ssi:32
msgid ""
"_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
-"boot was formerly a part of live-initramfs."
+"boot was formerly a part of /{live-initramfs}/."
msgstr ""
"_* *{live-boot}*: Uma coleção de scripts usados para inicializar sistemas "
-"live. live-boot era formalmente parte do live-initramfs."
+"live. live-boot era formalmente parte do /{live-initramfs}/."
#. type: Plain text
-#: en/about_manual.ssi:28
+#: en/about_manual.ssi:34
msgid ""
"_* *{live-build}*: A collection of scripts used to build customized Debian "
-"Live systems. live-build was formerly known as live-helper, and even earlier "
-"known as live-package."
+"Live systems. live-build was formerly known as /{live-helper}/, and even "
+"earlier known as /{live-package}/."
msgstr ""
"_* *{live-build}*: Uma coleção de scripts usados para construir sistemas "
-"Debian live customizados. live-build era formalmente conhecido como live-"
-"helper, e ainda antes conhecido como live-package."
+"Debian live customizados. live-build era formalmente conhecido como /{live-"
+"helper}/, e ainda antes conhecido como /{live-package}/."
#. type: Plain text
-#: en/about_manual.ssi:30
+#: en/about_manual.ssi:36
msgid ""
"_* *{live-config}*: A collection of scripts used to configure a live system "
-"during the boot process. live-config was formerly a part of live-initramfs."
+"during the boot process. live-config was formerly a part of /{live-"
+"initramfs}/."
msgstr ""
"_* *{live-config}*: Uma coleção de scripts usados para configurar um sistema "
-"live durante o processo de boot. live-config era formalmente parte do live-"
-"initramfs."
+"live durante o processo de boot. live-config era formalmente parte do /{live-"
+"initramfs}/."
#. type: Plain text
-#: en/about_manual.ssi:32
+#: en/about_manual.ssi:38
msgid ""
"_* *{live-manual}*: This document is maintained in a package called live-"
"manual."
@@ -177,7 +197,7 @@ msgstr ""
"manual."
#. type: Plain text
-#: en/about_manual.ssi:34
+#: en/about_manual.ssi:40
msgid ""
"_* *{Debian Installer (d-i)}*: The official installation system for the "
"Debian distribution."
@@ -186,7 +206,7 @@ msgstr ""
"distribuição Debian."
#. type: Plain text
-#: en/about_manual.ssi:36
+#: en/about_manual.ssi:42
msgid ""
"_* *{Boot parameters}*: Parameters that can be entered at the bootloader "
"prompt to influence the kernel or live-config."
@@ -195,18 +215,18 @@ msgstr ""
"bootloader para influenciar o kernel ou o live-config."
#. type: Plain text
-#: en/about_manual.ssi:38
+#: en/about_manual.ssi:44
msgid ""
-"_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+"_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run "
"different instances of the GNU/Linux environment on a single system "
"simultaneously without rebooting."
msgstr ""
-"_* *{chroot}*: O programa chroot, #{chroot(8)}#, nos habilita a rodar "
+"_* *{chroot}*: O programa /{chroot}/, #{chroot(8)}#, nos habilita a rodar "
"simultâneamente diferentes instâncias do ambiente do GNU/Linux em um único "
"sistema sem reinicialização."
#. type: Plain text
-#: en/about_manual.ssi:40
+#: en/about_manual.ssi:46
msgid ""
"_* *{Binary image}*: A file containing the live system, such as binary.iso "
"or binary.img."
@@ -215,7 +235,7 @@ msgstr ""
"binary.img."
#. type: Plain text
-#: en/about_manual.ssi:42
+#: en/about_manual.ssi:48
msgid ""
"_* *{Target distribution}*: The distribution upon which your live system "
"will be based. This can differ from the distribution of your host system."
@@ -224,26 +244,26 @@ msgstr ""
"baseado. Isso pode diferir da distribuição do seu sistema host."
#. type: Plain text
-#: en/about_manual.ssi:44
-msgid ""
-"_* *{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."
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:46
-msgid ""
-"The *{stable}* distribution contains the latest officially released "
-"distribution of Debian. The *{testing}* distribution is the staging area for "
-"the next *{stable}* release. A major advantage of using this distribution is "
-"that it has more recent versions of software relative to the *{stable}* "
-"release. The *{unstable}* distribution is where active development of Debian "
-"occurs. Generally, this distribution is run by developers and those who like "
-"to live on the edge."
+#: en/about_manual.ssi:50
+#, fuzzy
+#| msgid ""
+#| "The *{stable}* distribution contains the latest officially released "
+#| "distribution of Debian. The *{testing}* distribution is the staging area "
+#| "for the next *{stable}* release. A major advantage of using this "
+#| "distribution is that it has more recent versions of software relative to "
+#| "the *{stable}* release. The *{unstable}* distribution is where active "
+#| "development of Debian occurs. Generally, this distribution is run by "
+#| "developers and those who like to live on the edge."
+msgid ""
+"_* *{stable/testing/unstable}*: The *{stable}* distribution contains the "
+"latest officially released distribution of Debian. The *{testing}* "
+"distribution is the staging area for the next *{stable}* release. A major "
+"advantage of using this distribution is that it has more recent versions of "
+"software relative to the *{stable}* release. The *{unstable}* distribution "
+"is where active development of Debian occurs. Generally, this distribution "
+"is run by developers and those who like to live on the edge. Throughout the "
+"manual, we tend to use codenames for the releases, such as wheezy or sid, as "
+"that is what is supported by the tools themselves."
msgstr ""
"A distribuição estável (*{stable}*) contem a última versão oficial lançada "
"do Debian. A distribuição *{testing}* é a ária de estágio para a próxima "
@@ -254,82 +274,82 @@ msgstr ""
"desenvolvedores e aqueles que vivem no limite."
#. type: Plain text
-#: en/about_manual.ssi:48
+#: en/about_manual.ssi:52
msgid "2~ Authors"
msgstr "2~Autores"
#. type: Plain text
-#: en/about_manual.ssi:50
+#: en/about_manual.ssi:54
msgid "A list of authors (in alphabetical order):"
msgstr "A lista de autores (em ordem alfabética)"
#. type: Plain text
-#: en/about_manual.ssi:52
+#: en/about_manual.ssi:56
msgid "_* Ben Armstrong"
msgstr "_* Ben Armstrong"
#. type: Plain text
-#: en/about_manual.ssi:54
+#: en/about_manual.ssi:58
msgid "_* Brendan Sleight"
msgstr "_* Brendan Sleight"
#. type: Plain text
-#: en/about_manual.ssi:56
+#: en/about_manual.ssi:60
msgid "_* Chris Lamb"
msgstr "_* Chris Lamb"
#. type: Plain text
-#: en/about_manual.ssi:58
+#: en/about_manual.ssi:62
msgid "_* Daniel Baumann"
msgstr "_* Daniel Baumann"
#. type: Plain text
-#: en/about_manual.ssi:60
+#: en/about_manual.ssi:64
msgid "_* Franklin Piat"
msgstr "_* Franklin Piat"
#. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:66
msgid "_* Jonas Stein"
msgstr "_* Jonas Stein"
#. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:68
msgid "_* Kai Hendry"
msgstr "_* Kai Hendry"
#. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:70
msgid "_* Marco Amadori"
msgstr "_* Marco Amadori"
#. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:72
msgid "_* Mathieu Geli"
msgstr "_* Mathieu Geli"
#. type: Plain text
-#: en/about_manual.ssi:70
+#: en/about_manual.ssi:74
msgid "_* Matthias Kirschner"
msgstr "_* Matthias Kirschner"
#. type: Plain text
-#: en/about_manual.ssi:72
+#: en/about_manual.ssi:76
msgid "_* Richard Nelson"
msgstr "_* Richard Nelson"
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:78
msgid "_* Trent W. Buck"
msgstr "_* Trent W. Buck"
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:80
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
+#: en/about_manual.ssi:82
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -338,7 +358,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:80
+#: en/about_manual.ssi:84
msgid ""
"When submitting a contribution, please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted, the "
@@ -351,7 +371,7 @@ msgstr ""
"licenças do resto do documento, ou seja, GPL versão 3 ou superior."
#. type: Plain text
-#: en/about_manual.ssi:82
+#: en/about_manual.ssi:86
msgid ""
"The sources for this manual are maintained using the Git version control "
"system. You can check out the latest copy by executing:"
@@ -360,28 +380,29 @@ msgstr ""
"versão Git. Você pode fazer o checkout da ultima cópia executando:"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -405,56 +426,58 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:86
+#: en/about_manual.ssi:90
msgid "$ git clone git://live.debian.net/git/live-manual.git"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -478,30 +501,31 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/about_manual.ssi:90
+#: en/about_manual.ssi:94
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -512,13 +536,13 @@ msgstr ""
"para contruir estão instalados executando:"
#. type: Plain text
-#: en/about_manual.ssi:94
+#: en/about_manual.ssi:98
#, no-wrap
msgid " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:98
+#: en/about_manual.ssi:102
msgid ""
"You may build the live-manual from the top level directory of your Git "
"checkout by executing:"
@@ -527,13 +551,13 @@ msgstr ""
"diretório do seu Git checkout executando:"
#. type: Plain text
-#: en/about_manual.ssi:102
+#: en/about_manual.ssi:106
#, no-wrap
msgid " $ make build\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:110
msgid ""
"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 "
@@ -541,42 +565,42 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:110
+#: en/about_manual.ssi:114
#, no-wrap
msgid " $ make build LANGUAGES=en\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:114
+#: en/about_manual.ssi:118
msgid "It is also possible to build by document type, e.g:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:122
#, no-wrap
msgid " $ make build FORMATS=pdf\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:122
+#: en/about_manual.ssi:126
msgid "Or combine both, e.g:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:126
+#: en/about_manual.ssi:130
#, no-wrap
msgid " $ make build FORMATS=html LANGUAGES=it\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:130
+#: en/about_manual.ssi:134
#, fuzzy
#| msgid "3~ Applying patches"
msgid "3~ Applying changes"
msgstr "3~ Aplicando patches"
#. type: Plain text
-#: en/about_manual.ssi:132
+#: en/about_manual.ssi:136
msgid ""
"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 "
@@ -588,12 +612,12 @@ msgstr ""
"necessários:"
#. type: Plain text
-#: en/about_manual.ssi:134
+#: en/about_manual.ssi:138
msgid "_* Fetch the public commit key:"
msgstr "_* Obter a chave publica de commit:"
#. type: Plain text
-#: en/about_manual.ssi:143
+#: en/about_manual.ssi:147
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
@@ -605,12 +629,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:147
+#: en/about_manual.ssi:151
msgid "_* Add the following section to your openssh-client config:"
msgstr "_* Adicione a seguinte sessão na configuração do seu openssh-client:"
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:160
#, no-wrap
msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
@@ -622,12 +646,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:164
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:165
+#: en/about_manual.ssi:169
#, no-wrap
msgid ""
" $ git clone git at live.debian.net:/live-manual.git\n"
@@ -637,105 +661,86 @@ msgstr ""
" $ cd live-manual && git checkout debian-next\n"
#. type: Plain text
-#: en/about_manual.ssi:169
+#: en/about_manual.ssi:173
msgid ""
"_* 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:171
-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 ""
-"_* 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 "
-"atualizar os arquivos de tradução. "
-
-#. type: Plain text
#: en/about_manual.ssi:175
-#, no-wrap
-msgid " $ make commit\n"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:179
-msgid "_* Then"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:183
-#, no-wrap
-msgid " $ git add .\n"
+msgid ""
+"_* Do not use #{make commit}# unless you are updating translations in this "
+"commit, and in that case, do not mix changes to the English manual and "
+"translations in the same commit, but use separate commits for each. See the "
+"{Translation}#translation section for more details."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:187
+#: en/about_manual.ssi:177
#, 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."
+#| "_* 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 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."
+"_* Write commit messages that consist of complete, meaningful 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 "
-"acabando com uma parada total. Normalmente iniciando com as formas 'Fixing/"
-"Adding/Removing/Correcting/Translating'."
+"_* 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'."
#. type: Plain text
-#: en/about_manual.ssi:191
+#: en/about_manual.ssi:181
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:195
+#: en/about_manual.ssi:185
msgid "_* Push the commit to the server:"
msgstr "_* Enviar as submissões para os servidor."
#. type: Plain text
-#: en/about_manual.ssi:199
+#: en/about_manual.ssi:189
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:203
+#: en/about_manual.ssi:193
msgid "3~translation Translation"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:205
+#: en/about_manual.ssi:195
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:207
+#: en/about_manual.ssi:197
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). "
-"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."
+"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."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:209
+#: en/about_manual.ssi:199
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:211
+#: en/about_manual.ssi:201
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
"are updated from the po files and then you can review your changes launching "
@@ -744,7 +749,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:212
+#: en/about_manual.ssi:202
#, 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/about_project.ssi.po b/manual/po/pt_BR/about_project.ssi.po
index 5574a81..1488e97 100644
--- a/manual/po/pt_BR/about_project.ssi.po
+++ b/manual/po/pt_BR/about_project.ssi.po
@@ -1,12 +1,11 @@
# Portuguese translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-19 22:16+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-05-25 14:30+0300\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -109,7 +108,7 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:32
-msgid "_* It would be a subproject of Debian."
+msgid "_* It is a subproject of Debian."
msgstr ""
#. type: Plain text
@@ -194,20 +193,19 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:60
msgid ""
-"A system for configuring packages is provided using debconf in #{lb config}# "
-"(use --preseed FILE) allowing custom configured packages to be installed in "
-"your custom produced Debian Live images, but for official live images only "
-"default configuration will be used. For more information, please see "
-"{Customization overview}#customization-overview."
+"A system for configuring packages is provided using debconf allowing custom "
+"configured packages to be installed in your custom produced Debian Live "
+"images, but for official live images only default configuration will be "
+"used. For more information, please see {Customization overview}"
+"#customization-overview."
msgstr ""
#. type: Plain text
#: en/about_project.ssi:62
msgid ""
"Exception: There are a few essential changes needed to bring a live system "
-"to life (e.g. configuring pam to allow empty passwords). These essential "
-"changes have to be kept as minimal as possible and should be merged within "
-"the Debian repository if possible."
+"to life. These essential changes have to be kept as minimal as possible and "
+"should be merged within the Debian repository if possible."
msgstr ""
#. type: Plain text
@@ -236,8 +234,8 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:69
msgid ""
-"_* *{BTS}*: The Debian Bug Tracking System (BTS) contains details of bugs "
-"reported by users and developers. Each bug is given a number, and is kept on "
-"file until it is marked as having been dealt with. For more information, "
-"please see {Reporting bugs}#bugs."
+"_* *{BTS}*: The {Debian Bug Tracking System}http://www.debian.org/Bugs/ "
+"(BTS) contains details of bugs reported by users and developers. Each bug is "
+"given a number, and is kept on file until it is marked as having been dealt "
+"with. For more information, please see {Reporting bugs}#bugs."
msgstr ""
diff --git a/manual/po/pt_BR/index.html.in.po b/manual/po/pt_BR/index.html.in.po
index c810913..d324345 100644
--- a/manual/po/pt_BR/index.html.in.po
+++ b/manual/po/pt_BR/index.html.in.po
@@ -1,13 +1,13 @@
# 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.
+# This file is distributed under the same license as the live-manual package.
# Carlo Stemberger <carlo.stemberger at gmail.com>, 2010.
# Carlos Zuferri «chals» <chals at altorricon.com>, 2011.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-07 16:03+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-06-02 18:16+0300\n"
"PO-Revision-Date: 2011-12-26 19:10+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -38,7 +38,7 @@ msgstr ""
#. type: Content of: <html><body><p>
#: en/index.html.in:17
msgid ""
-"Please report errors, omissions, patches and suggestions to our mailinglist "
+"Please report errors, omissions, patches and suggestions to our mailing list "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
"org</a> and read about <a href=\"html/live-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
@@ -108,7 +108,7 @@ msgstr "Fonte"
#. type: Content of: <html><body><p>
#: en/index.html.in:38
msgid ""
-"The sources for this manual is available in a <a href=\"http://git.or.cz/"
+"The sources for this manual are available in a <a href=\"http://git.or.cz/"
"\">Git</a> repository at live.debian.net."
msgstr ""
"O fonte desse manual está diponível em um repositório <a href=\"http://git."
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index 3e813d5..46c26c3 100644
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -1,12 +1,11 @@
# Portuguese translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-03 00:19+0300\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-06-04 12:21+0300\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,8 +44,10 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-04-03\n"
+" :published: 2012-06-04\n"
msgstr ""
+"@date:\n"
+" :published: 04-06-2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
@@ -58,8 +59,8 @@ msgstr ""
#, no-wrap
msgid ""
"@make:\n"
-" :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/\n"
-" :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
+" :bold: /squeeze|wheezy|sid/\n"
+" :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
msgstr ""
diff --git a/manual/po/pt_BR/project_bugs.ssi.po b/manual/po/pt_BR/project_bugs.ssi.po
index 092ea3d..f1c1f69 100644
--- a/manual/po/pt_BR/project_bugs.ssi.po
+++ b/manual/po/pt_BR/project_bugs.ssi.po
@@ -1,12 +1,11 @@
# Portuguese translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-24 14:17-0400\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
"PO-Revision-Date: 2010-10-25 23:27+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,130 +16,144 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. 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/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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: 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-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
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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/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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: 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-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
-#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -304,7 +317,7 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:50
msgid ""
-"_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system"
+"_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system"
msgstr ""
#. type: Plain text
@@ -400,8 +413,8 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:82
msgid ""
-"live-build first bootstraps a basic Debian system with #{debootstrap}# or #"
-"{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
+"live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
+"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
"distribution it is bootstrapping, it may fail. If a bug appears here, check "
"if the error is related to a specific Debian package (most likely), or if it "
"is related to bootstrapping tool itself."
@@ -433,7 +446,7 @@ msgstr ""
#: en/project_bugs.ssi:90
msgid ""
"If this is the case, this is not a bug in Debian Live, but rather in Debian "
-"- please report it against the failing package. Running #{debootstrap}# "
+"- please report it against the failing package. Running /{debootstrap}/ "
"separately from the Live system build or running #{lb bootstrap --debug}# "
"will give you more information."
msgstr ""
diff --git a/manual/po/pt_BR/project_coding-style.ssi.po b/manual/po/pt_BR/project_coding-style.ssi.po
index 5d8758e..47a30bc 100644
--- a/manual/po/pt_BR/project_coding-style.ssi.po
+++ b/manual/po/pt_BR/project_coding-style.ssi.po
@@ -1,12 +1,11 @@
# Portuguese translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-31 16:32+0300\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-07 22:16+0300\n"
"PO-Revision-Date: 2010-11-30 11:05+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,29 +16,30 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -87,29 +87,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -195,37 +196,42 @@ msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:16
-msgid "2~ Indenting"
+msgid "_* Make sure all shell code runs with 'set -e'."
msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:18
-msgid "_* Always use tabs over spaces."
+msgid "2~ Indenting"
msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:20
-msgid "2~ Wrapping"
+msgid "_* Always use tabs over spaces."
msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:22
-msgid "_* Generally, lines are 80 chars at maximum."
+msgid "2~ Wrapping"
msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:24
+msgid "_* Generally, lines are 80 chars at maximum."
+msgstr ""
+
+#. type: Plain text
+#: en/project_coding-style.ssi:26
msgid "_* Use the \"Linux style\" of line breaks:"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:26 en/project_coding-style.ssi:49
-#: en/project_coding-style.ssi:90 en/project_coding-style.ssi:108
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:51
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:110
msgid "Bad:"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:32
+#: en/project_coding-style.ssi:34
#, no-wrap
msgid ""
" if foo; then\n"
@@ -234,13 +240,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:59
-#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:119
+#: en/project_coding-style.ssi:38 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:100 en/project_coding-style.ssi:121
msgid "Good:"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:43
+#: en/project_coding-style.ssi:45
#, no-wrap
msgid ""
" if foo\n"
@@ -250,108 +256,108 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:49
msgid "_* The same holds for functions:"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:55
+#: en/project_coding-style.ssi:57
#, no-wrap
msgid ""
-" foo () {\n"
+" Foo () {\n"
" bar\n"
" }\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:66
+#: en/project_coding-style.ssi:68
#, no-wrap
msgid ""
-" foo ()\n"
+" Foo ()\n"
" {\n"
" bar\n"
" }\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:72
msgid "2~ Variables"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:72
+#: en/project_coding-style.ssi:74
msgid "_* Variables are always in capital letters."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:74
+#: en/project_coding-style.ssi:76
msgid ""
"_* Variables that used in #{lb config}# always start with #{LB_}# prefix."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:76
+#: en/project_coding-style.ssi:78
msgid ""
"_* Internal temporary variables in live-build should start with the #{\\_LB_}"
"# prefix."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:78
+#: en/project_coding-style.ssi:80
msgid "_* Local variables start with live-build #{\\_\\_LB_}# prefix."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:80
+#: en/project_coding-style.ssi:82
msgid ""
"_* Variables in connection to a boot parameter in live-config start with #"
"{LIVE_}#."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:82
+#: en/project_coding-style.ssi:84
msgid "_* All other variables in live-config start with #{_}# prefix."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:84
+#: en/project_coding-style.ssi:86
msgid ""
"_* Use braces around variables; e.g. write #{${FOO}}# instead of #{$FOO}#."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:86
+#: en/project_coding-style.ssi:88
msgid ""
"_* Always protect variables with quotes to respect potential whitespaces: "
"write #{\"${FOO}\"}# not #{${FOO}}#."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:88
+#: en/project_coding-style.ssi:90
msgid ""
"_* For consistency reasons, always use quotes when assigning values to "
"variables:"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:94
+#: en/project_coding-style.ssi:96
#, no-wrap
msgid " FOO=bar\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:104
#, no-wrap
msgid " FOO=\"bar\"\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:108
msgid "_* If multiple variables are used, quote the full expression:"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:115
+#: en/project_coding-style.ssi:117
#, no-wrap
msgid ""
" if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
@@ -361,7 +367,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:126
+#: en/project_coding-style.ssi:128
#, no-wrap
msgid ""
" if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
@@ -371,19 +377,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:130
+#: en/project_coding-style.ssi:132
msgid "2~ Miscellaneous"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:132
+#: en/project_coding-style.ssi:134
msgid ""
"_* Use \"#{|}#\" (without the surround quotes) as a separator in calls to "
"sed, e.g. \"#{sed -e 's|foo|bar|'}#\" (without \"\")."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:134
+#: en/project_coding-style.ssi:136
msgid ""
"_* Don't use the #{test}# command for comparisons or tests, use \"#{[}#\" \"#"
"{]}#\" (without \"\"); e.g. \"#{if [ -x /bin/foo ]; ...}#\" and not \"#{if "
@@ -391,8 +397,15 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:135
+#: en/project_coding-style.ssi:138
msgid ""
"_* Use #{case}# wherever possible over #{test}#, as it's easier to read and "
"faster in execution."
msgstr ""
+
+#. type: Plain text
+#: en/project_coding-style.ssi:139
+msgid ""
+"_* Use capitalized names for functions to limit messing with the users "
+"environment."
+msgstr ""
diff --git a/manual/po/pt_BR/project_procedures.ssi.po b/manual/po/pt_BR/project_procedures.ssi.po
index 33678b6..9da3c91 100644
--- a/manual/po/pt_BR/project_procedures.ssi.po
+++ b/manual/po/pt_BR/project_procedures.ssi.po
@@ -1,12 +1,11 @@
# Portuguese translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 20:37-0400\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-23 20:28+0300\n"
"PO-Revision-Date: 2010-11-30 10:35+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,130 +16,142 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. 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:58
-#: 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: 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-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
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:62
-#: 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: 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-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
-#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -233,7 +244,7 @@ msgstr ""
#. type: Plain text
#: en/project_procedures.ssi:36
msgid ""
-"_* Again, we need updated mirror of debian, debian-security and debian-"
+"_* Again, we need updated mirrors of debian, debian-security and debian-"
"volatile."
msgstr ""
@@ -244,18 +255,32 @@ msgstr ""
#. type: Plain text
#: en/project_procedures.ssi:42
+msgid "3~ Last Point Release of a Debian Release"
+msgstr ""
+
+#. type: Plain text
+#: en/project_procedures.ssi:47
+msgid ""
+"Remember to adjust both chroot and binary mirrors when building the last set "
+"of images for a Debian release after it has been moved away from ftp.debian."
+"org to archive.debian.org. That way, old prebuilt live images are still "
+"useful without user modifications."
+msgstr ""
+
+#. type: Plain text
+#: en/project_procedures.ssi:49
msgid "3~ Point release announcement template"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:44
+#: en/project_procedures.ssi:51
msgid ""
"An annoucement mail for point releases can be generated using the template "
"below and the following command:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:52
+#: en/project_procedures.ssi:59
#, no-wrap
msgid ""
" $ sed \\\n"
@@ -266,20 +291,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:56
+#: en/project_procedures.ssi:63
msgid ""
"Please check the mail carefully before sending and pass it to others for "
"proof-reading."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:60
+#: en/project_procedures.ssi:67
#, no-wrap
msgid " Debian Live images for Debian GNU/Linux %major% updated\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:64
+#: en/project_procedures.ssi:71
#, no-wrap
msgid ""
" The Debian Live project is pleased to announce the availability of\n"
@@ -288,19 +313,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:66
+#: en/project_procedures.ssi:73
#, no-wrap
msgid " The images are available for download at:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:68
+#: en/project_procedures.ssi:75
#, no-wrap
msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:73
+#: en/project_procedures.ssi:80
#, no-wrap
msgid ""
" This update incorporates the changes made in the %minor% point release,\n"
@@ -310,29 +335,29 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:75
+#: en/project_procedures.ssi:82
#, no-wrap
msgid " <http://lists.debian.org/debian-announce/%release_mail%>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:77
+#: en/project_procedures.ssi:84
#, no-wrap
msgid " It also includes the following Live-specific changes:\n"
msgstr ""
#. type: Bullet: ' * '
-#: en/project_procedures.ssi:81
+#: en/project_procedures.ssi:88
msgid "[INSERT LIVE-SPECIFIC CHANGE HERE]"
msgstr ""
#. type: Bullet: ' * '
-#: en/project_procedures.ssi:81
+#: en/project_procedures.ssi:88
msgid "[LARGER ISSUES MAY DESERVE THEIR OWN SECTION]"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:85
+#: en/project_procedures.ssi:92
#, no-wrap
msgid ""
" URLs\n"
@@ -340,67 +365,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:87
+#: en/project_procedures.ssi:94
#, no-wrap
msgid " Download location of updated images:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:89
+#: en/project_procedures.ssi:96
#, no-wrap
msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:91
+#: en/project_procedures.ssi:98
#, no-wrap
msgid " Debian Live project homepage:\n"
msgstr " Projeto Debian Live Homepage:\n"
#. type: Plain text
-#: en/project_procedures.ssi:93
+#: en/project_procedures.ssi:100
#, no-wrap
msgid " <http://live.debian.net/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:95
+#: en/project_procedures.ssi:102
#, no-wrap
msgid " The current stable distribution:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:97
+#: en/project_procedures.ssi:104
#, no-wrap
msgid " <http://ftp.debian.org/debian/dists/stable>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:99
+#: en/project_procedures.ssi:106
#, no-wrap
msgid " stable distribution information (release notes, errata etc.):\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:101
+#: en/project_procedures.ssi:108
#, no-wrap
msgid " <http://www.debian.org/releases/stable/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:103
+#: en/project_procedures.ssi:110
#, no-wrap
msgid " Security announcements and information:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:105
+#: en/project_procedures.ssi:112
#, no-wrap
msgid " <http://www.debian.org/security/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:109
+#: en/project_procedures.ssi:116
#, no-wrap
msgid ""
" About Debian\n"
@@ -408,7 +433,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:113
+#: en/project_procedures.ssi:120
#, no-wrap
msgid ""
" The Debian Project is an association of Free Software developers who\n"
@@ -417,7 +442,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:117
+#: en/project_procedures.ssi:124
#, no-wrap
msgid ""
" About Debian Live\n"
@@ -425,7 +450,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:122
+#: en/project_procedures.ssi:129
#, no-wrap
msgid ""
" Debian Live is an official sub-project of Debian which produces Debian\n"
@@ -435,7 +460,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:126
+#: en/project_procedures.ssi:133
#, no-wrap
msgid ""
" Contact Information\n"
@@ -443,7 +468,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:130
+#: en/project_procedures.ssi:137
#, no-wrap
msgid ""
" For further information, please visit the Debian Live web pages at\n"
diff --git a/manual/po/pt_BR/style_guide.ssi.po b/manual/po/pt_BR/style_guide.ssi.po
index 5e76aff..298f1cb 100644
--- a/manual/po/pt_BR/style_guide.ssi.po
+++ b/manual/po/pt_BR/style_guide.ssi.po
@@ -1,12 +1,11 @@
# Portuguese translations for live-manual package
-# Copyright (C) 2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-31 19:15+0300\n"
+"POT-Creation-Date: 2012-06-03 17:04+0300\n"
"PO-Revision-Date: 2012-02-11 16:42+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -22,17 +21,16 @@ msgid ":B~ Appendix"
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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
@@ -93,17 +91,16 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
@@ -832,15 +829,15 @@ msgstr ""
#. type: Plain text
#: en/style_guide.ssi:228
-msgid "_* /{New lines}/"
+msgid "_* /{Newlines}/"
msgstr ""
#. type: Plain text
#: en/style_guide.ssi:230
msgid ""
-"The translated texts need to have the exact same new lines as the original "
+"The translated texts need to have the exact same newlines as the original "
"texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
-"in the original files. These new lines often appear, for instance, in the "
+"in the original files. These newlines often appear, for instance, in the "
"code blocks."
msgstr ""
@@ -878,9 +875,7 @@ msgstr ""
#. type: Bullet: ' - '
#: en/style_guide.ssi:244
-msgid ""
-"Metadata (often between colons *{:metadata:}*) especially the date in /{live-"
-"manual.ssm.po}/ because it changes every time live-manual is updated."
+msgid "Metadata (often between colons *{:metadata:}*)"
msgstr ""
#. type: Bullet: ' - '
diff --git a/manual/po/pt_BR/user_basics.ssi.po b/manual/po/pt_BR/user_basics.ssi.po
index e8d7712..9168165 100644
--- a/manual/po/pt_BR/user_basics.ssi.po
+++ b/manual/po/pt_BR/user_basics.ssi.po
@@ -1,12 +1,11 @@
# Portuguese translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-12 08:28-0400\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
"PO-Revision-Date: 2010-10-20 06:53-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,16 +16,18 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -34,8 +35,10 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -59,39 +62,42 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -99,8 +105,10 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -124,25 +132,26 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -302,7 +311,7 @@ msgstr ""
#: en/user_basics.ssi:48
msgid ""
"This process can take a while, depending on the speed of your network "
-"connection. When it is complete, there should be a #{binary-hybrid.iso}# "
+"connection. When it is complete, there should be a #{binary.hybrid.iso}# "
"image file, ready to use, in the current directory."
msgstr ""
@@ -341,7 +350,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:62
#, no-wrap
-msgid " $ wodim binary-hybrid.iso\n"
+msgid " $ wodim binary.hybrid.iso\n"
msgstr ""
#. type: Plain text
@@ -373,7 +382,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:75
#, no-wrap
-msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
+msgid " $ dd if=binary.hybrid.iso of=${USBSTICK}\n"
msgstr ""
#. type: Plain text
@@ -400,8 +409,8 @@ msgid ""
"Once you've booted the media, you are presented with a boot menu. If you "
"just press enter here, the system will boot using the default entry, #{Live}"
"# and default options. For more information about boot options, see the "
-"\"help\" entry in the menu and also the #{live-boot}# and #{live-config}# "
-"man pages found within the live system."
+"\"help\" entry in the menu and also the live-boot and live-config man pages "
+"found within the live system."
msgstr ""
#. type: Plain text
@@ -471,16 +480,16 @@ msgstr ""
#: en/user_basics.ssi:104
msgid ""
"The most versatile VM in Debian is QEMU. If your processor has hardware "
-"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
+"support for virtualization, use the /{qemu-kvm}/ package; the /{qemu-kvm}/ "
"package description briefly lists the requirements."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:106
msgid ""
-"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
-"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
-"the following examples. The #{qemu-utils}# package is also valuable for "
+"First, install /{qemu-kvm}/ if your processor supports it. If not, install /"
+"{qemu}/, in which case the program name is #{qemu}# instead of #{kvm}# in "
+"the following examples. The /{qemu-utils}/ package is also valuable for "
"creating virtual disk images with #{qemu-img}#."
msgstr ""
@@ -498,7 +507,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:118
#, no-wrap
-msgid " $ kvm -cdrom binary-hybrid.iso\n"
+msgid " $ kvm -cdrom binary.hybrid.iso\n"
msgstr ""
#. type: Plain text
@@ -513,7 +522,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:126
-msgid "In order to test the ISO with #{virtualbox-ose}#:"
+msgid "In order to test the ISO with /{virtualbox-ose}/:"
msgstr ""
#. type: Plain text
@@ -531,17 +540,14 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:136
msgid ""
-"Create a new virtual machine, change the storage settings to use #{binary-"
+"Create a new virtual machine, change the storage settings to use #{binary."
"hybrid.iso}# as the CD/DVD device, and start the machine."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:138
-msgid ""
-"Note: For live systems containing X.org that you want to test with #"
-"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
-"package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. "
-"Otherwise, the resolution is limited to 800x600."
+#, no-wrap
+msgid "*{Note:}* For live systems containing X.org that you want to test with /{virtualbox-ose}/, you may wish to include the VirtualBox X.org driver package, /{virtualbox-ose-guest-x11}/, in your live-build configuration. Otherwise, the resolution is limited to 800x600.\n"
msgstr ""
#. type: Plain text
@@ -570,10 +576,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:150
-msgid ""
-"Note: if you created an ISO hybrid image with the previous example, you will "
-"need to clean up your working directory with the #{lb clean}# command (see "
-"{The lb clean command}#lb-clean):"
+#, no-wrap
+msgid "*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):\n"
msgstr ""
#. type: Plain text
@@ -619,7 +623,7 @@ msgid ""
"bootloader, ready to be directly written on a USB stick. Since using an HDD "
"image is just like using an ISO hybrid image on USB, follow the instructions "
"in {Using an ISO hybrid live image}#using-iso-hybrid, except use the "
-"filename #{binary.img}# instead of #{binary-hybrid.iso}#."
+"filename #{binary.img}# instead of #{binary.hybrid.iso}#."
msgstr ""
#. type: Plain text
@@ -630,10 +634,10 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:182
msgid ""
-"First, install QEMU as described above in {Testing an ISO image with QEMU}"
-"#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which "
-"version your host system needs, specifying #{binary.img}# as the first hard "
-"drive."
+"First, install /{qemu}/ as described above in {Testing an ISO image with "
+"QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on "
+"which version your host system needs, specifying #{binary.img}# as the first "
+"hard drive."
msgstr ""
#. type: Plain text
@@ -651,7 +655,7 @@ msgstr ""
#: en/user_basics.ssi:192
msgid ""
"To use the remaining free space after copying #{binary.img}# to a USB stick, "
-"use a partitioning tool such as #{gparted}# or #{parted}# to create a new "
+"use a partitioning tool such as /{gparted}/ or /{parted}/ to create a new "
"partition on the stick. The first partition will be used by the Debian Live "
"system."
msgstr ""
@@ -678,11 +682,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:208
-msgid ""
-"Note: If you want to use the extra space with Windows, apparently that OS "
-"cannot normally access any partitions but the first. Some solutions to this "
-"problem have been discussed on our {mailing list}#contact, but it seems "
-"there are no easy answers."
+#, no-wrap
+msgid "*{Note:}* If you want to use the extra space with Windows, apparently that OS cannot normally access any partitions but the first. Some solutions to this problem have been discussed on our {mailing list}#contact, but it seems there are no easy answers.\n"
msgstr ""
#. type: Plain text
@@ -706,9 +707,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:216
-msgid ""
-"Note: if you performed any previous examples, you will need to clean up your "
-"working directory with the #{lb clean}# command:"
+#, no-wrap
+msgid "*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:\n"
msgstr ""
#. type: Plain text
@@ -840,9 +840,10 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:280
msgid ""
-"You should install the tftpd-hpa package. It can serve all files contained "
-"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
-"#{/srv/debian-live/tftpboot}#, run as root the following command:"
+"You should install the /{tftpd-hpa}/ package. It can serve all files "
+"contained inside a root directory, usually #{/srv/tftp}#. To let it serve "
+"files inside #{/srv/debian-live/tftpboot}#, run as root the following "
+"command:"
msgstr ""
#. type: Plain text
@@ -871,7 +872,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:294
-msgid "You need to install the #{nfs-kernel-server}# package."
+msgid "You need to install the /{nfs-kernel-server}/ package."
msgstr ""
#. type: Plain text
@@ -935,7 +936,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:322
-msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
+msgid "_* Install /{qemu}/, /{bridge-utils}/, /{sudo}/."
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-binary.ssi.po b/manual/po/pt_BR/user_customization-binary.ssi.po
index 2da678b..53a5ed6 100644
--- a/manual/po/pt_BR/user_customization-binary.ssi.po
+++ b/manual/po/pt_BR/user_customization-binary.ssi.po
@@ -1,12 +1,11 @@
# Portuguese translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-25 21:42+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
"PO-Revision-Date: 2010-11-30 11:20+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,28 +16,30 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -62,51 +63,54 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -130,25 +134,26 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -239,7 +244,7 @@ msgid ""
" include menu.cfg\n"
" default vesamenu.c32\n"
" prompt 0\n"
-" timeout 5\n"
+" timeout 50\n"
msgstr ""
#. type: Plain text
@@ -259,7 +264,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:43
#, no-wrap
-msgid " sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg\n"
+msgid " sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-contents.ssi.po b/manual/po/pt_BR/user_customization-contents.ssi.po
index a713a60..02494c2 100644
--- a/manual/po/pt_BR/user_customization-contents.ssi.po
+++ b/manual/po/pt_BR/user_customization-contents.ssi.po
@@ -1,12 +1,11 @@
# Portuguese translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-15 16:28+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,16 +16,19 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -34,9 +36,10 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -60,39 +63,43 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -100,9 +107,10 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -126,25 +134,26 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -236,7 +245,7 @@ msgstr ""
#: en/user_customization-contents.ssi:24
msgid ""
"To include files, simply add them to your #{config/includes.chroot}# "
-"directory. This directory corresponds to the root directory (#{/}#) of the "
+"directory. This directory corresponds to the root directory #{/}# of the "
"live system. For example, to add a file #{/var/www/index.html}# in the live "
"system, use:"
msgstr ""
@@ -412,6 +421,6 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:93
msgid ""
-"For more information about debconf, please see debconf(7) in the #{debconf}# "
-"package."
+"For more information about debconf, please see #{debconf(7)}# in the /"
+"{debconf}/ package."
msgstr ""
diff --git a/manual/po/pt_BR/user_customization-installer.ssi.po b/manual/po/pt_BR/user_customization-installer.ssi.po
index ef1b05f..d7fd4ee 100644
--- a/manual/po/pt_BR/user_customization-installer.ssi.po
+++ b/manual/po/pt_BR/user_customization-installer.ssi.po
@@ -1,12 +1,11 @@
# Portuguese translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
"PO-Revision-Date: 2010-11-30 10:53+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,28 +16,29 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -62,21 +62,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -85,28 +86,29 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -130,21 +132,22 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -199,7 +202,7 @@ msgstr ""
#: en/user_customization-installer.ssi:16
msgid ""
"On such images, Debian is installed by fetching and installing .deb packages "
-"using #{debootstrap}# or #{cdebootstrap}#, from the local media or some "
+"using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some "
"network-based network, resulting in a standard Debian system being installed "
"to the hard disk."
msgstr ""
@@ -224,7 +227,7 @@ msgstr ""
msgid ""
"Installation will proceed in an identical fashion to the \"Regular\" "
"installation described above, but at the actual package installation stage, "
-"instead of using #{debootstrap}# to fetch and install packages, the live "
+"instead of using /{debootstrap}/ to fetch and install packages, the live "
"filesystem image is copied to the target. This is achieved with a special "
"udeb called live-installer."
msgstr ""
@@ -238,10 +241,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-installer.ssi:26
-msgid ""
-"Note: to support both normal and live installer entries in the bootloader of "
-"the same live media, you must disable live-installer by preseeding #{live-"
-"installer/enable=false}#."
+#, no-wrap
+msgid "*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.\n"
msgstr ""
#. type: Plain text
@@ -309,5 +310,5 @@ msgid ""
"binary/}# to include them in the image. Additional or replacement files and "
"directories may be included in the installer initrd as well, in a similar "
"fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
-"placing the material in #{config/binary_debian-installer-includes/}#."
+"placing the material in #{config/includes.binary_debian-installer/}#."
msgstr ""
diff --git a/manual/po/pt_BR/user_customization-overview.ssi.po b/manual/po/pt_BR/user_customization-overview.ssi.po
index d85fefc..279b47c 100644
--- a/manual/po/pt_BR/user_customization-overview.ssi.po
+++ b/manual/po/pt_BR/user_customization-overview.ssi.po
@@ -1,12 +1,11 @@
# Portuguese translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: 2010-10-22 08:57-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -110,7 +109,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-overview.ssi:22
msgid ""
-"Although #{lb config}# does create a skeletal configuration in the config/ "
+"Although #{lb config}# creates a skeletal configuration in the config/ "
"directory, to accomplish your goals, you may need to provide additional "
"files in subdirectories of config/. Depending on where the files are stored "
"in the configuration, they may be copied into the live system's filesystem "
@@ -128,7 +127,7 @@ msgid "2~ Customization tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-overview.ssi:26
+#: en/user_customization-overview.ssi:25
msgid ""
"The following chapters are organized by the kinds of customization task "
"users typically perform: {Customizing package installation}#customizing-"
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index 5f05987..b6f5ff6 100644
--- a/manual/po/pt_BR/user_customization-packages.ssi.po
+++ b/manual/po/pt_BR/user_customization-packages.ssi.po
@@ -1,12 +1,11 @@
# Portuguese translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-14 22:45+0300\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,28 +16,29 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -62,21 +62,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -85,28 +86,29 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -130,21 +132,22 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -174,12 +177,12 @@ msgid ""
"distribution mirror. You can also add your own repositories for backports, "
"experimental or custom packages, or include packages directly as files. You "
"can define your own lists of packages to include, use live-build's "
-"predefined lists, use #{tasksel}# tasks, or a combination of all three. "
-"Finally, a number of options give some control over apt, or if you prefer, "
-"aptitude, at build time when packages are installed. You may find these "
-"handy if you use a proxy, want to disable installation of recommended "
-"packages to save space, or need to control which versions of packages are "
-"installed via APT pinning, to name a few possibilities."
+"predefined lists, use /{tasksel}/ tasks, or a combination of all three. "
+"Finally, a number of options give some control over /{apt}/, or if you "
+"prefer, /{aptitude}/, at build time when packages are installed. You may "
+"find these handy if you use a proxy, want to disable installation of "
+"recommended packages to save space, or need to control which versions of "
+"packages are installed via APT pinning, to name a few possibilities."
msgstr ""
#. type: Plain text
@@ -197,12 +200,12 @@ msgstr ""
msgid ""
"The distribution you choose has the broadest impact on which packages are "
"available to include in your live image. Specify the codename, which "
-"defaults to #{wheezy}# for the Wheezy version of live-build. Any current "
+"defaults to wheezy for the wheezy version of live-build. Any current "
"distribution carried in the Debian archive may be specified by its codename "
"here. (See {Terms}#terms for more details.) The #{--distribution}# option "
"not only influences the source of packages within the archive, but also "
-"instructs #{live-build}# to behave as needed to build each supported "
-"distribution. For example, to build against the *{unstable}* release, Sid, "
+"instructs live-build to behave as needed to build each supported "
+"distribution. For example, to build against the *{unstable}* release, sid, "
"specify:"
msgstr ""
@@ -257,12 +260,12 @@ msgid ""
"download speed. Each of the #{--mirror-*}# options governs which "
"distribution mirror is used at various stages of the build. Recall from "
"{Stages of the build}#stages-of-the-build that the *{bootstrap}* stage is "
-"when the chroot is initially populated by debootstrap with a minimal system, "
-"and the *{chroot}* stage is when the chroot used to construct the live "
-"system's filesystem is built. Thus, the corresponding mirror switches are "
-"used for those stages, and later, in the *{binary}* stage, the #{--mirror-"
-"binary}# and #{--mirror-binary-security}# values are used, superceding any "
-"mirrors used in an earlier stage."
+"when the chroot is initially populated by /{debootstrap}/ with a minimal "
+"system, and the *{chroot}* stage is when the chroot used to construct the "
+"live system's filesystem is built. Thus, the corresponding mirror switches "
+"are used for those stages, and later, in the *{binary}* stage, the #{--"
+"mirror-binary}# and #{--mirror-binary-security}# values are used, "
+"superceding any mirrors used in an earlier stage."
msgstr ""
#. type: Plain text
@@ -509,9 +512,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:125
msgid ""
-"For example, to make a list that includes the predefined #{gnome}# list plus "
-"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
-"contents:"
+"For example, to make a list that includes the predefined #{gnome}# list "
+"plus /{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the "
+"following contents:"
msgstr ""
#. type: Plain text
@@ -557,9 +560,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:148
msgid ""
-"You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architectures i386}# or #{--architectures amd64}# is "
-"specified:"
+"You may test for any one of a number of values, e.g. to install /"
+"{memtest86+}/ if either #{--architectures i386}# or #{--architectures amd64}"
+"# is specified:"
msgstr ""
#. type: Plain text
@@ -575,7 +578,7 @@ msgstr ""
#: en/user_customization-packages.ssi:158
msgid ""
"You may also test against variables that may contain more than one value, e."
-"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
+"g. to install /{vrms}/ if either #{contrib}# or #{non-free}# is specified "
"via #{--archive-areas}#:"
msgstr ""
@@ -637,8 +640,8 @@ msgstr ""
msgid ""
"The primary tasks available in the Debian Installer can be listed with #"
"{tasksel --list-tasks}# in the live system. The contents of any task, "
-"including ones not included in this list, may be examined with #{tasksel --"
-"task-packages}#."
+"including the ones not included in this list, may be examined with #{tasksel "
+"--task-packages}#."
msgstr ""
#. type: Plain text
@@ -883,7 +886,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:266
msgid ""
-"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
+"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 "
"to #{lb config}#. Choose the method implementing the preferred behaviour for "
"package installation, the notable difference being how missing packages are "
@@ -952,11 +955,11 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:294
msgid ""
-"This will not influence the entries in /etc/apt/sources.list, but merely "
-"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
-"APT needs those indices in order to operate in the live system, so before "
-"performing #{apt-cache search}# or #{apt-get install}#, for instance, the "
-"user must #{apt-get update}# first to create those indices."
+"This will not influence the entries in #{/etc/apt/sources.list}#, but merely "
+"whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is "
+"that APT needs those indices in order to operate in the live system, so "
+"before performing #{apt-cache search}# or #{apt-get install}#, for instance, "
+"the user must #{apt-get update}# first to create those indices."
msgstr ""
#. type: Plain text
@@ -1019,11 +1022,11 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:314
msgid ""
-"Let's say you are building a Wheezy 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 "
+"Let's say you are building a wheezy 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, Wheezy. The following will "
+"taken from the target system distribution, wheezy. The following will "
"accomplish this:"
msgstr ""
@@ -1051,7 +1054,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:331
#, no-wrap
-msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with Wheezy using:\n"
+msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:\n"
msgstr ""
#. type: Plain text
@@ -1066,9 +1069,9 @@ msgid ""
"the case where you do not want a package that is recommended by another "
"package. Suppose you are building an LXDE image using #{--package-lists lxde}"
"# option, but don't want the user prompted to store wifi passwords in the "
-"keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
-"turn recommends #{gnome-keyring}#. So you want to omit the recommended #"
-"{gnome-keyring}# package. This can be done by adding the following stanza to "
+"keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in "
+"turn recommends /{gnome-keyring}/. So you want to omit the recommended /"
+"{gnome-keyring}/ package. This can be done by adding the following stanza to "
"#{config/chroot_apt/preferences}#:"
msgstr ""
diff --git a/manual/po/pt_BR/user_customization-runtime.ssi.po b/manual/po/pt_BR/user_customization-runtime.ssi.po
index 257dde9..105b3bb 100644
--- a/manual/po/pt_BR/user_customization-runtime.ssi.po
+++ b/manual/po/pt_BR/user_customization-runtime.ssi.po
@@ -1,12 +1,11 @@
# Portuguese translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-24 15:08+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-06-03 20:02+0300\n"
"PO-Revision-Date: 2010-11-30 11:40+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,28 +16,29 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -86,28 +86,29 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -374,7 +375,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:96
msgid ""
-"Persistence is a common name for different kinds of solutions for saving "
+"'Persistence' is a common name for different kinds of solutions for saving "
"across reboots some, or all, of this run-time evolution of the system. To "
"understand how it could work it could be handy to know that even if the "
"system is booted and run from read-only media, modification to the files and "
@@ -389,15 +390,16 @@ msgid ""
"medium like local storage media, a network share or even a session of a "
"multisession (re)writable CD/DVD. All these media are supported in Debian "
"Live in different ways, and all but the last one require a special boot "
-"parameter to be specified at boot time: #{persistent}#."
+"parameter to be specified at boot time: #{persistence}#."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:100
msgid ""
-"If the boot parameter #{persistent}# is set (and #{nopersistent}# is not "
+"If the boot parameter #{persistence}# is set (and #{nopersistence}# is not "
"set), local storage media (e.g. hard disks, USB drives) will be probed for "
-"persistent volumes during boot. A persistent volume is any of the following:"
+"persistence volumes during boot. A persistence volume is any of the "
+"following:"
msgstr ""
#. type: Plain text
@@ -416,20 +418,20 @@ msgid ""
"_* an image/archive file located on the root of any readable filesystem "
"(even an NTFS partition of a foreign OS), identified by its file name. In "
"this case the file name must also use the containing filesystem as the file "
-"extension, e.g. \"<label>.ext3\"."
+"extension, e.g. \"<label>.ext4\"."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:108
msgid ""
-"It is possible to restrict which types of persistent volumes to use by "
+"It is possible to restrict which types of persistence volumes to use by "
"specifying certain boot parameters described in the live-boot(7) man page. "
"The \"identifying labels\" referred to above can be any of the following:"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:110
-msgid "_* #{full-ov}# for full persistent overlays."
+msgid "_* #{full-ov}# for full persistence overlays."
msgstr ""
#. type: Plain text
@@ -449,7 +451,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:118
-msgid "3~ Full persistent overlays"
+msgid "3~ Full persistence overlays"
msgstr ""
#. type: Plain text
@@ -457,15 +459,15 @@ msgstr ""
msgid ""
"By 'full persistence' it is meant that instead of using a tmpfs for storing "
"modifications to the read-only media (with the copy-on-write, COW, system) a "
-"persistent volume is used. For this type of persistence the volume label "
-"must be #{full-ov}#. This could, for instance, be an ext2 partition on a "
+"persistence volume is used. For this type of persistence the volume label "
+"must be #{full-ov}#. This could, for instance, be an ext4 partition on a "
"hard disk or on a usb key created with, e.g.:"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:124
#, no-wrap
-msgid " # mkfs.ext2 -L full-ov /dev/sdb1\n"
+msgid " # mkfs.ext4 -L full-ov /dev/sdb1\n"
msgstr ""
#. type: Plain text
@@ -489,7 +491,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:138
msgid ""
-"Here's an example of how to create an ext2-based image file used for full "
+"Here's an example of how to create an ext4-based image file used for full "
"persistence:"
msgstr ""
@@ -498,7 +500,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file\n"
-" $ /sbin/mkfs.ext2 -F full-ov\n"
+" $ /sbin/mkfs.ext4 -F full-ov\n"
msgstr ""
#. type: Plain text
@@ -517,54 +519,54 @@ msgstr ""
#: en/user_customization-runtime.ssi:151
msgid ""
"A volume with the label #{custom-ov}# can be configured to make arbitrary "
-"directories persistent. The file #{live.persist}#, located on the volume's "
-"filesystem root, controls which directories it makes persistent, and in "
-"which way."
+"directories persistent. The file #{live-persistence.conf}#, located on the "
+"volume's filesystem root, controls which directories it makes persistent, "
+"and in which way."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:153
msgid ""
"How custom overlay mounts are configured is described in full detail in the "
-"live.persist(5) man page, but a simple example should be sufficient for most "
-"uses. Let's say we want to make our home directory and APT cache persistent "
-"in an ext3 filesystem on the /dev/sdb1 partition:"
+"live-persistence.conf(5) man page, but a simple example should be sufficient "
+"for most uses. Let's say we want to make our home directory and APT cache "
+"persistent in an ext4 filesystem on the /dev/sdb1 partition:"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:160
#, no-wrap
msgid ""
-" $ mkfs.ext3 -L custom-ov /dev/sdb1\n"
-" $ mount -t ext3 /dev/sdb1 /mnt\n"
-" $ echo \"/home\" >> /mnt/live.persist\n"
-" $ echo \"/var/cache/apt\" >> /mnt/live.persist\n"
+" $ mkfs.ext4 -L custom-ov /dev/sdb1\n"
+" $ mount -t ext4 /dev/sdb1 /mnt\n"
+" $ echo \"/home\" >> /mnt/live-persistence.conf\n"
+" $ echo \"/var/cache/apt\" >> /mnt/live-persistence.conf\n"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:164
msgid ""
-"Then we reboot. During the first boot the contents of /home and /var/cache/"
-"apt will be copied into the persistent volume, and from then on all changes "
-"to these directories will live in the persistent volume. Please note that "
-"any paths listed in the #{live.persist}# file cannot contain white spaces or "
-"the special \".\" and \"..\" path components. Also, neither \"/live\" (or "
-"any of its sub-directories) nor \"/\" can be made persistent using custom "
-"mounts (for the latter, use the #{full-ov}# type persistence described "
-"above)."
+"Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
+"cache/apt}# will be copied into the persistence volume, and from then on all "
+"changes to these directories will live in the persistence volume. Please "
+"note that any paths listed in the #{live-persistence.conf}# file cannot "
+"contain white spaces or the special #{.}# and #{..}# path components. Also, "
+"neither #{/live}# (or any of its sub-directories) nor #{/}# can be made "
+"persistent using custom mounts (for the latter, use the #{full-ov}# type "
+"persistence described above)."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:166
msgid ""
-"Several different custom overlay volumes (with their own #{live.persist}# "
-"files) can be used at the same time, but if several volumes make the same "
-"directory persistent, only one of them will be used. If any two mounts are "
-"\"nested\" (i.e. one is a sub-directory of the other) the parent will be "
+"Several different custom overlay volumes (with their own #{live-persistence."
+"conf}# files) can be used at the same time, but if several volumes make the "
+"same directory persistent, only one of them will be used. If any two mounts "
+"are \"nested\" (i.e. one is a sub-directory of the other) the parent will be "
"mounted before the child so no mount will be hidden by the other. Nested "
-"custom mounts are problematic if they are listed in the same #{live.persist}"
-"# file. See the live.persist(5) man page for how to handle that case if you "
-"really need it (hint: you usually don't)."
+"custom mounts are problematic if they are listed in the same #{live-"
+"persistence.conf}# file. See the live-persistence.conf(5) man page for how "
+"to handle that case if you really need it (hint: you usually don't)."
msgstr ""
#. type: Plain text
@@ -576,13 +578,13 @@ msgstr ""
#: en/user_customization-runtime.ssi:170
msgid ""
"Snapshots are collections of files and directories which are not mounted "
-"while running but which are copied from a persistent volume to the system "
+"while running but which are copied from a persistence volume to the system "
"(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The "
"volume must be labeled #{live-sn}#, and it defaults to a simple cpio archive "
"named #{live-sn.cpio.gz}#. A power interruption during run time could lead "
"to data loss, hence, if you have important changes, invoke #{live-snapshot --"
"refresh}# as often as needed. This type of persistence, since it does not "
-"write continuously to the persistent media, is the most flash-based device "
+"write continuously to the persistence media, is the most flash-based device "
"friendly and the fastest of all the persistence systems, but it occupies as "
"much RAM as the size of the uncompressed snapshot."
msgstr ""
@@ -601,19 +603,19 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:176
-msgid "3~ Persistent SubText"
+msgid "3~ Persistence SubText"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:178
msgid ""
-"If a user would need multiple persistent storage of the same type for "
+"If a user would need multiple persistence storage of the same type for "
"different locations or testing, such as #{full-ov-nonwork}# and #{full-ov-"
-"work}#, the boot parameter #{persistent-subtext}# used in conjunction with "
-"the boot parameter #{persistent}# will allow for multiple but unique "
-"persistent media. An example would be if a user wanted to use a persistent "
+"work}#, the boot parameter #{persistence-subtext}# used in conjunction with "
+"the boot parameter #{persistence}# will allow for multiple but unique "
+"persistence media. An example would be if a user wanted to use a persistence "
"partition labeled #{live-sn-subText}# they would use the boot parameters of: "
-"#{persistent}# #{persistent-subtext=subText}#."
+"#{persistence}# #{persistence-subtext=subText}#."
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_examples.ssi.po b/manual/po/pt_BR/user_examples.ssi.po
index f3f1f51..1594f89 100644
--- a/manual/po/pt_BR/user_examples.ssi.po
+++ b/manual/po/pt_BR/user_examples.ssi.po
@@ -1,12 +1,11 @@
# Portuguese translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-13 14:44+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -22,26 +21,27 @@ msgid ":B~ Examples"
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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 en/user_customization-contents.ssi:26
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -67,49 +67,51 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 en/user_customization-contents.ssi:31
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -135,25 +137,26 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -165,7 +168,7 @@ msgid " # lb build\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#: en/user_customization-binary.ssi:41 en/user_examples.ssi:95
#, no-wrap
msgid " #!/bin/sh\n"
msgstr ""
@@ -274,7 +277,7 @@ msgstr ""
#: en/user_examples.ssi:46
msgid ""
"Assuming all goes well, after a while, the current directory will contain #"
-"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+"{binary.hybrid.iso}#. This ISO hybrid image can be booted directly in a "
"virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-"
"with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
"virtualbox, or else imaged onto optical media or a USB flash device as "
@@ -403,9 +406,9 @@ msgid ""
"First, #{--architectures i386}# ensures that on our #{amd64}# build system, "
"we build a 32-bit version suitable for use on most machines. Second, we use #"
"{--linux-flavours 686-pae}# because we don't anticipate using this image on "
-"much older systems. Third, we've chosen the #{lxde}# package list to give us "
+"much older systems. Third, we've chosen the /{lxde}/ package list to give us "
"a minimal desktop. And finally, we have added two initial favourite "
-"packages: #{iceweasel}# and #{xchat}#."
+"packages: /{iceweasel}/ and /{xchat}/."
msgstr ""
#. type: Plain text
@@ -445,8 +448,8 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:137
msgid ""
-"In this revision, we're going to clean up from the first build, add the #"
-"{vlc}# package to our configuration, rebuild, test and commit."
+"In this revision, we're going to clean up from the first build, add the /"
+"{vlc}/ package to our configuration, rebuild, test and commit."
msgstr ""
#. type: Plain text
@@ -467,7 +470,7 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:147
msgid ""
-"Now append the #{vlc}# package to our local package list in #{config/package-"
+"Now append the /{vlc}/ package to our local package list in #{config/package-"
"lists/my.list.chroot}#:"
msgstr ""
@@ -534,8 +537,8 @@ msgstr ""
#: en/user_examples.ssi:179
msgid ""
"Make a build directory and create a skeletal configuration in it built "
-"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
-"{xvnc4viewer}#, disabling recommends to make a minimal system:"
+"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
+"{xvnc4viewer}/, disabling recommends to make a minimal system:"
msgstr ""
#. type: Plain text
@@ -553,8 +556,8 @@ msgstr ""
#: en/user_examples.ssi:191
msgid ""
"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
-"the default user that will launch metacity and start xvncviewer, connecting "
-"to port #{5901}# on a server at #{192.168.1.2}#:"
+"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
+"connecting to port #{5901}# on a server at #{192.168.1.2}#:"
msgstr ""
#. type: Plain text
@@ -610,10 +613,10 @@ msgid ""
"the tradeoffs you are making between size and functionality. In this "
"example, we trim only so much as to make room for additional material within "
"a 128M media size, but without doing anything to destroy integrity of the "
-"packages contained within, such as the purging of locale data via the #"
-"{localepurge}# package, or other such \"intrusive\" optimizations. Of "
+"packages contained within, such as the purging of locale data via the /"
+"{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
"particular note, you should not use #{--bootstrap-flavour minimal}# unless "
-"you really know what you're doing, as omitting priority #{important}# "
+"you really know what you're doing, as omitting priority *{important}* "
"packages will most likely produce a broken live system."
msgstr ""
@@ -649,8 +652,8 @@ msgid ""
"system. Choosing the #{minimal}# package list leaves out the large #{locales}"
"# package and associated utilities. Dropping recommended packages with #{--"
"apt-recommends false}# saves some additional space, at the expense of "
-"omitting some packages you might otherwise expect to be there, such as #"
-"{firmware-linux-free}# which may be needed to support certain hardware. The "
+"omitting some packages you might otherwise expect to be there, such as /"
+"{firmware-linux-free}/ which may be needed to support certain hardware. The "
"remaining options shave off additional small amounts of space. It's up to "
"you to decide if the functionality that is sacrificed with each optimization "
"is worth the loss in functionality."
@@ -750,8 +753,8 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:292
msgid ""
-"Note that we have included the #{debian-installer-launcher}# package to "
-"launch the installer from the live desktop, and have also specified the 486 "
-"flavour kernel, as it is currently necessary to make the installer and live "
-"system kernels match for the launcher to work properly."
+"Note that we have included the debian-installer-launcher package to launch "
+"the installer from the live desktop, and have also specified the 486 flavour "
+"kernel, as it is currently necessary to make the installer and live system "
+"kernels match for the launcher to work properly."
msgstr ""
diff --git a/manual/po/pt_BR/user_installation.ssi.po b/manual/po/pt_BR/user_installation.ssi.po
index db27275..137ee80 100644
--- a/manual/po/pt_BR/user_installation.ssi.po
+++ b/manual/po/pt_BR/user_installation.ssi.po
@@ -1,12 +1,11 @@
# Portuguese translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-31 16:32+0300\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
"PO-Revision-Date: 2010-10-16 20:36-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,29 +16,30 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -87,29 +87,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -408,16 +409,16 @@ msgstr ""
#: en/user_installation.ssi:125
msgid ""
"You must build either on your target distribution or in a chroot containing "
-"your target platform: this means if your target is Wheezy then you should "
-"build against Wheezy."
+"your target platform: this means if your target is wheezy then you should "
+"build against wheezy."
msgstr ""
#. type: Plain text
#: en/user_installation.ssi:127
msgid ""
"Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
-"build #{live-boot}# for a target distribution that differs from your build "
-"system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy "
+"build live-boot for a target distribution that differs from your build "
+"system. For example, for wheezy live images, build live-boot in a wheezy "
"chroot. If your target distribution happens to match your build system "
"distribution, you may build directly on the build system using #{dpkg-"
"buildpackage}# (provided by the /{dpkg-dev}/ package):"
diff --git a/manual/po/pt_BR/user_managing_a_configuration.ssi.po b/manual/po/pt_BR/user_managing_a_configuration.ssi.po
index 3f3b09c..501779d 100644
--- a/manual/po/pt_BR/user_managing_a_configuration.ssi.po
+++ b/manual/po/pt_BR/user_managing_a_configuration.ssi.po
@@ -1,12 +1,11 @@
# Portuguese translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: 2010-10-13 17:00+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,28 +16,30 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -62,21 +63,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -85,28 +87,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -130,21 +134,22 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -216,7 +221,7 @@ msgid ""
"variable values, and each time you run #{lb config}# and #{lb clean}#, these "
"files will be executed. This will ensure that your configuration is kept "
"internally consistent from one revision to the next and from one live-build "
-"release to the next (though you will still have to take care and read the "
+"release to the next (Although you will still have to take care and read the "
"documentation when you upgrade live-build and make adjustments as needed)."
msgstr ""
diff --git a/manual/po/pt_BR/user_overview.ssi.po b/manual/po/pt_BR/user_overview.ssi.po
index d52e9cb..60fdbf2 100644
--- a/manual/po/pt_BR/user_overview.ssi.po
+++ b/manual/po/pt_BR/user_overview.ssi.po
@@ -1,12 +1,11 @@
# Portuguese translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-19 18:09+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,28 +16,30 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -62,21 +63,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -85,28 +87,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -130,21 +134,22 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -192,15 +197,15 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:14
msgid ""
-"Many concepts are similar to those in the debhelper Debian package tools "
+"Many concepts are similar to those in the /{debhelper}/ Debian package tools "
"written by Joey Hess:"
msgstr ""
#. type: Plain text
#: en/user_overview.ssi:16
msgid ""
-"_* The scripts have a central location for configuring their operation. In "
-"debhelper, this is the #{debian/}# subdirectory of a package tree. For "
+"_* The scripts have a central location for configuring their operation. In /"
+"{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For "
"example, dh_install will look, amongst others, for a file called #{debian/"
"install}# to determine which files should exist in a particular binary "
"package. In much the same way, live-build stores its configuration entirely "
@@ -217,9 +222,9 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:20
msgid ""
-"Unlike debhelper, live-build contains a tool to generate a skeleton "
+"Unlike /{debhelper}/, live-build contains a tool to generate a skeleton "
"configuration directory, #{lb config}#. This could be considered to be "
-"similar to tools such as #{dh-make}#. For more information about #{lb config}"
+"similar to tools such as /{dh-make}/. For more information about #{lb config}"
"#, please see {The lb config command}#lb-config."
msgstr ""
diff --git a/manual/po/ro/about_manual.ssi.po b/manual/po/ro/about_manual.ssi.po
index d511c41..841e950 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: 2012-03-07 08:59-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"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-18 19:35+0300\n"
+"PO-Revision-Date: 2012-04-14 22:32+0200\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
@@ -29,18 +31,25 @@ msgstr "1~about-manual Despre acest manual"
msgid ""
"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 7.0 \"Wheezy\" 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."
+"by the project for the Debian 7.0 \"wheezy\" release. An up-to-date version "
+"can always be found at http://live.debian.net/"
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:8
msgid ""
+"While live-manual 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
+#: en/about_manual.ssi:10
+msgid ""
"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 "
"using #{sudo}#. To distinguish between commands which may be executed by an "
@@ -54,40 +63,51 @@ msgstr ""
"Aceste simboluri nu fac parte din comenzi."
#. type: Plain text
-#: en/about_manual.ssi:10
+#: en/about_manual.ssi:12
msgid "2~ For the impatient"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:12
+#: en/about_manual.ssi:14
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 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, "
+"the details. Therefore, we suggest reading in the following order."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:16
+msgid ""
+"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."
+"a taste of what can be done with Debian Live."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:14
+#: en/about_manual.ssi:18
+msgid ""
+"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
+#: en/about_manual.ssi:20
msgid "2~terms Terms"
msgstr "2~terms Termeni"
#. type: Plain text
-#: en/about_manual.ssi:16
+#: en/about_manual.ssi:22
msgid ""
"_* *{Live system}*: An operating system that can boot without installation "
"to a hard drive. Live systems do not alter local operating system(s) or file"
@@ -102,7 +122,7 @@ msgstr ""
"USB. Unele chiar pot porni prin retaua de net."
#. type: Plain text
-#: en/about_manual.ssi:18
+#: en/about_manual.ssi:24
msgid ""
"_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, "
"live-build, live-config, and live-manual packages."
@@ -111,7 +131,7 @@ msgstr ""
"live-build, live-config, si live-manual."
#. type: Plain text
-#: en/about_manual.ssi:20
+#: en/about_manual.ssi:26
msgid ""
"_* *{Debian Live system}*: A live system that uses software from the Debian "
"operating system that may be booted from CDs, DVDs, USB sticks, over the "
@@ -124,49 +144,50 @@ msgstr ""
"parameter #{fetch=URL}#)."
#. type: Plain text
-#: en/about_manual.ssi:22
+#: en/about_manual.ssi:28
msgid "_* *{Host system}*: The environment used to create the live system."
msgstr ""
"_* *{Host system}*: Mediul folosit pentru crearea sistemului live pe un "
"sistem dat."
#. type: Plain text
-#: en/about_manual.ssi:24
+#: en/about_manual.ssi:30
msgid "_* *{Target system}*: The environment used to run the live system."
msgstr "_* *{Target system}*: Mediul folosit pentru rularea sistemului live."
#. type: Plain text
-#: en/about_manual.ssi:26
+#: en/about_manual.ssi:32
msgid ""
"_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
-"boot was formerly a part of live-initramfs."
+"boot was formerly a part of /{live-initramfs}/."
msgstr ""
"_* *{live-boot}*: O coloctie se scripte folosite la pornirea sistemului "
-"live. live-boot a facul parte formal din live-initramfs."
+"live. live-boot a facul parte formal din /{live-initramfs}/."
#. type: Plain text
-#: en/about_manual.ssi:28
+#: en/about_manual.ssi:34
msgid ""
"_* *{live-build}*: A collection of scripts used to build customized Debian "
-"Live systems. live-build was formerly known as live-helper, and even earlier "
-"known as live-package."
+"Live systems. live-build was formerly known as /{live-helper}/, and even "
+"earlier known as /{live-package}/."
msgstr ""
"_* *{live-build}*: O colectie de scripte folosite la particularizatrea "
-"sistemelor Debian Live. live-build a fost cunoscut ca live-helper, iar mai "
-"inainte ca live-package."
+"sistemelor Debian Live. live-build a fost cunoscut ca /{live-helper}/, iar "
+"mai inainte ca /{live-package}/."
#. type: Plain text
-#: en/about_manual.ssi:30
+#: en/about_manual.ssi:36
msgid ""
"_* *{live-config}*: A collection of scripts used to configure a live system "
-"during the boot process. live-config was formerly a part of live-initramfs."
+"during the boot process. live-config was formerly a part of /{live-"
+"initramfs}/."
msgstr ""
"_* *{live-config}*: O colectie de scripte folosite la configurarea sitemului "
"live in timpul procesului de pornire. live-config a fost cunoscut ca parte "
-"din live-initramfs."
+"din /{live-initramfs}/."
#. type: Plain text
-#: en/about_manual.ssi:32
+#: en/about_manual.ssi:38
msgid ""
"_* *{live-manual}*: This document is maintained in a package called live-"
"manual."
@@ -174,7 +195,7 @@ msgstr ""
"_* *{live-manual}*: Acest document face parte din pachetul numit live-manual."
#. type: Plain text
-#: en/about_manual.ssi:34
+#: en/about_manual.ssi:40
msgid ""
"_* *{Debian Installer (d-i)}*: The official installation system for the "
"Debian distribution."
@@ -183,7 +204,7 @@ msgstr ""
"distributia Debian."
#. type: Plain text
-#: en/about_manual.ssi:36
+#: en/about_manual.ssi:42
msgid ""
"_* *{Boot parameters}*: Parameters that can be entered at the bootloader "
"prompt to influence the kernel or live-config."
@@ -192,18 +213,18 @@ msgstr ""
"ului care sa infuenteze kernelul sau live-config."
#. type: Plain text
-#: en/about_manual.ssi:38
+#: en/about_manual.ssi:44
msgid ""
-"_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+"_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run "
"different instances of the GNU/Linux environment on a single system "
"simultaneously without rebooting."
msgstr ""
-"_* *{chroot}*: Programul chroot, #{chroot(8)}#, permite rularea a diferite "
-"instante din mediul GNU/Linux pe un singur sistem si in simultan fara a "
-"necesita o repornire a sistemului."
+"_* *{chroot}*: Programul /{chroot}/, #{chroot(8)}#, permite rularea a "
+"diferite instante din mediul GNU/Linux pe un singur sistem si in simultan "
+"fara a necesita o repornire a sistemului."
#. type: Plain text
-#: en/about_manual.ssi:40
+#: en/about_manual.ssi:46
msgid ""
"_* *{Binary image}*: A file containing the live system, such as binary.iso "
"or binary.img."
@@ -212,7 +233,7 @@ msgstr ""
"binary.iso sau binary.img."
#. type: Plain text
-#: en/about_manual.ssi:42
+#: en/about_manual.ssi:48
msgid ""
"_* *{Target distribution}*: The distribution upon which your live system "
"will be based. This can differ from the distribution of your host system."
@@ -221,26 +242,26 @@ msgstr ""
"distributie poate fi diferita de cea a sistemului gazda."
#. type: Plain text
-#: en/about_manual.ssi:44
-msgid ""
-"_* *{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."
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:46
-msgid ""
-"The *{stable}* distribution contains the latest officially released "
-"distribution of Debian. The *{testing}* distribution is the staging area for "
-"the next *{stable}* release. A major advantage of using this distribution is "
-"that it has more recent versions of software relative to the *{stable}* "
-"release. The *{unstable}* distribution is where active development of Debian "
-"occurs. Generally, this distribution is run by developers and those who like "
-"to live on the edge."
+#: en/about_manual.ssi:50
+#, fuzzy
+#| msgid ""
+#| "The *{stable}* distribution contains the latest officially released "
+#| "distribution of Debian. The *{testing}* distribution is the staging area "
+#| "for the next *{stable}* release. A major advantage of using this "
+#| "distribution is that it has more recent versions of software relative to "
+#| "the *{stable}* release. The *{unstable}* distribution is where active "
+#| "development of Debian occurs. Generally, this distribution is run by "
+#| "developers and those who like to live on the edge."
+msgid ""
+"_* *{stable/testing/unstable}*: The *{stable}* distribution contains the "
+"latest officially released distribution of Debian. The *{testing}* "
+"distribution is the staging area for the next *{stable}* release. A major "
+"advantage of using this distribution is that it has more recent versions of "
+"software relative to the *{stable}* release. The *{unstable}* distribution "
+"is where active development of Debian occurs. Generally, this distribution "
+"is run by developers and those who like to live on the edge. Throughout the "
+"manual, we tend to use codenames for the releases, such as wheezy or sid, as "
+"that is what is supported by the tools themselves."
msgstr ""
"*{stable}* contine ultima versiune oficiala a distributiei Debian. *{testing}"
"* este sursa pentru urmatoarea versiune *{stable}*. Pricipalul avantaj la "
@@ -250,82 +271,82 @@ msgstr ""
"cei ce le place riscul ... ."
#. type: Plain text
-#: en/about_manual.ssi:48
+#: en/about_manual.ssi:52
msgid "2~ Authors"
msgstr "2~ Autori"
#. type: Plain text
-#: en/about_manual.ssi:50
+#: en/about_manual.ssi:54
msgid "A list of authors (in alphabetical order):"
msgstr "Lista autorilor (in ordine alfabetica):"
#. type: Plain text
-#: en/about_manual.ssi:52
+#: en/about_manual.ssi:56
msgid "_* Ben Armstrong"
msgstr "_* Ben Armstrong"
#. type: Plain text
-#: en/about_manual.ssi:54
+#: en/about_manual.ssi:58
msgid "_* Brendan Sleight"
msgstr "_* Brendan Sleight"
#. type: Plain text
-#: en/about_manual.ssi:56
+#: en/about_manual.ssi:60
msgid "_* Chris Lamb"
msgstr "_* Chris Lamb"
#. type: Plain text
-#: en/about_manual.ssi:58
+#: en/about_manual.ssi:62
msgid "_* Daniel Baumann"
msgstr "_* Daniel Baumann"
#. type: Plain text
-#: en/about_manual.ssi:60
+#: en/about_manual.ssi:64
msgid "_* Franklin Piat"
msgstr "_* Franklin Piat"
#. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:66
msgid "_* Jonas Stein"
msgstr "_* Jonas Stein"
#. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:68
msgid "_* Kai Hendry"
msgstr "_* Kai Hendry"
#. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:70
msgid "_* Marco Amadori"
msgstr "_* Marco Amadori"
#. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:72
msgid "_* Mathieu Geli"
msgstr "_* Mathieu Geli"
#. type: Plain text
-#: en/about_manual.ssi:70
+#: en/about_manual.ssi:74
msgid "_* Matthias Kirschner"
msgstr "_* Matthias Kirschner"
#. type: Plain text
-#: en/about_manual.ssi:72
+#: en/about_manual.ssi:76
msgid "_* Richard Nelson"
msgstr "_* Richard Nelson"
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:78
msgid "_* Trent W. Buck"
msgstr "_* Trent W. Buck"
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:80
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
+#: en/about_manual.ssi:82
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -338,7 +359,7 @@ msgstr ""
"#contact pentru mai multe informatii."
#. type: Plain text
-#: en/about_manual.ssi:80
+#: en/about_manual.ssi:84
msgid ""
"When submitting a contribution, please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted, the "
@@ -351,7 +372,7 @@ msgstr ""
"documentului , adica GPL version 3 or later."
#. type: Plain text
-#: en/about_manual.ssi:82
+#: en/about_manual.ssi:86
msgid ""
"The sources for this manual are maintained using the Git version control "
"system. You can check out the latest copy by executing:"
@@ -360,28 +381,29 @@ msgstr ""
"ti checkout ultima copie prin executarea :"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -405,56 +427,58 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:86
+#: en/about_manual.ssi:90
msgid "$ git clone git://live.debian.net/git/live-manual.git"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -478,30 +502,31 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/about_manual.ssi:90
+#: en/about_manual.ssi:94
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -512,13 +537,13 @@ msgstr ""
"pentru 'building' sunt instalate, prin executatea comenzii:"
#. type: Plain text
-#: en/about_manual.ssi:94
+#: en/about_manual.ssi:98
#, no-wrap
msgid " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:98
+#: en/about_manual.ssi:102
msgid ""
"You may build the live-manual from the top level directory of your Git "
"checkout by executing:"
@@ -527,13 +552,13 @@ msgstr ""
"al dvs, prin executatea:"
#. type: Plain text
-#: en/about_manual.ssi:102
+#: en/about_manual.ssi:106
#, no-wrap
msgid " $ make build\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:110
msgid ""
"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 "
@@ -541,42 +566,42 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:110
+#: en/about_manual.ssi:114
#, no-wrap
msgid " $ make build LANGUAGES=en\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:114
+#: en/about_manual.ssi:118
msgid "It is also possible to build by document type, e.g:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:122
#, no-wrap
msgid " $ make build FORMATS=pdf\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:122
+#: en/about_manual.ssi:126
msgid "Or combine both, e.g:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:126
+#: en/about_manual.ssi:130
#, no-wrap
msgid " $ make build FORMATS=html LANGUAGES=it\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:130
+#: en/about_manual.ssi:134
#, fuzzy
#| msgid "3~ Applying patches"
msgid "3~ Applying changes"
msgstr "3~ Aplicarea de patch-uri"
#. type: Plain text
-#: en/about_manual.ssi:132
+#: en/about_manual.ssi:136
msgid ""
"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 "
@@ -587,12 +612,12 @@ msgstr ""
"contibutiile la repository, pasii urmatori sunt necesari:"
#. type: Plain text
-#: en/about_manual.ssi:134
+#: en/about_manual.ssi:138
msgid "_* Fetch the public commit key:"
msgstr "_* Fetch the public commit key:"
#. type: Plain text
-#: en/about_manual.ssi:143
+#: en/about_manual.ssi:147
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
@@ -604,12 +629,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:147
+#: en/about_manual.ssi:151
msgid "_* Add the following section to your openssh-client config:"
msgstr "_* Adaugati urmatoarea sectiuna la openssh-client config:"
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:160
#, no-wrap
msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
@@ -621,12 +646,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:164
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:165
+#: en/about_manual.ssi:169
#, no-wrap
msgid ""
" $ git clone git at live.debian.net:/live-manual.git\n"
@@ -636,102 +661,85 @@ msgstr ""
" $ cd live-manual && git checkout debian-next\n"
#. type: Plain text
-#: en/about_manual.ssi:169
+#: en/about_manual.ssi:173
msgid ""
"_* 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:171
-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:175
-#, no-wrap
-msgid " $ make commit\n"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:179
-msgid "_* Then"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:183
-#, no-wrap
-msgid " $ git add .\n"
+msgid ""
+"_* Do not use #{make commit}# unless you are updating translations in this "
+"commit, and in that case, do not mix changes to the English manual and "
+"translations in the same commit, but use separate commits for each. See the "
+"{Translation}#translation section for more details."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:187
+#: en/about_manual.ssi:177
#, 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."
+#| "_* 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 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."
+"_* Write commit messages that consist of complete, meaningful 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 "
-"punct si sens. Inceputul poate fii de forma 'Fixing/Adding/Removing/"
-"Correcting/Translating':"
+"_* 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':"
#. type: Plain text
-#: en/about_manual.ssi:191
+#: en/about_manual.ssi:181
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:195
+#: en/about_manual.ssi:185
msgid "_* Push the commit to the server:"
msgstr "_* Primite commit-ul la server:"
#. type: Plain text
-#: en/about_manual.ssi:199
+#: en/about_manual.ssi:189
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:203
+#: en/about_manual.ssi:193
msgid "3~translation Translation"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:205
+#: en/about_manual.ssi:195
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:207
+#: en/about_manual.ssi:197
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). "
-"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."
+"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."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:209
+#: en/about_manual.ssi:199
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:211
+#: en/about_manual.ssi:201
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
"are updated from the po files and then you can review your changes launching "
@@ -740,7 +748,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:212
+#: en/about_manual.ssi:202
#, 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/about_project.ssi.po b/manual/po/ro/about_project.ssi.po
index 0cbc76b..1687674 100644
--- a/manual/po/ro/about_project.ssi.po
+++ b/manual/po/ro/about_project.ssi.po
@@ -5,8 +5,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 2.0.0\n"
-"POT-Creation-Date: 2012-02-19 22:16+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-05-25 14:30+0300\n"
"PO-Revision-Date: 2011-12-03 16:06+0100\n"
"Last-Translator: Creatura85 <creatura85 at opensuse.org>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -126,7 +126,9 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:32
-msgid "_* It would be a subproject of Debian."
+#, fuzzy
+#| msgid "_* It would be a subproject of Debian."
+msgid "_* It is a subproject of Debian."
msgstr "_* Acesta va fi un subproiect Debian."
#. type: Plain text
@@ -226,31 +228,28 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:60
msgid ""
-"A system for configuring packages is provided using debconf in #{lb config}# "
-"(use --preseed FILE) allowing custom configured packages to be installed in "
-"your custom produced Debian Live images, but for official live images only "
-"default configuration will be used. For more information, please see "
-"{Customization overview}#customization-overview."
+"A system for configuring packages is provided using debconf allowing custom "
+"configured packages to be installed in your custom produced Debian Live "
+"images, but for official live images only default configuration will be "
+"used. For more information, please see {Customization overview}"
+"#customization-overview."
msgstr ""
"Cu toate acestea un sistem de configurare a programelor este permisa "
-"folosind debconf in #{lb config}# (use --preseed FILE), ce permite o "
-"particularizare a configurari programelor in sistemul live facur de dvs., "
-"insa imaginile oficiale live doar configurari de baza vot fi folosite. "
-"Pentru mai multe informatii, urmariti {Customization overview}#customization-"
-"overview."
+"folosind debconf, ce permite o particularizare a configurari programelor in "
+"sistemul live facur de dvs., insa imaginile oficiale live doar configurari "
+"de baza vot fi folosite. Pentru mai multe informatii, urmariti "
+"{Customization overview}#customization-overview."
#. type: Plain text
#: en/about_project.ssi:62
msgid ""
"Exception: There are a few essential changes needed to bring a live system "
-"to life (e.g. configuring pam to allow empty passwords). These essential "
-"changes have to be kept as minimal as possible and should be merged within "
-"the Debian repository if possible."
+"to life. These essential changes have to be kept as minimal as possible and "
+"should be merged within the Debian repository if possible."
msgstr ""
"Exceptie: Sunt desigur necesare cateva necesare sa aducem 'la viata' un "
-"sistem live ( de exemplu: configuratea pam care sa permita empty passwords). "
-"Dar aceste schimbari esentiale trebuie minimizate la maximum si pastrate in "
-"concordanta cu depozitul Debian."
+"sistem live. Dar aceste schimbari esentiale trebuie minimizate la maximum si "
+"pastrate in concordanta cu depozitul Debian."
#. type: Plain text
#: en/about_project.ssi:64
@@ -286,12 +285,12 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:69
msgid ""
-"_* *{BTS}*: The Debian Bug Tracking System (BTS) contains details of bugs "
-"reported by users and developers. Each bug is given a number, and is kept on "
-"file until it is marked as having been dealt with. For more information, "
-"please see {Reporting bugs}#bugs."
+"_* *{BTS}*: The {Debian Bug Tracking System}http://www.debian.org/Bugs/ "
+"(BTS) contains details of bugs reported by users and developers. Each bug is "
+"given a number, and is kept on file until it is marked as having been dealt "
+"with. For more information, please see {Reporting bugs}#bugs."
msgstr ""
-"_* *{BTS}*: BTS adica Debian Bug Tracking System , contine detalii asupra "
-"rapoartelor de bug facute de utilizatorisau dezvoltatori. Fiecare bug are un "
-"numar, si este mentinut deschis pana la rezolvare. Alte informatii gasiti la "
-"{Reporting bugs}#bugs."
+"_* *{BTS}*: BTS adica {Debian Bug Tracking System}http://www.debian.org/"
+"Bugs/ contine detalii asupra rapoartelor de bug facute de utilizatorisau "
+"dezvoltatori. Fiecare bug are un numar, si este mentinut deschis pana la "
+"rezolvare. Alte informatii gasiti la {Reporting bugs}#bugs."
diff --git a/manual/po/ro/index.html.in.po b/manual/po/ro/index.html.in.po
index c965e08..750f2f2 100644
--- a/manual/po/ro/index.html.in.po
+++ b/manual/po/ro/index.html.in.po
@@ -1,13 +1,12 @@
# Romanian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# Carlos Zuferri «chals» <chals at altorricon.com>, 2011.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-07 16:03+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-06-02 18:16+0300\n"
"PO-Revision-Date: 2011-12-26 19:10+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -38,12 +37,12 @@ msgstr ""
#. type: Content of: <html><body><p>
#: en/index.html.in:17
msgid ""
-"Please report errors, omissions, patches and suggestions to our mailinglist "
+"Please report errors, omissions, patches and suggestions to our mailing list "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
"org</a> and read about <a href=\"html/live-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
msgstr ""
-"Please report errors, omissions, patches and suggestions to our mailinglist "
+"Please report errors, omissions, patches and suggestions to our mailing list "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
"org</a> and read about <a href=\"html/live-manual.ro.html#how-to-contribute"
"\">how to contribute</a> to the manual."
@@ -108,7 +107,7 @@ msgstr ""
#. type: Content of: <html><body><p>
#: en/index.html.in:38
msgid ""
-"The sources for this manual is available in a <a href=\"http://git.or.cz/"
+"The sources for this manual are available in a <a href=\"http://git.or.cz/"
"\">Git</a> repository at live.debian.net."
msgstr ""
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index f54a60c..ee73ffc 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -1,12 +1,11 @@
# Romanian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-03 00:19+0300\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-06-04 12:21+0300\n"
"PO-Revision-Date: 2010-10-23 00:04+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -46,8 +45,10 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-04-03\n"
+" :published: 2012-06-04\n"
msgstr ""
+"@date:\n"
+" :published: 04.06.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
@@ -59,8 +60,8 @@ msgstr ""
#, no-wrap
msgid ""
"@make:\n"
-" :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/\n"
-" :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
+" :bold: /squeeze|wheezy|sid/\n"
+" :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
msgstr ""
diff --git a/manual/po/ro/project_bugs.ssi.po b/manual/po/ro/project_bugs.ssi.po
index 683cf40..b8674b6 100644
--- a/manual/po/ro/project_bugs.ssi.po
+++ b/manual/po/ro/project_bugs.ssi.po
@@ -1,13 +1,12 @@
# Romanian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
# Creak <romain.failliot at foolstep.com>, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-24 14:17-0400\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
"PO-Revision-Date: 2010-10-27 22:56+0200\n"
"Last-Translator: Creak <romain.failliot at foolstep.com>\n"
"Language-Team: Français <debian-live at lists.debian.org>\n"
@@ -18,130 +17,144 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. 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/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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: 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-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
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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/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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: 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-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
-#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -305,7 +318,7 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:50
msgid ""
-"_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system"
+"_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system"
msgstr ""
#. type: Plain text
@@ -401,8 +414,8 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:82
msgid ""
-"live-build first bootstraps a basic Debian system with #{debootstrap}# or #"
-"{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
+"live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
+"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
"distribution it is bootstrapping, it may fail. If a bug appears here, check "
"if the error is related to a specific Debian package (most likely), or if it "
"is related to bootstrapping tool itself."
@@ -434,7 +447,7 @@ msgstr ""
#: en/project_bugs.ssi:90
msgid ""
"If this is the case, this is not a bug in Debian Live, but rather in Debian "
-"- please report it against the failing package. Running #{debootstrap}# "
+"- please report it against the failing package. Running /{debootstrap}/ "
"separately from the Live system build or running #{lb bootstrap --debug}# "
"will give you more information."
msgstr ""
diff --git a/manual/po/ro/project_coding-style.ssi.po b/manual/po/ro/project_coding-style.ssi.po
index a8657c8..0600ad7 100644
--- a/manual/po/ro/project_coding-style.ssi.po
+++ b/manual/po/ro/project_coding-style.ssi.po
@@ -1,12 +1,11 @@
# Romanian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-31 16:32+0300\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-07 22:16+0300\n"
"PO-Revision-Date: 2010-11-30 11:05+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,29 +17,30 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -88,29 +88,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -196,37 +197,42 @@ msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:16
-msgid "2~ Indenting"
+msgid "_* Make sure all shell code runs with 'set -e'."
msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:18
-msgid "_* Always use tabs over spaces."
+msgid "2~ Indenting"
msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:20
-msgid "2~ Wrapping"
+msgid "_* Always use tabs over spaces."
msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:22
-msgid "_* Generally, lines are 80 chars at maximum."
+msgid "2~ Wrapping"
msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:24
+msgid "_* Generally, lines are 80 chars at maximum."
+msgstr ""
+
+#. type: Plain text
+#: en/project_coding-style.ssi:26
msgid "_* Use the \"Linux style\" of line breaks:"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:26 en/project_coding-style.ssi:49
-#: en/project_coding-style.ssi:90 en/project_coding-style.ssi:108
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:51
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:110
msgid "Bad:"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:32
+#: en/project_coding-style.ssi:34
#, no-wrap
msgid ""
" if foo; then\n"
@@ -235,13 +241,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:59
-#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:119
+#: en/project_coding-style.ssi:38 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:100 en/project_coding-style.ssi:121
msgid "Good:"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:43
+#: en/project_coding-style.ssi:45
#, no-wrap
msgid ""
" if foo\n"
@@ -251,108 +257,108 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:49
msgid "_* The same holds for functions:"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:55
+#: en/project_coding-style.ssi:57
#, no-wrap
msgid ""
-" foo () {\n"
+" Foo () {\n"
" bar\n"
" }\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:66
+#: en/project_coding-style.ssi:68
#, no-wrap
msgid ""
-" foo ()\n"
+" Foo ()\n"
" {\n"
" bar\n"
" }\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:72
msgid "2~ Variables"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:72
+#: en/project_coding-style.ssi:74
msgid "_* Variables are always in capital letters."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:74
+#: en/project_coding-style.ssi:76
msgid ""
"_* Variables that used in #{lb config}# always start with #{LB_}# prefix."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:76
+#: en/project_coding-style.ssi:78
msgid ""
"_* Internal temporary variables in live-build should start with the #{\\_LB_}"
"# prefix."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:78
+#: en/project_coding-style.ssi:80
msgid "_* Local variables start with live-build #{\\_\\_LB_}# prefix."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:80
+#: en/project_coding-style.ssi:82
msgid ""
"_* Variables in connection to a boot parameter in live-config start with #"
"{LIVE_}#."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:82
+#: en/project_coding-style.ssi:84
msgid "_* All other variables in live-config start with #{_}# prefix."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:84
+#: en/project_coding-style.ssi:86
msgid ""
"_* Use braces around variables; e.g. write #{${FOO}}# instead of #{$FOO}#."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:86
+#: en/project_coding-style.ssi:88
msgid ""
"_* Always protect variables with quotes to respect potential whitespaces: "
"write #{\"${FOO}\"}# not #{${FOO}}#."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:88
+#: en/project_coding-style.ssi:90
msgid ""
"_* For consistency reasons, always use quotes when assigning values to "
"variables:"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:94
+#: en/project_coding-style.ssi:96
#, no-wrap
msgid " FOO=bar\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:104
#, no-wrap
msgid " FOO=\"bar\"\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:108
msgid "_* If multiple variables are used, quote the full expression:"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:115
+#: en/project_coding-style.ssi:117
#, no-wrap
msgid ""
" if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
@@ -362,7 +368,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:126
+#: en/project_coding-style.ssi:128
#, no-wrap
msgid ""
" if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
@@ -372,19 +378,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:130
+#: en/project_coding-style.ssi:132
msgid "2~ Miscellaneous"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:132
+#: en/project_coding-style.ssi:134
msgid ""
"_* Use \"#{|}#\" (without the surround quotes) as a separator in calls to "
"sed, e.g. \"#{sed -e 's|foo|bar|'}#\" (without \"\")."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:134
+#: en/project_coding-style.ssi:136
msgid ""
"_* Don't use the #{test}# command for comparisons or tests, use \"#{[}#\" \"#"
"{]}#\" (without \"\"); e.g. \"#{if [ -x /bin/foo ]; ...}#\" and not \"#{if "
@@ -392,8 +398,15 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:135
+#: en/project_coding-style.ssi:138
msgid ""
"_* Use #{case}# wherever possible over #{test}#, as it's easier to read and "
"faster in execution."
msgstr ""
+
+#. type: Plain text
+#: en/project_coding-style.ssi:139
+msgid ""
+"_* Use capitalized names for functions to limit messing with the users "
+"environment."
+msgstr ""
diff --git a/manual/po/ro/project_procedures.ssi.po b/manual/po/ro/project_procedures.ssi.po
index 8270539..4d5861e 100644
--- a/manual/po/ro/project_procedures.ssi.po
+++ b/manual/po/ro/project_procedures.ssi.po
@@ -1,12 +1,11 @@
# Romanian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 20:37-0400\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-23 20:28+0300\n"
"PO-Revision-Date: 2010-11-30 10:35+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,130 +17,142 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. 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:58
-#: 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: 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-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
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:62
-#: 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: 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-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
-#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -234,7 +245,7 @@ msgstr ""
#. type: Plain text
#: en/project_procedures.ssi:36
msgid ""
-"_* Again, we need updated mirror of debian, debian-security and debian-"
+"_* Again, we need updated mirrors of debian, debian-security and debian-"
"volatile."
msgstr ""
@@ -245,18 +256,32 @@ msgstr ""
#. type: Plain text
#: en/project_procedures.ssi:42
+msgid "3~ Last Point Release of a Debian Release"
+msgstr ""
+
+#. type: Plain text
+#: en/project_procedures.ssi:47
+msgid ""
+"Remember to adjust both chroot and binary mirrors when building the last set "
+"of images for a Debian release after it has been moved away from ftp.debian."
+"org to archive.debian.org. That way, old prebuilt live images are still "
+"useful without user modifications."
+msgstr ""
+
+#. type: Plain text
+#: en/project_procedures.ssi:49
msgid "3~ Point release announcement template"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:44
+#: en/project_procedures.ssi:51
msgid ""
"An annoucement mail for point releases can be generated using the template "
"below and the following command:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:52
+#: en/project_procedures.ssi:59
#, no-wrap
msgid ""
" $ sed \\\n"
@@ -267,20 +292,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:56
+#: en/project_procedures.ssi:63
msgid ""
"Please check the mail carefully before sending and pass it to others for "
"proof-reading."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:60
+#: en/project_procedures.ssi:67
#, no-wrap
msgid " Debian Live images for Debian GNU/Linux %major% updated\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:64
+#: en/project_procedures.ssi:71
#, no-wrap
msgid ""
" The Debian Live project is pleased to announce the availability of\n"
@@ -289,19 +314,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:66
+#: en/project_procedures.ssi:73
#, no-wrap
msgid " The images are available for download at:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:68
+#: en/project_procedures.ssi:75
#, no-wrap
msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:73
+#: en/project_procedures.ssi:80
#, no-wrap
msgid ""
" This update incorporates the changes made in the %minor% point release,\n"
@@ -311,29 +336,29 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:75
+#: en/project_procedures.ssi:82
#, no-wrap
msgid " <http://lists.debian.org/debian-announce/%release_mail%>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:77
+#: en/project_procedures.ssi:84
#, no-wrap
msgid " It also includes the following Live-specific changes:\n"
msgstr ""
#. type: Bullet: ' * '
-#: en/project_procedures.ssi:81
+#: en/project_procedures.ssi:88
msgid "[INSERT LIVE-SPECIFIC CHANGE HERE]"
msgstr ""
#. type: Bullet: ' * '
-#: en/project_procedures.ssi:81
+#: en/project_procedures.ssi:88
msgid "[LARGER ISSUES MAY DESERVE THEIR OWN SECTION]"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:85
+#: en/project_procedures.ssi:92
#, no-wrap
msgid ""
" URLs\n"
@@ -341,67 +366,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:87
+#: en/project_procedures.ssi:94
#, no-wrap
msgid " Download location of updated images:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:89
+#: en/project_procedures.ssi:96
#, no-wrap
msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:91
+#: en/project_procedures.ssi:98
#, no-wrap
msgid " Debian Live project homepage:\n"
msgstr " Despre Proiectul Debian Live:\n"
#. type: Plain text
-#: en/project_procedures.ssi:93
+#: en/project_procedures.ssi:100
#, no-wrap
msgid " <http://live.debian.net/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:95
+#: en/project_procedures.ssi:102
#, no-wrap
msgid " The current stable distribution:\n"
msgstr " El reflecta starea (actuala) a distributiei:\n"
#. type: Plain text
-#: en/project_procedures.ssi:97
+#: en/project_procedures.ssi:104
#, no-wrap
msgid " <http://ftp.debian.org/debian/dists/stable>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:99
+#: en/project_procedures.ssi:106
#, no-wrap
msgid " stable distribution information (release notes, errata etc.):\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:101
+#: en/project_procedures.ssi:108
#, no-wrap
msgid " <http://www.debian.org/releases/stable/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:103
+#: en/project_procedures.ssi:110
#, no-wrap
msgid " Security announcements and information:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:105
+#: en/project_procedures.ssi:112
#, no-wrap
msgid " <http://www.debian.org/security/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:109
+#: en/project_procedures.ssi:116
#, no-wrap
msgid ""
" About Debian\n"
@@ -409,7 +434,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:113
+#: en/project_procedures.ssi:120
#, no-wrap
msgid ""
" The Debian Project is an association of Free Software developers who\n"
@@ -418,7 +443,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:117
+#: en/project_procedures.ssi:124
#, no-wrap
msgid ""
" About Debian Live\n"
@@ -426,7 +451,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:122
+#: en/project_procedures.ssi:129
#, no-wrap
msgid ""
" Debian Live is an official sub-project of Debian which produces Debian\n"
@@ -436,7 +461,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:126
+#: en/project_procedures.ssi:133
#, no-wrap
msgid ""
" Contact Information\n"
@@ -444,7 +469,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:130
+#: en/project_procedures.ssi:137
#, no-wrap
msgid ""
" For further information, please visit the Debian Live web pages at\n"
diff --git a/manual/po/ro/style_guide.ssi.po b/manual/po/ro/style_guide.ssi.po
index 649aead..aa74793 100644
--- a/manual/po/ro/style_guide.ssi.po
+++ b/manual/po/ro/style_guide.ssi.po
@@ -1,12 +1,11 @@
# Romanian translations for live-manual package
-# Copyright (C) 2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-31 19:15+0300\n"
+"POT-Creation-Date: 2012-06-03 17:04+0300\n"
"PO-Revision-Date: 2012-02-11 16:42+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -23,17 +22,16 @@ msgid ":B~ Appendix"
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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
@@ -94,17 +92,16 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
@@ -833,15 +830,15 @@ msgstr ""
#. type: Plain text
#: en/style_guide.ssi:228
-msgid "_* /{New lines}/"
+msgid "_* /{Newlines}/"
msgstr ""
#. type: Plain text
#: en/style_guide.ssi:230
msgid ""
-"The translated texts need to have the exact same new lines as the original "
+"The translated texts need to have the exact same newlines as the original "
"texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
-"in the original files. These new lines often appear, for instance, in the "
+"in the original files. These newlines often appear, for instance, in the "
"code blocks."
msgstr ""
@@ -879,9 +876,7 @@ msgstr ""
#. type: Bullet: ' - '
#: en/style_guide.ssi:244
-msgid ""
-"Metadata (often between colons *{:metadata:}*) especially the date in /{live-"
-"manual.ssm.po}/ because it changes every time live-manual is updated."
+msgid "Metadata (often between colons *{:metadata:}*)"
msgstr ""
#. type: Bullet: ' - '
diff --git a/manual/po/ro/user_basics.ssi.po b/manual/po/ro/user_basics.ssi.po
index dd059e7..814e991 100644
--- a/manual/po/ro/user_basics.ssi.po
+++ b/manual/po/ro/user_basics.ssi.po
@@ -1,12 +1,11 @@
# Romanian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-12 08:28-0400\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,16 +17,18 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -35,8 +36,10 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -60,39 +63,42 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -100,8 +106,10 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -125,25 +133,26 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -303,7 +312,7 @@ msgstr ""
#: en/user_basics.ssi:48
msgid ""
"This process can take a while, depending on the speed of your network "
-"connection. When it is complete, there should be a #{binary-hybrid.iso}# "
+"connection. When it is complete, there should be a #{binary.hybrid.iso}# "
"image file, ready to use, in the current directory."
msgstr ""
@@ -342,7 +351,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:62
#, no-wrap
-msgid " $ wodim binary-hybrid.iso\n"
+msgid " $ wodim binary.hybrid.iso\n"
msgstr ""
#. type: Plain text
@@ -374,7 +383,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:75
#, no-wrap
-msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
+msgid " $ dd if=binary.hybrid.iso of=${USBSTICK}\n"
msgstr ""
#. type: Plain text
@@ -401,8 +410,8 @@ msgid ""
"Once you've booted the media, you are presented with a boot menu. If you "
"just press enter here, the system will boot using the default entry, #{Live}"
"# and default options. For more information about boot options, see the "
-"\"help\" entry in the menu and also the #{live-boot}# and #{live-config}# "
-"man pages found within the live system."
+"\"help\" entry in the menu and also the live-boot and live-config man pages "
+"found within the live system."
msgstr ""
#. type: Plain text
@@ -472,16 +481,16 @@ msgstr ""
#: en/user_basics.ssi:104
msgid ""
"The most versatile VM in Debian is QEMU. If your processor has hardware "
-"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
+"support for virtualization, use the /{qemu-kvm}/ package; the /{qemu-kvm}/ "
"package description briefly lists the requirements."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:106
msgid ""
-"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
-"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
-"the following examples. The #{qemu-utils}# package is also valuable for "
+"First, install /{qemu-kvm}/ if your processor supports it. If not, install /"
+"{qemu}/, in which case the program name is #{qemu}# instead of #{kvm}# in "
+"the following examples. The /{qemu-utils}/ package is also valuable for "
"creating virtual disk images with #{qemu-img}#."
msgstr ""
@@ -499,7 +508,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:118
#, no-wrap
-msgid " $ kvm -cdrom binary-hybrid.iso\n"
+msgid " $ kvm -cdrom binary.hybrid.iso\n"
msgstr ""
#. type: Plain text
@@ -514,7 +523,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:126
-msgid "In order to test the ISO with #{virtualbox-ose}#:"
+msgid "In order to test the ISO with /{virtualbox-ose}/:"
msgstr ""
#. type: Plain text
@@ -532,17 +541,14 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:136
msgid ""
-"Create a new virtual machine, change the storage settings to use #{binary-"
+"Create a new virtual machine, change the storage settings to use #{binary."
"hybrid.iso}# as the CD/DVD device, and start the machine."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:138
-msgid ""
-"Note: For live systems containing X.org that you want to test with #"
-"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
-"package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. "
-"Otherwise, the resolution is limited to 800x600."
+#, no-wrap
+msgid "*{Note:}* For live systems containing X.org that you want to test with /{virtualbox-ose}/, you may wish to include the VirtualBox X.org driver package, /{virtualbox-ose-guest-x11}/, in your live-build configuration. Otherwise, the resolution is limited to 800x600.\n"
msgstr ""
#. type: Plain text
@@ -571,10 +577,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:150
-msgid ""
-"Note: if you created an ISO hybrid image with the previous example, you will "
-"need to clean up your working directory with the #{lb clean}# command (see "
-"{The lb clean command}#lb-clean):"
+#, no-wrap
+msgid "*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):\n"
msgstr ""
#. type: Plain text
@@ -620,7 +624,7 @@ msgid ""
"bootloader, ready to be directly written on a USB stick. Since using an HDD "
"image is just like using an ISO hybrid image on USB, follow the instructions "
"in {Using an ISO hybrid live image}#using-iso-hybrid, except use the "
-"filename #{binary.img}# instead of #{binary-hybrid.iso}#."
+"filename #{binary.img}# instead of #{binary.hybrid.iso}#."
msgstr ""
#. type: Plain text
@@ -631,10 +635,10 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:182
msgid ""
-"First, install QEMU as described above in {Testing an ISO image with QEMU}"
-"#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which "
-"version your host system needs, specifying #{binary.img}# as the first hard "
-"drive."
+"First, install /{qemu}/ as described above in {Testing an ISO image with "
+"QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on "
+"which version your host system needs, specifying #{binary.img}# as the first "
+"hard drive."
msgstr ""
#. type: Plain text
@@ -652,7 +656,7 @@ msgstr ""
#: en/user_basics.ssi:192
msgid ""
"To use the remaining free space after copying #{binary.img}# to a USB stick, "
-"use a partitioning tool such as #{gparted}# or #{parted}# to create a new "
+"use a partitioning tool such as /{gparted}/ or /{parted}/ to create a new "
"partition on the stick. The first partition will be used by the Debian Live "
"system."
msgstr ""
@@ -679,11 +683,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:208
-msgid ""
-"Note: If you want to use the extra space with Windows, apparently that OS "
-"cannot normally access any partitions but the first. Some solutions to this "
-"problem have been discussed on our {mailing list}#contact, but it seems "
-"there are no easy answers."
+#, no-wrap
+msgid "*{Note:}* If you want to use the extra space with Windows, apparently that OS cannot normally access any partitions but the first. Some solutions to this problem have been discussed on our {mailing list}#contact, but it seems there are no easy answers.\n"
msgstr ""
#. type: Plain text
@@ -707,9 +708,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:216
-msgid ""
-"Note: if you performed any previous examples, you will need to clean up your "
-"working directory with the #{lb clean}# command:"
+#, no-wrap
+msgid "*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:\n"
msgstr ""
#. type: Plain text
@@ -841,9 +841,10 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:280
msgid ""
-"You should install the tftpd-hpa package. It can serve all files contained "
-"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
-"#{/srv/debian-live/tftpboot}#, run as root the following command:"
+"You should install the /{tftpd-hpa}/ package. It can serve all files "
+"contained inside a root directory, usually #{/srv/tftp}#. To let it serve "
+"files inside #{/srv/debian-live/tftpboot}#, run as root the following "
+"command:"
msgstr ""
#. type: Plain text
@@ -872,7 +873,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:294
-msgid "You need to install the #{nfs-kernel-server}# package."
+msgid "You need to install the /{nfs-kernel-server}/ package."
msgstr ""
#. type: Plain text
@@ -936,7 +937,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:322
-msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
+msgid "_* Install /{qemu}/, /{bridge-utils}/, /{sudo}/."
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_customization-binary.ssi.po b/manual/po/ro/user_customization-binary.ssi.po
index 0f33aaa..f7e5038 100644
--- a/manual/po/ro/user_customization-binary.ssi.po
+++ b/manual/po/ro/user_customization-binary.ssi.po
@@ -1,12 +1,11 @@
# Romanian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-25 21:42+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
"PO-Revision-Date: 2010-11-30 11:20+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,28 +17,30 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -63,51 +64,54 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -131,25 +135,26 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -240,7 +245,7 @@ msgid ""
" include menu.cfg\n"
" default vesamenu.c32\n"
" prompt 0\n"
-" timeout 5\n"
+" timeout 50\n"
msgstr ""
#. type: Plain text
@@ -260,7 +265,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:43
#, no-wrap
-msgid " sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg\n"
+msgid " sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_customization-contents.ssi.po b/manual/po/ro/user_customization-contents.ssi.po
index 30fe07b..0345a4e 100644
--- a/manual/po/ro/user_customization-contents.ssi.po
+++ b/manual/po/ro/user_customization-contents.ssi.po
@@ -1,12 +1,11 @@
# Romanian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-15 16:28+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,16 +17,19 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -35,9 +37,10 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -61,39 +64,43 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -101,9 +108,10 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -127,25 +135,26 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -237,7 +246,7 @@ msgstr ""
#: en/user_customization-contents.ssi:24
msgid ""
"To include files, simply add them to your #{config/includes.chroot}# "
-"directory. This directory corresponds to the root directory (#{/}#) of the "
+"directory. This directory corresponds to the root directory #{/}# of the "
"live system. For example, to add a file #{/var/www/index.html}# in the live "
"system, use:"
msgstr ""
@@ -413,6 +422,6 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:93
msgid ""
-"For more information about debconf, please see debconf(7) in the #{debconf}# "
-"package."
+"For more information about debconf, please see #{debconf(7)}# in the /"
+"{debconf}/ package."
msgstr ""
diff --git a/manual/po/ro/user_customization-installer.ssi.po b/manual/po/ro/user_customization-installer.ssi.po
index e60444c..e13029c 100644
--- a/manual/po/ro/user_customization-installer.ssi.po
+++ b/manual/po/ro/user_customization-installer.ssi.po
@@ -1,12 +1,11 @@
# Romanian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
"PO-Revision-Date: 2010-11-30 10:53+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,28 +17,29 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -63,21 +63,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -86,28 +87,29 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -131,21 +133,22 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -200,7 +203,7 @@ msgstr ""
#: en/user_customization-installer.ssi:16
msgid ""
"On such images, Debian is installed by fetching and installing .deb packages "
-"using #{debootstrap}# or #{cdebootstrap}#, from the local media or some "
+"using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some "
"network-based network, resulting in a standard Debian system being installed "
"to the hard disk."
msgstr ""
@@ -225,7 +228,7 @@ msgstr ""
msgid ""
"Installation will proceed in an identical fashion to the \"Regular\" "
"installation described above, but at the actual package installation stage, "
-"instead of using #{debootstrap}# to fetch and install packages, the live "
+"instead of using /{debootstrap}/ to fetch and install packages, the live "
"filesystem image is copied to the target. This is achieved with a special "
"udeb called live-installer."
msgstr ""
@@ -239,10 +242,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-installer.ssi:26
-msgid ""
-"Note: to support both normal and live installer entries in the bootloader of "
-"the same live media, you must disable live-installer by preseeding #{live-"
-"installer/enable=false}#."
+#, no-wrap
+msgid "*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.\n"
msgstr ""
#. type: Plain text
@@ -310,5 +311,5 @@ msgid ""
"binary/}# to include them in the image. Additional or replacement files and "
"directories may be included in the installer initrd as well, in a similar "
"fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
-"placing the material in #{config/binary_debian-installer-includes/}#."
+"placing the material in #{config/includes.binary_debian-installer/}#."
msgstr ""
diff --git a/manual/po/ro/user_customization-overview.ssi.po b/manual/po/ro/user_customization-overview.ssi.po
index ee436bc..1d5e07f 100644
--- a/manual/po/ro/user_customization-overview.ssi.po
+++ b/manual/po/ro/user_customization-overview.ssi.po
@@ -1,12 +1,11 @@
# Romanian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: 2010-10-22 08:57-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -111,7 +110,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-overview.ssi:22
msgid ""
-"Although #{lb config}# does create a skeletal configuration in the config/ "
+"Although #{lb config}# creates a skeletal configuration in the config/ "
"directory, to accomplish your goals, you may need to provide additional "
"files in subdirectories of config/. Depending on where the files are stored "
"in the configuration, they may be copied into the live system's filesystem "
@@ -129,7 +128,7 @@ msgid "2~ Customization tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-overview.ssi:26
+#: en/user_customization-overview.ssi:25
msgid ""
"The following chapters are organized by the kinds of customization task "
"users typically perform: {Customizing package installation}#customizing-"
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index c39b866..e8d908e 100644
--- a/manual/po/ro/user_customization-packages.ssi.po
+++ b/manual/po/ro/user_customization-packages.ssi.po
@@ -1,12 +1,11 @@
# Romanian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-14 22:45+0300\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,28 +17,29 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -63,21 +63,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -86,28 +87,29 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -131,21 +133,22 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -175,12 +178,12 @@ msgid ""
"distribution mirror. You can also add your own repositories for backports, "
"experimental or custom packages, or include packages directly as files. You "
"can define your own lists of packages to include, use live-build's "
-"predefined lists, use #{tasksel}# tasks, or a combination of all three. "
-"Finally, a number of options give some control over apt, or if you prefer, "
-"aptitude, at build time when packages are installed. You may find these "
-"handy if you use a proxy, want to disable installation of recommended "
-"packages to save space, or need to control which versions of packages are "
-"installed via APT pinning, to name a few possibilities."
+"predefined lists, use /{tasksel}/ tasks, or a combination of all three. "
+"Finally, a number of options give some control over /{apt}/, or if you "
+"prefer, /{aptitude}/, at build time when packages are installed. You may "
+"find these handy if you use a proxy, want to disable installation of "
+"recommended packages to save space, or need to control which versions of "
+"packages are installed via APT pinning, to name a few possibilities."
msgstr ""
#. type: Plain text
@@ -198,12 +201,12 @@ msgstr ""
msgid ""
"The distribution you choose has the broadest impact on which packages are "
"available to include in your live image. Specify the codename, which "
-"defaults to #{wheezy}# for the Wheezy version of live-build. Any current "
+"defaults to wheezy for the wheezy version of live-build. Any current "
"distribution carried in the Debian archive may be specified by its codename "
"here. (See {Terms}#terms for more details.) The #{--distribution}# option "
"not only influences the source of packages within the archive, but also "
-"instructs #{live-build}# to behave as needed to build each supported "
-"distribution. For example, to build against the *{unstable}* release, Sid, "
+"instructs live-build to behave as needed to build each supported "
+"distribution. For example, to build against the *{unstable}* release, sid, "
"specify:"
msgstr ""
@@ -258,12 +261,12 @@ msgid ""
"download speed. Each of the #{--mirror-*}# options governs which "
"distribution mirror is used at various stages of the build. Recall from "
"{Stages of the build}#stages-of-the-build that the *{bootstrap}* stage is "
-"when the chroot is initially populated by debootstrap with a minimal system, "
-"and the *{chroot}* stage is when the chroot used to construct the live "
-"system's filesystem is built. Thus, the corresponding mirror switches are "
-"used for those stages, and later, in the *{binary}* stage, the #{--mirror-"
-"binary}# and #{--mirror-binary-security}# values are used, superceding any "
-"mirrors used in an earlier stage."
+"when the chroot is initially populated by /{debootstrap}/ with a minimal "
+"system, and the *{chroot}* stage is when the chroot used to construct the "
+"live system's filesystem is built. Thus, the corresponding mirror switches "
+"are used for those stages, and later, in the *{binary}* stage, the #{--"
+"mirror-binary}# and #{--mirror-binary-security}# values are used, "
+"superceding any mirrors used in an earlier stage."
msgstr ""
#. type: Plain text
@@ -510,9 +513,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:125
msgid ""
-"For example, to make a list that includes the predefined #{gnome}# list plus "
-"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
-"contents:"
+"For example, to make a list that includes the predefined #{gnome}# list "
+"plus /{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the "
+"following contents:"
msgstr ""
#. type: Plain text
@@ -558,9 +561,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:148
msgid ""
-"You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architectures i386}# or #{--architectures amd64}# is "
-"specified:"
+"You may test for any one of a number of values, e.g. to install /"
+"{memtest86+}/ if either #{--architectures i386}# or #{--architectures amd64}"
+"# is specified:"
msgstr ""
#. type: Plain text
@@ -576,7 +579,7 @@ msgstr ""
#: en/user_customization-packages.ssi:158
msgid ""
"You may also test against variables that may contain more than one value, e."
-"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
+"g. to install /{vrms}/ if either #{contrib}# or #{non-free}# is specified "
"via #{--archive-areas}#:"
msgstr ""
@@ -638,8 +641,8 @@ msgstr ""
msgid ""
"The primary tasks available in the Debian Installer can be listed with #"
"{tasksel --list-tasks}# in the live system. The contents of any task, "
-"including ones not included in this list, may be examined with #{tasksel --"
-"task-packages}#."
+"including the ones not included in this list, may be examined with #{tasksel "
+"--task-packages}#."
msgstr ""
#. type: Plain text
@@ -884,7 +887,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:266
msgid ""
-"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
+"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 "
"to #{lb config}#. Choose the method implementing the preferred behaviour for "
"package installation, the notable difference being how missing packages are "
@@ -953,11 +956,11 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:294
msgid ""
-"This will not influence the entries in /etc/apt/sources.list, but merely "
-"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
-"APT needs those indices in order to operate in the live system, so before "
-"performing #{apt-cache search}# or #{apt-get install}#, for instance, the "
-"user must #{apt-get update}# first to create those indices."
+"This will not influence the entries in #{/etc/apt/sources.list}#, but merely "
+"whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is "
+"that APT needs those indices in order to operate in the live system, so "
+"before performing #{apt-cache search}# or #{apt-get install}#, for instance, "
+"the user must #{apt-get update}# first to create those indices."
msgstr ""
#. type: Plain text
@@ -1020,11 +1023,11 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:314
msgid ""
-"Let's say you are building a Wheezy 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 "
+"Let's say you are building a wheezy 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, Wheezy. The following will "
+"taken from the target system distribution, wheezy. The following will "
"accomplish this:"
msgstr ""
@@ -1052,7 +1055,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:331
#, no-wrap
-msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with Wheezy using:\n"
+msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:\n"
msgstr ""
#. type: Plain text
@@ -1067,9 +1070,9 @@ msgid ""
"the case where you do not want a package that is recommended by another "
"package. Suppose you are building an LXDE image using #{--package-lists lxde}"
"# option, but don't want the user prompted to store wifi passwords in the "
-"keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
-"turn recommends #{gnome-keyring}#. So you want to omit the recommended #"
-"{gnome-keyring}# package. This can be done by adding the following stanza to "
+"keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in "
+"turn recommends /{gnome-keyring}/. So you want to omit the recommended /"
+"{gnome-keyring}/ package. This can be done by adding the following stanza to "
"#{config/chroot_apt/preferences}#:"
msgstr ""
diff --git a/manual/po/ro/user_customization-runtime.ssi.po b/manual/po/ro/user_customization-runtime.ssi.po
index 0c6e26f..b18fcac 100644
--- a/manual/po/ro/user_customization-runtime.ssi.po
+++ b/manual/po/ro/user_customization-runtime.ssi.po
@@ -1,12 +1,11 @@
# Romanian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-24 15:08+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-06-03 20:02+0300\n"
"PO-Revision-Date: 2010-11-30 11:40+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,28 +17,29 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -87,28 +87,29 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -375,7 +376,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:96
msgid ""
-"Persistence is a common name for different kinds of solutions for saving "
+"'Persistence' is a common name for different kinds of solutions for saving "
"across reboots some, or all, of this run-time evolution of the system. To "
"understand how it could work it could be handy to know that even if the "
"system is booted and run from read-only media, modification to the files and "
@@ -390,15 +391,16 @@ msgid ""
"medium like local storage media, a network share or even a session of a "
"multisession (re)writable CD/DVD. All these media are supported in Debian "
"Live in different ways, and all but the last one require a special boot "
-"parameter to be specified at boot time: #{persistent}#."
+"parameter to be specified at boot time: #{persistence}#."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:100
msgid ""
-"If the boot parameter #{persistent}# is set (and #{nopersistent}# is not "
+"If the boot parameter #{persistence}# is set (and #{nopersistence}# is not "
"set), local storage media (e.g. hard disks, USB drives) will be probed for "
-"persistent volumes during boot. A persistent volume is any of the following:"
+"persistence volumes during boot. A persistence volume is any of the "
+"following:"
msgstr ""
#. type: Plain text
@@ -417,20 +419,20 @@ msgid ""
"_* an image/archive file located on the root of any readable filesystem "
"(even an NTFS partition of a foreign OS), identified by its file name. In "
"this case the file name must also use the containing filesystem as the file "
-"extension, e.g. \"<label>.ext3\"."
+"extension, e.g. \"<label>.ext4\"."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:108
msgid ""
-"It is possible to restrict which types of persistent volumes to use by "
+"It is possible to restrict which types of persistence volumes to use by "
"specifying certain boot parameters described in the live-boot(7) man page. "
"The \"identifying labels\" referred to above can be any of the following:"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:110
-msgid "_* #{full-ov}# for full persistent overlays."
+msgid "_* #{full-ov}# for full persistence overlays."
msgstr ""
#. type: Plain text
@@ -450,7 +452,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:118
-msgid "3~ Full persistent overlays"
+msgid "3~ Full persistence overlays"
msgstr ""
#. type: Plain text
@@ -458,15 +460,15 @@ msgstr ""
msgid ""
"By 'full persistence' it is meant that instead of using a tmpfs for storing "
"modifications to the read-only media (with the copy-on-write, COW, system) a "
-"persistent volume is used. For this type of persistence the volume label "
-"must be #{full-ov}#. This could, for instance, be an ext2 partition on a "
+"persistence volume is used. For this type of persistence the volume label "
+"must be #{full-ov}#. This could, for instance, be an ext4 partition on a "
"hard disk or on a usb key created with, e.g.:"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:124
#, no-wrap
-msgid " # mkfs.ext2 -L full-ov /dev/sdb1\n"
+msgid " # mkfs.ext4 -L full-ov /dev/sdb1\n"
msgstr ""
#. type: Plain text
@@ -490,7 +492,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:138
msgid ""
-"Here's an example of how to create an ext2-based image file used for full "
+"Here's an example of how to create an ext4-based image file used for full "
"persistence:"
msgstr ""
@@ -499,7 +501,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file\n"
-" $ /sbin/mkfs.ext2 -F full-ov\n"
+" $ /sbin/mkfs.ext4 -F full-ov\n"
msgstr ""
#. type: Plain text
@@ -518,54 +520,54 @@ msgstr ""
#: en/user_customization-runtime.ssi:151
msgid ""
"A volume with the label #{custom-ov}# can be configured to make arbitrary "
-"directories persistent. The file #{live.persist}#, located on the volume's "
-"filesystem root, controls which directories it makes persistent, and in "
-"which way."
+"directories persistent. The file #{live-persistence.conf}#, located on the "
+"volume's filesystem root, controls which directories it makes persistent, "
+"and in which way."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:153
msgid ""
"How custom overlay mounts are configured is described in full detail in the "
-"live.persist(5) man page, but a simple example should be sufficient for most "
-"uses. Let's say we want to make our home directory and APT cache persistent "
-"in an ext3 filesystem on the /dev/sdb1 partition:"
+"live-persistence.conf(5) man page, but a simple example should be sufficient "
+"for most uses. Let's say we want to make our home directory and APT cache "
+"persistent in an ext4 filesystem on the /dev/sdb1 partition:"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:160
#, no-wrap
msgid ""
-" $ mkfs.ext3 -L custom-ov /dev/sdb1\n"
-" $ mount -t ext3 /dev/sdb1 /mnt\n"
-" $ echo \"/home\" >> /mnt/live.persist\n"
-" $ echo \"/var/cache/apt\" >> /mnt/live.persist\n"
+" $ mkfs.ext4 -L custom-ov /dev/sdb1\n"
+" $ mount -t ext4 /dev/sdb1 /mnt\n"
+" $ echo \"/home\" >> /mnt/live-persistence.conf\n"
+" $ echo \"/var/cache/apt\" >> /mnt/live-persistence.conf\n"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:164
msgid ""
-"Then we reboot. During the first boot the contents of /home and /var/cache/"
-"apt will be copied into the persistent volume, and from then on all changes "
-"to these directories will live in the persistent volume. Please note that "
-"any paths listed in the #{live.persist}# file cannot contain white spaces or "
-"the special \".\" and \"..\" path components. Also, neither \"/live\" (or "
-"any of its sub-directories) nor \"/\" can be made persistent using custom "
-"mounts (for the latter, use the #{full-ov}# type persistence described "
-"above)."
+"Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
+"cache/apt}# will be copied into the persistence volume, and from then on all "
+"changes to these directories will live in the persistence volume. Please "
+"note that any paths listed in the #{live-persistence.conf}# file cannot "
+"contain white spaces or the special #{.}# and #{..}# path components. Also, "
+"neither #{/live}# (or any of its sub-directories) nor #{/}# can be made "
+"persistent using custom mounts (for the latter, use the #{full-ov}# type "
+"persistence described above)."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:166
msgid ""
-"Several different custom overlay volumes (with their own #{live.persist}# "
-"files) can be used at the same time, but if several volumes make the same "
-"directory persistent, only one of them will be used. If any two mounts are "
-"\"nested\" (i.e. one is a sub-directory of the other) the parent will be "
+"Several different custom overlay volumes (with their own #{live-persistence."
+"conf}# files) can be used at the same time, but if several volumes make the "
+"same directory persistent, only one of them will be used. If any two mounts "
+"are \"nested\" (i.e. one is a sub-directory of the other) the parent will be "
"mounted before the child so no mount will be hidden by the other. Nested "
-"custom mounts are problematic if they are listed in the same #{live.persist}"
-"# file. See the live.persist(5) man page for how to handle that case if you "
-"really need it (hint: you usually don't)."
+"custom mounts are problematic if they are listed in the same #{live-"
+"persistence.conf}# file. See the live-persistence.conf(5) man page for how "
+"to handle that case if you really need it (hint: you usually don't)."
msgstr ""
#. type: Plain text
@@ -577,13 +579,13 @@ msgstr ""
#: en/user_customization-runtime.ssi:170
msgid ""
"Snapshots are collections of files and directories which are not mounted "
-"while running but which are copied from a persistent volume to the system "
+"while running but which are copied from a persistence volume to the system "
"(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The "
"volume must be labeled #{live-sn}#, and it defaults to a simple cpio archive "
"named #{live-sn.cpio.gz}#. A power interruption during run time could lead "
"to data loss, hence, if you have important changes, invoke #{live-snapshot --"
"refresh}# as often as needed. This type of persistence, since it does not "
-"write continuously to the persistent media, is the most flash-based device "
+"write continuously to the persistence media, is the most flash-based device "
"friendly and the fastest of all the persistence systems, but it occupies as "
"much RAM as the size of the uncompressed snapshot."
msgstr ""
@@ -602,19 +604,19 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:176
-msgid "3~ Persistent SubText"
+msgid "3~ Persistence SubText"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:178
msgid ""
-"If a user would need multiple persistent storage of the same type for "
+"If a user would need multiple persistence storage of the same type for "
"different locations or testing, such as #{full-ov-nonwork}# and #{full-ov-"
-"work}#, the boot parameter #{persistent-subtext}# used in conjunction with "
-"the boot parameter #{persistent}# will allow for multiple but unique "
-"persistent media. An example would be if a user wanted to use a persistent "
+"work}#, the boot parameter #{persistence-subtext}# used in conjunction with "
+"the boot parameter #{persistence}# will allow for multiple but unique "
+"persistence media. An example would be if a user wanted to use a persistence "
"partition labeled #{live-sn-subText}# they would use the boot parameters of: "
-"#{persistent}# #{persistent-subtext=subText}#."
+"#{persistence}# #{persistence-subtext=subText}#."
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index d463d5d..aab8dbd 100644
--- a/manual/po/ro/user_examples.ssi.po
+++ b/manual/po/ro/user_examples.ssi.po
@@ -1,12 +1,11 @@
# Romanian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-13 14:44+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -23,26 +22,27 @@ msgid ":B~ Examples"
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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 en/user_customization-contents.ssi:26
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -68,49 +68,51 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 en/user_customization-contents.ssi:31
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -136,25 +138,26 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -166,7 +169,7 @@ msgid " # lb build\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#: en/user_customization-binary.ssi:41 en/user_examples.ssi:95
#, no-wrap
msgid " #!/bin/sh\n"
msgstr ""
@@ -275,7 +278,7 @@ msgstr ""
#: en/user_examples.ssi:46
msgid ""
"Assuming all goes well, after a while, the current directory will contain #"
-"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+"{binary.hybrid.iso}#. This ISO hybrid image can be booted directly in a "
"virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-"
"with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
"virtualbox, or else imaged onto optical media or a USB flash device as "
@@ -404,9 +407,9 @@ msgid ""
"First, #{--architectures i386}# ensures that on our #{amd64}# build system, "
"we build a 32-bit version suitable for use on most machines. Second, we use #"
"{--linux-flavours 686-pae}# because we don't anticipate using this image on "
-"much older systems. Third, we've chosen the #{lxde}# package list to give us "
+"much older systems. Third, we've chosen the /{lxde}/ package list to give us "
"a minimal desktop. And finally, we have added two initial favourite "
-"packages: #{iceweasel}# and #{xchat}#."
+"packages: /{iceweasel}/ and /{xchat}/."
msgstr ""
#. type: Plain text
@@ -446,8 +449,8 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:137
msgid ""
-"In this revision, we're going to clean up from the first build, add the #"
-"{vlc}# package to our configuration, rebuild, test and commit."
+"In this revision, we're going to clean up from the first build, add the /"
+"{vlc}/ package to our configuration, rebuild, test and commit."
msgstr ""
#. type: Plain text
@@ -468,7 +471,7 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:147
msgid ""
-"Now append the #{vlc}# package to our local package list in #{config/package-"
+"Now append the /{vlc}/ package to our local package list in #{config/package-"
"lists/my.list.chroot}#:"
msgstr ""
@@ -535,8 +538,8 @@ msgstr ""
#: en/user_examples.ssi:179
msgid ""
"Make a build directory and create a skeletal configuration in it built "
-"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
-"{xvnc4viewer}#, disabling recommends to make a minimal system:"
+"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
+"{xvnc4viewer}/, disabling recommends to make a minimal system:"
msgstr ""
#. type: Plain text
@@ -554,8 +557,8 @@ msgstr ""
#: en/user_examples.ssi:191
msgid ""
"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
-"the default user that will launch metacity and start xvncviewer, connecting "
-"to port #{5901}# on a server at #{192.168.1.2}#:"
+"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
+"connecting to port #{5901}# on a server at #{192.168.1.2}#:"
msgstr ""
#. type: Plain text
@@ -611,10 +614,10 @@ msgid ""
"the tradeoffs you are making between size and functionality. In this "
"example, we trim only so much as to make room for additional material within "
"a 128M media size, but without doing anything to destroy integrity of the "
-"packages contained within, such as the purging of locale data via the #"
-"{localepurge}# package, or other such \"intrusive\" optimizations. Of "
+"packages contained within, such as the purging of locale data via the /"
+"{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
"particular note, you should not use #{--bootstrap-flavour minimal}# unless "
-"you really know what you're doing, as omitting priority #{important}# "
+"you really know what you're doing, as omitting priority *{important}* "
"packages will most likely produce a broken live system."
msgstr ""
@@ -650,8 +653,8 @@ msgid ""
"system. Choosing the #{minimal}# package list leaves out the large #{locales}"
"# package and associated utilities. Dropping recommended packages with #{--"
"apt-recommends false}# saves some additional space, at the expense of "
-"omitting some packages you might otherwise expect to be there, such as #"
-"{firmware-linux-free}# which may be needed to support certain hardware. The "
+"omitting some packages you might otherwise expect to be there, such as /"
+"{firmware-linux-free}/ which may be needed to support certain hardware. The "
"remaining options shave off additional small amounts of space. It's up to "
"you to decide if the functionality that is sacrificed with each optimization "
"is worth the loss in functionality."
@@ -751,8 +754,8 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:292
msgid ""
-"Note that we have included the #{debian-installer-launcher}# package to "
-"launch the installer from the live desktop, and have also specified the 486 "
-"flavour kernel, as it is currently necessary to make the installer and live "
-"system kernels match for the launcher to work properly."
+"Note that we have included the debian-installer-launcher package to launch "
+"the installer from the live desktop, and have also specified the 486 flavour "
+"kernel, as it is currently necessary to make the installer and live system "
+"kernels match for the launcher to work properly."
msgstr ""
diff --git a/manual/po/ro/user_installation.ssi.po b/manual/po/ro/user_installation.ssi.po
index 7cbb419..e39e393 100644
--- a/manual/po/ro/user_installation.ssi.po
+++ b/manual/po/ro/user_installation.ssi.po
@@ -1,12 +1,11 @@
# Romanian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-31 16:32+0300\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,29 +17,30 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -88,29 +88,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -409,16 +410,16 @@ msgstr ""
#: en/user_installation.ssi:125
msgid ""
"You must build either on your target distribution or in a chroot containing "
-"your target platform: this means if your target is Wheezy then you should "
-"build against Wheezy."
+"your target platform: this means if your target is wheezy then you should "
+"build against wheezy."
msgstr ""
#. type: Plain text
#: en/user_installation.ssi:127
msgid ""
"Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
-"build #{live-boot}# for a target distribution that differs from your build "
-"system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy "
+"build live-boot for a target distribution that differs from your build "
+"system. For example, for wheezy live images, build live-boot in a wheezy "
"chroot. If your target distribution happens to match your build system "
"distribution, you may build directly on the build system using #{dpkg-"
"buildpackage}# (provided by the /{dpkg-dev}/ package):"
diff --git a/manual/po/ro/user_managing_a_configuration.ssi.po b/manual/po/ro/user_managing_a_configuration.ssi.po
index d04a50b..842b295 100644
--- a/manual/po/ro/user_managing_a_configuration.ssi.po
+++ b/manual/po/ro/user_managing_a_configuration.ssi.po
@@ -1,12 +1,11 @@
# Romanian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: 2010-10-13 17:00+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,28 +17,30 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -63,21 +64,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -86,28 +88,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -131,21 +135,22 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -217,7 +222,7 @@ msgid ""
"variable values, and each time you run #{lb config}# and #{lb clean}#, these "
"files will be executed. This will ensure that your configuration is kept "
"internally consistent from one revision to the next and from one live-build "
-"release to the next (though you will still have to take care and read the "
+"release to the next (Although you will still have to take care and read the "
"documentation when you upgrade live-build and make adjustments as needed)."
msgstr ""
diff --git a/manual/po/ro/user_overview.ssi.po b/manual/po/ro/user_overview.ssi.po
index 7870778..a701159 100644
--- a/manual/po/ro/user_overview.ssi.po
+++ b/manual/po/ro/user_overview.ssi.po
@@ -1,12 +1,11 @@
# Romanian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-19 18:09+0100\n"
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,28 +17,30 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -63,21 +64,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -86,28 +88,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -131,21 +135,22 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -193,15 +198,15 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:14
msgid ""
-"Many concepts are similar to those in the debhelper Debian package tools "
+"Many concepts are similar to those in the /{debhelper}/ Debian package tools "
"written by Joey Hess:"
msgstr ""
#. type: Plain text
#: en/user_overview.ssi:16
msgid ""
-"_* The scripts have a central location for configuring their operation. In "
-"debhelper, this is the #{debian/}# subdirectory of a package tree. For "
+"_* The scripts have a central location for configuring their operation. In /"
+"{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For "
"example, dh_install will look, amongst others, for a file called #{debian/"
"install}# to determine which files should exist in a particular binary "
"package. In much the same way, live-build stores its configuration entirely "
@@ -218,9 +223,9 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:20
msgid ""
-"Unlike debhelper, live-build contains a tool to generate a skeleton "
+"Unlike /{debhelper}/, live-build contains a tool to generate a skeleton "
"configuration directory, #{lb config}#. This could be considered to be "
-"similar to tools such as #{dh-make}#. For more information about #{lb config}"
+"similar to tools such as /{dh-make}/. For more information about #{lb config}"
"#, please see {The lb config command}#lb-config."
msgstr ""
diff --git a/manual/pot/about_manual.ssi.pot b/manual/pot/about_manual.ssi.pot
index e753900..a18e6ff 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: 2012-03-07 08:59-0400\n"
+"POT-Creation-Date: 2012-04-18 19:35+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -31,18 +31,25 @@ msgstr ""
msgid ""
"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 7.0 \"Wheezy\" 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."
+"by the project for the Debian 7.0 \"wheezy\" release. An up-to-date version "
+"can always be found at http://live.debian.net/"
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:8
msgid ""
+"While live-manual 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
+#: en/about_manual.ssi:10
+msgid ""
"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 "
"using #{sudo}#. To distinguish between commands which may be executed by an "
@@ -52,40 +59,51 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:10
+#: en/about_manual.ssi:12
msgid "2~ For the impatient"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:12
+#: en/about_manual.ssi:14
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 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, "
+"the details. Therefore, we suggest reading in the following order."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:16
+msgid ""
+"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."
+"a taste of what can be done with Debian Live."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:14
+#: en/about_manual.ssi:18
+msgid ""
+"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
+#: en/about_manual.ssi:20
msgid "2~terms Terms"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:16
+#: en/about_manual.ssi:22
msgid ""
"_* *{Live system}*: An operating system that can boot without installation "
"to a hard drive. Live systems do not alter local operating system(s) or file"
@@ -95,14 +113,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:18
+#: en/about_manual.ssi:24
msgid ""
"_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, "
"live-build, live-config, and live-manual packages."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:20
+#: en/about_manual.ssi:26
msgid ""
"_* *{Debian Live system}*: A live system that uses software from the Debian "
"operating system that may be booted from CDs, DVDs, USB sticks, over the "
@@ -111,180 +129,172 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:22
+#: en/about_manual.ssi:28
msgid "_* *{Host system}*: The environment used to create the live system."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:24
+#: en/about_manual.ssi:30
msgid "_* *{Target system}*: The environment used to run the live system."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:26
+#: en/about_manual.ssi:32
msgid ""
"_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
-"boot was formerly a part of live-initramfs."
+"boot was formerly a part of /{live-initramfs}/."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:28
+#: en/about_manual.ssi:34
msgid ""
"_* *{live-build}*: A collection of scripts used to build customized Debian "
-"Live systems. live-build was formerly known as live-helper, and even earlier "
-"known as live-package."
+"Live systems. live-build was formerly known as /{live-helper}/, and even "
+"earlier known as /{live-package}/."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:30
+#: en/about_manual.ssi:36
msgid ""
"_* *{live-config}*: A collection of scripts used to configure a live system "
-"during the boot process. live-config was formerly a part of live-initramfs."
+"during the boot process. live-config was formerly a part of /{live-"
+"initramfs}/."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:32
+#: en/about_manual.ssi:38
msgid ""
"_* *{live-manual}*: This document is maintained in a package called live-"
"manual."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:34
+#: en/about_manual.ssi:40
msgid ""
"_* *{Debian Installer (d-i)}*: The official installation system for the "
"Debian distribution."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:36
+#: en/about_manual.ssi:42
msgid ""
"_* *{Boot parameters}*: Parameters that can be entered at the bootloader "
"prompt to influence the kernel or live-config."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:38
+#: en/about_manual.ssi:44
msgid ""
-"_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+"_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run "
"different instances of the GNU/Linux environment on a single system "
"simultaneously without rebooting."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:40
+#: en/about_manual.ssi:46
msgid ""
"_* *{Binary image}*: A file containing the live system, such as binary.iso "
"or binary.img."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:42
+#: en/about_manual.ssi:48
msgid ""
"_* *{Target distribution}*: The distribution upon which your live system "
"will be based. This can differ from the distribution of your host system."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:44
-msgid ""
-"_* *{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."
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:46
+#: en/about_manual.ssi:50
msgid ""
-"The *{stable}* distribution contains the latest officially released "
-"distribution of Debian. The *{testing}* distribution is the staging area for "
-"the next *{stable}* release. A major advantage of using this distribution is "
-"that it has more recent versions of software relative to the *{stable}* "
-"release. The *{unstable}* distribution is where active development of Debian "
-"occurs. Generally, this distribution is run by developers and those who like "
-"to live on the edge."
+"_* *{stable/testing/unstable}*: The *{stable}* distribution contains the "
+"latest officially released distribution of Debian. The *{testing}* "
+"distribution is the staging area for the next *{stable}* release. A major "
+"advantage of using this distribution is that it has more recent versions of "
+"software relative to the *{stable}* release. The *{unstable}* distribution "
+"is where active development of Debian occurs. Generally, this distribution "
+"is run by developers and those who like to live on the edge. Throughout the "
+"manual, we tend to use codenames for the releases, such as wheezy or sid, as "
+"that is what is supported by the tools themselves."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:48
+#: en/about_manual.ssi:52
msgid "2~ Authors"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:50
+#: en/about_manual.ssi:54
msgid "A list of authors (in alphabetical order):"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:52
+#: en/about_manual.ssi:56
msgid "_* Ben Armstrong"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:54
+#: en/about_manual.ssi:58
msgid "_* Brendan Sleight"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:56
+#: en/about_manual.ssi:60
msgid "_* Chris Lamb"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:58
+#: en/about_manual.ssi:62
msgid "_* Daniel Baumann"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:60
+#: en/about_manual.ssi:64
msgid "_* Franklin Piat"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:66
msgid "_* Jonas Stein"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:68
msgid "_* Kai Hendry"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:70
msgid "_* Marco Amadori"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:72
msgid "_* Mathieu Geli"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:70
+#: en/about_manual.ssi:74
msgid "_* Matthias Kirschner"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:72
+#: en/about_manual.ssi:76
msgid "_* Richard Nelson"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:78
msgid "_* Trent W. Buck"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:80
msgid "2~how-to-contribute Contributing to this document"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:78
+#: en/about_manual.ssi:82
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -293,7 +303,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:80
+#: en/about_manual.ssi:84
msgid ""
"When submitting a contribution, please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted, the "
@@ -302,35 +312,36 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:82
+#: en/about_manual.ssi:86
msgid ""
"The sources for this manual are maintained using the Git version control "
"system. You can check out the latest copy by executing:"
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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -354,56 +365,58 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:86
+#: en/about_manual.ssi:90
msgid "$ 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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -427,30 +440,31 @@ msgstr ""
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:90
+#: en/about_manual.ssi:94
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -458,26 +472,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:94
+#: en/about_manual.ssi:98
#, no-wrap
msgid " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:98
+#: en/about_manual.ssi:102
msgid ""
"You may build the live-manual from the top level directory of your Git "
"checkout by executing:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:102
+#: en/about_manual.ssi:106
#, no-wrap
msgid " $ make build\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:110
msgid ""
"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 "
@@ -485,40 +499,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:110
+#: en/about_manual.ssi:114
#, no-wrap
msgid " $ make build LANGUAGES=en\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:114
+#: en/about_manual.ssi:118
msgid "It is also possible to build by document type, e.g:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:122
#, no-wrap
msgid " $ make build FORMATS=pdf\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:122
+#: en/about_manual.ssi:126
msgid "Or combine both, e.g:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:126
+#: en/about_manual.ssi:130
#, no-wrap
msgid " $ make build FORMATS=html LANGUAGES=it\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:130
+#: en/about_manual.ssi:134
msgid "3~ Applying changes"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:132
+#: en/about_manual.ssi:136
msgid ""
"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 "
@@ -526,12 +540,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:134
+#: en/about_manual.ssi:138
msgid "_* Fetch the public commit key:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:143
+#: en/about_manual.ssi:147
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
@@ -543,12 +557,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:147
+#: en/about_manual.ssi:151
msgid "_* Add the following section to your openssh-client config:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:160
#, no-wrap
msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
@@ -560,12 +574,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:164
msgid "_* Check out a clone of the manual through ssh:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:165
+#: en/about_manual.ssi:169
#, no-wrap
msgid ""
" $ git clone git at live.debian.net:/live-manual.git\n"
@@ -573,92 +587,76 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:169
+#: en/about_manual.ssi:173
msgid ""
"_* 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:171
-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:175
-#, no-wrap
-msgid " $ make commit\n"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:179
-msgid "_* Then"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:183
-#, no-wrap
-msgid " $ git add .\n"
+msgid ""
+"_* Do not use #{make commit}# unless you are updating translations in this "
+"commit, and in that case, do not mix changes to the English manual and "
+"translations in the same commit, but use separate commits for each. See the "
+"{Translation}#translation section for more details."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:187
+#: en/about_manual.ssi:177
msgid ""
-"_* 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."
+"_* Write commit messages that consist of complete, meaningful 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:191
+#: en/about_manual.ssi:181
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:195
+#: en/about_manual.ssi:185
msgid "_* Push the commit to the server:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:199
+#: en/about_manual.ssi:189
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:203
+#: en/about_manual.ssi:193
msgid "3~translation Translation"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:205
+#: en/about_manual.ssi:195
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:207
+#: en/about_manual.ssi:197
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). "
-"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."
+"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."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:209
+#: en/about_manual.ssi:199
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:211
+#: en/about_manual.ssi:201
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
"are updated from the po files and then you can review your changes launching "
@@ -667,7 +665,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:212
+#: en/about_manual.ssi:202
#, 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/about_project.ssi.pot b/manual/pot/about_project.ssi.pot
index 855c75f..f636403 100644
--- a/manual/pot/about_project.ssi.pot
+++ b/manual/pot/about_project.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-19 22:16+0100\n"
+"POT-Creation-Date: 2012-05-25 14:30+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -109,7 +109,7 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:32
-msgid "_* It would be a subproject of Debian."
+msgid "_* It is a subproject of Debian."
msgstr ""
#. type: Plain text
@@ -194,20 +194,19 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:60
msgid ""
-"A system for configuring packages is provided using debconf in #{lb config}# "
-"(use --preseed FILE) allowing custom configured packages to be installed in "
-"your custom produced Debian Live images, but for official live images only "
-"default configuration will be used. For more information, please see "
-"{Customization overview}#customization-overview."
+"A system for configuring packages is provided using debconf allowing custom "
+"configured packages to be installed in your custom produced Debian Live "
+"images, but for official live images only default configuration will be "
+"used. For more information, please see {Customization overview}"
+"#customization-overview."
msgstr ""
#. type: Plain text
#: en/about_project.ssi:62
msgid ""
"Exception: There are a few essential changes needed to bring a live system "
-"to life (e.g. configuring pam to allow empty passwords). These essential "
-"changes have to be kept as minimal as possible and should be merged within "
-"the Debian repository if possible."
+"to life. These essential changes have to be kept as minimal as possible and "
+"should be merged within the Debian repository if possible."
msgstr ""
#. type: Plain text
@@ -236,8 +235,8 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:69
msgid ""
-"_* *{BTS}*: The Debian Bug Tracking System (BTS) contains details of bugs "
-"reported by users and developers. Each bug is given a number, and is kept on "
-"file until it is marked as having been dealt with. For more information, "
-"please see {Reporting bugs}#bugs."
+"_* *{BTS}*: The {Debian Bug Tracking System}http://www.debian.org/Bugs/ "
+"(BTS) contains details of bugs reported by users and developers. Each bug is "
+"given a number, and is kept on file until it is marked as having been dealt "
+"with. For more information, please see {Reporting bugs}#bugs."
msgstr ""
diff --git a/manual/pot/index.html.in.pot b/manual/pot/index.html.in.pot
index 7909322..3d7a8ee 100644
--- a/manual/pot/index.html.in.pot
+++ b/manual/pot/index.html.in.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-01-07 16:03+0100\n"
+"POT-Creation-Date: 2012-06-02 18:16+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -37,7 +37,7 @@ msgstr ""
#. type: Content of: <html><body><p>
#: en/index.html.in:17
msgid ""
-"Please report errors, omissions, patches and suggestions to our mailinglist "
+"Please report errors, omissions, patches and suggestions to our mailing list "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
"org</a> and read about <a href=\"html/live-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
@@ -97,7 +97,7 @@ msgstr ""
#. type: Content of: <html><body><p>
#: en/index.html.in:38
msgid ""
-"The sources for this manual is available in a <a href=\"http://git.or.cz/"
+"The sources for this manual are available in a <a href=\"http://git.or.cz/"
"\">Git</a> repository at live.debian.net."
msgstr ""
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index f5377d5..d775315 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: 2012-04-03 00:19+0300\n"
+"POT-Creation-Date: 2012-06-04 12:21+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-04-03\n"
+" :published: 2012-06-04\n"
msgstr ""
#. type: Plain text
@@ -58,8 +58,8 @@ msgstr ""
#, no-wrap
msgid ""
"@make:\n"
-" :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/\n"
-" :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
+" :bold: /squeeze|wheezy|sid/\n"
+" :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
msgstr ""
diff --git a/manual/pot/project_bugs.ssi.pot b/manual/pot/project_bugs.ssi.pot
index 7bd185d..60d3da5 100644
--- a/manual/pot/project_bugs.ssi.pot
+++ b/manual/pot/project_bugs.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,16 +17,19 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -34,63 +37,70 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: 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-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
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -98,49 +108,53 @@ msgstr ""
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: 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:353 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
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
@@ -304,7 +318,7 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:50
msgid ""
-"_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system"
+"_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system"
msgstr ""
#. type: Plain text
@@ -400,8 +414,8 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:82
msgid ""
-"live-build first bootstraps a basic Debian system with #{debootstrap}# or #"
-"{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
+"live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
+"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
"distribution it is bootstrapping, it may fail. If a bug appears here, check "
"if the error is related to a specific Debian package (most likely), or if it "
"is related to bootstrapping tool itself."
@@ -433,7 +447,7 @@ msgstr ""
#: en/project_bugs.ssi:90
msgid ""
"If this is the case, this is not a bug in Debian Live, but rather in Debian "
-"- please report it against the failing package. Running #{debootstrap}# "
+"- please report it against the failing package. Running /{debootstrap}/ "
"separately from the Live system build or running #{lb bootstrap --debug}# "
"will give you more information."
msgstr ""
diff --git a/manual/pot/project_coding-style.ssi.pot b/manual/pot/project_coding-style.ssi.pot
index 10f979b..cb44129 100644
--- a/manual/pot/project_coding-style.ssi.pot
+++ b/manual/pot/project_coding-style.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-31 16:32+0300\n"
+"POT-Creation-Date: 2012-04-07 22:16+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,29 +17,30 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -87,29 +88,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -195,37 +197,42 @@ msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:16
-msgid "2~ Indenting"
+msgid "_* Make sure all shell code runs with 'set -e'."
msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:18
-msgid "_* Always use tabs over spaces."
+msgid "2~ Indenting"
msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:20
-msgid "2~ Wrapping"
+msgid "_* Always use tabs over spaces."
msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:22
-msgid "_* Generally, lines are 80 chars at maximum."
+msgid "2~ Wrapping"
msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:24
+msgid "_* Generally, lines are 80 chars at maximum."
+msgstr ""
+
+#. type: Plain text
+#: en/project_coding-style.ssi:26
msgid "_* Use the \"Linux style\" of line breaks:"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:26 en/project_coding-style.ssi:49
-#: en/project_coding-style.ssi:90 en/project_coding-style.ssi:108
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:51
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:110
msgid "Bad:"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:32
+#: en/project_coding-style.ssi:34
#, no-wrap
msgid ""
" if foo; then\n"
@@ -234,13 +241,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:59
-#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:119
+#: en/project_coding-style.ssi:38 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:100 en/project_coding-style.ssi:121
msgid "Good:"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:43
+#: en/project_coding-style.ssi:45
#, no-wrap
msgid ""
" if foo\n"
@@ -250,108 +257,108 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:49
msgid "_* The same holds for functions:"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:55
+#: en/project_coding-style.ssi:57
#, no-wrap
msgid ""
-" foo () {\n"
+" Foo () {\n"
" bar\n"
" }\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:66
+#: en/project_coding-style.ssi:68
#, no-wrap
msgid ""
-" foo ()\n"
+" Foo ()\n"
" {\n"
" bar\n"
" }\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:72
msgid "2~ Variables"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:72
+#: en/project_coding-style.ssi:74
msgid "_* Variables are always in capital letters."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:74
+#: en/project_coding-style.ssi:76
msgid ""
"_* Variables that used in #{lb config}# always start with #{LB_}# prefix."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:76
+#: en/project_coding-style.ssi:78
msgid ""
"_* Internal temporary variables in live-build should start with the #{\\_LB_}"
"# prefix."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:78
+#: en/project_coding-style.ssi:80
msgid "_* Local variables start with live-build #{\\_\\_LB_}# prefix."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:80
+#: en/project_coding-style.ssi:82
msgid ""
"_* Variables in connection to a boot parameter in live-config start with #"
"{LIVE_}#."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:82
+#: en/project_coding-style.ssi:84
msgid "_* All other variables in live-config start with #{_}# prefix."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:84
+#: en/project_coding-style.ssi:86
msgid ""
"_* Use braces around variables; e.g. write #{${FOO}}# instead of #{$FOO}#."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:86
+#: en/project_coding-style.ssi:88
msgid ""
"_* Always protect variables with quotes to respect potential whitespaces: "
"write #{\"${FOO}\"}# not #{${FOO}}#."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:88
+#: en/project_coding-style.ssi:90
msgid ""
"_* For consistency reasons, always use quotes when assigning values to "
"variables:"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:94
+#: en/project_coding-style.ssi:96
#, no-wrap
msgid " FOO=bar\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:104
#, no-wrap
msgid " FOO=\"bar\"\n"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:108
msgid "_* If multiple variables are used, quote the full expression:"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:115
+#: en/project_coding-style.ssi:117
#, no-wrap
msgid ""
" if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
@@ -361,7 +368,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:126
+#: en/project_coding-style.ssi:128
#, no-wrap
msgid ""
" if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
@@ -371,19 +378,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:130
+#: en/project_coding-style.ssi:132
msgid "2~ Miscellaneous"
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:132
+#: en/project_coding-style.ssi:134
msgid ""
"_* Use \"#{|}#\" (without the surround quotes) as a separator in calls to "
"sed, e.g. \"#{sed -e 's|foo|bar|'}#\" (without \"\")."
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:134
+#: en/project_coding-style.ssi:136
msgid ""
"_* Don't use the #{test}# command for comparisons or tests, use \"#{[}#\" \"#"
"{]}#\" (without \"\"); e.g. \"#{if [ -x /bin/foo ]; ...}#\" and not \"#{if "
@@ -391,8 +398,15 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_coding-style.ssi:135
+#: en/project_coding-style.ssi:138
msgid ""
"_* Use #{case}# wherever possible over #{test}#, as it's easier to read and "
"faster in execution."
msgstr ""
+
+#. type: Plain text
+#: en/project_coding-style.ssi:139
+msgid ""
+"_* Use capitalized names for functions to limit messing with the users "
+"environment."
+msgstr ""
diff --git a/manual/pot/project_procedures.ssi.pot b/manual/pot/project_procedures.ssi.pot
index 62841dd..b336367 100644
--- a/manual/pot/project_procedures.ssi.pot
+++ b/manual/pot/project_procedures.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2012-04-23 20:28+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,16 +17,18 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -34,63 +36,69 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: 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-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
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -98,49 +106,53 @@ msgstr ""
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: 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:353 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
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
@@ -233,7 +245,7 @@ msgstr ""
#. type: Plain text
#: en/project_procedures.ssi:36
msgid ""
-"_* Again, we need updated mirror of debian, debian-security and debian-"
+"_* Again, we need updated mirrors of debian, debian-security and debian-"
"volatile."
msgstr ""
@@ -244,18 +256,32 @@ msgstr ""
#. type: Plain text
#: en/project_procedures.ssi:42
+msgid "3~ Last Point Release of a Debian Release"
+msgstr ""
+
+#. type: Plain text
+#: en/project_procedures.ssi:47
+msgid ""
+"Remember to adjust both chroot and binary mirrors when building the last set "
+"of images for a Debian release after it has been moved away from ftp.debian."
+"org to archive.debian.org. That way, old prebuilt live images are still "
+"useful without user modifications."
+msgstr ""
+
+#. type: Plain text
+#: en/project_procedures.ssi:49
msgid "3~ Point release announcement template"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:44
+#: en/project_procedures.ssi:51
msgid ""
"An annoucement mail for point releases can be generated using the template "
"below and the following command:"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:52
+#: en/project_procedures.ssi:59
#, no-wrap
msgid ""
" $ sed \\\n"
@@ -266,20 +292,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:56
+#: en/project_procedures.ssi:63
msgid ""
"Please check the mail carefully before sending and pass it to others for "
"proof-reading."
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:60
+#: en/project_procedures.ssi:67
#, no-wrap
msgid " Debian Live images for Debian GNU/Linux %major% updated\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:64
+#: en/project_procedures.ssi:71
#, no-wrap
msgid ""
" The Debian Live project is pleased to announce the availability of\n"
@@ -288,19 +314,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:66
+#: en/project_procedures.ssi:73
#, no-wrap
msgid " The images are available for download at:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:68
+#: en/project_procedures.ssi:75
#, no-wrap
msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:73
+#: en/project_procedures.ssi:80
#, no-wrap
msgid ""
" This update incorporates the changes made in the %minor% point release,\n"
@@ -310,29 +336,29 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:75
+#: en/project_procedures.ssi:82
#, no-wrap
msgid " <http://lists.debian.org/debian-announce/%release_mail%>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:77
+#: en/project_procedures.ssi:84
#, no-wrap
msgid " It also includes the following Live-specific changes:\n"
msgstr ""
#. type: Bullet: ' * '
-#: en/project_procedures.ssi:81
+#: en/project_procedures.ssi:88
msgid "[INSERT LIVE-SPECIFIC CHANGE HERE]"
msgstr ""
#. type: Bullet: ' * '
-#: en/project_procedures.ssi:81
+#: en/project_procedures.ssi:88
msgid "[LARGER ISSUES MAY DESERVE THEIR OWN SECTION]"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:85
+#: en/project_procedures.ssi:92
#, no-wrap
msgid ""
" URLs\n"
@@ -340,67 +366,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:87
+#: en/project_procedures.ssi:94
#, no-wrap
msgid " Download location of updated images:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:89
+#: en/project_procedures.ssi:96
#, no-wrap
msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:91
+#: en/project_procedures.ssi:98
#, no-wrap
msgid " Debian Live project homepage:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:93
+#: en/project_procedures.ssi:100
#, no-wrap
msgid " <http://live.debian.net/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:95
+#: en/project_procedures.ssi:102
#, no-wrap
msgid " The current stable distribution:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:97
+#: en/project_procedures.ssi:104
#, no-wrap
msgid " <http://ftp.debian.org/debian/dists/stable>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:99
+#: en/project_procedures.ssi:106
#, no-wrap
msgid " stable distribution information (release notes, errata etc.):\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:101
+#: en/project_procedures.ssi:108
#, no-wrap
msgid " <http://www.debian.org/releases/stable/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:103
+#: en/project_procedures.ssi:110
#, no-wrap
msgid " Security announcements and information:\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:105
+#: en/project_procedures.ssi:112
#, no-wrap
msgid " <http://www.debian.org/security/>\n"
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:109
+#: en/project_procedures.ssi:116
#, no-wrap
msgid ""
" About Debian\n"
@@ -408,7 +434,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:113
+#: en/project_procedures.ssi:120
#, no-wrap
msgid ""
" The Debian Project is an association of Free Software developers who\n"
@@ -417,7 +443,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:117
+#: en/project_procedures.ssi:124
#, no-wrap
msgid ""
" About Debian Live\n"
@@ -425,7 +451,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:122
+#: en/project_procedures.ssi:129
#, no-wrap
msgid ""
" Debian Live is an official sub-project of Debian which produces Debian\n"
@@ -435,7 +461,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:126
+#: en/project_procedures.ssi:133
#, no-wrap
msgid ""
" Contact Information\n"
@@ -443,7 +469,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_procedures.ssi:130
+#: en/project_procedures.ssi:137
#, no-wrap
msgid ""
" For further information, please visit the Debian Live web pages at\n"
diff --git a/manual/pot/style_guide.ssi.pot b/manual/pot/style_guide.ssi.pot
index 5b3e060..740db0e 100644
--- a/manual/pot/style_guide.ssi.pot
+++ b/manual/pot/style_guide.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-31 19:15+0300\n"
+"POT-Creation-Date: 2012-06-03 17:04+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -22,17 +22,16 @@ msgid ":B~ Appendix"
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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
@@ -93,17 +92,16 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
@@ -832,15 +830,15 @@ msgstr ""
#. type: Plain text
#: en/style_guide.ssi:228
-msgid "_* /{New lines}/"
+msgid "_* /{Newlines}/"
msgstr ""
#. type: Plain text
#: en/style_guide.ssi:230
msgid ""
-"The translated texts need to have the exact same new lines as the original "
+"The translated texts need to have the exact same newlines as the original "
"texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
-"in the original files. These new lines often appear, for instance, in the "
+"in the original files. These newlines often appear, for instance, in the "
"code blocks."
msgstr ""
@@ -878,9 +876,7 @@ msgstr ""
#. type: Bullet: ' - '
#: en/style_guide.ssi:244
-msgid ""
-"Metadata (often between colons *{:metadata:}*) especially the date in /{live-"
-"manual.ssm.po}/ because it changes every time live-manual is updated."
+msgid "Metadata (often between colons *{:metadata:}*)"
msgstr ""
#. type: Bullet: ' - '
diff --git a/manual/pot/user_basics.ssi.pot b/manual/pot/user_basics.ssi.pot
index 0cd1d12..01f2345 100644
--- a/manual/pot/user_basics.ssi.pot
+++ b/manual/pot/user_basics.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-01-12 08:28-0400\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,16 +17,18 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -34,8 +36,10 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -59,39 +63,42 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -99,8 +106,10 @@ msgstr ""
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -124,25 +133,26 @@ msgstr ""
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
@@ -302,7 +312,7 @@ msgstr ""
#: en/user_basics.ssi:48
msgid ""
"This process can take a while, depending on the speed of your network "
-"connection. When it is complete, there should be a #{binary-hybrid.iso}# "
+"connection. When it is complete, there should be a #{binary.hybrid.iso}# "
"image file, ready to use, in the current directory."
msgstr ""
@@ -341,7 +351,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:62
#, no-wrap
-msgid " $ wodim binary-hybrid.iso\n"
+msgid " $ wodim binary.hybrid.iso\n"
msgstr ""
#. type: Plain text
@@ -373,7 +383,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:75
#, no-wrap
-msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
+msgid " $ dd if=binary.hybrid.iso of=${USBSTICK}\n"
msgstr ""
#. type: Plain text
@@ -400,8 +410,8 @@ msgid ""
"Once you've booted the media, you are presented with a boot menu. If you "
"just press enter here, the system will boot using the default entry, #{Live}"
"# and default options. For more information about boot options, see the "
-"\"help\" entry in the menu and also the #{live-boot}# and #{live-config}# "
-"man pages found within the live system."
+"\"help\" entry in the menu and also the live-boot and live-config man pages "
+"found within the live system."
msgstr ""
#. type: Plain text
@@ -471,16 +481,16 @@ msgstr ""
#: en/user_basics.ssi:104
msgid ""
"The most versatile VM in Debian is QEMU. If your processor has hardware "
-"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
+"support for virtualization, use the /{qemu-kvm}/ package; the /{qemu-kvm}/ "
"package description briefly lists the requirements."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:106
msgid ""
-"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
-"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
-"the following examples. The #{qemu-utils}# package is also valuable for "
+"First, install /{qemu-kvm}/ if your processor supports it. If not, install /"
+"{qemu}/, in which case the program name is #{qemu}# instead of #{kvm}# in "
+"the following examples. The /{qemu-utils}/ package is also valuable for "
"creating virtual disk images with #{qemu-img}#."
msgstr ""
@@ -498,7 +508,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:118
#, no-wrap
-msgid " $ kvm -cdrom binary-hybrid.iso\n"
+msgid " $ kvm -cdrom binary.hybrid.iso\n"
msgstr ""
#. type: Plain text
@@ -513,7 +523,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:126
-msgid "In order to test the ISO with #{virtualbox-ose}#:"
+msgid "In order to test the ISO with /{virtualbox-ose}/:"
msgstr ""
#. type: Plain text
@@ -531,17 +541,14 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:136
msgid ""
-"Create a new virtual machine, change the storage settings to use #{binary-"
+"Create a new virtual machine, change the storage settings to use #{binary."
"hybrid.iso}# as the CD/DVD device, and start the machine."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:138
-msgid ""
-"Note: For live systems containing X.org that you want to test with #"
-"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
-"package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. "
-"Otherwise, the resolution is limited to 800x600."
+#, no-wrap
+msgid "*{Note:}* For live systems containing X.org that you want to test with /{virtualbox-ose}/, you may wish to include the VirtualBox X.org driver package, /{virtualbox-ose-guest-x11}/, in your live-build configuration. Otherwise, the resolution is limited to 800x600.\n"
msgstr ""
#. type: Plain text
@@ -570,10 +577,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:150
-msgid ""
-"Note: if you created an ISO hybrid image with the previous example, you will "
-"need to clean up your working directory with the #{lb clean}# command (see "
-"{The lb clean command}#lb-clean):"
+#, no-wrap
+msgid "*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):\n"
msgstr ""
#. type: Plain text
@@ -619,7 +624,7 @@ msgid ""
"bootloader, ready to be directly written on a USB stick. Since using an HDD "
"image is just like using an ISO hybrid image on USB, follow the instructions "
"in {Using an ISO hybrid live image}#using-iso-hybrid, except use the "
-"filename #{binary.img}# instead of #{binary-hybrid.iso}#."
+"filename #{binary.img}# instead of #{binary.hybrid.iso}#."
msgstr ""
#. type: Plain text
@@ -630,10 +635,10 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:182
msgid ""
-"First, install QEMU as described above in {Testing an ISO image with QEMU}"
-"#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which "
-"version your host system needs, specifying #{binary.img}# as the first hard "
-"drive."
+"First, install /{qemu}/ as described above in {Testing an ISO image with "
+"QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on "
+"which version your host system needs, specifying #{binary.img}# as the first "
+"hard drive."
msgstr ""
#. type: Plain text
@@ -651,7 +656,7 @@ msgstr ""
#: en/user_basics.ssi:192
msgid ""
"To use the remaining free space after copying #{binary.img}# to a USB stick, "
-"use a partitioning tool such as #{gparted}# or #{parted}# to create a new "
+"use a partitioning tool such as /{gparted}/ or /{parted}/ to create a new "
"partition on the stick. The first partition will be used by the Debian Live "
"system."
msgstr ""
@@ -678,11 +683,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:208
-msgid ""
-"Note: If you want to use the extra space with Windows, apparently that OS "
-"cannot normally access any partitions but the first. Some solutions to this "
-"problem have been discussed on our {mailing list}#contact, but it seems "
-"there are no easy answers."
+#, no-wrap
+msgid "*{Note:}* If you want to use the extra space with Windows, apparently that OS cannot normally access any partitions but the first. Some solutions to this problem have been discussed on our {mailing list}#contact, but it seems there are no easy answers.\n"
msgstr ""
#. type: Plain text
@@ -706,9 +708,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:216
-msgid ""
-"Note: if you performed any previous examples, you will need to clean up your "
-"working directory with the #{lb clean}# command:"
+#, no-wrap
+msgid "*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:\n"
msgstr ""
#. type: Plain text
@@ -840,9 +841,10 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:280
msgid ""
-"You should install the tftpd-hpa package. It can serve all files contained "
-"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
-"#{/srv/debian-live/tftpboot}#, run as root the following command:"
+"You should install the /{tftpd-hpa}/ package. It can serve all files "
+"contained inside a root directory, usually #{/srv/tftp}#. To let it serve "
+"files inside #{/srv/debian-live/tftpboot}#, run as root the following "
+"command:"
msgstr ""
#. type: Plain text
@@ -871,7 +873,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:294
-msgid "You need to install the #{nfs-kernel-server}# package."
+msgid "You need to install the /{nfs-kernel-server}/ package."
msgstr ""
#. type: Plain text
@@ -935,7 +937,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:322
-msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
+msgid "_* Install /{qemu}/, /{bridge-utils}/, /{sudo}/."
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_customization-binary.ssi.pot b/manual/pot/user_customization-binary.ssi.pot
index 22d4ac2..542f63f 100644
--- a/manual/pot/user_customization-binary.ssi.pot
+++ b/manual/pot/user_customization-binary.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-25 21:42+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,28 +17,30 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -62,51 +64,54 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -130,25 +135,26 @@ msgstr ""
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
@@ -239,7 +245,7 @@ msgid ""
" include menu.cfg\n"
" default vesamenu.c32\n"
" prompt 0\n"
-" timeout 5\n"
+" timeout 50\n"
msgstr ""
#. type: Plain text
@@ -259,7 +265,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:43
#, no-wrap
-msgid " sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg\n"
+msgid " sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_customization-contents.ssi.pot b/manual/pot/user_customization-contents.ssi.pot
index 2f4f5d2..0218f95 100644
--- a/manual/pot/user_customization-contents.ssi.pot
+++ b/manual/pot/user_customization-contents.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-01-15 16:28+0100\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,16 +17,19 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -34,9 +37,10 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -60,39 +64,43 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -100,9 +108,10 @@ msgstr ""
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -126,25 +135,26 @@ msgstr ""
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
@@ -236,7 +246,7 @@ msgstr ""
#: en/user_customization-contents.ssi:24
msgid ""
"To include files, simply add them to your #{config/includes.chroot}# "
-"directory. This directory corresponds to the root directory (#{/}#) of the "
+"directory. This directory corresponds to the root directory #{/}# of the "
"live system. For example, to add a file #{/var/www/index.html}# in the live "
"system, use:"
msgstr ""
@@ -412,6 +422,6 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:93
msgid ""
-"For more information about debconf, please see debconf(7) in the #{debconf}# "
-"package."
+"For more information about debconf, please see #{debconf(7)}# in the /"
+"{debconf}/ package."
msgstr ""
diff --git a/manual/pot/user_customization-installer.ssi.pot b/manual/pot/user_customization-installer.ssi.pot
index 07c2a1e..0e8a77f 100644
--- a/manual/pot/user_customization-installer.ssi.pot
+++ b/manual/pot/user_customization-installer.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,28 +17,29 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -62,21 +63,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -85,28 +87,29 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -130,21 +133,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -199,7 +203,7 @@ msgstr ""
#: en/user_customization-installer.ssi:16
msgid ""
"On such images, Debian is installed by fetching and installing .deb packages "
-"using #{debootstrap}# or #{cdebootstrap}#, from the local media or some "
+"using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some "
"network-based network, resulting in a standard Debian system being installed "
"to the hard disk."
msgstr ""
@@ -224,7 +228,7 @@ msgstr ""
msgid ""
"Installation will proceed in an identical fashion to the \"Regular\" "
"installation described above, but at the actual package installation stage, "
-"instead of using #{debootstrap}# to fetch and install packages, the live "
+"instead of using /{debootstrap}/ to fetch and install packages, the live "
"filesystem image is copied to the target. This is achieved with a special "
"udeb called live-installer."
msgstr ""
@@ -238,10 +242,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-installer.ssi:26
-msgid ""
-"Note: to support both normal and live installer entries in the bootloader of "
-"the same live media, you must disable live-installer by preseeding #{live-"
-"installer/enable=false}#."
+#, no-wrap
+msgid "*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.\n"
msgstr ""
#. type: Plain text
@@ -309,5 +311,5 @@ msgid ""
"binary/}# to include them in the image. Additional or replacement files and "
"directories may be included in the installer initrd as well, in a similar "
"fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
-"placing the material in #{config/binary_debian-installer-includes/}#."
+"placing the material in #{config/includes.binary_debian-installer/}#."
msgstr ""
diff --git a/manual/pot/user_customization-overview.ssi.pot b/manual/pot/user_customization-overview.ssi.pot
index 93027aa..c7d58a1 100644
--- a/manual/pot/user_customization-overview.ssi.pot
+++ b/manual/pot/user_customization-overview.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -110,7 +110,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-overview.ssi:22
msgid ""
-"Although #{lb config}# does create a skeletal configuration in the config/ "
+"Although #{lb config}# creates a skeletal configuration in the config/ "
"directory, to accomplish your goals, you may need to provide additional "
"files in subdirectories of config/. Depending on where the files are stored "
"in the configuration, they may be copied into the live system's filesystem "
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index 036e06b..ff1732a 100644
--- a/manual/pot/user_customization-packages.ssi.pot
+++ b/manual/pot/user_customization-packages.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-04-14 22:45+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,28 +17,29 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -62,21 +63,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -85,28 +87,29 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -130,21 +133,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -174,12 +178,12 @@ msgid ""
"distribution mirror. You can also add your own repositories for backports, "
"experimental or custom packages, or include packages directly as files. You "
"can define your own lists of packages to include, use live-build's "
-"predefined lists, use #{tasksel}# tasks, or a combination of all three. "
-"Finally, a number of options give some control over apt, or if you prefer, "
-"aptitude, at build time when packages are installed. You may find these "
-"handy if you use a proxy, want to disable installation of recommended "
-"packages to save space, or need to control which versions of packages are "
-"installed via APT pinning, to name a few possibilities."
+"predefined lists, use /{tasksel}/ tasks, or a combination of all three. "
+"Finally, a number of options give some control over /{apt}/, or if you "
+"prefer, /{aptitude}/, at build time when packages are installed. You may "
+"find these handy if you use a proxy, want to disable installation of "
+"recommended packages to save space, or need to control which versions of "
+"packages are installed via APT pinning, to name a few possibilities."
msgstr ""
#. type: Plain text
@@ -197,12 +201,12 @@ msgstr ""
msgid ""
"The distribution you choose has the broadest impact on which packages are "
"available to include in your live image. Specify the codename, which "
-"defaults to #{wheezy}# for the Wheezy version of live-build. Any current "
+"defaults to wheezy for the wheezy version of live-build. Any current "
"distribution carried in the Debian archive may be specified by its codename "
"here. (See {Terms}#terms for more details.) The #{--distribution}# option "
"not only influences the source of packages within the archive, but also "
-"instructs #{live-build}# to behave as needed to build each supported "
-"distribution. For example, to build against the *{unstable}* release, Sid, "
+"instructs live-build to behave as needed to build each supported "
+"distribution. For example, to build against the *{unstable}* release, sid, "
"specify:"
msgstr ""
@@ -257,12 +261,12 @@ msgid ""
"download speed. Each of the #{--mirror-*}# options governs which "
"distribution mirror is used at various stages of the build. Recall from "
"{Stages of the build}#stages-of-the-build that the *{bootstrap}* stage is "
-"when the chroot is initially populated by debootstrap with a minimal system, "
-"and the *{chroot}* stage is when the chroot used to construct the live "
-"system's filesystem is built. Thus, the corresponding mirror switches are "
-"used for those stages, and later, in the *{binary}* stage, the #{--mirror-"
-"binary}# and #{--mirror-binary-security}# values are used, superceding any "
-"mirrors used in an earlier stage."
+"when the chroot is initially populated by /{debootstrap}/ with a minimal "
+"system, and the *{chroot}* stage is when the chroot used to construct the "
+"live system's filesystem is built. Thus, the corresponding mirror switches "
+"are used for those stages, and later, in the *{binary}* stage, the #{--"
+"mirror-binary}# and #{--mirror-binary-security}# values are used, "
+"superceding any mirrors used in an earlier stage."
msgstr ""
#. type: Plain text
@@ -509,9 +513,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:125
msgid ""
-"For example, to make a list that includes the predefined #{gnome}# list plus "
-"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
-"contents:"
+"For example, to make a list that includes the predefined #{gnome}# list "
+"plus /{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the "
+"following contents:"
msgstr ""
#. type: Plain text
@@ -557,9 +561,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:148
msgid ""
-"You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architectures i386}# or #{--architectures amd64}# is "
-"specified:"
+"You may test for any one of a number of values, e.g. to install /"
+"{memtest86+}/ if either #{--architectures i386}# or #{--architectures amd64}"
+"# is specified:"
msgstr ""
#. type: Plain text
@@ -575,7 +579,7 @@ msgstr ""
#: en/user_customization-packages.ssi:158
msgid ""
"You may also test against variables that may contain more than one value, e."
-"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
+"g. to install /{vrms}/ if either #{contrib}# or #{non-free}# is specified "
"via #{--archive-areas}#:"
msgstr ""
@@ -637,8 +641,8 @@ msgstr ""
msgid ""
"The primary tasks available in the Debian Installer can be listed with #"
"{tasksel --list-tasks}# in the live system. The contents of any task, "
-"including ones not included in this list, may be examined with #{tasksel --"
-"task-packages}#."
+"including the ones not included in this list, may be examined with #{tasksel "
+"--task-packages}#."
msgstr ""
#. type: Plain text
@@ -883,7 +887,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:266
msgid ""
-"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
+"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 "
"to #{lb config}#. Choose the method implementing the preferred behaviour for "
"package installation, the notable difference being how missing packages are "
@@ -952,11 +956,11 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:294
msgid ""
-"This will not influence the entries in /etc/apt/sources.list, but merely "
-"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
-"APT needs those indices in order to operate in the live system, so before "
-"performing #{apt-cache search}# or #{apt-get install}#, for instance, the "
-"user must #{apt-get update}# first to create those indices."
+"This will not influence the entries in #{/etc/apt/sources.list}#, but merely "
+"whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is "
+"that APT needs those indices in order to operate in the live system, so "
+"before performing #{apt-cache search}# or #{apt-get install}#, for instance, "
+"the user must #{apt-get update}# first to create those indices."
msgstr ""
#. type: Plain text
@@ -1019,11 +1023,11 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:314
msgid ""
-"Let's say you are building a Wheezy 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 "
+"Let's say you are building a wheezy 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, Wheezy. The following will "
+"taken from the target system distribution, wheezy. The following will "
"accomplish this:"
msgstr ""
@@ -1051,7 +1055,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:331
#, no-wrap
-msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with Wheezy using:\n"
+msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:\n"
msgstr ""
#. type: Plain text
@@ -1066,9 +1070,9 @@ msgid ""
"the case where you do not want a package that is recommended by another "
"package. Suppose you are building an LXDE image using #{--package-lists lxde}"
"# option, but don't want the user prompted to store wifi passwords in the "
-"keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
-"turn recommends #{gnome-keyring}#. So you want to omit the recommended #"
-"{gnome-keyring}# package. This can be done by adding the following stanza to "
+"keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in "
+"turn recommends /{gnome-keyring}/. So you want to omit the recommended /"
+"{gnome-keyring}/ package. This can be done by adding the following stanza to "
"#{config/chroot_apt/preferences}#:"
msgstr ""
diff --git a/manual/pot/user_customization-runtime.ssi.pot b/manual/pot/user_customization-runtime.ssi.pot
index 5a1dafe..92728c7 100644
--- a/manual/pot/user_customization-runtime.ssi.pot
+++ b/manual/pot/user_customization-runtime.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-24 15:08+0100\n"
+"POT-Creation-Date: 2012-06-03 20:02+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,28 +17,29 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -86,28 +87,29 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -374,7 +376,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:96
msgid ""
-"Persistence is a common name for different kinds of solutions for saving "
+"'Persistence' is a common name for different kinds of solutions for saving "
"across reboots some, or all, of this run-time evolution of the system. To "
"understand how it could work it could be handy to know that even if the "
"system is booted and run from read-only media, modification to the files and "
@@ -389,15 +391,16 @@ msgid ""
"medium like local storage media, a network share or even a session of a "
"multisession (re)writable CD/DVD. All these media are supported in Debian "
"Live in different ways, and all but the last one require a special boot "
-"parameter to be specified at boot time: #{persistent}#."
+"parameter to be specified at boot time: #{persistence}#."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:100
msgid ""
-"If the boot parameter #{persistent}# is set (and #{nopersistent}# is not "
+"If the boot parameter #{persistence}# is set (and #{nopersistence}# is not "
"set), local storage media (e.g. hard disks, USB drives) will be probed for "
-"persistent volumes during boot. A persistent volume is any of the following:"
+"persistence volumes during boot. A persistence volume is any of the "
+"following:"
msgstr ""
#. type: Plain text
@@ -416,20 +419,20 @@ msgid ""
"_* an image/archive file located on the root of any readable filesystem "
"(even an NTFS partition of a foreign OS), identified by its file name. In "
"this case the file name must also use the containing filesystem as the file "
-"extension, e.g. \"<label>.ext3\"."
+"extension, e.g. \"<label>.ext4\"."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:108
msgid ""
-"It is possible to restrict which types of persistent volumes to use by "
+"It is possible to restrict which types of persistence volumes to use by "
"specifying certain boot parameters described in the live-boot(7) man page. "
"The \"identifying labels\" referred to above can be any of the following:"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:110
-msgid "_* #{full-ov}# for full persistent overlays."
+msgid "_* #{full-ov}# for full persistence overlays."
msgstr ""
#. type: Plain text
@@ -449,7 +452,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:118
-msgid "3~ Full persistent overlays"
+msgid "3~ Full persistence overlays"
msgstr ""
#. type: Plain text
@@ -457,15 +460,15 @@ msgstr ""
msgid ""
"By 'full persistence' it is meant that instead of using a tmpfs for storing "
"modifications to the read-only media (with the copy-on-write, COW, system) a "
-"persistent volume is used. For this type of persistence the volume label "
-"must be #{full-ov}#. This could, for instance, be an ext2 partition on a "
+"persistence volume is used. For this type of persistence the volume label "
+"must be #{full-ov}#. This could, for instance, be an ext4 partition on a "
"hard disk or on a usb key created with, e.g.:"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:124
#, no-wrap
-msgid " # mkfs.ext2 -L full-ov /dev/sdb1\n"
+msgid " # mkfs.ext4 -L full-ov /dev/sdb1\n"
msgstr ""
#. type: Plain text
@@ -489,7 +492,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:138
msgid ""
-"Here's an example of how to create an ext2-based image file used for full "
+"Here's an example of how to create an ext4-based image file used for full "
"persistence:"
msgstr ""
@@ -498,7 +501,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file\n"
-" $ /sbin/mkfs.ext2 -F full-ov\n"
+" $ /sbin/mkfs.ext4 -F full-ov\n"
msgstr ""
#. type: Plain text
@@ -517,54 +520,54 @@ msgstr ""
#: en/user_customization-runtime.ssi:151
msgid ""
"A volume with the label #{custom-ov}# can be configured to make arbitrary "
-"directories persistent. The file #{live.persist}#, located on the volume's "
-"filesystem root, controls which directories it makes persistent, and in "
-"which way."
+"directories persistent. The file #{live-persistence.conf}#, located on the "
+"volume's filesystem root, controls which directories it makes persistent, "
+"and in which way."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:153
msgid ""
"How custom overlay mounts are configured is described in full detail in the "
-"live.persist(5) man page, but a simple example should be sufficient for most "
-"uses. Let's say we want to make our home directory and APT cache persistent "
-"in an ext3 filesystem on the /dev/sdb1 partition:"
+"live-persistence.conf(5) man page, but a simple example should be sufficient "
+"for most uses. Let's say we want to make our home directory and APT cache "
+"persistent in an ext4 filesystem on the /dev/sdb1 partition:"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:160
#, no-wrap
msgid ""
-" $ mkfs.ext3 -L custom-ov /dev/sdb1\n"
-" $ mount -t ext3 /dev/sdb1 /mnt\n"
-" $ echo \"/home\" >> /mnt/live.persist\n"
-" $ echo \"/var/cache/apt\" >> /mnt/live.persist\n"
+" $ mkfs.ext4 -L custom-ov /dev/sdb1\n"
+" $ mount -t ext4 /dev/sdb1 /mnt\n"
+" $ echo \"/home\" >> /mnt/live-persistence.conf\n"
+" $ echo \"/var/cache/apt\" >> /mnt/live-persistence.conf\n"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:164
msgid ""
-"Then we reboot. During the first boot the contents of /home and /var/cache/"
-"apt will be copied into the persistent volume, and from then on all changes "
-"to these directories will live in the persistent volume. Please note that "
-"any paths listed in the #{live.persist}# file cannot contain white spaces or "
-"the special \".\" and \"..\" path components. Also, neither \"/live\" (or "
-"any of its sub-directories) nor \"/\" can be made persistent using custom "
-"mounts (for the latter, use the #{full-ov}# type persistence described "
-"above)."
+"Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
+"cache/apt}# will be copied into the persistence volume, and from then on all "
+"changes to these directories will live in the persistence volume. Please "
+"note that any paths listed in the #{live-persistence.conf}# file cannot "
+"contain white spaces or the special #{.}# and #{..}# path components. Also, "
+"neither #{/live}# (or any of its sub-directories) nor #{/}# can be made "
+"persistent using custom mounts (for the latter, use the #{full-ov}# type "
+"persistence described above)."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:166
msgid ""
-"Several different custom overlay volumes (with their own #{live.persist}# "
-"files) can be used at the same time, but if several volumes make the same "
-"directory persistent, only one of them will be used. If any two mounts are "
-"\"nested\" (i.e. one is a sub-directory of the other) the parent will be "
+"Several different custom overlay volumes (with their own #{live-persistence."
+"conf}# files) can be used at the same time, but if several volumes make the "
+"same directory persistent, only one of them will be used. If any two mounts "
+"are \"nested\" (i.e. one is a sub-directory of the other) the parent will be "
"mounted before the child so no mount will be hidden by the other. Nested "
-"custom mounts are problematic if they are listed in the same #{live.persist}"
-"# file. See the live.persist(5) man page for how to handle that case if you "
-"really need it (hint: you usually don't)."
+"custom mounts are problematic if they are listed in the same #{live-"
+"persistence.conf}# file. See the live-persistence.conf(5) man page for how "
+"to handle that case if you really need it (hint: you usually don't)."
msgstr ""
#. type: Plain text
@@ -576,13 +579,13 @@ msgstr ""
#: en/user_customization-runtime.ssi:170
msgid ""
"Snapshots are collections of files and directories which are not mounted "
-"while running but which are copied from a persistent volume to the system "
+"while running but which are copied from a persistence volume to the system "
"(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The "
"volume must be labeled #{live-sn}#, and it defaults to a simple cpio archive "
"named #{live-sn.cpio.gz}#. A power interruption during run time could lead "
"to data loss, hence, if you have important changes, invoke #{live-snapshot --"
"refresh}# as often as needed. This type of persistence, since it does not "
-"write continuously to the persistent media, is the most flash-based device "
+"write continuously to the persistence media, is the most flash-based device "
"friendly and the fastest of all the persistence systems, but it occupies as "
"much RAM as the size of the uncompressed snapshot."
msgstr ""
@@ -601,19 +604,19 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:176
-msgid "3~ Persistent SubText"
+msgid "3~ Persistence SubText"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:178
msgid ""
-"If a user would need multiple persistent storage of the same type for "
+"If a user would need multiple persistence storage of the same type for "
"different locations or testing, such as #{full-ov-nonwork}# and #{full-ov-"
-"work}#, the boot parameter #{persistent-subtext}# used in conjunction with "
-"the boot parameter #{persistent}# will allow for multiple but unique "
-"persistent media. An example would be if a user wanted to use a persistent "
+"work}#, the boot parameter #{persistence-subtext}# used in conjunction with "
+"the boot parameter #{persistence}# will allow for multiple but unique "
+"persistence media. An example would be if a user wanted to use a persistence "
"partition labeled #{live-sn-subText}# they would use the boot parameters of: "
-"#{persistent}# #{persistent-subtext=subText}#."
+"#{persistence}# #{persistence-subtext=subText}#."
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index 57ea9e9..161036d 100644
--- a/manual/pot/user_examples.ssi.pot
+++ b/manual/pot/user_examples.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-13 14:44+0100\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -22,26 +22,27 @@ msgid ":B~ Examples"
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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 en/user_customization-contents.ssi:26
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -67,49 +68,51 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 en/user_customization-contents.ssi:31
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -135,25 +138,26 @@ msgstr ""
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
@@ -165,7 +169,7 @@ msgid " # lb build\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#: en/user_customization-binary.ssi:41 en/user_examples.ssi:95
#, no-wrap
msgid " #!/bin/sh\n"
msgstr ""
@@ -274,7 +278,7 @@ msgstr ""
#: en/user_examples.ssi:46
msgid ""
"Assuming all goes well, after a while, the current directory will contain #"
-"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+"{binary.hybrid.iso}#. This ISO hybrid image can be booted directly in a "
"virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-"
"with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
"virtualbox, or else imaged onto optical media or a USB flash device as "
@@ -403,9 +407,9 @@ msgid ""
"First, #{--architectures i386}# ensures that on our #{amd64}# build system, "
"we build a 32-bit version suitable for use on most machines. Second, we use #"
"{--linux-flavours 686-pae}# because we don't anticipate using this image on "
-"much older systems. Third, we've chosen the #{lxde}# package list to give us "
+"much older systems. Third, we've chosen the /{lxde}/ package list to give us "
"a minimal desktop. And finally, we have added two initial favourite "
-"packages: #{iceweasel}# and #{xchat}#."
+"packages: /{iceweasel}/ and /{xchat}/."
msgstr ""
#. type: Plain text
@@ -445,8 +449,8 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:137
msgid ""
-"In this revision, we're going to clean up from the first build, add the #"
-"{vlc}# package to our configuration, rebuild, test and commit."
+"In this revision, we're going to clean up from the first build, add the /"
+"{vlc}/ package to our configuration, rebuild, test and commit."
msgstr ""
#. type: Plain text
@@ -467,7 +471,7 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:147
msgid ""
-"Now append the #{vlc}# package to our local package list in #{config/package-"
+"Now append the /{vlc}/ package to our local package list in #{config/package-"
"lists/my.list.chroot}#:"
msgstr ""
@@ -534,8 +538,8 @@ msgstr ""
#: en/user_examples.ssi:179
msgid ""
"Make a build directory and create a skeletal configuration in it built "
-"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
-"{xvnc4viewer}#, disabling recommends to make a minimal system:"
+"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
+"{xvnc4viewer}/, disabling recommends to make a minimal system:"
msgstr ""
#. type: Plain text
@@ -553,8 +557,8 @@ msgstr ""
#: en/user_examples.ssi:191
msgid ""
"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
-"the default user that will launch metacity and start xvncviewer, connecting "
-"to port #{5901}# on a server at #{192.168.1.2}#:"
+"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
+"connecting to port #{5901}# on a server at #{192.168.1.2}#:"
msgstr ""
#. type: Plain text
@@ -610,10 +614,10 @@ msgid ""
"the tradeoffs you are making between size and functionality. In this "
"example, we trim only so much as to make room for additional material within "
"a 128M media size, but without doing anything to destroy integrity of the "
-"packages contained within, such as the purging of locale data via the #"
-"{localepurge}# package, or other such \"intrusive\" optimizations. Of "
+"packages contained within, such as the purging of locale data via the /"
+"{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
"particular note, you should not use #{--bootstrap-flavour minimal}# unless "
-"you really know what you're doing, as omitting priority #{important}# "
+"you really know what you're doing, as omitting priority *{important}* "
"packages will most likely produce a broken live system."
msgstr ""
@@ -649,8 +653,8 @@ msgid ""
"system. Choosing the #{minimal}# package list leaves out the large #{locales}"
"# package and associated utilities. Dropping recommended packages with #{--"
"apt-recommends false}# saves some additional space, at the expense of "
-"omitting some packages you might otherwise expect to be there, such as #"
-"{firmware-linux-free}# which may be needed to support certain hardware. The "
+"omitting some packages you might otherwise expect to be there, such as /"
+"{firmware-linux-free}/ which may be needed to support certain hardware. The "
"remaining options shave off additional small amounts of space. It's up to "
"you to decide if the functionality that is sacrificed with each optimization "
"is worth the loss in functionality."
@@ -750,8 +754,8 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:292
msgid ""
-"Note that we have included the #{debian-installer-launcher}# package to "
-"launch the installer from the live desktop, and have also specified the 486 "
-"flavour kernel, as it is currently necessary to make the installer and live "
-"system kernels match for the launcher to work properly."
+"Note that we have included the debian-installer-launcher package to launch "
+"the installer from the live desktop, and have also specified the 486 flavour "
+"kernel, as it is currently necessary to make the installer and live system "
+"kernels match for the launcher to work properly."
msgstr ""
diff --git a/manual/pot/user_installation.ssi.pot b/manual/pot/user_installation.ssi.pot
index 243e075..b169e71 100644
--- a/manual/pot/user_installation.ssi.pot
+++ b/manual/pot/user_installation.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-31 16:32+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,29 +17,30 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
+#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -87,29 +88,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
+#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -408,16 +410,16 @@ msgstr ""
#: en/user_installation.ssi:125
msgid ""
"You must build either on your target distribution or in a chroot containing "
-"your target platform: this means if your target is Wheezy then you should "
-"build against Wheezy."
+"your target platform: this means if your target is wheezy then you should "
+"build against wheezy."
msgstr ""
#. type: Plain text
#: en/user_installation.ssi:127
msgid ""
"Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
-"build #{live-boot}# for a target distribution that differs from your build "
-"system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy "
+"build live-boot for a target distribution that differs from your build "
+"system. For example, for wheezy live images, build live-boot in a wheezy "
"chroot. If your target distribution happens to match your build system "
"distribution, you may build directly on the build system using #{dpkg-"
"buildpackage}# (provided by the /{dpkg-dev}/ package):"
diff --git a/manual/pot/user_managing_a_configuration.ssi.pot b/manual/pot/user_managing_a_configuration.ssi.pot
index 7041a6b..6f93f4a 100644
--- a/manual/pot/user_managing_a_configuration.ssi.pot
+++ b/manual/pot/user_managing_a_configuration.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,28 +17,30 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -62,21 +64,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -85,28 +88,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -130,21 +135,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -216,7 +222,7 @@ msgid ""
"variable values, and each time you run #{lb config}# and #{lb clean}#, these "
"files will be executed. This will ensure that your configuration is kept "
"internally consistent from one revision to the next and from one live-build "
-"release to the next (though you will still have to take care and read the "
+"release to the next (Although you will still have to take care and read the "
"documentation when you upgrade live-build and make adjustments as needed)."
msgstr ""
diff --git a/manual/pot/user_overview.ssi.pot b/manual/pot/user_overview.ssi.pot
index 83720ad..29f62be 100644
--- a/manual/pot/user_overview.ssi.pot
+++ b/manual/pot/user_overview.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-19 18:09+0100\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,28 +17,30 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. 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:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 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
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -62,21 +64,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -85,28 +88,30 @@ msgid "code{"
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:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 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
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -130,21 +135,22 @@ msgstr ""
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -192,15 +198,15 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:14
msgid ""
-"Many concepts are similar to those in the debhelper Debian package tools "
+"Many concepts are similar to those in the /{debhelper}/ Debian package tools "
"written by Joey Hess:"
msgstr ""
#. type: Plain text
#: en/user_overview.ssi:16
msgid ""
-"_* The scripts have a central location for configuring their operation. In "
-"debhelper, this is the #{debian/}# subdirectory of a package tree. For "
+"_* The scripts have a central location for configuring their operation. In /"
+"{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For "
"example, dh_install will look, amongst others, for a file called #{debian/"
"install}# to determine which files should exist in a particular binary "
"package. In much the same way, live-build stores its configuration entirely "
@@ -217,9 +223,9 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:20
msgid ""
-"Unlike debhelper, live-build contains a tool to generate a skeleton "
+"Unlike /{debhelper}/, live-build contains a tool to generate a skeleton "
"configuration directory, #{lb config}#. This could be considered to be "
-"similar to tools such as #{dh-make}#. For more information about #{lb config}"
+"similar to tools such as /{dh-make}/. For more information about #{lb config}"
"#, please see {The lb config command}#lb-config."
msgstr ""
diff --git a/manual/pt_BR/about_manual.ssi b/manual/pt_BR/about_manual.ssi
index 4f22d00..31e38bc 100644
--- a/manual/pt_BR/about_manual.ssi
+++ b/manual/pt_BR/about_manual.ssi
@@ -4,11 +4,13 @@
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 7.0 "Wheezy" 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
+by the project for the Debian 7.0 "wheezy" release. An up-to-date version
+can always be found at http://live.debian.net/
+
+While live-manual 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.
@@ -25,21 +27,24 @@ 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 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
+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.
+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
@@ -63,15 +68,15 @@ _* *{Host system}*: O ambiente usado para criar o sistema live.
_* *{Target system}*: O ambiente usado para rodar o sistema live.
_* *{live-boot}*: Uma coleção de scripts usados para inicializar sistemas
-live. live-boot era formalmente parte do live-initramfs.
+live. live-boot era formalmente parte do /{live-initramfs}/.
_* *{live-build}*: Uma coleção de scripts usados para construir sistemas
Debian live customizados. live-build era formalmente conhecido como
-live-helper, e ainda antes conhecido como live-package.
+/{live-helper}/, e ainda antes conhecido como /{live-package}/.
_* *{live-config}*: Uma coleção de scripts usados para configurar um sistema
live durante o processo de boot. live-config era formalmente parte do
-live-initramfs.
+/{live-initramfs}/.
_* *{live-manual}*: Esse documento é mantido em um pacote chamado
live-manual.
@@ -82,7 +87,7 @@ distribuição Debian.
_* *{Boot parameters}*: Parametros que podem ser entrados no prompt do
bootloader para influenciar o kernel ou o live-config.
-_* *{chroot}*: O programa chroot, #{chroot(8)}#, nos habilita a rodar
+_* *{chroot}*: O programa /{chroot}/, #{chroot(8)}#, nos habilita a rodar
simultâneamente diferentes instâncias do ambiente do GNU/Linux em um único
sistema sem reinicialização.
@@ -92,20 +97,15 @@ binary.img.
_* *{Target distribution}*: A distribuição em que o sistema live será
baseado. Isso pode diferir da distribuição do seu sistema host.
-_* *{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.
-
-A distribuição estável (*{stable}*) contem a última versão oficial lançada
-do Debian. A distribuição *{testing}* é a ária de estágio para a próxima
-versão estável(stable). A maior vantagem de usar essa distribuição é que ela
-tem versões mais recentes de software relacionado com a versão estável
-(*{stable}*). A distribuição instável (*{unstable}*) é onde ocorre o
-desenvolvimento ativo do Debian. Geralmente, essa distribuição é mantida por
-desenvolvedores e aqueles que vivem no limite.
+_* *{stable/testing/unstable}*: The *{stable}* distribution contains the
+latest officially released distribution of Debian. The *{testing}*
+distribution is the staging area for the next *{stable}* release. A major
+advantage of using this distribution is that it has more recent versions of
+software relative to the *{stable}* release. The *{unstable}* distribution
+is where active development of Debian occurs. Generally, this distribution
+is run by developers and those who like to live on the edge. Throughout the
+manual, we tend to use codenames for the releases, such as wheezy or sid, as
+that is what is supported by the tools themselves.
2~Autores
@@ -247,28 +247,15 @@ 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
-atualizar os arquivos de tradução.
-
-code{
-
- $ make commit
-
-}code
-
-_* Then
-
-code{
-
- $ git add .
-
-}code
+_* Do not use #{make commit}# unless you are updating translations in this
+commit, and in that case, do not mix changes to the English manual and
+translations in the same commit, but use separate commits for each. See the
+{Translation}#translation section for more details.
-_* 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.
+_* Write commit messages that consist of complete, meaningful 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{
@@ -290,9 +277,9 @@ 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.
+/{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.
_* Once the new language is added, you can randomly start translating all po
files in #{manual/po/}#.
diff --git a/manual/pt_BR/about_project.ssi b/manual/pt_BR/about_project.ssi
index d41ee63..c5464b1 100644
--- a/manual/pt_BR/about_project.ssi
+++ b/manual/pt_BR/about_project.ssi
@@ -37,7 +37,7 @@ Debian is the Universal Operating System: Debian has a live system to show
around and to accurately represent the Debian system with the following main
advantages:
-_* It would be a subproject of Debian.
+_* It is a subproject of Debian.
_* It reflects the (current) state of one distribution.
@@ -74,16 +74,15 @@ are after a regular installation of Debian.
Whenever we need a different default configuration, we will do that in
coordination with its package maintainer in Debian.
-A system for configuring packages is provided using debconf in #{lb config}#
-(use --preseed FILE) allowing custom configured packages to be installed in
-your custom produced Debian Live images, but for official live images only
-default configuration will be used. For more information, please see
-{Customization overview}#customization-overview.
+A system for configuring packages is provided using debconf allowing custom
+configured packages to be installed in your custom produced Debian Live
+images, but for official live images only default configuration will be
+used. For more information, please see {Customization
+overview}#customization-overview.
Exception: There are a few essential changes needed to bring a live system
-to life (e.g. configuring pam to allow empty passwords). These essential
-changes have to be kept as minimal as possible and should be merged within
-the Debian repository if possible.
+to life. These essential changes have to be kept as minimal as possible and
+should be merged within the Debian repository if possible.
2~contact Contact
@@ -97,7 +96,7 @@ channel on irc.debian.org (OFTC). When asking a question on IRC, please be
patient for an answer. If no answer is forthcoming, please email the mailing
list.
-_* *{BTS}*: The Debian Bug Tracking System (BTS) contains details of bugs
-reported by users and developers. Each bug is given a number, and is kept on
-file until it is marked as having been dealt with. For more information,
-please see {Reporting bugs}#bugs.
+_* *{BTS}*: The {Debian Bug Tracking System}http://www.debian.org/Bugs/
+(BTS) contains details of bugs reported by users and developers. Each bug is
+given a number, and is kept on file until it is marked as having been dealt
+with. For more information, please see {Reporting bugs}#bugs.
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index 43736ce..a8cf171 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -9,13 +9,13 @@
: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>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2012-04-03
+ :published: 04-06-2012
@publisher: Debian Live Project <debian-live at lists.debian.org>
@make:
- :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/
- :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/
+ :bold: /squeeze|wheezy|sid/
+ :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
diff --git a/manual/pt_BR/project_bugs.ssi b/manual/pt_BR/project_bugs.ssi
index b0c34fc..a051509 100644
--- a/manual/pt_BR/project_bugs.ssi
+++ b/manual/pt_BR/project_bugs.ssi
@@ -71,7 +71,7 @@ _* Version of live-boot on the live system
_* Version of live-config on the live system
-_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system
+_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system
_* Architecture of the live system
@@ -122,8 +122,8 @@ Where does the bug appear?
3~ At build time whilst bootstrapping
-live-build first bootstraps a basic Debian system with #{debootstrap}# or
-#{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian
+live-build first bootstraps a basic Debian system with /{debootstrap}/ or
+/{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian
distribution it is bootstrapping, it may fail. If a bug appears here, check
if the error is related to a specific Debian package (most likely), or if it
is related to bootstrapping tool itself.
@@ -140,7 +140,7 @@ can fail. If a bug appears here, check if the error is also reproducible on
a normal system.
If this is the case, this is not a bug in Debian Live, but rather in Debian
-- please report it against the failing package. Running #{debootstrap}#
+- please report it against the failing package. Running /{debootstrap}/
separately from the Live system build or running #{lb bootstrap --debug}#
will give you more information.
diff --git a/manual/pt_BR/project_coding-style.ssi b/manual/pt_BR/project_coding-style.ssi
index 7ec54b5..6005704 100644
--- a/manual/pt_BR/project_coding-style.ssi
+++ b/manual/pt_BR/project_coding-style.ssi
@@ -13,6 +13,8 @@ _* Only use the POSIX subset - for example, use $(foo) over `foo`.
_* You can check your scripts with 'sh -n' and 'checkbashisms'.
+_* Make sure all shell code runs with 'set -e'.
+
2~ Indenting
_* Always use tabs over spaces.
@@ -50,7 +52,7 @@ Bad:
code{
- foo () {
+ Foo () {
bar
}
@@ -60,7 +62,7 @@ Good:
code{
- foo ()
+ Foo ()
{
bar
}
@@ -142,3 +144,6 @@ _* Don't use the #{test}# command for comparisons or tests, use "#{[}#"
_* Use #{case}# wherever possible over #{test}#, as it's easier to read and
faster in execution.
+
+_* Use capitalized names for functions to limit messing with the users
+environment.
diff --git a/manual/pt_BR/project_procedures.ssi b/manual/pt_BR/project_procedures.ssi
index fb4ede8..c183dc6 100644
--- a/manual/pt_BR/project_procedures.ssi
+++ b/manual/pt_BR/project_procedures.ssi
@@ -37,13 +37,20 @@ _* Images are built and mirrored on cdimage.debian.org.
2~ Point Releases
-_* Again, we need updated mirror of debian, debian-security and
+_* Again, we need updated mirrors of debian, debian-security and
debian-volatile.
_* Images are built and mirrored on cdimage.debian.org.
_* Send announcement mail.
+3~ Last Point Release of a Debian Release
+
+Remember to adjust both chroot and binary mirrors when building the last set
+of images for a Debian release after it has been moved away from
+ftp.debian.org to archive.debian.org. That way, old prebuilt live images are
+still useful without user modifications.
+
3~ Point release announcement template
An annoucement mail for point releases can be generated using the template
diff --git a/manual/pt_BR/style_guide.ssi b/manual/pt_BR/style_guide.ssi
index 8b01cc3..edd8e20 100644
--- a/manual/pt_BR/style_guide.ssi
+++ b/manual/pt_BR/style_guide.ssi
@@ -342,11 +342,11 @@ intervention if the code changes.
Leave the code blocks empty (they will be automatically added then) if you
want to make your translation easier to maintain.
-_* /{New lines}/
+_* /{Newlines}/
-The translated texts need to have the exact same new lines as the original
+The translated texts need to have the exact same newlines as the original
texts. Be careful to press the "Enter" key or type *{\n}* if they appear in
-the original files. These new lines often appear, for instance, in the code
+the original files. These newlines often appear, for instance, in the code
blocks.
Make no mistake, this does not mean that the translated text needs to have
@@ -362,9 +362,7 @@ Translators should never translate:
- The commands given as examples
- - Metadata (often between colons *{:metadata:}*) especially the date in
- /{live-manual.ssm.po}/ because it changes every time live-manual is
- updated.
+ - Metadata (often between colons *{:metadata:}*)
- Links
diff --git a/manual/pt_BR/user_basics.ssi b/manual/pt_BR/user_basics.ssi
index 2eee04a..05401eb 100644
--- a/manual/pt_BR/user_basics.ssi
+++ b/manual/pt_BR/user_basics.ssi
@@ -87,7 +87,7 @@ code{
}code
This process can take a while, depending on the speed of your network
-connection. When it is complete, there should be a #{binary-hybrid.iso}#
+connection. When it is complete, there should be a #{binary.hybrid.iso}#
image file, ready to use, in the current directory.
2~using-iso-hybrid Using an ISO hybrid live image
@@ -106,7 +106,7 @@ code{
# apt-get install wodim
- $ wodim binary-hybrid.iso
+ $ wodim binary.hybrid.iso
}code
@@ -127,7 +127,7 @@ any previous contents on your stick!}*
code{
- $ dd if=binary-hybrid.iso of=${USBSTICK}
+ $ dd if=binary.hybrid.iso of=${USBSTICK}
}code
@@ -146,8 +146,8 @@ normal boot device.
Once you've booted the media, you are presented with a boot menu. If you
just press enter here, the system will boot using the default entry,
#{Live}# and default options. For more information about boot options, see
-the "help" entry in the menu and also the #{live-boot}# and #{live-config}#
-man pages found within the live system.
+the "help" entry in the menu and also the live-boot and live-config man
+pages found within the live system.
Assuming you've selected #{Live}# and booted a default desktop live image,
after the boot messages scroll by, you should be automatically logged into
@@ -179,12 +179,12 @@ software and choose one that is suitable for your needs.
3~testing-iso-with-qemu Testing an ISO image with QEMU
The most versatile VM in Debian is QEMU. If your processor has hardware
-support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}#
+support for virtualization, use the /{qemu-kvm}/ package; the /{qemu-kvm}/
package description briefly lists the requirements.
-First, install #{qemu-kvm}# if your processor supports it. If not, install
-#{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in
-the following examples. The #{qemu-utils}# package is also valuable for
+First, install /{qemu-kvm}/ if your processor supports it. If not, install
+/{qemu}/, in which case the program name is #{qemu}# instead of #{kvm}# in
+the following examples. The /{qemu-utils}/ package is also valuable for
creating virtual disk images with #{qemu-img}#.
code{
@@ -197,7 +197,7 @@ Booting an ISO image is simple:
code{
- $ kvm -cdrom binary-hybrid.iso
+ $ kvm -cdrom binary.hybrid.iso
}code
@@ -205,7 +205,7 @@ See the man pages for more details.
3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
-In order to test the ISO with #{virtualbox-ose}#:
+In order to test the ISO with /{virtualbox-ose}/:
code{
@@ -216,12 +216,9 @@ code{
}code
Create a new virtual machine, change the storage settings to use
-#{binary-hybrid.iso}# as the CD/DVD device, and start the machine.
+#{binary.hybrid.iso}# as the CD/DVD device, and start the machine.
-Note: For live systems containing X.org that you want to test with
-#{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver
-package, #{virtualbox-ose-guest-x11}#, in your live-build
-configuration. Otherwise, the resolution is limited to 800x600.
+*{Note:}* For live systems containing X.org that you want to test with /{virtualbox-ose}/, you may wish to include the VirtualBox X.org driver package, /{virtualbox-ose-guest-x11}/, in your live-build configuration. Otherwise, the resolution is limited to 800x600.
code{
@@ -240,9 +237,7 @@ which does not handle hybrid images properly, or want to use the remaining
space on the media for some purpose, such as a persistence partition, you
need an HDD image.
-Note: if you created an ISO hybrid image with the previous example, you will
-need to clean up your working directory with the #{lb clean}# command (see
-{The lb clean command}#lb-clean):
+*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):
code{
@@ -276,11 +271,11 @@ The generated binary image contains a VFAT partition and the syslinux
bootloader, ready to be directly written on a USB stick. Since using an HDD
image is just like using an ISO hybrid image on USB, follow the instructions
in {Using an ISO hybrid live image}#using-iso-hybrid, except use the
-filename #{binary.img}# instead of #{binary-hybrid.iso}#.
+filename #{binary.img}# instead of #{binary.hybrid.iso}#.
3~testing-hdd-with-qemu Testing an HDD image with Qemu
-First, install QEMU as described above in {Testing an ISO image with
+First, install /{qemu}/ as described above in {Testing an ISO image with
QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on
which version your host system needs, specifying #{binary.img}# as the first
hard drive.
@@ -294,7 +289,7 @@ code{
3~using-usb-extra-space Using the space left on a USB stick
To use the remaining free space after copying #{binary.img}# to a USB stick,
-use a partitioning tool such as #{gparted}# or #{parted}# to create a new
+use a partitioning tool such as /{gparted}/ or /{parted}/ to create a new
partition on the stick. The first partition will be used by the Debian Live
system.
@@ -314,10 +309,7 @@ code{
}code
-Note: If you want to use the extra space with Windows, apparently that OS
-cannot normally access any partitions but the first. Some solutions to this
-problem have been discussed on our {mailing list}#contact, but it seems
-there are no easy answers.
+*{Note:}* If you want to use the extra space with Windows, apparently that OS cannot normally access any partitions but the first. Some solutions to this problem have been discussed on our {mailing list}#contact, but it seems there are no easy answers.
*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image, so back up your extra partition first to restore again after updating the live image.}*
@@ -327,8 +319,7 @@ The following sequence of commands will create a basic netboot image
containing the Debian standard system without X.org. It is suitable for
booting over the network.
-Note: if you performed any previous examples, you will need to clean up your
-working directory with the #{lb clean}# command:
+*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:
code{
@@ -410,9 +401,10 @@ code{
This serves the kernel and initial ramdisk to the system at run time.
-You should install the tftpd-hpa package. It can serve all files contained
-inside a root directory, usually #{/srv/tftp}#. To let it serve files inside
-#{/srv/debian-live/tftpboot}#, run as root the following command:
+You should install the /{tftpd-hpa}/ package. It can serve all files
+contained inside a root directory, usually #{/srv/tftp}#. To let it serve
+files inside #{/srv/debian-live/tftpboot}#, run as root the following
+command:
code{
@@ -428,7 +420,7 @@ Once the guest computer has downloaded and booted a Linux kernel and loaded
its initrd, it will try to mount the Live filesystem image through a NFS
server.
-You need to install the #{nfs-kernel-server}# package.
+You need to install the /{nfs-kernel-server}/ package.
Then, make the filesystem image available through NFS by adding a line like
the following to #{/etc/exports}#:
@@ -463,7 +455,7 @@ To make our life easier, we can use virtualization. There are two solutions.
3~ Qemu
-_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#.
+_* Install /{qemu}/, /{bridge-utils}/, /{sudo}/.
Edit #{/etc/qemu-ifup}#:
diff --git a/manual/pt_BR/user_customization-binary.ssi b/manual/pt_BR/user_customization-binary.ssi
index 73cfb15..c83563a 100644
--- a/manual/pt_BR/user_customization-binary.ssi
+++ b/manual/pt_BR/user_customization-binary.ssi
@@ -47,7 +47,7 @@ code{
include menu.cfg
default vesamenu.c32
prompt 0
- timeout 5
+ timeout 50
}code
@@ -59,7 +59,7 @@ code{
#!/bin/sh
- sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg
+ sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg
}code
diff --git a/manual/pt_BR/user_customization-contents.ssi b/manual/pt_BR/user_customization-contents.ssi
index 4d67a3c..e6237cf 100644
--- a/manual/pt_BR/user_customization-contents.ssi
+++ b/manual/pt_BR/user_customization-contents.ssi
@@ -43,7 +43,7 @@ see {Live/chroot local hooks}#live-chroot-local-hooks if processing is
needed.
To include files, simply add them to your #{config/includes.chroot}#
-directory. This directory corresponds to the root directory (#{/}#) of the
+directory. This directory corresponds to the root directory #{/}# of the
live system. For example, to add a file #{/var/www/index.html}# in the live
system, use:
@@ -151,5 +151,5 @@ followed by the stage (#{.chroot}# or #{.binary}#) are considered to be
debconf preseed files and are installed by live-build using
#{debconf-set-selections}# during the corresponding stage.
-For more information about debconf, please see debconf(7) in the #{debconf}#
-package.
+For more information about debconf, please see #{debconf(7)}# in the
+/{debconf}/ package.
diff --git a/manual/pt_BR/user_customization-installer.ssi b/manual/pt_BR/user_customization-installer.ssi
index a41a62d..65f9860 100644
--- a/manual/pt_BR/user_customization-installer.ssi
+++ b/manual/pt_BR/user_customization-installer.ssi
@@ -18,7 +18,7 @@ The three main types of installer are:
*{"Regular" Debian Installer}*: This is a normal Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as "combined images".
On such images, Debian is installed by fetching and installing .deb packages
-using #{debootstrap}# or #{cdebootstrap}#, from the local media or some
+using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some
network-based network, resulting in a standard Debian system being installed
to the hard disk.
@@ -31,16 +31,14 @@ the image and enable it for you.
Installation will proceed in an identical fashion to the "Regular"
installation described above, but at the actual package installation stage,
-instead of using #{debootstrap}# to fetch and install packages, the live
+instead of using /{debootstrap}/ to fetch and install packages, the live
filesystem image is copied to the target. This is achieved with a special
udeb called live-installer.
After this stage, the Debian Installer continues as normal, installing and
configuring items such as bootloaders and local users, etc.
-Note: to support both normal and live installer entries in the bootloader of
-the same live media, you must disable live-installer by preseeding
-#{live-installer/enable=false}#.
+*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.
*{"Desktop" Debian Installer}*: Regardless of the type of Debian Installer included, #{d-i}# can be launched from the Desktop by clicking on an icon. This is user friendlier in some situations. In order to make use of this, the debian-installer-launcher package needs to be included.
@@ -86,4 +84,4 @@ built #{d-i}# component udeb packages. Place these in
replacement files and directories may be included in the installer initrd as
well, in a similar fashion to {Live/chroot local
includes}#live-chroot-local-includes, by placing the material in
-#{config/binary_debian-installer-includes/}#.
+#{config/includes.binary_debian-installer/}#.
diff --git a/manual/pt_BR/user_customization-overview.ssi b/manual/pt_BR/user_customization-overview.ssi
index 137e322..0e2fec2 100644
--- a/manual/pt_BR/user_customization-overview.ssi
+++ b/manual/pt_BR/user_customization-overview.ssi
@@ -55,7 +55,7 @@ in place.
2~ Supplement lb config with files
-Although #{lb config}# does create a skeletal configuration in the config/
+Although #{lb config}# creates a skeletal configuration in the config/
directory, to accomplish your goals, you may need to provide additional
files in subdirectories of config/. Depending on where the files are stored
in the configuration, they may be copied into the live system's filesystem
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index 4542f38..eb3724f 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -11,12 +11,12 @@ areas. To ensure decent download speeds, you should choose a nearby
distribution mirror. You can also add your own repositories for backports,
experimental or custom packages, or include packages directly as files. You
can define your own lists of packages to include, use live-build's
-predefined lists, use #{tasksel}# tasks, or a combination of all
-three. Finally, a number of options give some control over apt, or if you
-prefer, aptitude, at build time when packages are installed. You may find
-these handy if you use a proxy, want to disable installation of recommended
-packages to save space, or need to control which versions of packages are
-installed via APT pinning, to name a few possibilities.
+predefined lists, use /{tasksel}/ tasks, or a combination of all
+three. Finally, a number of options give some control over /{apt}/, or if
+you prefer, /{aptitude}/, at build time when packages are installed. You may
+find these handy if you use a proxy, want to disable installation of
+recommended packages to save space, or need to control which versions of
+packages are installed via APT pinning, to name a few possibilities.
2~ Package sources
@@ -24,12 +24,12 @@ installed via APT pinning, to name a few possibilities.
The distribution you choose has the broadest impact on which packages are
available to include in your live image. Specify the codename, which
-defaults to #{wheezy}# for the Wheezy version of live-build. Any current
+defaults to wheezy for the wheezy version of live-build. Any current
distribution carried in the Debian archive may be specified by its codename
here. (See {Terms}#terms for more details.) The #{--distribution}# option
not only influences the source of packages within the archive, but also
-instructs #{live-build}# to behave as needed to build each supported
-distribution. For example, to build against the *{unstable}* release, Sid,
+instructs live-build to behave as needed to build each supported
+distribution. For example, to build against the *{unstable}* release, sid,
specify:
code{
@@ -65,10 +65,10 @@ the world so that people in each region can choose a nearby mirror for best
download speed. Each of the #{--mirror-*}# options governs which
distribution mirror is used at various stages of the build. Recall from
{Stages of the build}#stages-of-the-build that the *{bootstrap}* stage is
-when the chroot is initially populated by debootstrap with a minimal system,
-and the *{chroot}* stage is when the chroot used to construct the live
-system's filesystem is built. Thus, the corresponding mirror switches are
-used for those stages, and later, in the *{binary}* stage, the
+when the chroot is initially populated by /{debootstrap}/ with a minimal
+system, and the *{chroot}* stage is when the chroot used to construct the
+live system's filesystem is built. Thus, the corresponding mirror switches
+are used for those stages, and later, in the *{binary}* stage, the
#{--mirror-binary}# and #{--mirror-binary-security}# values are used,
superceding any mirrors used in an earlier stage.
@@ -209,8 +209,8 @@ includes. Refer to these in the #{/usr/share/live/build/package-lists/}#
directory, as they serve as good examples of how to write your own lists.
For example, to make a list that includes the predefined #{gnome}# list plus
-iceweasel, create #{config/package-lists/my.list.chroot}# with the following
-contents:
+/{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the
+following contents:
code{
@@ -240,7 +240,7 @@ code{
}code
You may test for any one of a number of values, e.g. to install
-#{memtest86+}# if either #{--architectures i386}# or #{--architectures
+/{memtest86+}/ if either #{--architectures i386}# or #{--architectures
amd64}# is specified:
code{
@@ -252,7 +252,7 @@ code{
}code
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
+e.g. to install /{vrms}/ if either #{contrib}# or #{non-free}# is specified
via #{--archive-areas}#:
code{
@@ -294,7 +294,7 @@ code{
The primary tasks available in the Debian Installer can be listed with
#{tasksel --list-tasks}# in the live system. The contents of any task,
-including ones not included in this list, may be examined with #{tasksel
+including the ones not included in this list, may be examined with #{tasksel
--task-packages}#.
3~desktop-and-language-tasks Desktop and language tasks
@@ -427,7 +427,7 @@ man page.
3~choosing-apt-or-aptitude Choosing apt or aptitude
-You can elect to use either #{apt}# or #{aptitude}# when installing packages
+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
to #{lb config}#. Choose the method implementing the preferred behaviour for
package installation, the notable difference being how missing packages are
@@ -466,11 +466,11 @@ code{
}code
-This will not influence the entries in /etc/apt/sources.list, but merely
-whether /var/lib/apt contains the indices files or not. The tradeoff is that
-APT needs those indices in order to operate in the live system, so before
-performing #{apt-cache search}# or #{apt-get install}#, for instance, the
-user must #{apt-get update}# first to create those indices.
+This will not influence the entries in #{/etc/apt/sources.list}#, but merely
+whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is
+that APT needs those indices in order to operate in the live system, so
+before performing #{apt-cache search}# or #{apt-get install}#, for instance,
+the user must #{apt-get update}# first to create those indices.
If you find the installation of recommended packages bloats your image too
much, you may disable that default option of APT with:
@@ -507,11 +507,11 @@ 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/includes.chroot/etc/apt/preferences}#.
-Let's say you are building a Wheezy 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
+Let's say you are building a wheezy 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, Wheezy. The following will
+taken from the target system distribution, wheezy. The following will
accomplish this:
code{
@@ -529,7 +529,7 @@ code{
}code
-*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with Wheezy using:
+*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:
code{
@@ -541,9 +541,9 @@ 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
package. Suppose you are building an LXDE image using #{--package-lists
lxde}# option, but don't want the user prompted to store wifi passwords in
-the keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in
-turn recommends #{gnome-keyring}#. So you want to omit the recommended
-#{gnome-keyring}# package. This can be done by adding the following stanza
+the keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in
+turn recommends /{gnome-keyring}/. So you want to omit the recommended
+/{gnome-keyring}/ package. This can be done by adding the following stanza
to #{config/chroot_apt/preferences}#:
code{
diff --git a/manual/pt_BR/user_customization-runtime.ssi b/manual/pt_BR/user_customization-runtime.ssi
index bd4c0fe..a5dc96b 100644
--- a/manual/pt_BR/user_customization-runtime.ssi
+++ b/manual/pt_BR/user_customization-runtime.ssi
@@ -130,7 +130,7 @@ other media in addition to CDs; but still, in its default behaviour, it
should be considered read-only and all the run-time evolutions of the system
are lost at shutdown.
-Persistence is a common name for different kinds of solutions for saving
+'Persistence' is a common name for different kinds of solutions for saving
across reboots some, or all, of this run-time evolution of the system. To
understand how it could work it could be handy to know that even if the
system is booted and run from read-only media, modification to the files and
@@ -141,11 +141,12 @@ The data stored on this ramdisk should be saved on a writable persistent
medium like local storage media, a network share or even a session of a
multisession (re)writable CD/DVD. All these media are supported in Debian
Live in different ways, and all but the last one require a special boot
-parameter to be specified at boot time: #{persistent}#.
+parameter to be specified at boot time: #{persistence}#.
-If the boot parameter #{persistent}# is set (and #{nopersistent}# is not
+If the boot parameter #{persistence}# is set (and #{nopersistence}# is not
set), local storage media (e.g. hard disks, USB drives) will be probed for
-persistent volumes during boot. A persistent volume is any of the following:
+persistence volumes during boot. A persistence volume is any of the
+following:
_* a partition, identified by its GPT name.
@@ -154,14 +155,14 @@ _* a filesystem, identified by its filesystem label.
_* an image/archive file located on the root of any readable filesystem
(even an NTFS partition of a foreign OS), identified by its file name. In
this case the file name must also use the containing filesystem as the file
-extension, e.g. "<label>.ext3".
+extension, e.g. "<label>.ext4".
-It is possible to restrict which types of persistent volumes to use by
+It is possible to restrict which types of persistence volumes to use by
specifying certain boot parameters described in the live-boot(7) man
page. The "identifying labels" referred to above can be any of the
following:
-_* #{full-ov}# for full persistent overlays.
+_* #{full-ov}# for full persistence overlays.
_* #{custom-ov}# for custom overlays.
@@ -169,17 +170,17 @@ _* #{live-sn}# for full system snapshots.
_* #{home-sn}# for /home snapshots.
-3~ Full persistent overlays
+3~ Full persistence overlays
By 'full persistence' it is meant that instead of using a tmpfs for storing
modifications to the read-only media (with the copy-on-write, COW, system) a
-persistent volume is used. For this type of persistence the volume label
-must be #{full-ov}#. This could, for instance, be an ext2 partition on a
+persistence volume is used. For this type of persistence the volume label
+must be #{full-ov}#. This could, for instance, be an ext4 partition on a
hard disk or on a usb key created with, e.g.:
code{
- # mkfs.ext2 -L full-ov /dev/sdb1
+ # mkfs.ext4 -L full-ov /dev/sdb1
}code
@@ -194,13 +195,13 @@ code{
}code
-Here's an example of how to create an ext2-based image file used for full
+Here's an example of how to create an ext4-based image file used for full
persistence:
code{
$ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file
- $ /sbin/mkfs.ext2 -F full-ov
+ $ /sbin/mkfs.ext4 -F full-ov
}code
@@ -210,52 +211,53 @@ reboot.
3~ Custom overlays
A volume with the label #{custom-ov}# can be configured to make arbitrary
-directories persistent. The file #{live.persist}#, located on the volume's
-filesystem root, controls which directories it makes persistent, and in
-which way.
+directories persistent. The file #{live-persistence.conf}#, located on the
+volume's filesystem root, controls which directories it makes persistent,
+and in which way.
How custom overlay mounts are configured is described in full detail in the
-live.persist(5) man page, but a simple example should be sufficient for most
-uses. Let's say we want to make our home directory and APT cache persistent
-in an ext3 filesystem on the /dev/sdb1 partition:
+live-persistence.conf(5) man page, but a simple example should be sufficient
+for most uses. Let's say we want to make our home directory and APT cache
+persistent in an ext4 filesystem on the /dev/sdb1 partition:
code{
- $ mkfs.ext3 -L custom-ov /dev/sdb1
- $ mount -t ext3 /dev/sdb1 /mnt
- $ echo "/home" >> /mnt/live.persist
- $ echo "/var/cache/apt" >> /mnt/live.persist
+ $ mkfs.ext4 -L custom-ov /dev/sdb1
+ $ mount -t ext4 /dev/sdb1 /mnt
+ $ echo "/home" >> /mnt/live-persistence.conf
+ $ echo "/var/cache/apt" >> /mnt/live-persistence.conf
}code
-Then we reboot. During the first boot the contents of /home and
-/var/cache/apt will be copied into the persistent volume, and from then on
-all changes to these directories will live in the persistent volume. Please
-note that any paths listed in the #{live.persist}# file cannot contain white
-spaces or the special "." and ".." path components. Also, neither "/live"
-(or any of its sub-directories) nor "/" can be made persistent using custom
-mounts (for the latter, use the #{full-ov}# type persistence described
-above).
-
-Several different custom overlay volumes (with their own #{live.persist}#
-files) can be used at the same time, but if several volumes make the same
-directory persistent, only one of them will be used. If any two mounts are
-"nested" (i.e. one is a sub-directory of the other) the parent will be
-mounted before the child so no mount will be hidden by the other. Nested
-custom mounts are problematic if they are listed in the same
-#{live.persist}# file. See the live.persist(5) man page for how to handle
-that case if you really need it (hint: you usually don't).
+Then we reboot. During the first boot the contents of #{/home}# and
+#{/var/cache/apt}# will be copied into the persistence volume, and from then
+on all changes to these directories will live in the persistence
+volume. Please note that any paths listed in the #{live-persistence.conf}#
+file cannot contain white spaces or the special #{.}# and #{..}# path
+components. Also, neither #{/live}# (or any of its sub-directories) nor
+#{/}# can be made persistent using custom mounts (for the latter, use the
+#{full-ov}# type persistence described above).
+
+Several different custom overlay volumes (with their own
+#{live-persistence.conf}# files) can be used at the same time, but if
+several volumes make the same directory persistent, only one of them will be
+used. If any two mounts are "nested" (i.e. one is a sub-directory of the
+other) the parent will be mounted before the child so no mount will be
+hidden by the other. Nested custom mounts are problematic if they are listed
+in the same #{live-persistence.conf}# file. See the live-persistence.conf(5)
+man page for how to handle that case if you really need it (hint: you
+usually don't).
3~ Snapshots
Snapshots are collections of files and directories which are not mounted
-while running but which are copied from a persistent volume to the system
+while running but which are copied from a persistence volume to the system
(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The
volume must be labeled #{live-sn}#, and it defaults to a simple cpio archive
named #{live-sn.cpio.gz}#. A power interruption during run time could lead
to data loss, hence, if you have important changes, invoke #{live-snapshot
--refresh}# as often as needed. This type of persistence, since it does not
-write continuously to the persistent media, is the most flash-based device
+write continuously to the persistence media, is the most flash-based device
friendly and the fastest of all the persistence systems, but it occupies as
much RAM as the size of the uncompressed snapshot.
@@ -264,15 +266,15 @@ works the same as the main snapshot but it is only applied to /home.
Snapshots cannot currently handle file deletion.
-3~ Persistent SubText
+3~ Persistence SubText
-If a user would need multiple persistent storage of the same type for
+If a user would need multiple persistence storage of the same type for
different locations or testing, such as #{full-ov-nonwork}# and
-#{full-ov-work}#, the boot parameter #{persistent-subtext}# used in
-conjunction with the boot parameter #{persistent}# will allow for multiple
-but unique persistent media. An example would be if a user wanted to use a
-persistent partition labeled #{live-sn-subText}# they would use the boot
-parameters of: #{persistent}# #{persistent-subtext=subText}#.
+#{full-ov-work}#, the boot parameter #{persistence-subtext}# used in
+conjunction with the boot parameter #{persistence}# will allow for multiple
+but unique persistence media. An example would be if a user wanted to use a
+persistence partition labeled #{live-sn-subText}# they would use the boot
+parameters of: #{persistence}# #{persistence-subtext=subText}#.
3~ Partial remastering
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
index 428c580..aa406ad 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/pt_BR/user_examples.ssi
@@ -60,7 +60,7 @@ code{
}code
Assuming all goes well, after a while, the current directory will contain
-#{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a
+#{binary.hybrid.iso}#. This ISO hybrid image can be booted directly in a
virtual machine as described in {Testing an ISO image with
Qemu}#testing-iso-with-qemu and {Testing an ISO image with
virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical
@@ -149,9 +149,9 @@ code{
First, #{--architectures i386}# ensures that on our #{amd64}# build system,
we build a 32-bit version suitable for use on most machines. Second, we use
#{--linux-flavours 686-pae}# because we don't anticipate using this image on
-much older systems. Third, we've chosen the #{lxde}# package list to give us
+much older systems. Third, we've chosen the /{lxde}/ package list to give us
a minimal desktop. And finally, we have added two initial favourite
-packages: #{iceweasel}# and #{xchat}#.
+packages: /{iceweasel}/ and /{xchat}/.
Now, build the image:
@@ -179,7 +179,7 @@ code{
3~ Second revision
In this revision, we're going to clean up from the first build, add the
-#{vlc}# package to our configuration, rebuild, test and commit.
+/{vlc}/ package to our configuration, rebuild, test and commit.
The #{lb clean}# command will clean up all generated files from the previous
build except for the cache, which saves having to re-download packages. This
@@ -192,7 +192,7 @@ code{
}code
-Now append the #{vlc}# package to our local package list in
+Now append the /{vlc}/ package to our local package list in
#{config/package-lists/my.list.chroot}#:
code{
@@ -235,8 +235,8 @@ cases drawn from the collected experiences of users of Debian Live.
*{Use case:}* Create an image with live-build to boot directly to a VNC server.
Make a build directory and create a skeletal configuration in it built
-around the standard-x11 list, including #{gdm3}#, #{metacity}# and
-#{xvnc4viewer}#, disabling recommends to make a minimal system:
+around the standard-x11 list, including /{gdm3}/, /{metacity}/ and
+/{xvnc4viewer}/, disabling recommends to make a minimal system:
code{
@@ -249,8 +249,8 @@ code{
}code
Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for
-the default user that will launch metacity and start xvncviewer, connecting
-to port #{5901}# on a server at #{192.168.1.2}#:
+the default user that will launch /{metacity}/ and start /{xvncviewer}/,
+connecting to port #{5901}# on a server at #{192.168.1.2}#:
code{
@@ -285,9 +285,9 @@ the tradeoffs you are making between size and functionality. In this
example, we trim only so much as to make room for additional material within
a 128M media size, but without doing anything to destroy integrity of the
packages contained within, such as the purging of locale data via the
-#{localepurge}# package, or other such "intrusive" optimizations. Of
+/{localepurge}/ package, or other such "intrusive" optimizations. Of
particular note, you should not use #{--bootstrap-flavour minimal}# unless
-you really know what you're doing, as omitting priority #{important}#
+you really know what you're doing, as omitting priority *{important}*
packages will most likely produce a broken live system.
code{
@@ -318,7 +318,7 @@ system. Choosing the #{minimal}# package list leaves out the large
#{locales}# package and associated utilities. Dropping recommended packages
with #{--apt-recommends false}# saves some additional space, at the expense
of omitting some packages you might otherwise expect to be there, such as
-#{firmware-linux-free}# which may be needed to support certain hardware. The
+/{firmware-linux-free}/ which may be needed to support certain hardware. The
remaining options shave off additional small amounts of space. It's up to
you to decide if the functionality that is sacrificed with each optimization
is worth the loss in functionality.
@@ -385,7 +385,7 @@ code{
}code
-Note that we have included the #{debian-installer-launcher}# package to
-launch the installer from the live desktop, and have also specified the 486
-flavour kernel, as it is currently necessary to make the installer and live
-system kernels match for the launcher to work properly.
+Note that we have included the debian-installer-launcher package to launch
+the installer from the live desktop, and have also specified the 486 flavour
+kernel, as it is currently necessary to make the installer and live system
+kernels match for the launcher to work properly.
diff --git a/manual/pt_BR/user_installation.ssi b/manual/pt_BR/user_installation.ssi
index 1949e3d..c5aa801 100644
--- a/manual/pt_BR/user_installation.ssi
+++ b/manual/pt_BR/user_installation.ssi
@@ -132,12 +132,12 @@ if that is your reason for building these packages from source.
_* Build live-boot and live-config .deb files
You must build either on your target distribution or in a chroot containing
-your target platform: this means if your target is Wheezy then you should
-build against Wheezy.
+your target platform: this means if your target is wheezy then you should
+build against wheezy.
Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to
-build #{live-boot}# for a target distribution that differs from your build
-system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy
+build live-boot for a target distribution that differs from your build
+system. For example, for wheezy live images, build live-boot in a wheezy
chroot. If your target distribution happens to match your build system
distribution, you may build directly on the build system using
#{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
diff --git a/manual/pt_BR/user_managing_a_configuration.ssi b/manual/pt_BR/user_managing_a_configuration.ssi
index 7df1d34..8f6089a 100644
--- a/manual/pt_BR/user_managing_a_configuration.ssi
+++ b/manual/pt_BR/user_managing_a_configuration.ssi
@@ -34,7 +34,7 @@ options, and an auto/clean that removes the files containing configuration
variable values, and each time you run #{lb config}# and #{lb clean}#, these
files will be executed. This will ensure that your configuration is kept
internally consistent from one revision to the next and from one live-build
-release to the next (though you will still have to take care and read the
+release to the next (Although you will still have to take care and read the
documentation when you upgrade live-build and make adjustments as needed).
2~ Example auto scripts
diff --git a/manual/pt_BR/user_overview.ssi b/manual/pt_BR/user_overview.ssi
index beda6d4..c0e59b5 100644
--- a/manual/pt_BR/user_overview.ssi
+++ b/manual/pt_BR/user_overview.ssi
@@ -14,11 +14,11 @@ The idea behind live-build is to be a framework that uses a configuration
directory to completely automate and customize all aspects of building a
Live image.
-Many concepts are similar to those in the debhelper Debian package tools
+Many concepts are similar to those in the /{debhelper}/ Debian package tools
written by Joey Hess:
_* The scripts have a central location for configuring their operation. In
-debhelper, this is the #{debian/}# subdirectory of a package tree. For
+/{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For
example, dh_install will look, amongst others, for a file called
#{debian/install}# to determine which files should exist in a particular
binary package. In much the same way, live-build stores its configuration
@@ -27,9 +27,9 @@ entirely under a #{config/}# subdirectory.
_* The scripts are independent - that is to say, it is always safe to run
each command.
-Unlike debhelper, live-build contains a tool to generate a skeleton
+Unlike /{debhelper}/, live-build contains a tool to generate a skeleton
configuration directory, #{lb config}#. This could be considered to be
-similar to tools such as #{dh-make}#. For more information about #{lb
+similar to tools such as /{dh-make}/. For more information about #{lb
config}#, please see {The lb config command}#lb-config.
The remainder of this section discusses the three most important commands:
diff --git a/manual/ro/about_manual.ssi b/manual/ro/about_manual.ssi
index 8be5f32..9155256 100644
--- a/manual/ro/about_manual.ssi
+++ b/manual/ro/about_manual.ssi
@@ -4,11 +4,13 @@
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 7.0 "Wheezy" 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
+by the project for the Debian 7.0 "wheezy" release. An up-to-date version
+can always be found at http://live.debian.net/
+
+While live-manual 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.
@@ -23,21 +25,24 @@ 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 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
+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.
+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
@@ -61,15 +66,15 @@ sistem dat.
_* *{Target system}*: Mediul folosit pentru rularea sistemului live.
_* *{live-boot}*: O coloctie se scripte folosite la pornirea sistemului
-live. live-boot a facul parte formal din live-initramfs.
+live. live-boot a facul parte formal din /{live-initramfs}/.
_* *{live-build}*: O colectie de scripte folosite la particularizatrea
-sistemelor Debian Live. live-build a fost cunoscut ca live-helper, iar mai
-inainte ca live-package.
+sistemelor Debian Live. live-build a fost cunoscut ca /{live-helper}/, iar
+mai inainte ca /{live-package}/.
_* *{live-config}*: O colectie de scripte folosite la configurarea sitemului
live in timpul procesului de pornire. live-config a fost cunoscut ca parte
-din live-initramfs.
+din /{live-initramfs}/.
_* *{live-manual}*: Acest document face parte din pachetul numit
live-manual.
@@ -80,9 +85,9 @@ distributia Debian.
_* *{Boot parameters}*: Parameti care pot fi adaugati la promptul
bootloader-ului care sa infuenteze kernelul sau live-config.
-_* *{chroot}*: Programul chroot, #{chroot(8)}#, permite rularea a diferite
-instante din mediul GNU/Linux pe un singur sistem si in simultan fara a
-necesita o repornire a sistemului.
+_* *{chroot}*: Programul /{chroot}/, #{chroot(8)}#, permite rularea a
+diferite instante din mediul GNU/Linux pe un singur sistem si in simultan
+fara a necesita o repornire a sistemului.
_* *{Binary image}*: Un fisier ce contine sistemul live, ca de exemplu
binary.iso sau binary.img.
@@ -90,19 +95,15 @@ binary.iso sau binary.img.
_* *{Target distribution}*: Dea pe care se bazeaza sistemul live. Aceasta
distributie poate fi diferita de cea a sistemului gazda.
-_* *{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.
-
-*{stable}* contine ultima versiune oficiala a distributiei
-Debian. *{testing}* este sursa pentru urmatoarea versiune
-*{stable}*. Pricipalul avantaj la folosirea distibutiei *{testing}* este
-folosirea programelor mai noi decat cele din *{stable}*. Distributia
-*{unstable}* este locul unde au loc activ dezvoltarile din Debian. In
-general ea este folosita de dezvoltatori sau de cei ce le place riscul ... .
+_* *{stable/testing/unstable}*: The *{stable}* distribution contains the
+latest officially released distribution of Debian. The *{testing}*
+distribution is the staging area for the next *{stable}* release. A major
+advantage of using this distribution is that it has more recent versions of
+software relative to the *{stable}* release. The *{unstable}* distribution
+is where active development of Debian occurs. Generally, this distribution
+is run by developers and those who like to live on the edge. Throughout the
+manual, we tend to use codenames for the releases, such as wheezy or sid, as
+that is what is supported by the tools themselves.
2~ Autori
@@ -242,28 +243,15 @@ 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
-translation files:
-
-code{
-
- $ make commit
-
-}code
-
-_* Then
-
-code{
-
- $ git add .
-
-}code
+_* Do not use #{make commit}# unless you are updating translations in this
+commit, and in that case, do not mix changes to the English manual and
+translations in the same commit, but use separate commits for each. See the
+{Translation}#translation section for more details.
-_* 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.
+_* Write commit messages that consist of complete, meaningful 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{
@@ -285,9 +273,9 @@ 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.
+/{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.
_* Once the new language is added, you can randomly start translating all po
files in #{manual/po/}#.
diff --git a/manual/ro/about_project.ssi b/manual/ro/about_project.ssi
index e0aa567..f407646 100644
--- a/manual/ro/about_project.ssi
+++ b/manual/ro/about_project.ssi
@@ -37,7 +37,7 @@ Debian se considera Sistemul de Operare Universal: Are un mecanism live
pentru a se promova in jur si de a prezenta cu acuratete sistemul de operare
ce are urmatoarele mari avantaje:
-_* Acesta va fi un subproiect Debian.
+_* It is a subproject of Debian.
_* El reflecta starea (actuala) a distributiei.
@@ -76,15 +76,13 @@ In caz de nevoie a unei configuratii diferite, aceasta schimbare va fii
facuta in coordonare cu responsabilui de program din Debian.
Cu toate acestea un sistem de configurare a programelor este permisa
-folosind debconf in #{lb config}# (use --preseed FILE), ce permite o
-particularizare a configurari programelor in sistemul live facur de dvs.,
-insa imaginile oficiale live doar configurari de baza vot fi
-folosite. Pentru mai multe informatii, urmariti {Customization
-overview}#customization-overview.
+folosind debconf, ce permite o particularizare a configurari programelor in
+sistemul live facur de dvs., insa imaginile oficiale live doar configurari
+de baza vot fi folosite. Pentru mai multe informatii, urmariti
+{Customization overview}#customization-overview.
Exceptie: Sunt desigur necesare cateva necesare sa aducem 'la viata' un
-sistem live ( de exemplu: configuratea pam care sa permita empty
-passwords). Dar aceste schimbari esentiale trebuie minimizate la maximum si
+sistem live. Dar aceste schimbari esentiale trebuie minimizate la maximum si
pastrate in concordanta cu depozitul Debian.
2~contact Contact
@@ -99,7 +97,8 @@ _* *{IRC}*: Un numar de utilizatori si dezvoltatori sunt prezenti in canalul
fiti cu multa rabdare in asteptarea raspunsului. In caz de lipsa a unui
raspuns , folositi mailing list.
-_* *{BTS}*: BTS adica Debian Bug Tracking System , contine detalii asupra
-rapoartelor de bug facute de utilizatorisau dezvoltatori. Fiecare bug are un
-numar, si este mentinut deschis pana la rezolvare. Alte informatii gasiti la
-{Reporting bugs}#bugs.
+_* *{BTS}*: BTS adica {Debian Bug Tracking
+System}http://www.debian.org/Bugs/ contine detalii asupra rapoartelor de bug
+facute de utilizatorisau dezvoltatori. Fiecare bug are un numar, si este
+mentinut deschis pana la rezolvare. Alte informatii gasiti la {Reporting
+bugs}#bugs.
diff --git a/manual/ro/index.html.in b/manual/ro/index.html.in
index b09c34d..e265da8 100644
--- a/manual/ro/index.html.in
+++ b/manual/ro/index.html.in
@@ -16,7 +16,7 @@ be incomplete or may not be up to date.
<p>
- Please report errors, omissions, patches and suggestions to our mailinglist
+ Please report errors, omissions, patches and suggestions to our mailing list
at <a
href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
and read about <a href="html/live-manual.ro.html#how-to-contribute">how to
@@ -45,7 +45,7 @@ href="pdf/landscape.ro.letter.pdf">letter landscape</a></li>
<h3>Source</h3>
<p>
- The sources for this manual is available in a <a
+ The sources for this manual are available in a <a
href="http://git.or.cz/">Git</a> repository at live.debian.net.
</p>
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index 43736ce..3412459 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -9,13 +9,13 @@
: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>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2012-04-03
+ :published: 04.06.2012
@publisher: Debian Live Project <debian-live at lists.debian.org>
@make:
- :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/
- :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/
+ :bold: /squeeze|wheezy|sid/
+ :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
diff --git a/manual/ro/project_bugs.ssi b/manual/ro/project_bugs.ssi
index b0c34fc..a051509 100644
--- a/manual/ro/project_bugs.ssi
+++ b/manual/ro/project_bugs.ssi
@@ -71,7 +71,7 @@ _* Version of live-boot on the live system
_* Version of live-config on the live system
-_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system
+_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system
_* Architecture of the live system
@@ -122,8 +122,8 @@ Where does the bug appear?
3~ At build time whilst bootstrapping
-live-build first bootstraps a basic Debian system with #{debootstrap}# or
-#{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian
+live-build first bootstraps a basic Debian system with /{debootstrap}/ or
+/{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian
distribution it is bootstrapping, it may fail. If a bug appears here, check
if the error is related to a specific Debian package (most likely), or if it
is related to bootstrapping tool itself.
@@ -140,7 +140,7 @@ can fail. If a bug appears here, check if the error is also reproducible on
a normal system.
If this is the case, this is not a bug in Debian Live, but rather in Debian
-- please report it against the failing package. Running #{debootstrap}#
+- please report it against the failing package. Running /{debootstrap}/
separately from the Live system build or running #{lb bootstrap --debug}#
will give you more information.
diff --git a/manual/ro/project_coding-style.ssi b/manual/ro/project_coding-style.ssi
index 7ec54b5..6005704 100644
--- a/manual/ro/project_coding-style.ssi
+++ b/manual/ro/project_coding-style.ssi
@@ -13,6 +13,8 @@ _* Only use the POSIX subset - for example, use $(foo) over `foo`.
_* You can check your scripts with 'sh -n' and 'checkbashisms'.
+_* Make sure all shell code runs with 'set -e'.
+
2~ Indenting
_* Always use tabs over spaces.
@@ -50,7 +52,7 @@ Bad:
code{
- foo () {
+ Foo () {
bar
}
@@ -60,7 +62,7 @@ Good:
code{
- foo ()
+ Foo ()
{
bar
}
@@ -142,3 +144,6 @@ _* Don't use the #{test}# command for comparisons or tests, use "#{[}#"
_* Use #{case}# wherever possible over #{test}#, as it's easier to read and
faster in execution.
+
+_* Use capitalized names for functions to limit messing with the users
+environment.
diff --git a/manual/ro/project_procedures.ssi b/manual/ro/project_procedures.ssi
index 49b1924..66dfa7c 100644
--- a/manual/ro/project_procedures.ssi
+++ b/manual/ro/project_procedures.ssi
@@ -37,13 +37,20 @@ _* Images are built and mirrored on cdimage.debian.org.
2~ Point Releases
-_* Again, we need updated mirror of debian, debian-security and
+_* Again, we need updated mirrors of debian, debian-security and
debian-volatile.
_* Images are built and mirrored on cdimage.debian.org.
_* Send announcement mail.
+3~ Last Point Release of a Debian Release
+
+Remember to adjust both chroot and binary mirrors when building the last set
+of images for a Debian release after it has been moved away from
+ftp.debian.org to archive.debian.org. That way, old prebuilt live images are
+still useful without user modifications.
+
3~ Point release announcement template
An annoucement mail for point releases can be generated using the template
diff --git a/manual/ro/style_guide.ssi b/manual/ro/style_guide.ssi
index 8b01cc3..edd8e20 100644
--- a/manual/ro/style_guide.ssi
+++ b/manual/ro/style_guide.ssi
@@ -342,11 +342,11 @@ intervention if the code changes.
Leave the code blocks empty (they will be automatically added then) if you
want to make your translation easier to maintain.
-_* /{New lines}/
+_* /{Newlines}/
-The translated texts need to have the exact same new lines as the original
+The translated texts need to have the exact same newlines as the original
texts. Be careful to press the "Enter" key or type *{\n}* if they appear in
-the original files. These new lines often appear, for instance, in the code
+the original files. These newlines often appear, for instance, in the code
blocks.
Make no mistake, this does not mean that the translated text needs to have
@@ -362,9 +362,7 @@ Translators should never translate:
- The commands given as examples
- - Metadata (often between colons *{:metadata:}*) especially the date in
- /{live-manual.ssm.po}/ because it changes every time live-manual is
- updated.
+ - Metadata (often between colons *{:metadata:}*)
- Links
diff --git a/manual/ro/user_basics.ssi b/manual/ro/user_basics.ssi
index 2eee04a..05401eb 100644
--- a/manual/ro/user_basics.ssi
+++ b/manual/ro/user_basics.ssi
@@ -87,7 +87,7 @@ code{
}code
This process can take a while, depending on the speed of your network
-connection. When it is complete, there should be a #{binary-hybrid.iso}#
+connection. When it is complete, there should be a #{binary.hybrid.iso}#
image file, ready to use, in the current directory.
2~using-iso-hybrid Using an ISO hybrid live image
@@ -106,7 +106,7 @@ code{
# apt-get install wodim
- $ wodim binary-hybrid.iso
+ $ wodim binary.hybrid.iso
}code
@@ -127,7 +127,7 @@ any previous contents on your stick!}*
code{
- $ dd if=binary-hybrid.iso of=${USBSTICK}
+ $ dd if=binary.hybrid.iso of=${USBSTICK}
}code
@@ -146,8 +146,8 @@ normal boot device.
Once you've booted the media, you are presented with a boot menu. If you
just press enter here, the system will boot using the default entry,
#{Live}# and default options. For more information about boot options, see
-the "help" entry in the menu and also the #{live-boot}# and #{live-config}#
-man pages found within the live system.
+the "help" entry in the menu and also the live-boot and live-config man
+pages found within the live system.
Assuming you've selected #{Live}# and booted a default desktop live image,
after the boot messages scroll by, you should be automatically logged into
@@ -179,12 +179,12 @@ software and choose one that is suitable for your needs.
3~testing-iso-with-qemu Testing an ISO image with QEMU
The most versatile VM in Debian is QEMU. If your processor has hardware
-support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}#
+support for virtualization, use the /{qemu-kvm}/ package; the /{qemu-kvm}/
package description briefly lists the requirements.
-First, install #{qemu-kvm}# if your processor supports it. If not, install
-#{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in
-the following examples. The #{qemu-utils}# package is also valuable for
+First, install /{qemu-kvm}/ if your processor supports it. If not, install
+/{qemu}/, in which case the program name is #{qemu}# instead of #{kvm}# in
+the following examples. The /{qemu-utils}/ package is also valuable for
creating virtual disk images with #{qemu-img}#.
code{
@@ -197,7 +197,7 @@ Booting an ISO image is simple:
code{
- $ kvm -cdrom binary-hybrid.iso
+ $ kvm -cdrom binary.hybrid.iso
}code
@@ -205,7 +205,7 @@ See the man pages for more details.
3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
-In order to test the ISO with #{virtualbox-ose}#:
+In order to test the ISO with /{virtualbox-ose}/:
code{
@@ -216,12 +216,9 @@ code{
}code
Create a new virtual machine, change the storage settings to use
-#{binary-hybrid.iso}# as the CD/DVD device, and start the machine.
+#{binary.hybrid.iso}# as the CD/DVD device, and start the machine.
-Note: For live systems containing X.org that you want to test with
-#{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver
-package, #{virtualbox-ose-guest-x11}#, in your live-build
-configuration. Otherwise, the resolution is limited to 800x600.
+*{Note:}* For live systems containing X.org that you want to test with /{virtualbox-ose}/, you may wish to include the VirtualBox X.org driver package, /{virtualbox-ose-guest-x11}/, in your live-build configuration. Otherwise, the resolution is limited to 800x600.
code{
@@ -240,9 +237,7 @@ which does not handle hybrid images properly, or want to use the remaining
space on the media for some purpose, such as a persistence partition, you
need an HDD image.
-Note: if you created an ISO hybrid image with the previous example, you will
-need to clean up your working directory with the #{lb clean}# command (see
-{The lb clean command}#lb-clean):
+*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):
code{
@@ -276,11 +271,11 @@ The generated binary image contains a VFAT partition and the syslinux
bootloader, ready to be directly written on a USB stick. Since using an HDD
image is just like using an ISO hybrid image on USB, follow the instructions
in {Using an ISO hybrid live image}#using-iso-hybrid, except use the
-filename #{binary.img}# instead of #{binary-hybrid.iso}#.
+filename #{binary.img}# instead of #{binary.hybrid.iso}#.
3~testing-hdd-with-qemu Testing an HDD image with Qemu
-First, install QEMU as described above in {Testing an ISO image with
+First, install /{qemu}/ as described above in {Testing an ISO image with
QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on
which version your host system needs, specifying #{binary.img}# as the first
hard drive.
@@ -294,7 +289,7 @@ code{
3~using-usb-extra-space Using the space left on a USB stick
To use the remaining free space after copying #{binary.img}# to a USB stick,
-use a partitioning tool such as #{gparted}# or #{parted}# to create a new
+use a partitioning tool such as /{gparted}/ or /{parted}/ to create a new
partition on the stick. The first partition will be used by the Debian Live
system.
@@ -314,10 +309,7 @@ code{
}code
-Note: If you want to use the extra space with Windows, apparently that OS
-cannot normally access any partitions but the first. Some solutions to this
-problem have been discussed on our {mailing list}#contact, but it seems
-there are no easy answers.
+*{Note:}* If you want to use the extra space with Windows, apparently that OS cannot normally access any partitions but the first. Some solutions to this problem have been discussed on our {mailing list}#contact, but it seems there are no easy answers.
*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image, so back up your extra partition first to restore again after updating the live image.}*
@@ -327,8 +319,7 @@ The following sequence of commands will create a basic netboot image
containing the Debian standard system without X.org. It is suitable for
booting over the network.
-Note: if you performed any previous examples, you will need to clean up your
-working directory with the #{lb clean}# command:
+*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:
code{
@@ -410,9 +401,10 @@ code{
This serves the kernel and initial ramdisk to the system at run time.
-You should install the tftpd-hpa package. It can serve all files contained
-inside a root directory, usually #{/srv/tftp}#. To let it serve files inside
-#{/srv/debian-live/tftpboot}#, run as root the following command:
+You should install the /{tftpd-hpa}/ package. It can serve all files
+contained inside a root directory, usually #{/srv/tftp}#. To let it serve
+files inside #{/srv/debian-live/tftpboot}#, run as root the following
+command:
code{
@@ -428,7 +420,7 @@ Once the guest computer has downloaded and booted a Linux kernel and loaded
its initrd, it will try to mount the Live filesystem image through a NFS
server.
-You need to install the #{nfs-kernel-server}# package.
+You need to install the /{nfs-kernel-server}/ package.
Then, make the filesystem image available through NFS by adding a line like
the following to #{/etc/exports}#:
@@ -463,7 +455,7 @@ To make our life easier, we can use virtualization. There are two solutions.
3~ Qemu
-_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#.
+_* Install /{qemu}/, /{bridge-utils}/, /{sudo}/.
Edit #{/etc/qemu-ifup}#:
diff --git a/manual/ro/user_customization-binary.ssi b/manual/ro/user_customization-binary.ssi
index 73cfb15..c83563a 100644
--- a/manual/ro/user_customization-binary.ssi
+++ b/manual/ro/user_customization-binary.ssi
@@ -47,7 +47,7 @@ code{
include menu.cfg
default vesamenu.c32
prompt 0
- timeout 5
+ timeout 50
}code
@@ -59,7 +59,7 @@ code{
#!/bin/sh
- sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg
+ sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg
}code
diff --git a/manual/ro/user_customization-contents.ssi b/manual/ro/user_customization-contents.ssi
index 4d67a3c..e6237cf 100644
--- a/manual/ro/user_customization-contents.ssi
+++ b/manual/ro/user_customization-contents.ssi
@@ -43,7 +43,7 @@ see {Live/chroot local hooks}#live-chroot-local-hooks if processing is
needed.
To include files, simply add them to your #{config/includes.chroot}#
-directory. This directory corresponds to the root directory (#{/}#) of the
+directory. This directory corresponds to the root directory #{/}# of the
live system. For example, to add a file #{/var/www/index.html}# in the live
system, use:
@@ -151,5 +151,5 @@ followed by the stage (#{.chroot}# or #{.binary}#) are considered to be
debconf preseed files and are installed by live-build using
#{debconf-set-selections}# during the corresponding stage.
-For more information about debconf, please see debconf(7) in the #{debconf}#
-package.
+For more information about debconf, please see #{debconf(7)}# in the
+/{debconf}/ package.
diff --git a/manual/ro/user_customization-installer.ssi b/manual/ro/user_customization-installer.ssi
index a41a62d..65f9860 100644
--- a/manual/ro/user_customization-installer.ssi
+++ b/manual/ro/user_customization-installer.ssi
@@ -18,7 +18,7 @@ The three main types of installer are:
*{"Regular" Debian Installer}*: This is a normal Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as "combined images".
On such images, Debian is installed by fetching and installing .deb packages
-using #{debootstrap}# or #{cdebootstrap}#, from the local media or some
+using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some
network-based network, resulting in a standard Debian system being installed
to the hard disk.
@@ -31,16 +31,14 @@ the image and enable it for you.
Installation will proceed in an identical fashion to the "Regular"
installation described above, but at the actual package installation stage,
-instead of using #{debootstrap}# to fetch and install packages, the live
+instead of using /{debootstrap}/ to fetch and install packages, the live
filesystem image is copied to the target. This is achieved with a special
udeb called live-installer.
After this stage, the Debian Installer continues as normal, installing and
configuring items such as bootloaders and local users, etc.
-Note: to support both normal and live installer entries in the bootloader of
-the same live media, you must disable live-installer by preseeding
-#{live-installer/enable=false}#.
+*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.
*{"Desktop" Debian Installer}*: Regardless of the type of Debian Installer included, #{d-i}# can be launched from the Desktop by clicking on an icon. This is user friendlier in some situations. In order to make use of this, the debian-installer-launcher package needs to be included.
@@ -86,4 +84,4 @@ built #{d-i}# component udeb packages. Place these in
replacement files and directories may be included in the installer initrd as
well, in a similar fashion to {Live/chroot local
includes}#live-chroot-local-includes, by placing the material in
-#{config/binary_debian-installer-includes/}#.
+#{config/includes.binary_debian-installer/}#.
diff --git a/manual/ro/user_customization-overview.ssi b/manual/ro/user_customization-overview.ssi
index 137e322..0e2fec2 100644
--- a/manual/ro/user_customization-overview.ssi
+++ b/manual/ro/user_customization-overview.ssi
@@ -55,7 +55,7 @@ in place.
2~ Supplement lb config with files
-Although #{lb config}# does create a skeletal configuration in the config/
+Although #{lb config}# creates a skeletal configuration in the config/
directory, to accomplish your goals, you may need to provide additional
files in subdirectories of config/. Depending on where the files are stored
in the configuration, they may be copied into the live system's filesystem
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index 4542f38..eb3724f 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -11,12 +11,12 @@ areas. To ensure decent download speeds, you should choose a nearby
distribution mirror. You can also add your own repositories for backports,
experimental or custom packages, or include packages directly as files. You
can define your own lists of packages to include, use live-build's
-predefined lists, use #{tasksel}# tasks, or a combination of all
-three. Finally, a number of options give some control over apt, or if you
-prefer, aptitude, at build time when packages are installed. You may find
-these handy if you use a proxy, want to disable installation of recommended
-packages to save space, or need to control which versions of packages are
-installed via APT pinning, to name a few possibilities.
+predefined lists, use /{tasksel}/ tasks, or a combination of all
+three. Finally, a number of options give some control over /{apt}/, or if
+you prefer, /{aptitude}/, at build time when packages are installed. You may
+find these handy if you use a proxy, want to disable installation of
+recommended packages to save space, or need to control which versions of
+packages are installed via APT pinning, to name a few possibilities.
2~ Package sources
@@ -24,12 +24,12 @@ installed via APT pinning, to name a few possibilities.
The distribution you choose has the broadest impact on which packages are
available to include in your live image. Specify the codename, which
-defaults to #{wheezy}# for the Wheezy version of live-build. Any current
+defaults to wheezy for the wheezy version of live-build. Any current
distribution carried in the Debian archive may be specified by its codename
here. (See {Terms}#terms for more details.) The #{--distribution}# option
not only influences the source of packages within the archive, but also
-instructs #{live-build}# to behave as needed to build each supported
-distribution. For example, to build against the *{unstable}* release, Sid,
+instructs live-build to behave as needed to build each supported
+distribution. For example, to build against the *{unstable}* release, sid,
specify:
code{
@@ -65,10 +65,10 @@ the world so that people in each region can choose a nearby mirror for best
download speed. Each of the #{--mirror-*}# options governs which
distribution mirror is used at various stages of the build. Recall from
{Stages of the build}#stages-of-the-build that the *{bootstrap}* stage is
-when the chroot is initially populated by debootstrap with a minimal system,
-and the *{chroot}* stage is when the chroot used to construct the live
-system's filesystem is built. Thus, the corresponding mirror switches are
-used for those stages, and later, in the *{binary}* stage, the
+when the chroot is initially populated by /{debootstrap}/ with a minimal
+system, and the *{chroot}* stage is when the chroot used to construct the
+live system's filesystem is built. Thus, the corresponding mirror switches
+are used for those stages, and later, in the *{binary}* stage, the
#{--mirror-binary}# and #{--mirror-binary-security}# values are used,
superceding any mirrors used in an earlier stage.
@@ -209,8 +209,8 @@ includes. Refer to these in the #{/usr/share/live/build/package-lists/}#
directory, as they serve as good examples of how to write your own lists.
For example, to make a list that includes the predefined #{gnome}# list plus
-iceweasel, create #{config/package-lists/my.list.chroot}# with the following
-contents:
+/{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the
+following contents:
code{
@@ -240,7 +240,7 @@ code{
}code
You may test for any one of a number of values, e.g. to install
-#{memtest86+}# if either #{--architectures i386}# or #{--architectures
+/{memtest86+}/ if either #{--architectures i386}# or #{--architectures
amd64}# is specified:
code{
@@ -252,7 +252,7 @@ code{
}code
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
+e.g. to install /{vrms}/ if either #{contrib}# or #{non-free}# is specified
via #{--archive-areas}#:
code{
@@ -294,7 +294,7 @@ code{
The primary tasks available in the Debian Installer can be listed with
#{tasksel --list-tasks}# in the live system. The contents of any task,
-including ones not included in this list, may be examined with #{tasksel
+including the ones not included in this list, may be examined with #{tasksel
--task-packages}#.
3~desktop-and-language-tasks Desktop and language tasks
@@ -427,7 +427,7 @@ man page.
3~choosing-apt-or-aptitude Choosing apt or aptitude
-You can elect to use either #{apt}# or #{aptitude}# when installing packages
+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
to #{lb config}#. Choose the method implementing the preferred behaviour for
package installation, the notable difference being how missing packages are
@@ -466,11 +466,11 @@ code{
}code
-This will not influence the entries in /etc/apt/sources.list, but merely
-whether /var/lib/apt contains the indices files or not. The tradeoff is that
-APT needs those indices in order to operate in the live system, so before
-performing #{apt-cache search}# or #{apt-get install}#, for instance, the
-user must #{apt-get update}# first to create those indices.
+This will not influence the entries in #{/etc/apt/sources.list}#, but merely
+whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is
+that APT needs those indices in order to operate in the live system, so
+before performing #{apt-cache search}# or #{apt-get install}#, for instance,
+the user must #{apt-get update}# first to create those indices.
If you find the installation of recommended packages bloats your image too
much, you may disable that default option of APT with:
@@ -507,11 +507,11 @@ 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/includes.chroot/etc/apt/preferences}#.
-Let's say you are building a Wheezy 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
+Let's say you are building a wheezy 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, Wheezy. The following will
+taken from the target system distribution, wheezy. The following will
accomplish this:
code{
@@ -529,7 +529,7 @@ code{
}code
-*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with Wheezy using:
+*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:
code{
@@ -541,9 +541,9 @@ 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
package. Suppose you are building an LXDE image using #{--package-lists
lxde}# option, but don't want the user prompted to store wifi passwords in
-the keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in
-turn recommends #{gnome-keyring}#. So you want to omit the recommended
-#{gnome-keyring}# package. This can be done by adding the following stanza
+the keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in
+turn recommends /{gnome-keyring}/. So you want to omit the recommended
+/{gnome-keyring}/ package. This can be done by adding the following stanza
to #{config/chroot_apt/preferences}#:
code{
diff --git a/manual/ro/user_customization-runtime.ssi b/manual/ro/user_customization-runtime.ssi
index bd4c0fe..a5dc96b 100644
--- a/manual/ro/user_customization-runtime.ssi
+++ b/manual/ro/user_customization-runtime.ssi
@@ -130,7 +130,7 @@ other media in addition to CDs; but still, in its default behaviour, it
should be considered read-only and all the run-time evolutions of the system
are lost at shutdown.
-Persistence is a common name for different kinds of solutions for saving
+'Persistence' is a common name for different kinds of solutions for saving
across reboots some, or all, of this run-time evolution of the system. To
understand how it could work it could be handy to know that even if the
system is booted and run from read-only media, modification to the files and
@@ -141,11 +141,12 @@ The data stored on this ramdisk should be saved on a writable persistent
medium like local storage media, a network share or even a session of a
multisession (re)writable CD/DVD. All these media are supported in Debian
Live in different ways, and all but the last one require a special boot
-parameter to be specified at boot time: #{persistent}#.
+parameter to be specified at boot time: #{persistence}#.
-If the boot parameter #{persistent}# is set (and #{nopersistent}# is not
+If the boot parameter #{persistence}# is set (and #{nopersistence}# is not
set), local storage media (e.g. hard disks, USB drives) will be probed for
-persistent volumes during boot. A persistent volume is any of the following:
+persistence volumes during boot. A persistence volume is any of the
+following:
_* a partition, identified by its GPT name.
@@ -154,14 +155,14 @@ _* a filesystem, identified by its filesystem label.
_* an image/archive file located on the root of any readable filesystem
(even an NTFS partition of a foreign OS), identified by its file name. In
this case the file name must also use the containing filesystem as the file
-extension, e.g. "<label>.ext3".
+extension, e.g. "<label>.ext4".
-It is possible to restrict which types of persistent volumes to use by
+It is possible to restrict which types of persistence volumes to use by
specifying certain boot parameters described in the live-boot(7) man
page. The "identifying labels" referred to above can be any of the
following:
-_* #{full-ov}# for full persistent overlays.
+_* #{full-ov}# for full persistence overlays.
_* #{custom-ov}# for custom overlays.
@@ -169,17 +170,17 @@ _* #{live-sn}# for full system snapshots.
_* #{home-sn}# for /home snapshots.
-3~ Full persistent overlays
+3~ Full persistence overlays
By 'full persistence' it is meant that instead of using a tmpfs for storing
modifications to the read-only media (with the copy-on-write, COW, system) a
-persistent volume is used. For this type of persistence the volume label
-must be #{full-ov}#. This could, for instance, be an ext2 partition on a
+persistence volume is used. For this type of persistence the volume label
+must be #{full-ov}#. This could, for instance, be an ext4 partition on a
hard disk or on a usb key created with, e.g.:
code{
- # mkfs.ext2 -L full-ov /dev/sdb1
+ # mkfs.ext4 -L full-ov /dev/sdb1
}code
@@ -194,13 +195,13 @@ code{
}code
-Here's an example of how to create an ext2-based image file used for full
+Here's an example of how to create an ext4-based image file used for full
persistence:
code{
$ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file
- $ /sbin/mkfs.ext2 -F full-ov
+ $ /sbin/mkfs.ext4 -F full-ov
}code
@@ -210,52 +211,53 @@ reboot.
3~ Custom overlays
A volume with the label #{custom-ov}# can be configured to make arbitrary
-directories persistent. The file #{live.persist}#, located on the volume's
-filesystem root, controls which directories it makes persistent, and in
-which way.
+directories persistent. The file #{live-persistence.conf}#, located on the
+volume's filesystem root, controls which directories it makes persistent,
+and in which way.
How custom overlay mounts are configured is described in full detail in the
-live.persist(5) man page, but a simple example should be sufficient for most
-uses. Let's say we want to make our home directory and APT cache persistent
-in an ext3 filesystem on the /dev/sdb1 partition:
+live-persistence.conf(5) man page, but a simple example should be sufficient
+for most uses. Let's say we want to make our home directory and APT cache
+persistent in an ext4 filesystem on the /dev/sdb1 partition:
code{
- $ mkfs.ext3 -L custom-ov /dev/sdb1
- $ mount -t ext3 /dev/sdb1 /mnt
- $ echo "/home" >> /mnt/live.persist
- $ echo "/var/cache/apt" >> /mnt/live.persist
+ $ mkfs.ext4 -L custom-ov /dev/sdb1
+ $ mount -t ext4 /dev/sdb1 /mnt
+ $ echo "/home" >> /mnt/live-persistence.conf
+ $ echo "/var/cache/apt" >> /mnt/live-persistence.conf
}code
-Then we reboot. During the first boot the contents of /home and
-/var/cache/apt will be copied into the persistent volume, and from then on
-all changes to these directories will live in the persistent volume. Please
-note that any paths listed in the #{live.persist}# file cannot contain white
-spaces or the special "." and ".." path components. Also, neither "/live"
-(or any of its sub-directories) nor "/" can be made persistent using custom
-mounts (for the latter, use the #{full-ov}# type persistence described
-above).
-
-Several different custom overlay volumes (with their own #{live.persist}#
-files) can be used at the same time, but if several volumes make the same
-directory persistent, only one of them will be used. If any two mounts are
-"nested" (i.e. one is a sub-directory of the other) the parent will be
-mounted before the child so no mount will be hidden by the other. Nested
-custom mounts are problematic if they are listed in the same
-#{live.persist}# file. See the live.persist(5) man page for how to handle
-that case if you really need it (hint: you usually don't).
+Then we reboot. During the first boot the contents of #{/home}# and
+#{/var/cache/apt}# will be copied into the persistence volume, and from then
+on all changes to these directories will live in the persistence
+volume. Please note that any paths listed in the #{live-persistence.conf}#
+file cannot contain white spaces or the special #{.}# and #{..}# path
+components. Also, neither #{/live}# (or any of its sub-directories) nor
+#{/}# can be made persistent using custom mounts (for the latter, use the
+#{full-ov}# type persistence described above).
+
+Several different custom overlay volumes (with their own
+#{live-persistence.conf}# files) can be used at the same time, but if
+several volumes make the same directory persistent, only one of them will be
+used. If any two mounts are "nested" (i.e. one is a sub-directory of the
+other) the parent will be mounted before the child so no mount will be
+hidden by the other. Nested custom mounts are problematic if they are listed
+in the same #{live-persistence.conf}# file. See the live-persistence.conf(5)
+man page for how to handle that case if you really need it (hint: you
+usually don't).
3~ Snapshots
Snapshots are collections of files and directories which are not mounted
-while running but which are copied from a persistent volume to the system
+while running but which are copied from a persistence volume to the system
(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The
volume must be labeled #{live-sn}#, and it defaults to a simple cpio archive
named #{live-sn.cpio.gz}#. A power interruption during run time could lead
to data loss, hence, if you have important changes, invoke #{live-snapshot
--refresh}# as often as needed. This type of persistence, since it does not
-write continuously to the persistent media, is the most flash-based device
+write continuously to the persistence media, is the most flash-based device
friendly and the fastest of all the persistence systems, but it occupies as
much RAM as the size of the uncompressed snapshot.
@@ -264,15 +266,15 @@ works the same as the main snapshot but it is only applied to /home.
Snapshots cannot currently handle file deletion.
-3~ Persistent SubText
+3~ Persistence SubText
-If a user would need multiple persistent storage of the same type for
+If a user would need multiple persistence storage of the same type for
different locations or testing, such as #{full-ov-nonwork}# and
-#{full-ov-work}#, the boot parameter #{persistent-subtext}# used in
-conjunction with the boot parameter #{persistent}# will allow for multiple
-but unique persistent media. An example would be if a user wanted to use a
-persistent partition labeled #{live-sn-subText}# they would use the boot
-parameters of: #{persistent}# #{persistent-subtext=subText}#.
+#{full-ov-work}#, the boot parameter #{persistence-subtext}# used in
+conjunction with the boot parameter #{persistence}# will allow for multiple
+but unique persistence media. An example would be if a user wanted to use a
+persistence partition labeled #{live-sn-subText}# they would use the boot
+parameters of: #{persistence}# #{persistence-subtext=subText}#.
3~ Partial remastering
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
index 428c580..aa406ad 100644
--- a/manual/ro/user_examples.ssi
+++ b/manual/ro/user_examples.ssi
@@ -60,7 +60,7 @@ code{
}code
Assuming all goes well, after a while, the current directory will contain
-#{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a
+#{binary.hybrid.iso}#. This ISO hybrid image can be booted directly in a
virtual machine as described in {Testing an ISO image with
Qemu}#testing-iso-with-qemu and {Testing an ISO image with
virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical
@@ -149,9 +149,9 @@ code{
First, #{--architectures i386}# ensures that on our #{amd64}# build system,
we build a 32-bit version suitable for use on most machines. Second, we use
#{--linux-flavours 686-pae}# because we don't anticipate using this image on
-much older systems. Third, we've chosen the #{lxde}# package list to give us
+much older systems. Third, we've chosen the /{lxde}/ package list to give us
a minimal desktop. And finally, we have added two initial favourite
-packages: #{iceweasel}# and #{xchat}#.
+packages: /{iceweasel}/ and /{xchat}/.
Now, build the image:
@@ -179,7 +179,7 @@ code{
3~ Second revision
In this revision, we're going to clean up from the first build, add the
-#{vlc}# package to our configuration, rebuild, test and commit.
+/{vlc}/ package to our configuration, rebuild, test and commit.
The #{lb clean}# command will clean up all generated files from the previous
build except for the cache, which saves having to re-download packages. This
@@ -192,7 +192,7 @@ code{
}code
-Now append the #{vlc}# package to our local package list in
+Now append the /{vlc}/ package to our local package list in
#{config/package-lists/my.list.chroot}#:
code{
@@ -235,8 +235,8 @@ cases drawn from the collected experiences of users of Debian Live.
*{Use case:}* Create an image with live-build to boot directly to a VNC server.
Make a build directory and create a skeletal configuration in it built
-around the standard-x11 list, including #{gdm3}#, #{metacity}# and
-#{xvnc4viewer}#, disabling recommends to make a minimal system:
+around the standard-x11 list, including /{gdm3}/, /{metacity}/ and
+/{xvnc4viewer}/, disabling recommends to make a minimal system:
code{
@@ -249,8 +249,8 @@ code{
}code
Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for
-the default user that will launch metacity and start xvncviewer, connecting
-to port #{5901}# on a server at #{192.168.1.2}#:
+the default user that will launch /{metacity}/ and start /{xvncviewer}/,
+connecting to port #{5901}# on a server at #{192.168.1.2}#:
code{
@@ -285,9 +285,9 @@ the tradeoffs you are making between size and functionality. In this
example, we trim only so much as to make room for additional material within
a 128M media size, but without doing anything to destroy integrity of the
packages contained within, such as the purging of locale data via the
-#{localepurge}# package, or other such "intrusive" optimizations. Of
+/{localepurge}/ package, or other such "intrusive" optimizations. Of
particular note, you should not use #{--bootstrap-flavour minimal}# unless
-you really know what you're doing, as omitting priority #{important}#
+you really know what you're doing, as omitting priority *{important}*
packages will most likely produce a broken live system.
code{
@@ -318,7 +318,7 @@ system. Choosing the #{minimal}# package list leaves out the large
#{locales}# package and associated utilities. Dropping recommended packages
with #{--apt-recommends false}# saves some additional space, at the expense
of omitting some packages you might otherwise expect to be there, such as
-#{firmware-linux-free}# which may be needed to support certain hardware. The
+/{firmware-linux-free}/ which may be needed to support certain hardware. The
remaining options shave off additional small amounts of space. It's up to
you to decide if the functionality that is sacrificed with each optimization
is worth the loss in functionality.
@@ -385,7 +385,7 @@ code{
}code
-Note that we have included the #{debian-installer-launcher}# package to
-launch the installer from the live desktop, and have also specified the 486
-flavour kernel, as it is currently necessary to make the installer and live
-system kernels match for the launcher to work properly.
+Note that we have included the debian-installer-launcher package to launch
+the installer from the live desktop, and have also specified the 486 flavour
+kernel, as it is currently necessary to make the installer and live system
+kernels match for the launcher to work properly.
diff --git a/manual/ro/user_installation.ssi b/manual/ro/user_installation.ssi
index 1949e3d..c5aa801 100644
--- a/manual/ro/user_installation.ssi
+++ b/manual/ro/user_installation.ssi
@@ -132,12 +132,12 @@ if that is your reason for building these packages from source.
_* Build live-boot and live-config .deb files
You must build either on your target distribution or in a chroot containing
-your target platform: this means if your target is Wheezy then you should
-build against Wheezy.
+your target platform: this means if your target is wheezy then you should
+build against wheezy.
Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to
-build #{live-boot}# for a target distribution that differs from your build
-system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy
+build live-boot for a target distribution that differs from your build
+system. For example, for wheezy live images, build live-boot in a wheezy
chroot. If your target distribution happens to match your build system
distribution, you may build directly on the build system using
#{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
diff --git a/manual/ro/user_managing_a_configuration.ssi b/manual/ro/user_managing_a_configuration.ssi
index 7df1d34..8f6089a 100644
--- a/manual/ro/user_managing_a_configuration.ssi
+++ b/manual/ro/user_managing_a_configuration.ssi
@@ -34,7 +34,7 @@ options, and an auto/clean that removes the files containing configuration
variable values, and each time you run #{lb config}# and #{lb clean}#, these
files will be executed. This will ensure that your configuration is kept
internally consistent from one revision to the next and from one live-build
-release to the next (though you will still have to take care and read the
+release to the next (Although you will still have to take care and read the
documentation when you upgrade live-build and make adjustments as needed).
2~ Example auto scripts
diff --git a/manual/ro/user_overview.ssi b/manual/ro/user_overview.ssi
index beda6d4..c0e59b5 100644
--- a/manual/ro/user_overview.ssi
+++ b/manual/ro/user_overview.ssi
@@ -14,11 +14,11 @@ The idea behind live-build is to be a framework that uses a configuration
directory to completely automate and customize all aspects of building a
Live image.
-Many concepts are similar to those in the debhelper Debian package tools
+Many concepts are similar to those in the /{debhelper}/ Debian package tools
written by Joey Hess:
_* The scripts have a central location for configuring their operation. In
-debhelper, this is the #{debian/}# subdirectory of a package tree. For
+/{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For
example, dh_install will look, amongst others, for a file called
#{debian/install}# to determine which files should exist in a particular
binary package. In much the same way, live-build stores its configuration
@@ -27,9 +27,9 @@ entirely under a #{config/}# subdirectory.
_* The scripts are independent - that is to say, it is always safe to run
each command.
-Unlike debhelper, live-build contains a tool to generate a skeleton
+Unlike /{debhelper}/, live-build contains a tool to generate a skeleton
configuration directory, #{lb config}#. This could be considered to be
-similar to tools such as #{dh-make}#. For more information about #{lb
+similar to tools such as /{dh-make}/. For more information about #{lb
config}#, please see {The lb config command}#lb-config.
The remainder of this section discusses the three most important commands:
--
live-manual
More information about the debian-live-changes
mailing list