[SCM] live-manual branch, upstream, updated. upstream/3.0_a10-1-ga524f9b
Daniel Baumann
daniel at debian.org
Tue Apr 3 07:21:44 UTC 2012
The following commit has been merged in the upstream branch:
commit a524f9b9807971c47107e02c4631f35a539d8d27
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Apr 3 09:20:48 2012 +0200
Adding upstream version 3.0~a11.
diff --git a/Makefile b/Makefile
index 28dcf0b..7a4c188 100644
--- a/Makefile
+++ b/Makefile
@@ -71,16 +71,17 @@ commit: tidy test
@if grep -qs fuzzy manual/po/*/*; \
then \
- echo "Please fix fuzzy in manual/po/* first."; \
- exit 1; \
+ echo "" ; \
+ echo "There are some fuzzy strings. You can run 'make translate' to fix them." ; \
+ exit 1 ; \
fi
@echo
- @echo "Successful... please do:"
+ @echo "You may now proceed...please do:"
@echo
@echo " * git add ."
@echo " * git commit -a -m \"Your commit message.\""
- @echo " * git push"
+ @echo " * git push "
install:
FROMDIR=$(CURDIR)/build/manual; \
@@ -102,3 +103,12 @@ distclean: clean
rm -rf build
rebuild: distclean build
+
+translate:
+ @if grep -qs fuzzy manual/po/*/*; \
+ then \
+ ./manual/bin/find-fuzzy.sh ; \
+ else \
+ echo "There are no fuzzy strings to translate." ; \
+ fi
+
diff --git a/VERSION b/VERSION
index bf14168..2e25043 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a10
+3.0~a11
diff --git a/manual/_sisu/home/index.html b/manual/_sisu/home/index.html
index 175f09d..6dbeb1f 100644
--- a/manual/_sisu/home/index.html
+++ b/manual/_sisu/home/index.html
@@ -23,12 +23,12 @@
<h3>Meta</h3>
<p>
- Builds are scheduled every 10th minute of an hour.
+ Builds are scheduled every 20 minutes.
</p>
<ul>
- <li><a href="build.log">build.log</a></li>
- <li><a href="manual-trace">manual-trace</a></li>
+ <li><a href="../build.log">build.log</a></li>
+ <li><a href="../manual-trace">manual-trace</a></li>
</ul>
<p>
diff --git a/manual/bin/find-fuzzy.sh b/manual/bin/find-fuzzy.sh
new file mode 100755
index 0000000..b459e29
--- /dev/null
+++ b/manual/bin/find-fuzzy.sh
@@ -0,0 +1,113 @@
+#!/bin/sh
+
+# Script to assist translators in finding and fixing fuzzy strings in live-manual.
+
+echo ""
+echo "There are $(grep -w 'fuzzy' manual/po/*/* | wc -l) fuzzy strings altogether in live-manual."
+echo "This script can help you find and fix them. What is your language?."
+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}
+
+# Creating the function. Searches 'fuzzy' and offers to open editor to fix them.
+
+find_fuzzy()
+
+{
+ 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:"
+ echo ""
+ echo " * git add ."
+ echo " * git commit -a -m \"Your commit message.\""
+ echo " * git push "
+ echo ""
+ exit 0
+ else
+ echo ""
+ echo "Do you want to launch your text editor to start fixing them? [yes/no]"
+
+ read OPENEDITOR
+ case "$OPENEDITOR" in
+
+ y*|Y*) $EDITOR $(grep -w 'fuzzy' manual/po/$ANSWER/* | uniq | sed 's|:#, fuzzy.*||')
+ ;;
+
+ n*|N*) exit 0
+ ;;
+
+ *) echo "You didn't type 'yes'. Exiting..."
+ exit 0
+
+ esac
+
+ fi
+ exit 0
+}
+
+# Languages menu.
+
+read ANSWER
+case "$ANSWER" in
+
+ de) find_fuzzy
+ ;;
+
+ en) echo "Nothing to be done, really."
+ echo "Translation English-English not implemented yet!"
+ ;;
+
+ es) find_fuzzy
+ ;;
+
+ fr) find_fuzzy
+ ;;
+
+ it) find_fuzzy
+ ;;
+
+ pt_BR) find_fuzzy
+ ;;
+
+ ro) find_fuzzy
+ ;;
+
+ 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
+
+ y*|Y*) $EDITOR $(grep -w 'fuzzy' manual/po/*/* | uniq | sed 's|:#, fuzzy.*||')
+ ;;
+
+ n*|N*) exit 0
+ ;;
+
+ *) echo "You didn't type 'yes'. Exiting..."
+ exit 0
+
+ esac
+
+ ;;
+
+ q) exit
+ ;;
+
+ *) echo "No language chosen. Exiting..."
+
+esac
+
+
+
+
diff --git a/manual/de/about_manual.ssi b/manual/de/about_manual.ssi
index d01ce5b..1f4bd26 100644
--- a/manual/de/about_manual.ssi
+++ b/manual/de/about_manual.ssi
@@ -2,8 +2,9 @@
1~about-manual About this manual
-The main goal of this manual is to serve as a single access point to all
-documentation related to the Debian Live project. While it is primarily
+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
@@ -279,7 +280,7 @@ code{
}code
-3~ Translation
+3~translation Translation
To submit a translation for a new language, follow these three steps:
diff --git a/manual/de/about_project.ssi b/manual/de/about_project.ssi
index 677a730..d48f58d 100644
--- a/manual/de/about_project.ssi
+++ b/manual/de/about_project.ssi
@@ -101,7 +101,3 @@ _* *{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.
-
-_* *{Wiki}*: The Debian Live wiki at http://wiki.debian.org/DebianLive is a
-place to gather information, discuss applied technologies, and document
-frameworks of Debian Live systems that go beyond the scope of this document.
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index 84d2856..5b93915 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,7 +9,7 @@
: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-02-06
+ :published: 2012-04-03
@publisher: Debian Live Projekt <debian-live at lists.debian.org>
@@ -60,3 +60,7 @@
:B~ Beispiele
<< user_examples.ssi
+
+:B~ Appendix
+
+<< style_guide.ssi
diff --git a/manual/de/project_coding-style.ssi b/manual/de/project_coding-style.ssi
index c4a9b86..7ec54b5 100644
--- a/manual/de/project_coding-style.ssi
+++ b/manual/de/project_coding-style.ssi
@@ -133,7 +133,7 @@ code{
2~ Miscellaneous
-_* Use "#{|}#" (without the surround quotes) as a seperator in calls to sed,
+_* Use "#{|}#" (without the surround quotes) as a separator in calls to sed,
e.g. "#{sed -e 's|foo|bar|'}#" (without "").
_* Don't use the #{test}# command for comparisons or tests, use "#{[}#"
diff --git a/manual/de/style_guide.ssi b/manual/de/style_guide.ssi
new file mode 100644
index 0000000..8b01cc3
--- /dev/null
+++ b/manual/de/style_guide.ssi
@@ -0,0 +1,371 @@
+:B~ Appendix
+
+1~style-guide Style guide
+
+2~ Guidelines for authors
+
+This section deals with some general considerations to be taken into account
+when writing technical documentation for live-manual. They are divided into
+linguistic features and recommended procedures.
+
+*{Note:}* Authors should first read {Contributing to this document}#how-to-contribute
+
+3~ Linguistic features
+
+_* /{Use plain English}/
+
+Keep in mind that a high percentage of your readers are not native
+speakers. So as a general rule try to use short, meaningful sentences,
+followed by a full stop.
+
+This does not mean that you have to use a simplistic, naive style. It is a
+suggestion to try to avoid, as much as possible, complex subordinate
+sentences that make the text difficult to understand for non-native
+speakers.
+
+_* /{Variety of English}/
+
+The most widely spread varieties of English are British and American so it
+is very likely that most authors will use either one or the other. In a
+collaborative environment, the ideal variety would be "International
+English" but it is very difficult, not to say impossible, to decide on which
+variety among all the existing ones, is the best to use.
+
+We expect that different varieties may mix without creating
+misunderstandings but in general terms you should try to be coherent and
+before deciding on using British, American or any other English flavour at
+your discretion, please take a look at how other people write and try to
+imitate them.
+
+_* /{Be balanced}/
+
+Do not be biased. Avoid including references to ideologies completely
+unrelated to live-manual. Technical writing should be as neutral as
+possible. It is in the very nature of scientific writing.
+
+_* /{Be politically correct}/
+
+Try to avoid sexist language as much as possible. If you need to make
+references to the third person singular preferably use "they" rather than
+"he" or "she" or awkward inventions such as "s/he", "s(he)" and the like.
+
+_* /{Be concise}/
+
+Go straight to the point and do not wander around aimlessly. Give as much
+information as necessary but do not give more information than necessary,
+this is to say, do not explain unnecessary details. Your readers are
+intelligent. Presume some previous knowledge on their part.
+
+_* /{Minimize translation work}/
+
+Keep in mind that whatever you write will have to be translated into several
+other languages. This implies that a number of people will have to do an
+extra work if you add useless or redundant information.
+
+_* /{Be coherent}/
+
+As suggested before, it is almost impossible to standardize a collaborative
+document into a perfectly unified whole. However, every effort on your side
+to write in a coherent way with the rest of the authors will be appreciated.
+
+_* /{Be cohesive}/
+
+Use as many text-forming devices as necessary to make your text cohesive and
+unambiguous. (Text-forming devices are linguistic markers such as
+connectors).
+
+_* /{Be descriptive}/
+
+It is preferable to describe the point in one or several paragraphs than
+merely using a number of sentences in a typical "changelog" style. Describe
+it! Your readers will appreciate it.
+
+_* /{Dictionary}/
+
+Look up the meaning of words in a dictionary or encyclopedia if you do not
+know how to express certain concepts in English. But keep in mind that a
+dictionary can either be your best friend or can turn into your worst enemy
+if you do not know how to use it correctly.
+
+English has the largest vocabulary that exists (With over one million
+words). Many of these words are borrowings from other languages. When
+looking up the meaning of words in a bilingual dictionary the tendency of a
+non-native speaker is to choose the one that sounds more similar in their
+mother tongue. This often turns into an excessively formal discourse which
+does not sound quite natural in English.
+
+As a general rule, if a concept can be expressed using different synonyms,
+it is a good advice to choose the first word proposed by the dictionary. If
+in doubt, choosing words of Germanic origin (Usually monosyllabic words) is
+often the right thing to do. Be warned that these two techniques might
+produce a rather informal discourse but at least your choice of words will
+be of wide use and generally accepted.
+
+Using a dictionary of collocations is recommended. They are extremely
+helpful when it comes to know which words usually occur together.
+
+Again it is a good practice to learn from the work of others. Using a search
+engine to check how other authors use certain expressions may help a lot.
+
+_* /{False friends, idioms and other idiomatic expressions}/
+
+Watch out for false friends. No matter how proficient you are in a foreign
+language you cannot help falling from time to time in the trap of the so
+called "false friends", words that look similar in two languages but whose
+meanings or uses might be completely different.
+
+Try to avoid idioms as much as possible. "Idioms" are expressions that may
+convey a completely different meaning from what their individual words seem
+to mean. Sometimes, idioms are difficult to understand even for native
+speakers!
+
+_* /{Avoid slang, abbreviations, contractions...}/
+
+Even though you are encouraged to use plain, everyday English, technical
+writing belongs to the formal register of the language.
+
+Try to avoid slang, unusual abbreviations that are difficult to understand
+and above all contractions that try to imitate the spoken language. Not to
+mention typical irc and family friendly expressions.
+
+3~ Procedures
+
+_* /{Test before write}/
+
+It is important that authors test their examples before adding them to
+live-manual to ensure that everything works as described. Testing on a clean
+chroot or VM can be a good starting point. Besides, it would be ideal if the
+tests were then carried out on different machines with different hardware to
+spot possible problems that may arise.
+
+_* /{Examples}/
+
+When providing an example try to be as specific as you can. An example is,
+after all, just an example.
+
+It is often better to use a line that only applies to an specific case than
+using abstractions that may confuse your readers. In this case you can
+provide a brief explanation of the effects of the proposed example.
+
+There may be some exceptions when the example suggests using some
+potentially dangerous commands that, if misused, may cause data loss or
+other similar undesirable effects. In this case you should provide a
+thorough explanation of the possible side effects.
+
+_* /{External links}/
+
+Links to external sites should only be used when the information on those
+sites is crucial when it comes to understanding a special point. Even so,
+try to use links to external sites as sparsely as possible. Internet links
+are likely to change from time to time resulting in broken links and leaving
+your arguments in an incomplete state.
+
+Besides, people who read the manual offline will not have the chance to
+follow those links.
+
+_* /{Avoid branding and things that violate the license under which the
+manual is published}/
+
+Try to avoid branding as much as possible. Keep in mind that other
+downstream projects might make use of the documentation you write. So you
+are complicating things for them if you add certain specific material.
+
+live-manual is licensed under the GNU GPL. This has a number of implications
+that apply to the distribution of the material (of any kind, including
+copyrighted graphics or logos) that is published with it.
+
+_* /{Write a first draft, revise, edit, improve, redo if necessary}/
+
+ - Brainstorm!. You need to organize your ideas first in a logical sequence
+ of events.
+
+ - Once you have somehow organized those ideas in your mind write a first
+ draft.
+
+ - Revise grammar, syntax and spelling.
+
+ - Improve your statements and redo any part if necessary.
+
+_* /{Chapters}/
+
+Use the conventional numbering system for chapters and subtitles. e.g. 1,
+1.1, 1.1.1, 1.1.2 ... 1.2, 1.2.1, 1.2.2 ... 2, 2.1 ... and so on. See markup
+below.
+
+If you have to enumerate a series of steps or stages in your description,
+you can also use ordinal numbers: First, second, third ... or First, Then,
+After that, Finally ... Alternatively you can use bulleted items.
+
+_* /{Markup}/
+
+And last but not least, live-manual uses {SiSU}http://www.sisudoc.org to
+process the text files and produce a multiple format output. It is
+recommended to take a look at {SiSU's
+manual}http://www.sisudoc.org/sisu/sisu_manual/markup.html to get familiar
+with its markup, or else type:
+
+code{
+
+ $ sisu --help markup
+
+}code
+
+Here are some markup examples that may prove useful:
+
+ - For emphasis/bold text:
+
+code{
+
+*{foo}* or !{foo}!
+
+}code
+
+produces: *{foo}* or !{foo}!. Use it to emphasize certain key words.
+
+ - For italics:
+
+code{
+
+/{foo}/
+
+}code
+
+produces: /{foo}/. Use them e.g. for the names of debian packages.
+
+ - For monospace:
+
+code{
+
+#{foo}#
+
+}code
+
+produces: #{foo}#. Use it e.g. for the names of commands. And also to
+highlight some key words or things like paths.
+
+ - For code blocks:
+
+code{
+
+ code{
+
+ $ foo
+ # bar
+
+ }code
+
+}code
+
+produces:
+
+code{
+
+ $ foo
+ # bar
+
+}code
+
+Use #{code{}# to open and #{}code}# to close the tags. It is important to
+remember to leave a space at the beginning of each line of code.
+
+2~ Guidelines for translators
+
+This section deals with some general considerations to be taken into account
+when translating the contents of live-manual.
+
+As a general recommendation, translators should have read and understood the
+translation rules that apply to their specific languages. Usually,
+translation groups and mailing lists provide information on how to produce
+translated work that complies with Debian quality standards.
+
+*{Note:}* Translators should also read {Contributing to this document}#how-to-contribute. In particular the section {Translation}#translation
+
+3~ Translation hints
+
+_* /{Comments}/
+
+The role of the translator is to convey as faithfully as possible the
+meaning of words, sentences, paragraphs and texts as written by the original
+authors into their target language.
+
+So they should refrain from adding personal comments or extra bits of
+information of their own. If they want to add a comment for other
+translators working on the same documents, they can leave it in the space
+reserved for that. That is, the header of the strings in the *{po}* files
+preceded by a number sign *{#}*. Most graphical translation programs can
+automatically handle those types of comments.
+
+_* /{TN, Translator's Note}/
+
+It is perfectly acceptable however, to include a word or an expression in
+brackets in the translated text if, and only if, that makes the meaning of a
+difficult word or expression clearer to the reader. Inside the brackets the
+translator should make evident that the addition was theirs using the
+abbreviation "TN" or "Translator's Note".
+
+_* /{Impersonal sentences}/
+
+Documents written in English make an extensive use of the impersonal form
+"you". In some other languages that do not share this characteristic, this
+might give the false impression that the original texts are directly
+addressing the reader when they are actually not doing so. Translators must
+be aware of that fact and reflect it in their language as accurately as
+possible.
+
+_* /{False friends}/
+
+The trap of "false friends" explained before especially applies to
+translators. Double check the meaning of suspicious false friends if in
+doubt.
+
+_* /{Markup}/
+
+Translators working initially with *{pot}* files and later on with *{po}*
+files will find many markup features in the strings. They can translate the
+text anyway, as long as it is translatable, but it is extremely important
+that they use exactly the same markup as the original English version.
+
+_* /{Code blocks}/
+
+Some translators decide to include the code blocks in the translated files
+because it is easier for them to identify what has already been translated
+and what has not by looking at the percentages if they use a graphical
+translation program.
+
+Include the code blocks if you want to score a 100% complete translation.
+
+On the other hand some translators prefer to leave the code blocks
+"untranslated" (i.e. not including them). This makes the translation easier
+to maintain once finished because it does not require translators
+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}/
+
+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.
+
+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.
+
+_* /{Untranslatable strings}/
+
+Translators should never translate:
+
+ - The code names of releases
+
+ - The names of programs
+
+ - 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.
+
+ - Links
+
+ - Paths
diff --git a/manual/de/user_customization-binary.ssi b/manual/de/user_customization-binary.ssi
index 1902f77..73cfb15 100644
--- a/manual/de/user_customization-binary.ssi
+++ b/manual/de/user_customization-binary.ssi
@@ -4,13 +4,36 @@ B~ Customizing the binary image
2~ Bootloader
-live-build uses syslinux and some of its derivatives (depending on the image
-type) as bootloaders by default. You can easily modify their options using
-different methods, like {includes}#includes or {hooks}#hooks.
+live-build uses /{syslinux}/ and some of its derivatives (depending on the
+image type) as bootloaders by default. You can easily customize them in a
+number of ways that range from providing a full theme to changing the boot
+timeout or simply adding a personalized splash image. Some of the following
+examples of customization make use of different methods, like
+{includes}#includes or {hooks}#hooks.
-For example, these derivatives are configured by default with a timeout of 0
-(zero) which means that they will pause indefinitely at their splash screen
-until you press a key.
+If you want to use a full theme you can specify the #{--syslinux-theme}#
+option (see man #{lb_config}#). live-build will then retrieve the theme from
+the mirror and install it.
+
+Imagine that you want to build a progress client but you prefer to include
+the server's theme because you want to have the help menu. Then you would
+launch #{lb config}# as follows:
+
+code{
+
+ $ lb config --mode progress --syslinux-theme progress-server
+
+}code
+
+You can also create your own theme or modify an already existing one and if
+you do not have a mirror, you can add the package to
+#{config/packages.chroot}#. In this case it is not necessary to specify any
+option.
+
+There is also the possibility of making smaller changes. For instance,
+syslinux derivatives are configured by default with a timeout of 0 (zero)
+which means that they will pause indefinitely at their splash screen until
+you press a key.
To modify the boot timeout of a default #{iso-hybrid}# image you can edit a
default *{isolinux.cfg}* file specifying the timeout in units of seconds and
@@ -40,7 +63,8 @@ code{
}code
-For more information please see man syslinux(1).
+Likewise, if you want to use a personalized splash.png image you can add a
+picture of 640x480 pixels to #{config/includes.binary/isolinux/}#
2~ ISO metadata
diff --git a/manual/de/user_customization-installer.ssi b/manual/de/user_customization-installer.ssi
index d8d0c17..a41a62d 100644
--- a/manual/de/user_customization-installer.ssi
+++ b/manual/de/user_customization-installer.ssi
@@ -15,7 +15,7 @@ seen abbreviated to "d-i".
The three main types of installer are:
-*{"Regular" Debian Installer}*: This is a normal Debian Live image with a seperate 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".
+*{"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
@@ -52,7 +52,7 @@ architecture. For example:
code{
- $ lb config --architecture i386 --linux-flavours 486 \
+ $ lb config --architectures i386 --linux-flavours 486 \
--debian-installer live
$ echo debian-installer-launcher >> config/package-lists/my.list.chroot
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index 01fd8c2..4542f38 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -29,7 +29,7 @@ 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,
+distribution. For example, to build against the *{unstable}* release, Sid,
specify:
code{
@@ -64,13 +64,13 @@ 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.
+{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
@@ -114,9 +114,9 @@ is available in your target distribution. These may be, for example, for
backports, experimental or custom packages. To configure additional
repositories, create #{config/archives/your-repository.list.chroot}#, and/or
#{config/archives/your-repository.list.binary}# files. As with the
-#{--mirror-*}# options, these govern the repositories used in the *chroot*
-stage when building the image, and in the *binary* stage, i.e. for use when
-running the live system.
+#{--mirror-*}# options, these govern the repositories used in the *{chroot}*
+stage when building the image, and in the *{binary}* stage, i.e. for use
+when running the live system.
For example, #{config/archives/live.list.chroot}# allows you to install
packages from the debian live snapshot repository at live system build time.
@@ -226,26 +226,26 @@ the #{LB_}# prefix) may be used in conditional statements in package
lists. Generally, this means any #{lb config}# option uppercased and with
dashes changed to underscores. But in practice, it is only the ones that
influence package selection that make sense, such as #{DISTRIBUTION}#,
-#{ARCHITECTURE}# or #{ARCHIVE_AREAS}#.
+#{ARCHITECTURES}# or #{ARCHIVE_AREAS}#.
-For example, to install #{ia32-libs}# if the #{--architecture amd64}# is
+For example, to install #{ia32-libs}# if the #{--architectures amd64}# is
specified:
code{
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
ia32-libs
#endif
}code
You may test for any one of a number of values, e.g. to install
-#{memtest86+}# if either #{--architecture i386}# or #{--architecture amd64}#
-is specified:
+#{memtest86+}# if either #{--architectures i386}# or #{--architectures
+amd64}# is specified:
code{
- #if ARCHITECTURE i386 amd64
+ #if ARCHITECTURES i386 amd64
memtest86+
#endif
@@ -267,7 +267,7 @@ A conditional may surround an #{#include}# directive:
code{
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
#include <gnome-full>
#endif
@@ -495,7 +495,7 @@ as explained in {APT pinning}#apt-pinning.
3~ Passing options to apt or aptitude
-If there is not an #{lb config}# option to alter APT's behaviour in the way
+If there is not a #{lb config}# option to alter APT's behaviour in the way
you need, use #{--apt-options}# or #{--aptitude-options}# to pass any
options through to your configured APT tool. See the man pages for #{apt}#
and #{aptitude}# for details.
diff --git a/manual/de/user_customization-runtime.ssi b/manual/de/user_customization-runtime.ssi
index 610fdb1..bd4c0fe 100644
--- a/manual/de/user_customization-runtime.ssi
+++ b/manual/de/user_customization-runtime.ssi
@@ -37,7 +37,7 @@ To change the default username you can simply specify it in your config:
code{
-$ lb config --bootappend-live "username=live-user"
+ $ lb config --bootappend-live "username=live-user"
}code
@@ -138,24 +138,48 @@ 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 a Hard Disk, a USB key, a network share or even a session of a
+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}#.
-3~ Full 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:
+
+_* 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".
+
+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:
+
+_* #{full-ov}# for full persistent overlays.
+
+_* #{custom-ov}# for custom overlays.
+
+_* #{live-sn}# for full system snapshots.
+
+_* #{home-sn}# for /home snapshots.
+
+3~ Full persistent 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
-writable partition is used. In order to use this feature a partition with a
-clean writable supported filesystem on it labeled "live-rw" must be attached
-on the system at boot time and the system must be started with the boot
-parameter 'persistent'. This partition could be an ext2 partition on the
+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.:
code{
- # mkfs.ext2 -L live-rw /dev/sdb1
+ # mkfs.ext2 -L full-ov /dev/sdb1
}code
@@ -166,59 +190,85 @@ label with one of the following:
code{
- # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems
+ $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems
}code
-But since live system users cannot always use a hard drive partition, and
-considering that most USB keys have poor write speeds, 'full' persistence
-could be also used with just image files, so you could create a file
-representing a partition and put this image file even on a NTFS partition of
-a foreign OS, with something like:
+Here's an example of how to create an ext2-based image file used for full
+persistence:
code{
- $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file
- $ /sbin/mkfs.ext2 -F live-rw
+ $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file
+ $ /sbin/mkfs.ext2 -F full-ov
}code
-Then copy the #{live-rw}# file to a writable partition and reboot with the
-boot parameter 'persistent'.
+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.
+
+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:
-3~ Home automounting
+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
+
+}code
-If during the boot a partition (filesystem) image file or a partition
-labeled #{home-rw}# is discovered, this filesystem will be directly mounted
-as #{/home}#, thus permitting persistence of files that belong to e.g. the
-default user. It can be combined with full persistence.
+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).
3~ Snapshots
Snapshots are collections of files and directories which are not mounted
-while running but which are copied from a persistent device to the system
+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
-content of a snapshot could reside on a partition or an image file (like the
-above mentioned types) labeled #{live-sn}#, but it defaults to a simple cpio
-archive named #{live-sn.cpio.gz}#. As above, at boot time, the block devices
-connected to the system are traversed to see if a partition or a file named
-like that could be found. A power interruption during run time could lead to
-data loss, hence a tool invoked #{live-snapshot --refresh}# could be called
-to sync important changes. 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.
+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.
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 but full persistence and
-home automounting can.
+Snapshots cannot currently handle file deletion.
3~ Persistent SubText
If a user would need multiple persistent storage of the same type for
-different locations or testing, such as #{live-rw-nonwork}# and
-#{live-rw-work}#, the boot parameter #{persistent-subtext}# used in
+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
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
index 1faee91..a87a36f 100644
--- a/manual/de/user_examples.ssi
+++ b/manual/de/user_examples.ssi
@@ -131,7 +131,7 @@ code{
#!/bin/sh
lb config noauto \
- --architecture i386 \
+ --architectures i386 \
--linux-flavours 686-pae \
--package-lists lxde \
"${@}"
@@ -146,7 +146,7 @@ code{
}code
-First, #{--architecture i386}# ensures that on our #{amd64}# build system,
+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
diff --git a/manual/de/user_installation.ssi b/manual/de/user_installation.ssi
index bd8393d..1949e3d 100644
--- a/manual/de/user_installation.ssi
+++ b/manual/de/user_installation.ssi
@@ -105,7 +105,7 @@ are available on http://live.debian.net/debian/.
2~ live-boot and live-config
-*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the live-boot-doc and live-config-doc packages separately.
+*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the /{live-boot-doc}/ and /{live-config-doc}/ packages separately.
3~ From the Debian repository
diff --git a/manual/de/user_managing_a_configuration.ssi b/manual/de/user_managing_a_configuration.ssi
index d0706a8..7df1d34 100644
--- a/manual/de/user_managing_a_configuration.ssi
+++ b/manual/de/user_managing_a_configuration.ssi
@@ -31,7 +31,7 @@ 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 #{lb config}# and #{lb clean}#, these
+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
diff --git a/manual/de/user_overview.ssi b/manual/de/user_overview.ssi
index ad40e60..beda6d4 100644
--- a/manual/de/user_overview.ssi
+++ b/manual/de/user_overview.ssi
@@ -58,8 +58,9 @@ subdirectory which it populates with some default settings, and a skeleton
code{
$ lb config
+ [2012-03-19 15:17:14] lb_config
P: Considering defaults defined in /etc/live/build.conf
- P: Creating config tree
+ P: Creating config tree for a debian system
}code
@@ -81,7 +82,7 @@ It is possible to specify many options, such as:
code{
- $ lb config --binary-images net --hostname live-machine --username live-user ...
+ $ lb config --binary-images net --bootappend-live "hostname=live-machine username=live-user" ...
}code
diff --git a/manual/en/about_manual.ssi b/manual/en/about_manual.ssi
index 966b3f3..02d8c25 100644
--- a/manual/en/about_manual.ssi
+++ b/manual/en/about_manual.ssi
@@ -2,7 +2,7 @@
1~about-manual About this manual
-The main goal of this manual is to serve as a single access point to all documentation related to the Debian Live project. 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. 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.
@@ -199,7 +199,7 @@ code{
}code
-3~ Translation
+3~translation Translation
To submit a translation for a new language, follow these three steps:
diff --git a/manual/en/about_project.ssi b/manual/en/about_project.ssi
index 11099ce..f47290f 100644
--- a/manual/en/about_project.ssi
+++ b/manual/en/about_project.ssi
@@ -67,5 +67,3 @@ _* *{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.
-
-_* *{Wiki}*: The Debian Live wiki at http://wiki.debian.org/DebianLive is a place to gather information, discuss applied technologies, and document frameworks of Debian Live systems that go beyond the scope of this document.
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 485e4aa..43736ce 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -9,7 +9,7 @@
: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-02-06
+ :published: 2012-04-03
@publisher: Debian Live Project <debian-live at lists.debian.org>
@@ -60,3 +60,7 @@
:B~ Examples
<< user_examples.ssi
+
+:B~ Appendix
+
+<< style_guide.ssi
diff --git a/manual/en/project_coding-style.ssi b/manual/en/project_coding-style.ssi
index fadff70..f3d9f90 100644
--- a/manual/en/project_coding-style.ssi
+++ b/manual/en/project_coding-style.ssi
@@ -128,7 +128,7 @@ code{
2~ Miscellaneous
-_* Use "#{|}#" (without the surround quotes) as a seperator in calls to sed, e.g. "#{sed -e 's|foo|bar|'}#" (without "").
+_* Use "#{|}#" (without the surround quotes) as a separator in calls to sed, e.g. "#{sed -e 's|foo|bar|'}#" (without "").
_* 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; ...}#".
diff --git a/manual/en/style_guide.ssi b/manual/en/style_guide.ssi
new file mode 100644
index 0000000..9958459
--- /dev/null
+++ b/manual/en/style_guide.ssi
@@ -0,0 +1,247 @@
+:B~ Appendix
+
+1~style-guide Style guide
+
+2~ Guidelines for authors
+
+This section deals with some general considerations to be taken into account when writing technical documentation for live-manual. They are divided into linguistic features and recommended procedures.
+
+*{Note:}* Authors should first read {Contributing to this document}#how-to-contribute
+
+3~ Linguistic features
+
+_* /{Use plain English}/
+
+Keep in mind that a high percentage of your readers are not native speakers. So as a general rule try to use short, meaningful sentences, followed by a full stop.
+
+This does not mean that you have to use a simplistic, naive style. It is a suggestion to try to avoid, as much as possible, complex subordinate sentences that make the text difficult to understand for non-native speakers.
+
+_* /{Variety of English}/
+
+The most widely spread varieties of English are British and American so it is very likely that most authors will use either one or the other. In a collaborative environment, the ideal variety would be "International English" but it is very difficult, not to say impossible, to decide on which variety among all the existing ones, is the best to use.
+
+We expect that different varieties may mix without creating misunderstandings but in general terms you should try to be coherent and before deciding on using British, American or any other English flavour at your discretion, please take a look at how other people write and try to imitate them.
+
+_* /{Be balanced}/
+
+Do not be biased. Avoid including references to ideologies completely unrelated to live-manual. Technical writing should be as neutral as possible. It is in the very nature of scientific writing.
+
+_* /{Be politically correct}/
+
+Try to avoid sexist language as much as possible. If you need to make references to the third person singular preferably use "they" rather than "he" or "she" or awkward inventions such as "s/he", "s(he)" and the like.
+
+_* /{Be concise}/
+
+Go straight to the point and do not wander around aimlessly. Give as much information as necessary but do not give more information than necessary, this is to say, do not explain unnecessary details. Your readers are intelligent. Presume some previous knowledge on their part.
+
+_* /{Minimize translation work}/
+
+Keep in mind that whatever you write will have to be translated into several other languages. This implies that a number of people will have to do an extra work if you add useless or redundant information.
+
+_* /{Be coherent}/
+
+As suggested before, it is almost impossible to standardize a collaborative document into a perfectly unified whole. However, every effort on your side to write in a coherent way with the rest of the authors will be appreciated.
+
+_* /{Be cohesive}/
+
+Use as many text-forming devices as necessary to make your text cohesive and unambiguous. (Text-forming devices are linguistic markers such as connectors).
+
+_* /{Be descriptive}/
+
+It is preferable to describe the point in one or several paragraphs than merely using a number of sentences in a typical "changelog" style. Describe it! Your readers will appreciate it.
+
+_* /{Dictionary}/
+
+Look up the meaning of words in a dictionary or encyclopedia if you do not know how to express certain concepts in English. But keep in mind that a dictionary can either be your best friend or can turn into your worst enemy if you do not know how to use it correctly.
+
+English has the largest vocabulary that exists (With over one million words). Many of these words are borrowings from other languages. When looking up the meaning of words in a bilingual dictionary the tendency of a non-native speaker is to choose the one that sounds more similar in their mother tongue. This often turns into an excessively formal discourse which does not sound quite natural in English.
+
+As a general rule, if a concept can be expressed using different synonyms, it is a good advice to choose the first word proposed by the dictionary. If in doubt, choosing words of Germanic origin (Usually monosyllabic words) is often the right thing to do. Be warned that these two techniques might produce a rather informal discourse but at least your choice of words will be of wide use and generally accepted.
+
+Using a dictionary of collocations is recommended. They are extremely helpful when it comes to know which words usually occur together.
+
+Again it is a good practice to learn from the work of others. Using a search engine to check how other authors use certain expressions may help a lot.
+
+_* /{False friends, idioms and other idiomatic expressions}/
+
+Watch out for false friends. No matter how proficient you are in a foreign language you cannot help falling from time to time in the trap of the so called "false friends", words that look similar in two languages but whose meanings or uses might be completely different.
+
+Try to avoid idioms as much as possible. "Idioms" are expressions that may convey a completely different meaning from what their individual words seem to mean. Sometimes, idioms are difficult to understand even for native speakers!
+
+_* /{Avoid slang, abbreviations, contractions...}/
+
+Even though you are encouraged to use plain, everyday English, technical writing belongs to the formal register of the language.
+
+Try to avoid slang, unusual abbreviations that are difficult to understand and above all contractions that try to imitate the spoken language. Not to mention typical irc and family friendly expressions.
+
+3~ Procedures
+
+_* /{Test before write}/
+
+It is important that authors test their examples before adding them to live-manual to ensure that everything works as described. Testing on a clean chroot or VM can be a good starting point. Besides, it would be ideal if the tests were then carried out on different machines with different hardware to spot possible problems that may arise.
+
+_* /{Examples}/
+
+When providing an example try to be as specific as you can. An example is, after all, just an example.
+
+It is often better to use a line that only applies to an specific case than using abstractions that may confuse your readers. In this case you can provide a brief explanation of the effects of the proposed example.
+
+There may be some exceptions when the example suggests using some potentially dangerous commands that, if misused, may cause data loss or other similar undesirable effects. In this case you should provide a thorough explanation of the possible side effects.
+
+_* /{External links}/
+
+Links to external sites should only be used when the information on those sites is crucial when it comes to understanding a special point. Even so, try to use links to external sites as sparsely as possible. Internet links are likely to change from time to time resulting in broken links and leaving your arguments in an incomplete state.
+
+Besides, people who read the manual offline will not have the chance to follow those links.
+
+_* /{Avoid branding and things that violate the license under which the manual is published}/
+
+Try to avoid branding as much as possible. Keep in mind that other downstream projects might make use of the documentation you write. So you are complicating things for them if you add certain specific material.
+
+live-manual is licensed under the GNU GPL. This has a number of implications that apply to the distribution of the material (of any kind, including copyrighted graphics or logos) that is published with it.
+
+_* /{Write a first draft, revise, edit, improve, redo if necessary}/
+
+ - Brainstorm!. You need to organize your ideas first in a logical sequence of events.
+
+ - Once you have somehow organized those ideas in your mind write a first draft.
+
+ - Revise grammar, syntax and spelling.
+
+ - Improve your statements and redo any part if necessary.
+
+_* /{Chapters}/
+
+Use the conventional numbering system for chapters and subtitles. e.g. 1, 1.1, 1.1.1, 1.1.2 ... 1.2, 1.2.1, 1.2.2 ... 2, 2.1 ... and so on. See markup below.
+
+If you have to enumerate a series of steps or stages in your description, you can also use ordinal numbers: First, second, third ... or First, Then, After that, Finally ... Alternatively you can use bulleted items.
+
+_* /{Markup}/
+
+And last but not least, live-manual uses {SiSU}http://www.sisudoc.org to process the text files and produce a multiple format output. It is recommended to take a look at {SiSU's manual}http://www.sisudoc.org/sisu/sisu_manual/markup.html to get familiar with its markup, or else type:
+
+code{
+
+ $ sisu --help markup
+
+}code
+
+Here are some markup examples that may prove useful:
+
+ - For emphasis/bold text:
+
+code{
+
+*{foo}* or !{foo}!
+
+}code
+
+produces: *{foo}* or !{foo}!. Use it to emphasize certain key words.
+
+ - For italics:
+
+code{
+
+/{foo}/
+
+}code
+
+produces: /{foo}/. Use them e.g. for the names of debian packages.
+
+ - For monospace:
+
+code{
+
+#{foo}#
+
+}code
+
+produces: #{foo}#. Use it e.g. for the names of commands. And also to highlight some key words or things like paths.
+
+ - For code blocks:
+
+code{
+
+ code{
+
+ $ foo
+ # bar
+
+ }code
+
+}code
+
+produces:
+
+code{
+
+ $ foo
+ # bar
+
+}code
+
+Use #{code{}# to open and #{}code}# to close the tags. It is important to remember to leave a space at the beginning of each line of code.
+
+2~ Guidelines for translators
+
+This section deals with some general considerations to be taken into account when translating the contents of live-manual.
+
+As a general recommendation, translators should have read and understood the translation rules that apply to their specific languages. Usually, translation groups and mailing lists provide information on how to produce translated work that complies with Debian quality standards.
+
+*{Note:}* Translators should also read {Contributing to this document}#how-to-contribute. In particular the section {Translation}#translation
+
+3~ Translation hints
+
+_* /{Comments}/
+
+The role of the translator is to convey as faithfully as possible the meaning of words, sentences, paragraphs and texts as written by the original authors into their target language.
+
+So they should refrain from adding personal comments or extra bits of information of their own. If they want to add a comment for other translators working on the same documents, they can leave it in the space reserved for that. That is, the header of the strings in the *{po}* files preceded by a number sign *{#}*. Most graphical translation programs can automatically handle those types of comments.
+
+_* /{TN, Translator's Note}/
+
+It is perfectly acceptable however, to include a word or an expression in brackets in the translated text if, and only if, that makes the meaning of a difficult word or expression clearer to the reader. Inside the brackets the translator should make evident that the addition was theirs using the abbreviation "TN" or "Translator's Note".
+
+_* /{Impersonal sentences}/
+
+Documents written in English make an extensive use of the impersonal form "you". In some other languages that do not share this characteristic, this might give the false impression that the original texts are directly addressing the reader when they are actually not doing so. Translators must be aware of that fact and reflect it in their language as accurately as possible.
+
+_* /{False friends}/
+
+The trap of "false friends" explained before especially applies to translators. Double check the meaning of suspicious false friends if in doubt.
+
+_* /{Markup}/
+
+Translators working initially with *{pot}* files and later on with *{po}* files will find many markup features in the strings. They can translate the text anyway, as long as it is translatable, but it is extremely important that they use exactly the same markup as the original English version.
+
+_* /{Code blocks}/
+
+Some translators decide to include the code blocks in the translated files because it is easier for them to identify what has already been translated and what has not by looking at the percentages if they use a graphical translation program.
+
+Include the code blocks if you want to score a 100% complete translation.
+
+On the other hand some translators prefer to leave the code blocks "untranslated" (i.e. not including them). This makes the translation easier to maintain once finished because it does not require translators 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}/
+
+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.
+
+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.
+
+_* /{Untranslatable strings}/
+
+Translators should never translate:
+
+ - The code names of releases
+
+ - The names of programs
+
+ - 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.
+
+ - Links
+
+ - Paths
diff --git a/manual/en/user_customization-binary.ssi b/manual/en/user_customization-binary.ssi
index 88fc1f6..fb05339 100644
--- a/manual/en/user_customization-binary.ssi
+++ b/manual/en/user_customization-binary.ssi
@@ -4,9 +4,21 @@ B~ Customizing the binary image
2~ Bootloader
-live-build uses syslinux and some of its derivatives (depending on the image type) as bootloaders by default. You can easily modify their options using different methods, like {includes}#includes or {hooks}#hooks.
+live-build uses /{syslinux}/ and some of its derivatives (depending on the image type) as bootloaders by default. You can easily customize them in a number of ways that range from providing a full theme to changing the boot timeout or simply adding a personalized splash image. Some of the following examples of customization make use of different methods, like {includes}#includes or {hooks}#hooks.
-For example, these derivatives are configured by default with a timeout of 0 (zero) which means that they will pause indefinitely at their splash screen until you press a key.
+If you want to use a full theme you can specify the #{--syslinux-theme}# option (see man #{lb_config}#). live-build will then retrieve the theme from the mirror and install it.
+
+Imagine that you want to build a progress client but you prefer to include the server's theme because you want to have the help menu. Then you would launch #{lb config}# as follows:
+
+code{
+
+ $ lb config --mode progress --syslinux-theme progress-server
+
+}code
+
+You can also create your own theme or modify an already existing one and if you do not have a mirror, you can add the package to #{config/packages.chroot}#. In this case it is not necessary to specify any option.
+
+There is also the possibility of making smaller changes. For instance, syslinux derivatives are configured by default with a timeout of 0 (zero) which means that they will pause indefinitely at their splash screen until you press a key.
To modify the boot timeout of a default #{iso-hybrid}# image you can edit a default *{isolinux.cfg}* file specifying the timeout in units of seconds and add it to #{config/includes.binary/isolinux/}#
@@ -21,7 +33,7 @@ code{
}code
-An alternative way of achieving the same goal could be writing a hook and adding it to #{config/hooks/}# Remember to add the #{.binary}# suffix to run in the binary stage. A proposed example:
+An alternative way of achieving the same goal could be writing a hook and adding it to #{config/hooks/}# Remember to add the #{.binary}# suffix to run in the binary stage. A proposed example:
code{
@@ -31,7 +43,7 @@ code{
}code
-For more information please see man syslinux(1).
+Likewise, if you want to use a personalized splash.png image you can add a picture of 640x480 pixels to #{config/includes.binary/isolinux/}#
2~ ISO metadata
diff --git a/manual/en/user_customization-installer.ssi b/manual/en/user_customization-installer.ssi
index 6a8e934..f524781 100644
--- a/manual/en/user_customization-installer.ssi
+++ b/manual/en/user_customization-installer.ssi
@@ -10,7 +10,7 @@ Please note the careful use of capital letters when referring to the "Debian Ins
The three main types of installer are:
-*{"Regular" Debian Installer}*: This is a normal Debian Live image with a seperate 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".
+*{"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.
@@ -30,7 +30,7 @@ Note that by default, live-build does not include Debian Installer images in the
code{
- $ lb config --architecture i386 --linux-flavours 486 \
+ $ lb config --architectures i386 --linux-flavours 486 \
--debian-installer live
$ echo debian-installer-launcher >> config/package-lists/my.list.chroot
diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index e7b277d..a93062b 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -8,7 +8,7 @@ Perhaps the most basic customization of a Debian live system is the selection of
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
@@ -59,7 +59,7 @@ code{
3~additional-repositories Additional repositories
-You may add more repositories, broadening your package choices beyond what is available in your target distribution. These may be, for example, for backports, experimental or custom packages. To configure additional repositories, create #{config/archives/your-repository.list.chroot}#, and/or #{config/archives/your-repository.list.binary}# files. As with the #{--mirror-*}# options, these govern the repositories used in the *chroot* stage when building the image, and in the *binary* stage, i.e. for use when running the live system.
+You may add more repositories, broadening your package choices beyond what is available in your target distribution. These may be, for example, for backports, experimental or custom packages. To configure additional repositories, create #{config/archives/your-repository.list.chroot}#, and/or #{config/archives/your-repository.list.binary}# files. As with the #{--mirror-*}# options, these govern the repositories used in the *{chroot}* stage when building the image, and in the *{binary}* stage, i.e. for use when running the live system.
For example, #{config/archives/live.list.chroot}# allows you to install packages from the debian live snapshot repository at live system build time.
@@ -132,23 +132,23 @@ code{
3~ Using conditionals inside package lists
-Any of the live-build configuration variables stored in #{config/*}# (minus the #{LB_}# prefix) may be used in conditional statements in package lists. Generally, this means any #{lb config}# option uppercased and with dashes changed to underscores. But in practice, it is only the ones that influence package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURE}# or #{ARCHIVE_AREAS}#.
+Any of the live-build configuration variables stored in #{config/*}# (minus the #{LB_}# prefix) may be used in conditional statements in package lists. Generally, this means any #{lb config}# option uppercased and with dashes changed to underscores. But in practice, it is only the ones that influence package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURES}# or #{ARCHIVE_AREAS}#.
-For example, to install #{ia32-libs}# if the #{--architecture amd64}# is specified:
+For example, to install #{ia32-libs}# if the #{--architectures amd64}# is specified:
code{
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
ia32-libs
#endif
}code
-You may test for any one of a number of values, e.g. to install #{memtest86+}# if either #{--architecture i386}# or #{--architecture amd64}# is specified:
+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{
- #if ARCHITECTURE i386 amd64
+ #if ARCHITECTURES i386 amd64
memtest86+
#endif
@@ -168,7 +168,7 @@ A conditional may surround an #{#include}# directive:
code{
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
#include <gnome-full>
#endif
@@ -304,7 +304,7 @@ The tradeoff here is that if you don't install recommended packages for a given
3~ Passing options to apt or aptitude
-If there is not an #{lb config}# option to alter APT's behaviour in the way you need, use #{--apt-options}# or #{--aptitude-options}# to pass any options through to your configured APT tool. See the man pages for #{apt}# and #{aptitude}# for details.
+If there is not a #{lb config}# option to alter APT's behaviour in the way you need, use #{--apt-options}# or #{--aptitude-options}# to pass any options through to your configured APT tool. See the man pages for #{apt}# and #{aptitude}# for details.
3~apt-pinning APT pinning
diff --git a/manual/en/user_customization-runtime.ssi b/manual/en/user_customization-runtime.ssi
index 7daaa77..6eac0d5 100644
--- a/manual/en/user_customization-runtime.ssi
+++ b/manual/en/user_customization-runtime.ssi
@@ -25,7 +25,7 @@ To change the default username you can simply specify it in your config:
code{
-$ lb config --bootappend-live "username=live-user"
+ $ lb config --bootappend-live "username=live-user"
}code
@@ -94,15 +94,33 @@ A Debian Live system is a generalization of this paradigm and thus supports othe
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 a Hard Disk, a USB key, 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: #{persistent}#.
-3~ Full 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:
-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 writable partition is used. In order to use this feature a partition with a clean writable supported filesystem on it labeled "live-rw" must be attached on the system at boot time and the system must be started with the boot parameter 'persistent'. This partition could be an ext2 partition on the hard disk or on a usb key created with, e.g.:
+_* 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".
+
+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:
+
+_* #{full-ov}# for full persistent overlays.
+
+_* #{custom-ov}# for custom overlays.
+
+_* #{live-sn}# for full system snapshots.
+
+_* #{home-sn}# for /home snapshots.
+
+3~ Full persistent 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.:
code{
- # mkfs.ext2 -L live-rw /dev/sdb1
+ # mkfs.ext2 -L full-ov /dev/sdb1
}code
@@ -112,36 +130,51 @@ If you already have a partition on your device, you could just change the label
code{
- # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems
+ $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems
}code
-But since live system users cannot always use a hard drive partition, and considering that most USB keys have poor write speeds, 'full' persistence could be also used with just image files, so you could create a file representing a partition and put this image file even on a NTFS partition of a foreign OS, with something like:
+Here's an example of how to create an ext2-based image file used for full persistence:
code{
- $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file
- $ /sbin/mkfs.ext2 -F live-rw
+ $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file
+ $ /sbin/mkfs.ext2 -F full-ov
}code
-Then copy the #{live-rw}# file to a writable partition and reboot with the boot parameter 'persistent'.
+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.
+
+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:
+
+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
+
+}code
-3~ Home automounting
+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).
-If during the boot a partition (filesystem) image file or a partition labeled #{home-rw}# is discovered, this filesystem will be directly mounted as #{/home}#, thus permitting persistence of files that belong to e.g. the default user. It can be combined with full persistence.
+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).
3~ Snapshots
-Snapshots are collections of files and directories which are not mounted while running but which are copied from a persistent device to the system (tmpfs) at boot and which are resynced at reboot/shutdown of the system. The content of a snapshot could reside on a partition or an image file (like the above mentioned types) labeled #{live-sn}#, but it defaults to a simple cpio archive named #{live-sn.cpio.gz}#. As above, at boot time, the block devices connected to the system are traversed to see if a partition or a file named like that could be found. A power interruption during run time could lead to data loss, hence a tool invoked #{live-snapshot --refresh}# could be called to sync important changes. 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.
+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.
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 but full persistence and home automounting can.
+Snapshots cannot currently handle file deletion.
3~ Persistent SubText
-If a user would need multiple persistent storage of the same type for different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-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 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}#.
3~ Partial remastering
diff --git a/manual/en/user_examples.ssi b/manual/en/user_examples.ssi
index 834ef3f..17835e8 100644
--- a/manual/en/user_examples.ssi
+++ b/manual/en/user_examples.ssi
@@ -94,7 +94,7 @@ code{
#!/bin/sh
lb config noauto \
- --architecture i386 \
+ --architectures i386 \
--linux-flavours 686-pae \
--package-lists lxde \
"${@}"
@@ -109,7 +109,7 @@ code{
}code
-First, #{--architecture i386}# ensures that on our #{amd64}# build system, we build a 32-bit version suitable for use on most machines. Second, we use #{--linux-flavours 686-pae}# because we don't anticipate using this image on much older systems. Third, we've chosen the #{lxde}# package list to give us a minimal desktop. And finally, we have added two initial favourite packages: #{iceweasel}# and #{xchat}#.
+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:
diff --git a/manual/en/user_installation.ssi b/manual/en/user_installation.ssi
index fd1f93f..4c92140 100644
--- a/manual/en/user_installation.ssi
+++ b/manual/en/user_installation.ssi
@@ -98,7 +98,7 @@ If you do not wish to build or install live-build from source, you can use snaps
2~ live-boot and live-config
-*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the live-boot-doc and live-config-doc packages separately.
+*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the /{live-boot-doc}/ and /{live-config-doc}/ packages separately.
3~ From the Debian repository
diff --git a/manual/en/user_managing_a_configuration.ssi b/manual/en/user_managing_a_configuration.ssi
index 5047b97..aad6304 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 #{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 (though 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 9dd5a31..ff22e63 100644
--- a/manual/en/user_overview.ssi
+++ b/manual/en/user_overview.ssi
@@ -35,8 +35,9 @@ Issuing #{lb config}# without any arguments creates a #{config/}# subdirectory w
code{
$ lb config
+ [2012-03-19 15:17:14] lb_config
P: Considering defaults defined in /etc/live/build.conf
- P: Creating config tree
+ P: Creating config tree for a debian system
}code
@@ -54,7 +55,7 @@ It is possible to specify many options, such as:
code{
- $ lb config --binary-images net --hostname live-machine --username live-user ...
+ $ lb config --binary-images net --bootappend-live "hostname=live-machine username=live-user" ...
}code
diff --git a/manual/es/about_manual.ssi b/manual/es/about_manual.ssi
index 604b69f..3543ad2 100644
--- a/manual/es/about_manual.ssi
+++ b/manual/es/about_manual.ssi
@@ -3,16 +3,17 @@
1~about-manual Acerca de este manual
El objetivo principal de este manual es servir como único punto de acceso a
-toda la documentación referente al projecto Debian Live. Está principalmente
+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
-cubre la preparación de las imágenes para arrancar un sistema desde un medio
-de almacenamiento o desde red local. {Personalización del comportamiento en
-tiempo de ejecución}#customizing-run-time-behaviours describe alguna 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.
+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
@@ -33,12 +34,12 @@ 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 ejemplos}#using-the-examples, seguido de
+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,
+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
@@ -174,7 +175,7 @@ $ git clone git://live.debian.net/git/live-manual.git
Antes de enviar una contribución se debería realizar una visualización del
trabajo realizado. Para ello asegurarse de tener instalados los paquetes
-necesarios para la construcción del live-manual ejecutando la siguiente
+necesarios para la construcción de live-manual ejecutando la siguiente
orden:
code{
@@ -201,7 +202,7 @@ la siguiente orden:
code{
-$ make build LANGUAGES=en
+ $ make build LANGUAGES=en
}code
@@ -291,15 +292,15 @@ code{
}code
_* Una vez se han saneado y se han añadido los ficheros, se deberán entregar
-los cambios. Se deberá escribir un mensaje de entrega que consistirá en una
-o varias frases en ingles, comenzando con una letra mayúscula y acabando con
+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:
code{
-$ git commit -a -m "Adding a section on applying patches."
+ $ git commit -a -m "Adding a section on applying patches."
}code
@@ -312,7 +313,7 @@ code{
}code
-3~ Traducciones
+3~translation Traducción
Para enviar una traducción para un nuevo idioma, se deben seguir los
siguientes pasos:
@@ -333,4 +334,4 @@ que los manuales traducidos son actualizados desde los ficheros
de realizar la entrega mediante #{git add .}#, #{git commit -a -m
"Translating..."}# y #{git push}#.
-*{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.
+*{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.
diff --git a/manual/es/about_project.ssi b/manual/es/about_project.ssi
index a0afe14..56b0073 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:
-_* Debería ser un subproyecto de Debian.
+_* Sería un subproyecto de Debian.
_* Refleja el estado (actual) de una versión Debian.
@@ -108,8 +108,3 @@ _* *{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.
-
-_* *{Wiki}*: El wiki de Debian Live en http://wiki.debian.org/DebianLive es
-el lugar donde obtener información, discutir sobre la aplicación de
-tecnologías y de documentar herramientas para los sistemas Debian Live que
-vayan más allá del ámbito de este documento.
diff --git a/manual/es/live-manual.ssm b/manual/es/live-manual.ssm
index d2f142a..daa6409 100644
--- a/manual/es/live-manual.ssm
+++ b/manual/es/live-manual.ssm
@@ -9,7 +9,7 @@
: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-02-06
+ :published: 2012-04-03
@publisher: Debian Live Project <debian-live at lists.debian.org>
@@ -60,3 +60,7 @@
:B~ Ejemplos
<< user_examples.ssi
+
+:B~ Apéndice
+
+<< style_guide.ssi
diff --git a/manual/es/project_bugs.ssi b/manual/es/project_bugs.ssi
index 6752d82..6fdea3a 100644
--- a/manual/es/project_bugs.ssi
+++ b/manual/es/project_bugs.ssi
@@ -30,8 +30,8 @@ especifica cualquiera de estas dos versiones.
% FIXME:
Si esto causa mucha dificultad, no se debe crear un sistema basado en
-*{testing}* o *{unstable}*, sino que debe utilizarse *{stable}*. Live-build
-siempre utiliza por defecto la versión *{stable}* .
+*{testing}* o *{unstable}*, sino que debe utilizarse *{stable}*. live-build
+siempre crea, por defecto, la versión *{stable}* .
Los problemas detectados se especifican en la sección 'status' de la página
web http://live.debian.net/.
@@ -114,7 +114,7 @@ precedidos de #{LC_ALL=C}# o #{LC_ALL=en_US}#.
2~ Aislar el fallo si es posible
Si es posible, aislar el caso del fallo al menor cambio posible que lo
-produzca. No siempre es fácil hacer esto, así que si no se consigue para su
+produzca. No siempre es fácil hacer esto, así que si no se consigue para el
informe, no hay que preocuparse. Sin embargo, si se planea el ciclo de
desarrollo bién, con conjuntos de cambios lo bastante pequeños por
iteración, puede ser posible aislar el problema mediante la construcción de
diff --git a/manual/es/project_coding-style.ssi b/manual/es/project_coding-style.ssi
index a965c1f..371f5cc 100644
--- a/manual/es/project_coding-style.ssi
+++ b/manual/es/project_coding-style.ssi
@@ -8,7 +8,7 @@ otros.
2~ Compatibilidad
_* No utilizar sintaxis o semántica que sea única para el intérprete de
-comandos Bash. Por ejemplo, el uso de matrices.
+comandos Bash. Por ejemplo, el uso de arrays.
_* Utilizar únicamente el subconjunto POSIX - por ejemplo, usar $(foo) en
lugar de `foo`.
diff --git a/manual/es/project_procedures.ssi b/manual/es/project_procedures.ssi
index 72722d3..aa915d0 100644
--- a/manual/es/project_procedures.ssi
+++ b/manual/es/project_procedures.ssi
@@ -70,75 +70,76 @@ para su corrección.
code{
-Imágenes de Debian en vivo para Debian GNU/Linux %major% actualizadas
+ Debian Live images for Debian GNU/Linux %major% updated
-El proyecto Debian Live se complace en anunciar la disponibilidad de las imágenes en vivo actualizadas para su distribución estable de Debian GNU / Linux %major%
- (nombre en clave "%codename%").
+ The Debian Live project is pleased to announce the availability of
+ updated Live images for its stable distribution Debian GNU/Linux %major%
+ (codename "%codename%").
- Las imágenes están disponibles para su descarga en:
+ The images are available for download at:
<http://cdimage.debian.org/cdimage/release/current-live/>
- Esta actualización incorpora las modificaciones introducidas en la nueva versión, %minor%
- la cual añade correcciones para problemas de seguridad a la versión estable
- junto con algunos ajustes para problemas graves. Se puede consultar
- una lista completa de los cambios en:
+ This update incorporates the changes made in the %minor% point release,
+ which adds corrections for security problems to the stable release
+ along with a few adjustments for serious problems. A full list of the
+ changes may be viewed at:
<http://lists.debian.org/debian-announce/%release_mail%>
-También incluye los siguientes cambios específicos del proyecto Live:
+ It also includes the following Live-specific changes:
- * [INSERTAR CAMBIOS ESPECÍFICOS DEL PROYECTO LIVE AQUI]
- * [INSERTAR CAMBIOS ESPECÍFICOS DEL PROYECTO LIVE AQUI]
- * [LAS CUESTIONES MÁS IMPORTANTES PUEDEN MERECER SU PROPIA SECCIÓN]
+ * [INSERT LIVE-SPECIFIC CHANGE HERE]
+ * [INSERT LIVE-SPECIFIC CHANGE HERE]
+ * [LARGER ISSUES MAY DESERVE THEIR OWN SECTION]
URLs
----
-Sitio de descarga de imágenes actualizadas:
+ Download location of updated images:
<http://cdimage.debian.org/cdimage/release/current-live/>
-Página principal del proyecto Debian Live
+ Debian Live project homepage:
<http://live.debian.net/>
- La distribución estable actual:
+ The current stable distribution:
<http://ftp.debian.org/debian/dists/stable>
-Información acerca de la distribución estable (notas de publicación, errores, etc.):
+ stable distribution information (release notes, errata etc.):
<http://www.debian.org/releases/stable/>
-Anuncios de seguridad e información
+ Security announcements and information:
<http://www.debian.org/security/>
- Acerca de Debian
+ About Debian
-------------
- El Proyecto Debian es una asociación de desarrolladores de Software Libre que
- ofrecen voluntariamente su tiempo y esfuerzo con el fin de producir el
- sistema operativo libre Debian GNU/Linux.
+ The Debian Project is an association of Free Software developers who
+ volunteer their time and effort in order to produce the completely free
+ operating system Debian GNU/Linux.
- Acerca de Debian Live
+ About Debian Live
-----------------
- Debian Live es un sub-proyecto oficial de Debian que produce sistemas
- Debian que no requieren una instalación clásica. Las imágenes están disponibles
- para CD/DVD, llaves USB y arranque en red PXE, así como
- imágenes de un sistema de ficheros básico para el arranque directamente desde Internet.
+ Debian Live is an official sub-project of Debian which produces Debian
+ systems that do not require a classical installer. Images are available
+ for CD/DVD discs, USB sticks and PXE netbooting as well as a bare
+ filesystem images for booting directly from the internet.
- Información de contacto
+ Contact Information
-------------------
-Para más información, visitar las páginas web de Debian Live
-<http://live.debian.net/> o bien enviar un correo a
-<debian-live at lists.debian.org>.
+ For further information, please visit the Debian Live web pages at
+ <http://live.debian.net/> or alternatively send mail to
+ <debian-live at lists.debian.org>.
}code
diff --git a/manual/es/style_guide.ssi b/manual/es/style_guide.ssi
new file mode 100644
index 0000000..31a364a
--- /dev/null
+++ b/manual/es/style_guide.ssi
@@ -0,0 +1,371 @@
+:B~ Apéndice
+
+1~style-guide Style guide
+
+2~ Guidelines for authors
+
+This section deals with some general considerations to be taken into account
+when writing technical documentation for live-manual. They are divided into
+linguistic features and recommended procedures.
+
+*{Note:}* Authors should first read {Contributing to this document}#how-to-contribute
+
+3~ Linguistic features
+
+_* /{Use plain English}/
+
+Keep in mind that a high percentage of your readers are not native
+speakers. So as a general rule try to use short, meaningful sentences,
+followed by a full stop.
+
+This does not mean that you have to use a simplistic, naive style. It is a
+suggestion to try to avoid, as much as possible, complex subordinate
+sentences that make the text difficult to understand for non-native
+speakers.
+
+_* /{Variety of English}/
+
+The most widely spread varieties of English are British and American so it
+is very likely that most authors will use either one or the other. In a
+collaborative environment, the ideal variety would be "International
+English" but it is very difficult, not to say impossible, to decide on which
+variety among all the existing ones, is the best to use.
+
+We expect that different varieties may mix without creating
+misunderstandings but in general terms you should try to be coherent and
+before deciding on using British, American or any other English flavour at
+your discretion, please take a look at how other people write and try to
+imitate them.
+
+_* /{Be balanced}/
+
+Do not be biased. Avoid including references to ideologies completely
+unrelated to live-manual. Technical writing should be as neutral as
+possible. It is in the very nature of scientific writing.
+
+_* /{Be politically correct}/
+
+Try to avoid sexist language as much as possible. If you need to make
+references to the third person singular preferably use "they" rather than
+"he" or "she" or awkward inventions such as "s/he", "s(he)" and the like.
+
+_* /{Be concise}/
+
+Go straight to the point and do not wander around aimlessly. Give as much
+information as necessary but do not give more information than necessary,
+this is to say, do not explain unnecessary details. Your readers are
+intelligent. Presume some previous knowledge on their part.
+
+_* /{Minimize translation work}/
+
+Keep in mind that whatever you write will have to be translated into several
+other languages. This implies that a number of people will have to do an
+extra work if you add useless or redundant information.
+
+_* /{Be coherent}/
+
+As suggested before, it is almost impossible to standardize a collaborative
+document into a perfectly unified whole. However, every effort on your side
+to write in a coherent way with the rest of the authors will be appreciated.
+
+_* /{Be cohesive}/
+
+Use as many text-forming devices as necessary to make your text cohesive and
+unambiguous. (Text-forming devices are linguistic markers such as
+connectors).
+
+_* /{Be descriptive}/
+
+It is preferable to describe the point in one or several paragraphs than
+merely using a number of sentences in a typical "changelog" style. Describe
+it! Your readers will appreciate it.
+
+_* /{Dictionary}/
+
+Look up the meaning of words in a dictionary or encyclopedia if you do not
+know how to express certain concepts in English. But keep in mind that a
+dictionary can either be your best friend or can turn into your worst enemy
+if you do not know how to use it correctly.
+
+English has the largest vocabulary that exists (With over one million
+words). Many of these words are borrowings from other languages. When
+looking up the meaning of words in a bilingual dictionary the tendency of a
+non-native speaker is to choose the one that sounds more similar in their
+mother tongue. This often turns into an excessively formal discourse which
+does not sound quite natural in English.
+
+As a general rule, if a concept can be expressed using different synonyms,
+it is a good advice to choose the first word proposed by the dictionary. If
+in doubt, choosing words of Germanic origin (Usually monosyllabic words) is
+often the right thing to do. Be warned that these two techniques might
+produce a rather informal discourse but at least your choice of words will
+be of wide use and generally accepted.
+
+Using a dictionary of collocations is recommended. They are extremely
+helpful when it comes to know which words usually occur together.
+
+Again it is a good practice to learn from the work of others. Using a search
+engine to check how other authors use certain expressions may help a lot.
+
+_* /{False friends, idioms and other idiomatic expressions}/
+
+Watch out for false friends. No matter how proficient you are in a foreign
+language you cannot help falling from time to time in the trap of the so
+called "false friends", words that look similar in two languages but whose
+meanings or uses might be completely different.
+
+Try to avoid idioms as much as possible. "Idioms" are expressions that may
+convey a completely different meaning from what their individual words seem
+to mean. Sometimes, idioms are difficult to understand even for native
+speakers!
+
+_* /{Avoid slang, abbreviations, contractions...}/
+
+Even though you are encouraged to use plain, everyday English, technical
+writing belongs to the formal register of the language.
+
+Try to avoid slang, unusual abbreviations that are difficult to understand
+and above all contractions that try to imitate the spoken language. Not to
+mention typical irc and family friendly expressions.
+
+3~ Procedures
+
+_* /{Test before write}/
+
+It is important that authors test their examples before adding them to
+live-manual to ensure that everything works as described. Testing on a clean
+chroot or VM can be a good starting point. Besides, it would be ideal if the
+tests were then carried out on different machines with different hardware to
+spot possible problems that may arise.
+
+_* /{Examples}/
+
+When providing an example try to be as specific as you can. An example is,
+after all, just an example.
+
+It is often better to use a line that only applies to an specific case than
+using abstractions that may confuse your readers. In this case you can
+provide a brief explanation of the effects of the proposed example.
+
+There may be some exceptions when the example suggests using some
+potentially dangerous commands that, if misused, may cause data loss or
+other similar undesirable effects. In this case you should provide a
+thorough explanation of the possible side effects.
+
+_* /{External links}/
+
+Links to external sites should only be used when the information on those
+sites is crucial when it comes to understanding a special point. Even so,
+try to use links to external sites as sparsely as possible. Internet links
+are likely to change from time to time resulting in broken links and leaving
+your arguments in an incomplete state.
+
+Besides, people who read the manual offline will not have the chance to
+follow those links.
+
+_* /{Avoid branding and things that violate the license under which the
+manual is published}/
+
+Try to avoid branding as much as possible. Keep in mind that other
+downstream projects might make use of the documentation you write. So you
+are complicating things for them if you add certain specific material.
+
+live-manual is licensed under the GNU GPL. This has a number of implications
+that apply to the distribution of the material (of any kind, including
+copyrighted graphics or logos) that is published with it.
+
+_* /{Write a first draft, revise, edit, improve, redo if necessary}/
+
+ - Brainstorm!. You need to organize your ideas first in a logical sequence
+ of events.
+
+ - Once you have somehow organized those ideas in your mind write a first
+ draft.
+
+ - Revise grammar, syntax and spelling.
+
+ - Improve your statements and redo any part if necessary.
+
+_* /{Chapters}/
+
+Use the conventional numbering system for chapters and subtitles. e.g. 1,
+1.1, 1.1.1, 1.1.2 ... 1.2, 1.2.1, 1.2.2 ... 2, 2.1 ... and so on. See markup
+below.
+
+If you have to enumerate a series of steps or stages in your description,
+you can also use ordinal numbers: First, second, third ... or First, Then,
+After that, Finally ... Alternatively you can use bulleted items.
+
+_* /{Markup}/
+
+And last but not least, live-manual uses {SiSU}http://www.sisudoc.org to
+process the text files and produce a multiple format output. It is
+recommended to take a look at {SiSU's
+manual}http://www.sisudoc.org/sisu/sisu_manual/markup.html to get familiar
+with its markup, or else type:
+
+code{
+
+ $ sisu --help markup
+
+}code
+
+Here are some markup examples that may prove useful:
+
+ - For emphasis/bold text:
+
+code{
+
+*{foo}* or !{foo}!
+
+}code
+
+produces: *{foo}* or !{foo}!. Use it to emphasize certain key words.
+
+ - For italics:
+
+code{
+
+/{foo}/
+
+}code
+
+produces: /{foo}/. Use them e.g. for the names of debian packages.
+
+ - For monospace:
+
+code{
+
+#{foo}#
+
+}code
+
+produces: #{foo}#. Use it e.g. for the names of commands. And also to
+highlight some key words or things like paths.
+
+ - For code blocks:
+
+code{
+
+ code{
+
+ $ foo
+ # bar
+
+ }code
+
+}code
+
+produces:
+
+code{
+
+ $ foo
+ # bar
+
+}code
+
+Use #{code{}# to open and #{}code}# to close the tags. It is important to
+remember to leave a space at the beginning of each line of code.
+
+2~ Guidelines for translators
+
+This section deals with some general considerations to be taken into account
+when translating the contents of live-manual.
+
+As a general recommendation, translators should have read and understood the
+translation rules that apply to their specific languages. Usually,
+translation groups and mailing lists provide information on how to produce
+translated work that complies with Debian quality standards.
+
+*{Note:}* Translators should also read {Contributing to this document}#how-to-contribute. In particular the section {Translation}#translation
+
+3~ Translation hints
+
+_* /{Comments}/
+
+The role of the translator is to convey as faithfully as possible the
+meaning of words, sentences, paragraphs and texts as written by the original
+authors into their target language.
+
+So they should refrain from adding personal comments or extra bits of
+information of their own. If they want to add a comment for other
+translators working on the same documents, they can leave it in the space
+reserved for that. That is, the header of the strings in the *{po}* files
+preceded by a number sign *{#}*. Most graphical translation programs can
+automatically handle those types of comments.
+
+_* /{TN, Translator's Note}/
+
+It is perfectly acceptable however, to include a word or an expression in
+brackets in the translated text if, and only if, that makes the meaning of a
+difficult word or expression clearer to the reader. Inside the brackets the
+translator should make evident that the addition was theirs using the
+abbreviation "TN" or "Translator's Note".
+
+_* /{Impersonal sentences}/
+
+Documents written in English make an extensive use of the impersonal form
+"you". In some other languages that do not share this characteristic, this
+might give the false impression that the original texts are directly
+addressing the reader when they are actually not doing so. Translators must
+be aware of that fact and reflect it in their language as accurately as
+possible.
+
+_* /{False friends}/
+
+The trap of "false friends" explained before especially applies to
+translators. Double check the meaning of suspicious false friends if in
+doubt.
+
+_* /{Markup}/
+
+Translators working initially with *{pot}* files and later on with *{po}*
+files will find many markup features in the strings. They can translate the
+text anyway, as long as it is translatable, but it is extremely important
+that they use exactly the same markup as the original English version.
+
+_* /{Code blocks}/
+
+Some translators decide to include the code blocks in the translated files
+because it is easier for them to identify what has already been translated
+and what has not by looking at the percentages if they use a graphical
+translation program.
+
+Include the code blocks if you want to score a 100% complete translation.
+
+On the other hand some translators prefer to leave the code blocks
+"untranslated" (i.e. not including them). This makes the translation easier
+to maintain once finished because it does not require translators
+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}/
+
+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.
+
+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.
+
+_* /{Untranslatable strings}/
+
+Translators should never translate:
+
+ - The code names of releases
+
+ - The names of programs
+
+ - 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.
+
+ - Links
+
+ - Paths
diff --git a/manual/es/user_basics.ssi b/manual/es/user_basics.ssi
index 785fd62..3970e2f 100644
--- a/manual/es/user_basics.ssi
+++ b/manual/es/user_basics.ssi
@@ -7,15 +7,14 @@ imágenes en vivo y las instrucciones para el uso de los tres tipos de
imágenes más utilizadas. El tipo de imagen más versátil, #{iso-hybrid}#, se
puede utilizar en una máquina virtual, en medios ópticos u otros dispositivo
de almacenamiento USB. En ciertos casos especiales, como para el uso de la
-persistencia («persistence» N. del T.) las imágenes #{hdd}#, pueden ser las
-más adecuadas para dispositivos USB. El capítulo termina con instrucciones
-para crear y usar una imagen de tipo #{net}#, que es un poco más complicado
-debido a la configuración necesaria en el servidor. Es un tema ligeramente
-avanzado para cualquier persona que no esté familiarizada con el arranque en
-red, pero se incluye aquí porque una vez que se realiza la instalación, es
-una forma muy conveniente para probar y desplegar imágenes de arranque en
-red local sin la molestia de tratar con los dispositivos de almacenamiento
-de la imagen.
+persistencia, las imágenes #{hdd}#, pueden ser las más adecuadas para
+dispositivos USB. El capítulo termina con instrucciones para crear y usar
+una imagen de tipo #{net}#, que es un poco más complicado debido a la
+configuración necesaria en el servidor. Es un tema ligeramente avanzado para
+cualquier persona que no esté familiarizada con el arranque en red, pero se
+incluye aquí porque una vez que se realiza la instalación, es una forma muy
+conveniente para probar y desplegar imágenes de arranque en red local sin la
+molestia de tratar con los dispositivos de almacenamiento de la imagen.
A lo largo de todo el capítulo se hace a menudo referencia al nombre de las
imágenes producidas por defecto por live-build. Si se descarga una imagen ya
@@ -129,12 +128,12 @@ Las imágenes ISO preparadas con el comando #{isohybrid}# igual que las
imágenes del tipo #{iso-hybrid}# producidas por defecto, pueden
sencillamente copiarse a una llave USB con #{dd}# o con un programa
equivalente. Conectar una llave USB con un tamaño suficiente para la imagen
-y determinar qué dispositivo es, («device» N. del T.) al cual nos
-referiremos de ahora en adelante como #{${USBSTICK}}#. Este nombre de
-«dispositivo» se refiere a la llave entera como por ejemplo #{/dev/sdb}# y
-¡No a una partición como #{/dev/sdb1}#! Se puede encontrar el nombre del
-dispositivo correcto mirando la salida de #{dmesg}# después de conectar la
-llave, o mejor aún ejecutando #{ls -l /dev/disk/by-id}#.
+y determinar qué dispositivo es, al cual nos referiremos de ahora en
+adelante como #{${USBSTICK}}#. Este nombre de «dispositivo» se refiere a la
+llave entera como por ejemplo #{/dev/sdb}# y ¡No a una partición como
+#{/dev/sdb1}#! Se puede encontrar el nombre del dispositivo correcto mirando
+la salida de #{dmesg}# después de conectar la llave, o mejor aún ejecutando
+#{ls -l /dev/disk/by-id}#.
Cuando se esté seguro de tener el nombre del dispositivo correcto, usar el
comando #{dd}# para copiar la imagen a la llave. *{¡Esto borrará de forma
@@ -142,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
diff --git a/manual/es/user_customization-binary.ssi b/manual/es/user_customization-binary.ssi
index 38a3fce..1b8ccb7 100644
--- a/manual/es/user_customization-binary.ssi
+++ b/manual/es/user_customization-binary.ssi
@@ -4,14 +4,37 @@ B~ Personalización de la imagen binaria
2~ Gestor de arranque
-live-build usa syslinux y algunos de sus derivados (en función del tipo de
-imagen) como gestores de arranque por defecto. Se puede modificar fácilmente
-algunas opciones utilizando distintos métodos, como {includes}#includes o
-{scripts gancho (hooks)}#hooks.
+live-build usa /{syslinux}/ y algunos de sus derivados (en función del
+tipo de imagen) como gestores de arranque por defecto. Se pueden
+personalizar fácilmente de formas diferentes que varían desde usar un tema
+completo a cambiar el tiempo de arranque por defecto o simplemente añadir
+una imagen splash. Algunos de los siguientes ejemplos de personalización
+usan distintos métodos, como {includes}#includes o {scripts gancho
+(hooks)}#hooks.
+
+Si se quiere usar un tema completo se puede especificar la opción
+#{--syslinux-theme}# (ver man #{lb_config}#). live-build lo descargará de la
+réplica y lo instalará.
+
+Si se desea crear un cliente progress pero se quiere usar el tema del
+servidor que incluye el menú de ayuda. Se puede configurar como se explica a
+continuación:
-Por ejemplo, estos derivados están configurados por defecto con un tiempo de
-espera de 0 (cero) lo que significa que harán una pausa indefinida en su
-pantalla de inicio hasta que se pulse una tecla.
+code{
+
+ $ lb config --mode progress --syslinux-theme progress-server
+
+}code
+
+También se puede crear un tema propio o modificar uno que ya exista y si no
+se dispone de una réplica, se puede añadir el paquete a
+#{config/packages.chroot}#. En este caso no es necesario especificar ninguna
+opción.
+
+Se pueden hacer cambios más pequeños. Por ejemplo, los derivados de syslinux
+están configurados por defecto con un tiempo de espera de 0 (cero) lo que
+significa que harán una pausa indefinida en su pantalla de inicio hasta que
+se pulse una tecla.
Para modificar el tiempo de espera de arranque de una imagen #{iso-hybrid}#
se puede editar un fichero *{isolinux.cfg}* especificando el tiempo de
@@ -42,7 +65,8 @@ code{
}code
-Para más información ver la página del manual de syslinux(1).
+Del mismo modo, si se quiere usar una splash.png personalizada basta con
+añadir una imagen de 640x480 píxeles en #{config/includes.binary/isolinux/}#
2~ Metadatos ISO
diff --git a/manual/es/user_customization-contents.ssi b/manual/es/user_customization-contents.ssi
index ef5cf6f..2fb96fa 100644
--- a/manual/es/user_customization-contents.ssi
+++ b/manual/es/user_customization-contents.ssi
@@ -5,25 +5,25 @@
Este capítulo trata, no solamente de una mera descripción de cómo
seleccionar los paquetes a incluir en el sistema en vivo, sino que además
presenta cómo hacer el «ajuste fino» de la personalización de los contenidos
-del propio sistema. Los «añadidos» (includes) permiten adjuntar o reemplazar
-cualquier fichero en la imagen Debian Live a crear, los scripts gancho
-(hooks) permiten ejecutar cualquier orden en las diferentes etapas de
-creación y en el momento del arranque y por último, la preconfiguración
-permite configurar paquetes cuando son instalados, suministrando las
-respuestas a las preguntas de debconf.
+del propio sistema. Los includes permiten adjuntar o reemplazar cualquier
+fichero en la imagen Debian Live a crear, los scripts gancho (hooks)
+permiten ejecutar cualquier orden en las diferentes etapas de creación y en
+el momento del arranque y por último, la preconfiguración permite configurar
+paquetes cuando son instalados, suministrando las respuestas a las preguntas
+de debconf.
2~includes Includes
Idealmente, un sistema Debain Live debería incluir solamente ficheros que
son obtenidos de paquetes Debian no modificados. Sin embargo, algunas veces
es conveniente incluir o modificar algún contenido mediante ficheros. La
-utilización de «añadidos» (includes) posibilita la inclusión, modificación o
-cambio de cualquier fichero en la imagen Debian Live a crear. live-build
-tiene tres mecanismos:
+utilización de includes posibilita la inclusión, modificación o cambio de
+cualquier fichero en la imagen Debian Live a crear. live-build tiene tres
+mecanismos:
_* Includes locales en chroot : Estos includes permiten incluir o reemplazar
-ficheros del entorno chroot. Para más información ver {Includes locales en
-Live/chroot}#live-chroot-local-includes
+ficheros en el sistema de ficheros chroot. Para más información ver
+{Includes locales en Live/chroot}#live-chroot-local-includes
_* Includes locales en Binary: Estos includes permiten incluir o reemplazar
ficheros en la propia imagen binaria generada. Para más información ver
@@ -41,16 +41,13 @@ Para más infomación acerca de la diferencia entre las imágenes "Live" y
Los includes locales en chroot se utilizan para incluir o reemplazar
ficheros en el sistema de ficheros Live/chroot de manera que puedan ser
-utilizados en el sistema en vivo. Una utilización típica de estos Includes
-puede ser el rellenar el directorio (#{/etc/skel}#) del sistema en vivo para
-que sea utilizado en la creación del directorio home al dar de alta usuarios
-en el sistema en vivo. Otra utilización típica es suministrar ficheros de
-configuración que puedan ser incluidos o reemplazados en la imagen sin
-necesidad de realizar proceso alguno (Los ficheros son simplemente copiados
-sin realizar ningún proceso de los mismos para adecuarlos al sistema
-concreto. N. del T); Si se necesita realizar algún procesado de estos
-ficheros ver la sección {Scripts gancho locales en
-Live/chroot}#live-chroot-local-hooks
+utilizados en el sistema en vivo. Una utilización típica de estos includes
+puede ser rellenar el directorio (#{/etc/skel}#) usado por el sistema Live
+para crear el directorio home del usuario. Otra utilización típica es
+suministrar ficheros de configuración que pueden ser incluidos o
+reemplazados en la imagen sin necesidad de realizar procesado alguno; Si se
+necesita realizar algún procesado de estos ficheros ver la sección {Scripts
+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
diff --git a/manual/es/user_customization-installer.ssi b/manual/es/user_customization-installer.ssi
index 104741b..cbdd8a7 100644
--- a/manual/es/user_customization-installer.ssi
+++ b/manual/es/user_customization-installer.ssi
@@ -55,7 +55,7 @@ kernel que utiliza #{d-i}# en la arquitectura especificada. Por ejemplo:
code{
- $ lb config --architecture i386 --linux-flavours 486 \
+ $ lb config --architectures i386 --linux-flavours 486 \
--debian-installer live
$ echo debian-installer-launcher >> config/package-lists/my.list.chroot
@@ -77,7 +77,7 @@ ejemplo, para preconfigurar la variante local a #{es_ES}# se puede hacer:
code{
- $ echo "d-i debian-installer/locale string es_ES" \
+ $ echo "d-i debian-installer/locale string en_US" \
>> config/binary_debian-installer/preseed.cfg
}code
diff --git a/manual/es/user_customization-overview.ssi b/manual/es/user_customization-overview.ssi
index 3975cc4..b507c7b 100644
--- a/manual/es/user_customization-overview.ssi
+++ b/manual/es/user_customization-overview.ssi
@@ -27,7 +27,7 @@ en {Personalización de las variantes locales e
idioma}#customizing-locale-and-language.
Las opciones de configuración en tiempo de creación se describen en la
-página del manual del comando #{lb config}#. Las opciones en tiempo de
+página de manual del comando #{lb config}#. Las opciones en tiempo de
arranque se describen en las páginas de manual de los paquetes live-boot y
live-config. Aunque los paquetes live-boot y live-config se instalan en el
sistema en vivo que se está creando, también se recomienda que sean
@@ -89,5 +89,5 @@ Los siguientes capítulos se organizan por tareas de personalización que el
usuario realiza típicamente: Los capítulos de {Personalización de la
instalación de paquetes}#customizing-package-installation, {Personalización
de contenidos}#customizing-contents y {Personalización de las variantes
-locales e idioma}#customizing-locale-and-language cubre solamente unas pocas
-de las tareas que pueden realizarse.
+locales e idioma}#customizing-locale-and-language cubren solamente unas
+pocas de las tareas que pueden realizarse.
diff --git a/manual/es/user_customization-packages.ssi b/manual/es/user_customization-packages.ssi
index e9f742c..54a7a7c 100644
--- a/manual/es/user_customization-packages.ssi
+++ b/manual/es/user_customization-packages.ssi
@@ -11,17 +11,17 @@ seleccionan la distribucion base y las áreas del archivo Debian a utilizar
son las que más influyen a la hora de conocer qué paquetes estarán
disponibles para su instalación en la imagen. Para asegurar una buena
velocidad de descarga de paquetes, se debería elegir el repositorio Debian
-más cercano. Se pueden añadir repositorios para paquetes backports,
-experimentales, paquetes personalizados o incluir ficheros de paquetes
-directamente. Se pueden definir listas de paquetes a incluir personalizadas,
-utilizar listas 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.
+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
+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.
2~ Origen de los paquetes
@@ -36,7 +36,7 @@ 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:
+*{inestable}*, Sid, se debe indicar:
code{
@@ -74,13 +74,13 @@ mundo, de manera que se puede seleccionar la réplica más cercana con el fin
de obtener la mejor velocidad de descarga. Cada una de las opciones
#{--mirror-*}# gobierna qué réplica de repositorio Debian se utiliza en las
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
+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
+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.
@@ -132,8 +132,8 @@ personalizados. Para configurar repositorios adicionales se debe crear los
ficheros #{config/archives/your-repository.list.chroot}# y/o
#{config/archives/your-repository.list.binary}#. Al igual que en las
opciones #{--mirror-*}#, estos ficheros gobiernan los repositorios
-utilizados en las etapas *chroot* y *binary* respectivamente, esto es, los
-repositorios que serán utilizados cuando se ejecute el sistema en vivo.
+utilizados en las etapas *{chroot}* y *{binary}* respectivamente, esto es,
+los repositorios que serán utilizados cuando se ejecute el sistema en vivo.
Por ejemplo, #{config/archives/live.list.chroot}# permite instalar paquetes
de las instantáneas del repositorio Debian Live en el momento de crear la
@@ -221,11 +221,11 @@ lista.
Para crear una lista para la etapa «binary» crear un fichero con el sufijo
#{.list.binary}# en #{config/package-lists/}#. Estos paquetes no son
-instalados en el sistema en vivo, pero son incluidos en él en #{pool/}#. El
-uso típico de una de estas lista sería para una de las variantes de
-instalador normal («non-live» N.del T.). Tal y como se mencionaba
-anteriormente, si se desea usar la misma lista para la etapa «chroot» basta
-con solamente añadir el sufijo #{.list}#
+instalados en el sistema en vivo, pero son incluidos en #{pool/}#. El uso
+típico de una de estas lista sería para una de las variantes de instalador
+normal («non-live» N.del T.). Tal y como se mencionaba anteriormente, si se
+desea usar la misma lista para la etapa «chroot» basta con solamente añadir
+el sufijo #{.list}#
3~ Extensión de una lista de paquetes dada mediante «includes»
@@ -254,15 +254,15 @@ prefijo #{LB_}#). En general esto significa que puede utilizarse cualquier
opción válida para #{lb config}# cambiando las letras minúsculas por
mayúsculas y los guiones por subrayados. En la práctica solamente tiene
sentido utilizar aquellas variables relacionadas con la selección de
-paquetes, como pueden ser #{DISTRIBUTION}#, #{ARCHITECTURE}# o
+paquetes, como pueden ser #{DISTRIBUTION}#, #{ARCHITECTURES}# o
#{ARCHIVE_AREAS}#.
Por ejemplo, para instalar el paquete #{ia32-libs}# si se ha especificado la
-arquitectura amd64 (#{--architecture amd64}#) se puede utilizar:
+arquitectura amd64 (#{--architectures amd64}#) se puede utilizar:
code{
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
ia32-libs
#endif
@@ -270,12 +270,12 @@ code{
En la expresión condicional pueden utilizarse varios valores. Por ejemplo
para instalar el paquete #{memtest86+}# si la arquitectura es i386
-(#{--architecture i386}#) o es amd64 (#{--architecture amd64}#) se puede
+(#{--architectures i386}#) o es amd64 (#{--architectures amd64}#) se puede
especificar:
code{
- #if ARCHITECTURE i386 amd64
+ #if ARCHITECTURES i386 amd64
memtest86+
#endif
@@ -298,10 +298,7 @@ Es habitual que una condición incluya una directiva «include»:
code{
- #if ARCHITECTURE amd64
- #include <gnome-full>
- #endif
-
+
}code
No se permite el anidamiento de estructuras condicionales.
@@ -425,10 +422,10 @@ es usar #{dpkg-name}#.
El método #{packages.chroot}# para la instalación de paquetes personalizados
tiene desventajas:
-_* No es posible utilizar APT seguro.
+_* No es posible utilizar secure APT.
-_* Se deben depositar todos los paquetes necesarios para cumplir
-dependencias en el directorio #{config/packages.chroot/}#.
+_* Se deben depositar todos los paquetes apropiados en el directorio
+#{config/packages.chroot/}#.
_* No es adecuado para almacenar configuraciones de Debian Live en un
control de versiones.
@@ -498,7 +495,7 @@ code{
3~ Ajuste de APT para ahorrar espacio
-En ocasiones será necesario ahorrar algún espacio en el medio de
+En ocasiones es necesario ahorrar un poco de espacio en el medio de
instalación. Las dos opciones descritas a continuación pueden ser de
interes.
diff --git a/manual/es/user_customization-runtime.ssi b/manual/es/user_customization-runtime.ssi
index d517934..1d302ea 100644
--- a/manual/es/user_customization-runtime.ssi
+++ b/manual/es/user_customization-runtime.ssi
@@ -6,7 +6,7 @@ tiempo de ejecución.
Toda la configuración que se hace en tiempo de ejecución es realizada por
live-config. Éstas son algunas de las opciones más comunes de live-config en
las que los usuarios están más interesados. Se puede encontrar una lista
-completa de todas las posibilidades en la página del manual de live-config.
+completa de todas las posibilidades en la página de manual de live-config.
2~ Personalización del usuario por defecto del sistema en vivo
@@ -42,7 +42,7 @@ en la configuración:
code{
-$ lb config --bootappend-live "username=live-user"
+ $ lb config --bootappend-live "username=live-user"
}code
@@ -76,7 +76,7 @@ code{
}code
Este parámetro también se puede utilizar en la línea de comandos del
-kernel. Se puede especificar una variante local usando una palabra completa
+kernel. Se puede especificar una variante local de esta forma:
#{language_country.encoding}#.
Tanto la configuración del teclado de la consola y del entorno gráfico X
@@ -129,7 +129,7 @@ code{
}code
-2~persistence Persistencia (Modo guardar cambios)
+2~persistence Persistencia
Un paradigma de un cd en vivo («live cd» N. del T.) es ser un sistema
pre-instalado que funciona desde medios de almacenamiento de sólo lectura,
@@ -142,38 +142,63 @@ 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 (o modo guardar cambios) es un nombre común que se dá 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 almacenamiento de sólo lectura, las modificaciones de
-los ficheros y 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.
+La persistencia es un nombre común que se dá 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
+almacenamiento de sólo lectura, las modificaciones de los ficheros y
+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 disco duro, una memoria USB, un recurso compartido de red o
-incluso en una sesión de un CD/DVD regrabable en multisesión. Todos estos
+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}#.
-3~ Persistencia total
+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. discos duros, llaves USB) volúmenes con persistencia durante el
+arranque. Un volumen persistente es cualquiera de los siguientes:
+
+_* una partición, identificada por su nombre GPT.
+
+_* Un sistema de ficheros, identificado por su etiqueta de sistema de
+ficheros.
+
+_* 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".
+
+Es posible restringir qué tipos de volúmenes persistentes se pueden usar
+especificando ciertos parámetros de arranque descritos en la página del
+manual de live-boot(7). Las "etiquetas identificadoras" referidas
+anteriormente pueden ser cualquiera de las siguientes:
+
+_* #{full-ov}# para capas de persistencia total.
+
+_* #{custom-ov}# para capas personalizadas.
+
+_* #{live-sn}# para instantáneas del sistema entero.
+
+_* #{home-sn}# para instantáneas de /home.
+
+3~ Capas de persistencia total
Por «Persistencia total» se entiende la utilización de una partición de
escritura en lugar de usar un tmpfs (sistema de ficheros temporal) para
-guardar los cambios realizados a los medios de sólo lectura (con el sistema
-copiar-al-escribir o COW «copy-on-write» N. del T.). Para utilizar esta
-función se debe crear una partición grabable vacía con la etiqueta «live-rw»
-formateada con un sistema de ficheros compatible en el medio usado para
-arracar el sistema en vivo. En el momento de arrancar se debe iniciar el
-sistema con el parámetro de arranque 'persistent'. Esta partición puede ser
-una partición ext2 en el disco duro o en una memoria USB creada con, por
-ejemplo:
+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
+con. p.ej:
code{
- # mkfs.ext2 -L live-rw /dev/sdb1
+ # mkfs.ext2 -L full-ov /dev/sdb1
}code
@@ -184,70 +209,95 @@ etiqueta con uno de los siguientes:
code{
- # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems
+ $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems
}code
-Pero ya que los usuarios de un sistema en vivo no siempre pueden utilizar
-una partición del disco duro, y teniendo en cuenta que la mayoría de
-memorias USB tienen velocidades de escritura lentas, la persistencia total
-también puede ser usada con ficheros imagen, de este modo se puede crear un
-fichero que represente una partición y poner ese fichero imagen incluso en
-una partición NTFS de un sistema operativo no nativo, con algo similar a
-esto:
+Un ejemplo de cómo crear un fichero imagen basado en ext2 usando
+persistencia total.
code{
- $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file
- $ /sbin/mkfs.ext2 -F live-rw
+ $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file
+ $ /sbin/mkfs.ext2 -F full-ov
}code
-A continuación, copiar el fichero #{live-rw}# a un partición grabable y
-reiniciar el sistema con el parámetro de arranque «persistent».
+A continuación, copiar el fichero #{full-ov}# en una partición grabable y
+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.
+
+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:
-3~ Montar Home de forma automática
+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
+
+}code
-Si durante el arranque se encuentra una partición (sistema de ficheros) con
-un fichero imagen o una partición con la etiqueta #{home-rw}# el sistema de
-ficheros será montado de forma automática como #{/home}#, lo que permite la
-persistencia de los ficheros que pertenecen a, por ejemplo, el usuario por
-defecto. Se puede combinar con persistencia total.
+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.
+
+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).
3~ Instantáneas
Las instantáneas son colecciones de ficheros y directorios que no se montan
-durante la ejecución, pero que se copian desde un dispositivo persistente al
+durante la ejecución, pero que se copian desde un volumen persistente al
sistema (tmpfs) en el arranque y que se resincroniza en el reinicio/apagado
-del sistema. El contenido de una instantánea puede residir en una partición
-o en un fichero imagen (como los tipos mencionados anteriormente) con la
-etiqueta #{live-sn}#, pero el valor predeterminado es un archivo cpio simple
-denominado #{live-sn.cpio.gz}#. Como en el caso anterior, en el momento del
-arranque los dispositivos conectados al sistema se recorren buscando una
-partición o un fichero llamado así. Una interrupción de la alimentación en
-tiempo de ejecución podría conducir a la pérdida de datos, por lo tanto, se
-puede usar la herramienta #{live-snapshot --refresh}# para sincronizar
-cambios importantes. Este tipo de persistencia es la menos agresiva con
-dispositivos tipo flash y el más rápido de todos los sistemas de
-persistencia, ya que no escribe continuamente en los medios de
-almacenamiento.
+del sistema. El volumen debe tener la etiqueta #{live-sn}#, y su valor
+predeterminado es un simple archivo cpio denominado #{live-sn.cpio.gz}#. Una
+interrupción del suministro eléctrico en tiempo de ejecución podría conducir
+a la pérdida de datos, por lo tanto, se puede usar la herramienta
+#{live-snapshot --refresh}# para sincronizar cambios importantes. Este tipo
+de persistencia es la menos agresiva con los dispositivos tipo flash y el
+más rápido de todos los sistemas de persistencia, ya que no escribe
+continuamente en los medios de almacenamiento, pero ocupa tanta RAM como el
+tamaño de la instantánea sin comprimir.
Existe también una versión de la instantánea /home y su etiqueta es
#{home-sn.*}#; que funciona igual que la instantánea principal, pero sólo se
aplica a /home.
-Las instantáneas actualmente no pueden manejar el borrado de ficheros pero
-la persistencia total y el montaje automático sí pueden.
+Las instantáneas no pueden manejar el borrado de ficheros.
3~ SubText persistente
Si un usuario necesita un almacenamiento persistente múltiple del mismo tipo
-para diferentes lugares o pruebas, tales como #{live-rw-nonwork}# y
-#{live-rw-work}#, el parámetro de arranque #{persistent-subtext}# usado
+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 persistentes múltiples pero únicos. Un ejemplo sería si un
+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 de: #{persistent}#
+#{live-sn-subText}# usaría los parámetros de arranque: #{persistent}#
#{persistent-subtext=subText}#.
3~ Remasterización parcial
diff --git a/manual/es/user_examples.ssi b/manual/es/user_examples.ssi
index 2850ecc..b02d079 100644
--- a/manual/es/user_examples.ssi
+++ b/manual/es/user_examples.ssi
@@ -4,7 +4,7 @@
Este capítulo ofrece ejemplos de creación de imágenes para casos de uso
específicos de Debian Live. Si se es nuevo en la creación de una imagen
-propia de Debian Live, se recomienda mirar primero a los tres tutoriales en
+propia de Debian Live, se recomienda leer primero los tres tutoriales en
secuencia, ya que cada uno enseña nuevas técnicas que ayudan a utilizar y
entender los ejemplos restantes.
@@ -141,7 +141,7 @@ code{
#!/bin/sh
lb config noauto \
- --architecture i386 \
+ --architectures i386 \
--linux-flavours 686-pae \
--package-lists lxde \
"${@}"
@@ -156,7 +156,7 @@ code{
}code
-En primer lugar con #{--architecture i386}# se asegura de que en nuestro
+En primer lugar con #{--architectures i386}# se asegura de que en nuestro
sistema de creación #{amd64}# se crea una versión de 32-bits adecuada para
ser usada en la mayoría de máquinas. En segundo lugar, se usa
#{--linux-flavours 686-pae}# porque no se espera usar esta imagen en
@@ -212,8 +212,7 @@ Añadir ahora el paquete #{vlc}# a nuestra lista de paquetes local en
code{
- $ echo vlc >> config/package-lists/my.list.chroot
-
+
}code
Crear de nuevo:
@@ -292,7 +291,7 @@ code{
}code
-Disfrutar.
+Disfrutarlo.
2~ Una imagen básica para un pendrive USB de 128M
@@ -361,8 +360,7 @@ tasksel-data, para proceder, asegurarse de tener ambas cosas:
code{
- # apt-get install dctrl-tools tasksel-data
-
+
}code
Ahora podemos buscar las tareas apropiadas, primero con:
diff --git a/manual/es/user_installation.ssi b/manual/es/user_installation.ssi
index 0b7d15b..72abc83 100644
--- a/manual/es/user_installation.ssi
+++ b/manual/es/user_installation.ssi
@@ -30,7 +30,7 @@ _* Desde el repositorio Debian
_* A partir del código fuente
-_* Desde «instantáneas»
+_* Usando instantáneas
Si se usa Debian, el método recomendado es instalar live-build a través del
repositorio de Debian.
@@ -108,12 +108,13 @@ puede usar instantáneas. Estas se generan automáticamente a partir de la
2~ live-boot y live-config
-*{Nota:}* No es necesario instalar live-boot o live-config en el sistema para crear sistemas personalizados de Debian Live. Sin embargo, eso no causará ningún daño y es útil por motivos de referencia. Si únicamente se desea tener la documentación, es posible instalar los paquetes live-boot-doc y live-config-doc de forma independiente.
+*{Nota:}* No es necesario instalar live-boot o live-config en el sistema para crear sistemas personalizados de Debian Live. Sin embargo, eso no causará ningún daño y es útil por motivos de referencia. Si únicamente se desea tener la documentación, es posible instalar los paquetes /{live-boot-doc}/ y /{live-config-doc}/ de forma independiente.
3~ Desde el repositorio Debian.
Tanto live-boot como live-config están disponibles en el repositorio Debian
-siguiendo la {Instalación de live-build}#installing-live-build.
+siguiendo un procedimiento similar al explicado en la {Instalación de
+live-build}#installing-live-build.
3~ A partir del código fuente
diff --git a/manual/es/user_managing_a_configuration.ssi b/manual/es/user_managing_a_configuration.ssi
index 053af55..ff8a810 100644
--- a/manual/es/user_managing_a_configuration.ssi
+++ b/manual/es/user_managing_a_configuration.ssi
@@ -52,12 +52,12 @@ realizar algún ajuste manual en los ficheros de configuración).
2~ Un ejemplo de scripts auto.
Se debe utilizar scripts auto similares a los ejemplos que se muestran a
-continuación como punto de partida para nueva configuración de las
-herramientas live-build. Hay que hacer notar que, cuando se ejecuta el
+continuación como punto de partida para una nueva configuración de la
+herramienta live-build. Hay que hacer notar que, cuando se ejecuta el
comando #{lb}# dentro del script auto, se debe especificar la opción
-#{noauto}# para asegurar que el script auto no es vuelto a ejecutar
-repetitivamente. Tampoco se debe olvidar el asegurar que los scripts auto
-deben ser ejecutables (por ejemplo #{chmod 755 auto/*}#).
+#{noauto}# para asegurar que el script auto no se vuelve a ejecutar
+repetitivamente. Tampoco se debe olvidar asegurarse de que los scripts auto
+sean ejecutables (por ejemplo #{chmod 755 auto/*}#).
#{auto/config}#
@@ -102,8 +102,7 @@ code{
Se puede editar el script #{auto/config}#, modificándolo o añadiendo
cualquier opción que se acomode a las necesidades requeridas. En el ejemplo
-anterior, se asignará la opción #{--package-lists standard}# como si fuese
-asignada por defecto. Se puede cambiar este valor a uno adecuado o
-simplemente eliminarlo si no es necesario añadiendo cualquier otra opción
-que se adecue a las necesidades requeridas por la imagen a crear, en líneas
-como las siguientes.
+anterior, se asigna la opción por defecto #{--package-lists standard}#. Se
+puede cambiar este valor por uno adecuado o simplemente eliminarlo si no es
+necesario, añadiendo en las líneas siguientes cualquier otra opción que se
+adecue a las necesidades requeridas para la imagen a crear.
diff --git a/manual/es/user_overview.ssi b/manual/es/user_overview.ssi
index da8e769..fbab7e2 100644
--- a/manual/es/user_overview.ssi
+++ b/manual/es/user_overview.ssi
@@ -15,7 +15,7 @@ La idea detrás de live-build es ser un marco (framework) que utiliza un
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 las del paquete de herramientas de Debian
+Muchos conceptos son similares a los del paquete de herramientas de Debian
debhelper escrito por Joey Hess:
_* Los scripts tienen una ubicación central para la configuración de su
@@ -62,8 +62,9 @@ forma de esqueleto #{auto/}#:
code{
$ lb config
+ [2012-03-19 15:17:14] lb_config
P: Considering defaults defined in /etc/live/build.conf
- P: Creating config tree
+ P: Creating config tree for a debian system
}code
@@ -85,11 +86,11 @@ Es posible especificar muchas opciones, tales como:
code{
- $ lb config --binary-images net --hostname live-machine --username live-user ...
+ $ lb config --binary-images net --bootappend-live "hostname=live-machine username=live-user" ...
}code
-Una lista completa de opciones está disponible en la página del manual
+Una lista completa de opciones está disponible en la página de manual
#{lb_config}#.
3~lb-build El comando #{lb build}#
diff --git a/manual/fr/about_manual.ssi b/manual/fr/about_manual.ssi
index 6afd52d..ffa488c 100644
--- a/manual/fr/about_manual.ssi
+++ b/manual/fr/about_manual.ssi
@@ -3,12 +3,13 @@
1~about-manual À propos de ce manuel
L'objectif principal de ce manuel est servir de point d'accès unique à tous
-les documents liés au projet Debian Live. Tandis qu'il est principalement
-sur vous aider à construire un système Live et non pas sur des sujets de
-l'utilisateur final, un utilisateur final peut trouver des informations
-utiles dans ces sections: {Les Bases}#the-basics couvrent la préparation des
-images pour être démarrées à partir des supports ou depuis le réseau, et
-{Personnalisation des comportements au moment de
+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.
@@ -51,16 +52,16 @@ 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
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 depuis le
+des clés USB. Certains systèmes peuvent également être démarrés sur le
réseau.
_* *{Debian Live}*: Le sous-projet Debian qui maintient les paquets
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 lancé depuis 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}#).
+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}#).
_* *{Système hôte}*: L'environnement utilisé pour créer le système live.
@@ -75,7 +76,7 @@ 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 de démarrage. live-config faisait
+système live durant le processus d'amorçage. live-config faisait
initialement partie de live-initramfs.
_* *{live-manual}*: Ce document est maintenu dans un paquet nommé
@@ -84,8 +85,8 @@ live-manual.
_* *{Debian Installer (d-i)}*: Le système d'installation officiel pour la
distribution Debian.
-_* *{Paramètres de démarrage}*: 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 pouvant ê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
@@ -145,8 +146,8 @@ _* Trent W. Buck
Ce manuel est conçu comme un projet communautaire et toutes les propositions
d'améliorations et de contributions sont bienvenues. La meilleure façon de
-soumettre une contribution est de l'envoyer à la liste de diffusion. S'il
-vous plaît voir {Contact}#contact pour plus d'informations.
+soumettre une contribution est l'envoyer à la liste de diffusion. S'il vous
+plaît voir {Contact}#contact pour plus d'informations.
Lorsque vous soumettez une contribution, veuillez indiquer clairement le
copyright et inclure la mention légale relative à la licence. Notez que pour
@@ -172,8 +173,8 @@ code{
}code
-Vous pouvez compiler live-manual depuis le répertoire racine de votre Git
-checkout en exécutant:
+Vous pouvez compiler live-manual dans le répertoire de niveau supérieur de
+votre Git checkout en exécutant:
code{
@@ -209,10 +210,10 @@ code{
3~ Appliquer des modifications
-Les contributions directes au référentiel sont possibles pour tout le
-monde. Cependant, nous vous demandons d'envoyer les changements importants
-sur la liste de diffusion au préalable. Afin de faire un push sur le
-référentiel, les étapes suivantes sont nécessaires.
+Les contributions au dépôt sont possibles pour tout le monde. Cependant,
+nous vous demandons d'envoyer les changements importants sur la liste de
+diffusion au préalable. Afin de faire un push au dépôt, les étapes suivantes
+sont nécessaires.
_* Téléchargez la clé publique:
@@ -253,8 +254,8 @@ _* Notez que vous devez livrer des changements sur la branche debian-next,
pas sur la branche debian.
_* Après édition des fichiers dans #{manual/en/}#, veuillez appeler 'commit'
-dans le dossier racine du répertoire afin de nettoyer les fichier et de
-mettre à jour les fichiers de traduction:
+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{
@@ -273,8 +274,8 @@ code{
_* Après le nettoyage et d'ajouter les fichiers, soumettre les
modifications. Veuillez écrire les commentaires de commit à l'aide de
phrases complètes, en commençant par une majuscule et en terminant par un
-point, et en commençant par 'Fixing/Adding/Removing/Correcting/Translating',
-par exemple
+point, et avec la forme 'Fixing/Adding/Removing/Correcting/Translating', par
+exemple
code{
@@ -290,7 +291,7 @@ code{
}code
-3~ Traduction
+3~translation Traduction
Pour soumettre une traduction pour une nouvelle langue, suivez ces trois
étapes:
diff --git a/manual/fr/about_project.ssi b/manual/fr/about_project.ssi
index 7d47451..a2c87df 100644
--- a/manual/fr/about_project.ssi
+++ b/manual/fr/about_project.ssi
@@ -55,9 +55,9 @@ _* Il utilise un noyau Debian inchangé sans correctifs supplémentaires.
3~ Seulement des paquets inchangés de Debian «main»
-Nous seulement utiliserons les paquets du référentiel de Debian dans la
-section «main ». La section non-free ne fait pas partie de Debian et ne peut
-donc pas être utilisée pour les images officiels du système live.
+Nous seulement utiliserons les paquets du dépôt Debian dans la section «main
+». La section non-free ne fait pas partie de Debian et ne peut donc pas être
+utilisée pour les images officiels du système live.
Nous ne changerons pas les paquets. Chaque fois que nous avons besoin de
changer quelque chose, nous le ferons en coordination avec le responsable du
@@ -65,9 +65,8 @@ paquet dans Debian.
À titre d'exception, nos propres paquets tels que live-boot, live-build ou
live-config peuvent être utilisés temporairement à partir de notre propre
-référentiel pour raisons de développement (par exemple pour créer des
-instantanés de développement). Ils seront téléchargés sur Debian
-régulièrement.
+dépôt pour raisons de développement (par exemple pour créer des instantanés
+de développement). Ils seront téléchargés sur Debian régulièrement.
3~ Pas de configuration des paquets du système live
@@ -88,8 +87,8 @@ 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
-aussi minimes que possible et devraient être fusionnées au sein du
-référentiel Debian s'il est possible.
+aussi minimes que possible et devraient être fusionnées au sein du dépôt
+Debian s'il est possible.
2~contact Contact
@@ -110,8 +109,3 @@ 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.
-
-_* *{Wiki}*: Le wiki Debian Live à http://wiki.debian.org/DebianLive est un
-lieu pour recueillir des informations, discuter des technologies appliquées,
-et structures des systèmes Debian Live qui vont au-delà de la portée de ce
-document.
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index 776d785..21f51d2 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -9,7 +9,7 @@
: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-02-06
+ :published: 2012-04-03
@publisher: Debian Live Project <debian-live at lists.debian.org>
@@ -60,3 +60,7 @@
:B~ Exemples
<< user_examples.ssi
+
+:B~ Appendix
+
+<< style_guide.ssi
diff --git a/manual/fr/project_bugs.ssi b/manual/fr/project_bugs.ssi
index dd25ee5..05eddc8 100644
--- a/manual/fr/project_bugs.ssi
+++ b/manual/fr/project_bugs.ssi
@@ -43,7 +43,7 @@ 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 à partir de
+*{testing}* et fixer la nouvelle version du paquet qui échoue de
*{unstable}* (voir {APT pinning}#apt-pinning pour plus de détails).
2~ Reconstruire à partir de zéro
@@ -54,17 +54,17 @@ système live à partir de zéro pour voir si le bogue est reproductible.
2~ Utilisez paquets mises à jour
-L'utilisation de paquets obsolètes peut causer d'importants problèmes en
+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.
2~collect-information Recueillir l'information
-S'il vous plaît fournir assez d'informations à votre rapport. Inclure au
+S'il vous plaît fournir assez d'informations à votre rapport. Incluez au
moins la version exacte de live-build où le bogue est rencontré et les
mesures pour le reproduire. S'il vous plaît utilisez votre bon sens et
-inclure d'autres renseignements pertinents, si vous pensez que cela pourrait
+incluez d'autres renseignements pertinents, si vous pensez que cela pourrait
aider à résoudre le problème.
Pour tirer le meilleur parti de votre rapport de bogue, nous avons besoin
@@ -132,11 +132,11 @@ Où est-ce que le bogue apparaît?
3~ Au moment de la construction tandis l'amorçage
-live-build amorce (bootstrap) 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é à l'outil d'amorçage lui-même.
+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 à
+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
Debian lui-même que nous ne pouvons résoudre directement. S'il vous plaît
@@ -156,8 +156,8 @@ 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 depuis
-un miroir officiel.
+problème, s'il vous plaît toujours le reproduire d'abord en amorçant sur un
+miroir officiel.
3~ Au moment du démarrage
@@ -179,7 +179,7 @@ système Live, c'est probablement un bogue dans Debian Live. Cependant,
Avant de présenter le bogue, s'il vous plaît recherchez sur le web pour 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 ya toujours une chance qu'il a été discuté
+problème particulier, il y a toujours une chance qu'il a été discuté
ailleurs, et une solution possible, un correctif, ou une solution de
contournement a été proposé.
@@ -198,7 +198,7 @@ Le projet Debian Live conserve la trace de tous les bogues dans le système
Debian Bug Tracking System (BTS). Pour plus d'informations sur la façon
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}#
-à partir du paquet du même nom.
+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
@@ -208,6 +208,6 @@ 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
+de Debian (comme Ubuntu et autres) *{ne}* doivent *{pas}* être rapportés au
BTS de Debian, sauf qu'ils peuvent être également reproduits sur un système
Debian en utilisant les paquets Debian officiels.
diff --git a/manual/fr/project_coding-style.ssi b/manual/fr/project_coding-style.ssi
index de25f9c..8dd38b9 100644
--- a/manual/fr/project_coding-style.ssi
+++ b/manual/fr/project_coding-style.ssi
@@ -7,7 +7,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
-Bash. Par exemple, l'utilisation de structures de tableau.
+Bash. Par exemple, l'utilisation d'arrays.
_* N'utiliser que le sous-ensemble POSIX - par exemple, utiliser $(foo) au
lieu de `foo`.
diff --git a/manual/fr/style_guide.ssi b/manual/fr/style_guide.ssi
new file mode 100644
index 0000000..8b01cc3
--- /dev/null
+++ b/manual/fr/style_guide.ssi
@@ -0,0 +1,371 @@
+:B~ Appendix
+
+1~style-guide Style guide
+
+2~ Guidelines for authors
+
+This section deals with some general considerations to be taken into account
+when writing technical documentation for live-manual. They are divided into
+linguistic features and recommended procedures.
+
+*{Note:}* Authors should first read {Contributing to this document}#how-to-contribute
+
+3~ Linguistic features
+
+_* /{Use plain English}/
+
+Keep in mind that a high percentage of your readers are not native
+speakers. So as a general rule try to use short, meaningful sentences,
+followed by a full stop.
+
+This does not mean that you have to use a simplistic, naive style. It is a
+suggestion to try to avoid, as much as possible, complex subordinate
+sentences that make the text difficult to understand for non-native
+speakers.
+
+_* /{Variety of English}/
+
+The most widely spread varieties of English are British and American so it
+is very likely that most authors will use either one or the other. In a
+collaborative environment, the ideal variety would be "International
+English" but it is very difficult, not to say impossible, to decide on which
+variety among all the existing ones, is the best to use.
+
+We expect that different varieties may mix without creating
+misunderstandings but in general terms you should try to be coherent and
+before deciding on using British, American or any other English flavour at
+your discretion, please take a look at how other people write and try to
+imitate them.
+
+_* /{Be balanced}/
+
+Do not be biased. Avoid including references to ideologies completely
+unrelated to live-manual. Technical writing should be as neutral as
+possible. It is in the very nature of scientific writing.
+
+_* /{Be politically correct}/
+
+Try to avoid sexist language as much as possible. If you need to make
+references to the third person singular preferably use "they" rather than
+"he" or "she" or awkward inventions such as "s/he", "s(he)" and the like.
+
+_* /{Be concise}/
+
+Go straight to the point and do not wander around aimlessly. Give as much
+information as necessary but do not give more information than necessary,
+this is to say, do not explain unnecessary details. Your readers are
+intelligent. Presume some previous knowledge on their part.
+
+_* /{Minimize translation work}/
+
+Keep in mind that whatever you write will have to be translated into several
+other languages. This implies that a number of people will have to do an
+extra work if you add useless or redundant information.
+
+_* /{Be coherent}/
+
+As suggested before, it is almost impossible to standardize a collaborative
+document into a perfectly unified whole. However, every effort on your side
+to write in a coherent way with the rest of the authors will be appreciated.
+
+_* /{Be cohesive}/
+
+Use as many text-forming devices as necessary to make your text cohesive and
+unambiguous. (Text-forming devices are linguistic markers such as
+connectors).
+
+_* /{Be descriptive}/
+
+It is preferable to describe the point in one or several paragraphs than
+merely using a number of sentences in a typical "changelog" style. Describe
+it! Your readers will appreciate it.
+
+_* /{Dictionary}/
+
+Look up the meaning of words in a dictionary or encyclopedia if you do not
+know how to express certain concepts in English. But keep in mind that a
+dictionary can either be your best friend or can turn into your worst enemy
+if you do not know how to use it correctly.
+
+English has the largest vocabulary that exists (With over one million
+words). Many of these words are borrowings from other languages. When
+looking up the meaning of words in a bilingual dictionary the tendency of a
+non-native speaker is to choose the one that sounds more similar in their
+mother tongue. This often turns into an excessively formal discourse which
+does not sound quite natural in English.
+
+As a general rule, if a concept can be expressed using different synonyms,
+it is a good advice to choose the first word proposed by the dictionary. If
+in doubt, choosing words of Germanic origin (Usually monosyllabic words) is
+often the right thing to do. Be warned that these two techniques might
+produce a rather informal discourse but at least your choice of words will
+be of wide use and generally accepted.
+
+Using a dictionary of collocations is recommended. They are extremely
+helpful when it comes to know which words usually occur together.
+
+Again it is a good practice to learn from the work of others. Using a search
+engine to check how other authors use certain expressions may help a lot.
+
+_* /{False friends, idioms and other idiomatic expressions}/
+
+Watch out for false friends. No matter how proficient you are in a foreign
+language you cannot help falling from time to time in the trap of the so
+called "false friends", words that look similar in two languages but whose
+meanings or uses might be completely different.
+
+Try to avoid idioms as much as possible. "Idioms" are expressions that may
+convey a completely different meaning from what their individual words seem
+to mean. Sometimes, idioms are difficult to understand even for native
+speakers!
+
+_* /{Avoid slang, abbreviations, contractions...}/
+
+Even though you are encouraged to use plain, everyday English, technical
+writing belongs to the formal register of the language.
+
+Try to avoid slang, unusual abbreviations that are difficult to understand
+and above all contractions that try to imitate the spoken language. Not to
+mention typical irc and family friendly expressions.
+
+3~ Procedures
+
+_* /{Test before write}/
+
+It is important that authors test their examples before adding them to
+live-manual to ensure that everything works as described. Testing on a clean
+chroot or VM can be a good starting point. Besides, it would be ideal if the
+tests were then carried out on different machines with different hardware to
+spot possible problems that may arise.
+
+_* /{Examples}/
+
+When providing an example try to be as specific as you can. An example is,
+after all, just an example.
+
+It is often better to use a line that only applies to an specific case than
+using abstractions that may confuse your readers. In this case you can
+provide a brief explanation of the effects of the proposed example.
+
+There may be some exceptions when the example suggests using some
+potentially dangerous commands that, if misused, may cause data loss or
+other similar undesirable effects. In this case you should provide a
+thorough explanation of the possible side effects.
+
+_* /{External links}/
+
+Links to external sites should only be used when the information on those
+sites is crucial when it comes to understanding a special point. Even so,
+try to use links to external sites as sparsely as possible. Internet links
+are likely to change from time to time resulting in broken links and leaving
+your arguments in an incomplete state.
+
+Besides, people who read the manual offline will not have the chance to
+follow those links.
+
+_* /{Avoid branding and things that violate the license under which the
+manual is published}/
+
+Try to avoid branding as much as possible. Keep in mind that other
+downstream projects might make use of the documentation you write. So you
+are complicating things for them if you add certain specific material.
+
+live-manual is licensed under the GNU GPL. This has a number of implications
+that apply to the distribution of the material (of any kind, including
+copyrighted graphics or logos) that is published with it.
+
+_* /{Write a first draft, revise, edit, improve, redo if necessary}/
+
+ - Brainstorm!. You need to organize your ideas first in a logical sequence
+ of events.
+
+ - Once you have somehow organized those ideas in your mind write a first
+ draft.
+
+ - Revise grammar, syntax and spelling.
+
+ - Improve your statements and redo any part if necessary.
+
+_* /{Chapters}/
+
+Use the conventional numbering system for chapters and subtitles. e.g. 1,
+1.1, 1.1.1, 1.1.2 ... 1.2, 1.2.1, 1.2.2 ... 2, 2.1 ... and so on. See markup
+below.
+
+If you have to enumerate a series of steps or stages in your description,
+you can also use ordinal numbers: First, second, third ... or First, Then,
+After that, Finally ... Alternatively you can use bulleted items.
+
+_* /{Markup}/
+
+And last but not least, live-manual uses {SiSU}http://www.sisudoc.org to
+process the text files and produce a multiple format output. It is
+recommended to take a look at {SiSU's
+manual}http://www.sisudoc.org/sisu/sisu_manual/markup.html to get familiar
+with its markup, or else type:
+
+code{
+
+ $ sisu --help markup
+
+}code
+
+Here are some markup examples that may prove useful:
+
+ - For emphasis/bold text:
+
+code{
+
+*{foo}* or !{foo}!
+
+}code
+
+produces: *{foo}* or !{foo}!. Use it to emphasize certain key words.
+
+ - For italics:
+
+code{
+
+/{foo}/
+
+}code
+
+produces: /{foo}/. Use them e.g. for the names of debian packages.
+
+ - For monospace:
+
+code{
+
+#{foo}#
+
+}code
+
+produces: #{foo}#. Use it e.g. for the names of commands. And also to
+highlight some key words or things like paths.
+
+ - For code blocks:
+
+code{
+
+ code{
+
+ $ foo
+ # bar
+
+ }code
+
+}code
+
+produces:
+
+code{
+
+ $ foo
+ # bar
+
+}code
+
+Use #{code{}# to open and #{}code}# to close the tags. It is important to
+remember to leave a space at the beginning of each line of code.
+
+2~ Guidelines for translators
+
+This section deals with some general considerations to be taken into account
+when translating the contents of live-manual.
+
+As a general recommendation, translators should have read and understood the
+translation rules that apply to their specific languages. Usually,
+translation groups and mailing lists provide information on how to produce
+translated work that complies with Debian quality standards.
+
+*{Note:}* Translators should also read {Contributing to this document}#how-to-contribute. In particular the section {Translation}#translation
+
+3~ Translation hints
+
+_* /{Comments}/
+
+The role of the translator is to convey as faithfully as possible the
+meaning of words, sentences, paragraphs and texts as written by the original
+authors into their target language.
+
+So they should refrain from adding personal comments or extra bits of
+information of their own. If they want to add a comment for other
+translators working on the same documents, they can leave it in the space
+reserved for that. That is, the header of the strings in the *{po}* files
+preceded by a number sign *{#}*. Most graphical translation programs can
+automatically handle those types of comments.
+
+_* /{TN, Translator's Note}/
+
+It is perfectly acceptable however, to include a word or an expression in
+brackets in the translated text if, and only if, that makes the meaning of a
+difficult word or expression clearer to the reader. Inside the brackets the
+translator should make evident that the addition was theirs using the
+abbreviation "TN" or "Translator's Note".
+
+_* /{Impersonal sentences}/
+
+Documents written in English make an extensive use of the impersonal form
+"you". In some other languages that do not share this characteristic, this
+might give the false impression that the original texts are directly
+addressing the reader when they are actually not doing so. Translators must
+be aware of that fact and reflect it in their language as accurately as
+possible.
+
+_* /{False friends}/
+
+The trap of "false friends" explained before especially applies to
+translators. Double check the meaning of suspicious false friends if in
+doubt.
+
+_* /{Markup}/
+
+Translators working initially with *{pot}* files and later on with *{po}*
+files will find many markup features in the strings. They can translate the
+text anyway, as long as it is translatable, but it is extremely important
+that they use exactly the same markup as the original English version.
+
+_* /{Code blocks}/
+
+Some translators decide to include the code blocks in the translated files
+because it is easier for them to identify what has already been translated
+and what has not by looking at the percentages if they use a graphical
+translation program.
+
+Include the code blocks if you want to score a 100% complete translation.
+
+On the other hand some translators prefer to leave the code blocks
+"untranslated" (i.e. not including them). This makes the translation easier
+to maintain once finished because it does not require translators
+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}/
+
+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.
+
+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.
+
+_* /{Untranslatable strings}/
+
+Translators should never translate:
+
+ - The code names of releases
+
+ - The names of programs
+
+ - 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.
+
+ - Links
+
+ - Paths
diff --git a/manual/fr/user_basics.ssi b/manual/fr/user_basics.ssi
index 1397d66..0bea152 100644
--- a/manual/fr/user_basics.ssi
+++ b/manual/fr/user_basics.ssi
@@ -21,7 +21,7 @@ Tout au long du chapitre, nous ferons souvent référence à la valeur par
défaut des noms de fichiers produits par live-build. Si vous téléchargez une
image précompilée les noms de fichiers peuvent varier.
-2~what-is-live Qu'est-ce qu'un système live?
+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é
@@ -121,7 +121,7 @@ code{
}code
-3~copying-iso-hybrid-to-usb Copie d'un image ISO hybride sur une clé USB
+3~copying-iso-hybrid-to-usb Copie d'une image ISO hybride sur une clé USB
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
@@ -130,11 +130,11 @@ une capacité suffisamment grande pour votre fichier image et déterminez quel
dispositif il 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 dans la sortie de #{dmesg}# après avoir branché le dispositif,
-ou mieux encore, #{ls -l /dev/disk/by-id}#.
+en regardant la sortie de #{dmesg}# après avoir branché le dispositif, ou
+mieux encore, #{ls -l /dev/disk/by-id}#.
Une fois que vous êtes sûr d'avoir le nom correct de l'appareil, utilisez la
-commande #{dd}# pour copier l'image sur le clé. *{Ceci écrasera tout fichier
+commande #{dd}# pour copier l'image sur la clé. *{Ceci écrasera tout fichier
déjà existant sur votre clé!}*
code{
@@ -147,15 +147,15 @@ 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 PXE, une certaine configuration dans le BIOS
-de votre ordinateur peut être d'abord nécessaire. Depuis 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 clé pour
-ouvrir un menu d'amorçage au démarrage, qui est le moyen le plus facile si
-elle est disponible sur votre système. Sinon, vous avez besoin d'entrer dans
-le menu de configuration du BIOS et modifier l'ordre de démarrage pour
-placer le dispositif de démarrage pour le système live devant votre
-périphérique de démarrage normal.
+DVD, clé USB, ou le 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
+touche pour ouvrir un menu d'amorçage au démarrage, qui est le moyen le plus
+facile si elle est disponible sur votre système. Sinon, vous avez besoin
+d'entrer dans le menu de configuration du BIOS et modifier l'ordre de
+démarrage pour placer le dispositif de démarrage pour le système live devant
+votre périphérique de démarrage normal.
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
@@ -187,7 +187,7 @@ 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
substitut pour l'exécution que le matériel lui-même.
-_* Parfois il ya des bogues que deviennent visibles uniquement pendant
+_* Parfois il y a des bogues que deviennent visibles uniquement pendant
l'exécution dans une VM. En cas de doute, testez votre image directement sur
le matériel.
@@ -201,7 +201,7 @@ support matériel pour la virtualisation, vouz 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 supporte. Sinon,
+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}#.
@@ -347,7 +347,7 @@ pas de réponses faciles.
2~building-netboot-image Construction d'une image netboot
La séquence de commandes suivante va créer une image NetBoot de base
-contenant le système Debian standard sans X.org. Elle peur être démarrée sur
+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
@@ -369,13 +369,13 @@ code{
}code
-Contrairement à les images ISO et HDD netbooting 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.
+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.
Maintenant construire l'image avec la commande #{lb build}#
@@ -399,13 +399,13 @@ de fichiers dans #{live/filesystem.squashfs}# et le kernel, initrd et le
chargeur de démarrage pxelinux dans #{tftpboot/debian-live/i386}#.
Nous devons maintenant configurer trois services sur le serveur pour activer
-netboot: le serveur DHCP, serveur TFTP et le serveur NFS.
+le démarrage sur le réseau: le serveur DHCP, serveur TFTP et le serveur NFS.
3~ Serveur DHCP
Nous devons configurer le serveur DHCP de notre réseau pour être sûr de
-donner une adresse IP au système client netboot, et pour annoncer
-l'emplacement du chargeur de démarrage PXE.
+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.
Voici un exemple source d'inspiration, écrit pour le serveur ISC DHCP
#{isc-dhcp-server}# dans le fichier de configuration
@@ -491,7 +491,7 @@ les essais des images sur des machines physiques peuvent prendre vraiment
beaucoup de temps.
Afin de rendre notre vie plus facile, nous pouvons utiliser la
-virtualisation. Il ya deux solutions.
+virtualisation. Il y a deux solutions.
3~ Qemu
diff --git a/manual/fr/user_customization-binary.ssi b/manual/fr/user_customization-binary.ssi
index 119ef49..170dc39 100644
--- a/manual/fr/user_customization-binary.ssi
+++ b/manual/fr/user_customization-binary.ssi
@@ -4,12 +4,34 @@ B~ Personnalisation de l'image binaire
2~ Chargeur d'amorçage
-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
-modifier leurs options en utilisant différentes méthodes, comme
-{includes}#includes ou {hooks}#hooks.
+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.
-Par exemple, ces dérivés sont configurés par défaut avec un timeout de 0
+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
+thème du miroir et l'installera.
+
+Imaginez que vous voulez construire un client progress, mais vous voulez
+inclure le thème du serveur parce que vous voulez avoir le menu
+d'aide. Ensuite, vous devez lancer #{lb config}# comme suit:
+
+code{
+
+ $ lb config --mode progress --syslinux-theme progress-server
+
+}code
+
+Vous pouvez également créer votre propre thème ou modifier un déjà existant
+et si vous n'avez pas un miroir, vous pouvez ajouter le paquet à
+#{config/packages.chroot}#. Dans ce cas, il n'est pas nécessaire de
+spécifier une autre option.
+
+Il y a aussi la possibilité de faire des petits changements. Par exemple,
+les dérivés de syslinux sont configurés par défaut avec un timeout de 0
(zéro) qui signifie qu'ils se mettront en pause indéfiniment à leur écran de
démarrage jusqu'à ce que vous pressez une touche.
@@ -41,7 +63,9 @@ code{
}code
-Pour plus d'informations s'il vous plaît voir man syslinux(1).
+Également, si vous souhaitez utiliser une splash.png personnalisée, vous
+pouvez ajouter une image de 640x480 pixels à
+#{config/includes.binary/isolinux/}#
2~ Métadonnées ISO
diff --git a/manual/fr/user_customization-contents.ssi b/manual/fr/user_customization-contents.ssi
index 5e79a3c..2094e14 100644
--- a/manual/fr/user_customization-contents.ssi
+++ b/manual/fr/user_customization-contents.ssi
@@ -17,7 +17,7 @@ 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
-mécanismes de leur utilisation:
+mécanismes pour leur utilisation:
_* Chroot local includes: Ils vous permettent d'ajouter ou remplacer des
fichiers sur le système de fichiers chroot/Live. S'il vous plaît voir
@@ -34,17 +34,17 @@ répertoires d'outils. S'il vous plaît voir {Binary includes}#binary-includes
pour plus d'informations.
S'il vous plaît voir {Termes}#terms pour plus d'informations sur la
-distinction entre les images "Live" et "binaire".
+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 du 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
+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.
Pour inclure des fichiers, il suffit de les ajouter à votre répertoire
@@ -80,13 +80,13 @@ sorte que les fichiers installés par les paquets sont écrasé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'il soit accessible 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écrit par et lié par une page
-d'index HTML. Copiez simplement le matériel dans #{config/includes.binary/}#
-comme suit:
+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:
code{
@@ -99,7 +99,7 @@ live.
3~binary-includes Binary includes
-live-build a certains fichiers standard (comme la documentation) qui sera
+live-build a certains fichiers standard (comme la documentation) qui seront
inclus dans la configuration par défaut sur tous les supports live. Ceci
peut être désactivé avec:
@@ -111,12 +111,12 @@ code{
Sinon, le matériel sera installé par live-build dans #{/includes/}# par
défaut sur le système de fichiers du support, ou bien vous pouvez spécifier
-un autre chemin avec
+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 binaire de la construction afin de personnaliser l'image.
+et binary de la construction afin de personnaliser l'image.
3~live-chroot-local-hooks Live/chroot local hooks
@@ -146,11 +146,11 @@ modifiés ou de tiers}#installing-modified-or-third-party-packages.
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, les dernièrs commandes
-binaires. Les commandes de votre hook ne s'exécutent pas dans le chroot,
+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
construction, ou vous pourriez endommager votre système de construction!
-Voir les exemples de scripts hook binaires pour diverses tâches courantes de
+Voir les exemples de binary hook scripts pour diverses tâches courantes de
personnalisation binaires fournis dans
#{/usr/share/live/build/examples/hooks}# que vous pouvez copier ou symlink
pour les utiliser dans votre propre configuration.
diff --git a/manual/fr/user_customization-installer.ssi b/manual/fr/user_customization-installer.ssi
index 59d6724..f169770 100644
--- a/manual/fr/user_customization-installer.ssi
+++ b/manual/fr/user_customization-installer.ssi
@@ -2,25 +2,25 @@
1~customizing-installer Personnalisation de l'installateur Debian
-Les images du système Debian Live peuvent être intégrées à l'installateur
+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
en ce qui est inclus et comment fonctionne l'installateur.
S'il vous plaît noter l'utilisation prudente des lettres majuscules pour
désigner «l'Installateur Debian» dans cette section - lorsqu'il est utilisé
comme cela, nous faisons explicitement référence à l'installateur officiel
-pour le système Debian, rien d'autre. On le voit souvent abrégé en «d-i».
+pour le système Debian, pas autre chose. On le voit souvent abrégé en «d-i».
2~ Types de l'installateur Debian
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 séparé et initrd qui (lorsqu'il est sélectionné à partir du chargeur de démarrage approprié) se lance dans une instance d'installateur Debian standard, exactement comme si vous aviez téléchargé une image CD de Debian et la démarré.
+*{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".
Sur ces images, Debian est installé par l'extraction et l'installation de
-paquets .deb à l'aide de #{debootstrap}# ou #{cdebootstrap}#, Depuis des
-supports locaux ou à partir du réseau basé sur le 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 à partir du 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
@@ -28,7 +28,7 @@ l'Installateur Debian pour plus d'informations. Une fois que vous avez un
fichier de préconfiguration qui fonctionne live-build peut automatiquement
le mettre à l'image et l'activer pour vous.
-*{Installateur Debian "Live" }*: C'est une image de Debian Live avec un noyau séparé et initrd qui (lorsqu'il est sélectionné à partir du chargeur de démarrage approprié) se lance dans une instance de l'installateur Debian.
+*{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"
décrite ci-dessus, mais à l'étape de l'installation des paquets, au lieu
@@ -40,11 +40,12 @@ 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
-Remarque: Pour soutenir les deux entrées installateur normal et live dans le
-chargeur de démarrage du même support live, vous devez désactiver
-«live-installer» en 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é depuis le 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.
+*{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
@@ -54,7 +55,7 @@ bureau" fonctionne le noyau du système live doit correspondre au noyau que
code{
- $ lb config --architecture i386 --linux-flavours 486 \
+ $ lb config --architectures i386 --linux-flavours 486 \
--debian-installer live
$ echo debian-installer-launcher >> config/package-lists/my.list.chroot
diff --git a/manual/fr/user_customization-overview.ssi b/manual/fr/user_customization-overview.ssi
index c71f69c..94231eb 100644
--- a/manual/fr/user_customization-overview.ssi
+++ b/manual/fr/user_customization-overview.ssi
@@ -5,15 +5,15 @@
Ce chapitre donne un aperçu des diverses façons dont vous pouvez
personnaliser un système Debian Live.
-2~ Configuration pendant la construction vs. le démarrage
+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
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 de démarrage
-peut être modifiée par l'utilisateur en le spécifiant à l'invite de
+arrivent plus tard, appliquées par live-config. Toute option d'amorçage peut
+être modifiée par l'utilisateur en le spécifiant à l'invite de
démarrage. L'image peut également être construite avec les paramètres de
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
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index 5f68aec..b2d619d 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -5,16 +5,16 @@ paquets
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érents options dans certains moments de la construction pour
-personnaliser l'installation des paquets de live-build. Le plus large choix
-influençant les paquets qui sont disponibles pour l'installation dans
+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 référentiels
-pour les backports, paquets expérimentaux ou personnalisés, ou inclure des
+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
+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,
@@ -34,7 +34,7 @@ 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:
+*{unstable}*, Sid, précisez:
code{
@@ -69,14 +69,14 @@ des dérivés.
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
avec la meilleur vitesse de téléchargement. Chacune des options
-#{--mirror-*}# qui régit quel miroir de distribution est utilisée à
-différents stades de la construction. Rappelez-vous de {Etapes de la
-construction}#stages-of-the-build que l'étape *bootstrap* c'est quand le
+#{--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
-correspondants sont utilisées pour ces étapes, et plus tard, dans le
-*binary* stade les valeurs #{--mirror-binary}# 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.
@@ -118,20 +118,20 @@ code{
}code
-3~additional-repositories Référentiels additionnels
+3~additional-repositories Dépôts additionnels
-Vous pouvez ajouter plus de référentiels, élargir vos choix de paquets
+Vous pouvez ajouter d'autres dépôts, élargissant votre choix de paquets
au-delà ceux disponibles dans votre distribution objectif. Il peut être, par
exemple, pour backports, expérimentaux ou des paquets personnalisés. Pour
-configurer des référentiels supplémentaires, créer les fichiers
+configurer des dépôts supplémentaires, créer les fichiers
#{config/archives/your-repository.list.chroot}#, et/ou
#{config/archives/your-repository.list.binary}#. Comme avec les options
-#{--mirror-*}#, elles gouvernent les référentiels utilisés dans l'étape
-*chroot* lors de la construction de l'image, et dans l'étape *binaire*,
-c'est à dire pour une utilisation au moment de l'exécution du système live.
+#{--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.
Par exemple, #{config/archives/live.list.chroot}# vous permet d'installer
-des paquets du référentiel des instantanés debian live au moment de la
+les paquets du dépôt des instantanés debian live au moment de la
construction du système live.
code{
@@ -141,15 +141,15 @@ code{
}code
Si vous ajoutez la même ligne à #{config/archives/live.list.binary}#, le
-référentiel sera ajouté au répertoire #{/etc/apt/sources.list.d/}# de votre
+dépôt sera ajouté au répertoire #{/etc/apt/sources.list.d/}# de votre
système live.
Si ces fichiers existent, ils seront sélectionnés automatiquement.
-Vous devriez également mettre la clé GPG utilisée pour signer le référentiel
-dans fichiers #{config/archives/your-repository.key.{binary,chroot}}#
+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 référentiels 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 permettre des instantanés live, une simple commande suffit pour l'activer:
code{
@@ -165,8 +165,7 @@ 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
dans votre arbre #{config/}# qui est bien adapté aux essais de nouveaux
-paquets ou expérimentaux avant qu'ils ne soient disponibles sur un
-référentiel.
+paquets ou expérimentaux avant qu'ils ne soient disponibles sur un dépôt.
3~package-lists Listes de paquets
@@ -206,11 +205,11 @@ Vous pouvez compléter ou remplacer entièrement les listes fournies en
utilisant listes de paquets locaux stockées dans #{config/package-lists/}#.
Les listes de paquets qui existent dans ce répertoire ont besoin d'avoir un
-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.
+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 du #{.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é sur le support.
3~ Listes locaux de paquets binaires
@@ -247,27 +246,27 @@ Toutes les variables de configuration de live-build stocké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 soulignement. Mais en pratique, c'est seulement ceux qui
-influencent lasélection des paquets qui font sens, comme #{DISTRIBUTION}#,
-#{ARCHITECTURE}# ou #{ARCHIVE_AREAS}#.
+influencent la sélection des paquets qui font sens, comme #{DISTRIBUTION}#,
+#{ARCHITECTURES}# ou #{ARCHIVE_AREAS}#.
-Par exemple, pour installer #{ia32-libs}# si la #{--architecture amd64}# est
-spécifié:
+Par exemple, pour installer #{ia32-libs}# si la #{--architectures amd64}#
+est spécifié:
code{
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
ia32-libs
#endif
}code
Vous pouvez tester pour un certain nombre de valeurs, par exemple pour
-installer #{memtest86+}# si #{--architecture i386}# ou #{--architecture
+installer #{memtest86+}# si #{--architectures i386}# ou #{--architectures
amd64}# est spécifié:
code{
- #if ARCHITECTURE i386 amd64
+ #if ARCHITECTURES i386 amd64
memtest86+
#endif
@@ -289,7 +288,7 @@ Un conditionnel peut entourer une directive #{#include}#:
code{
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
#include <gnome-full>
#endif
@@ -328,25 +327,25 @@ besoin d'une certaine planification et de configuration supplémentaire
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 entrées de menu pour
+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.
Lors du développement d'une image de bureau live, l'image généralement
-démarre directement à un bureau de travail, le choix des deux
-environnements de bureau et la langue par défaut ayant été faite 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 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 de disposition fait 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 d'entrée, si vous les voulez, vous
-devez les spécifier dans votre configuration. Par exemple, une image de
-bureau GNOME contenant de soutien pour le japonais pourrait inclure les
-tâches suivantes:
+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
+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
+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
+image de bureau GNOME contenant soutien pour le japonais pourrait inclure
+les tâches suivantes:
code{
@@ -377,9 +376,9 @@ modifiés ou de tiers
Tandis qu'il est contre la philosophie de Debian Live, il peut parfois être
nécessaire de construire un système live avec des versions modifiées des
-paquets qui sont dans le référentiel Debian. C'est peut-être de modifier ou
-soutenir des fonctionnalités supplémentaires, des langues et de la marque,
-ou même de supprimer des éléments de paquets existants qui sont
+paquets qui sont dans le dépôt Debian. C'est peut-être pour modifier ou
+soutenir des fonctionnalités supplémentaires, des langues et branding, ou
+même pour supprimer des éléments dans les paquets existants qui sont
indésirables. De même, les paquets "de tiers" peuvent être utilisés pour
ajouter des fonctionnalités sur mesure et/ou propriétaires.
@@ -395,7 +394,7 @@ Il y a deux façons d'installer des paquets personnalisés modifiés:
_* #{packages.chroot}#
-_* En utilisant un référentiel APT personnalisé
+_* 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
@@ -423,29 +422,28 @@ _* Vous devez installer tous les paquets appropriés dans le répertoire
_* Il ne se prête pas au stockage de configurations Debian Live dans le
contrôle de révision.
-3~ Utilisant un référentiel APT pour installer des paquets personnalisés.
+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 à
installer}#choosing-packages-to-install pour plus de détails.
-Si créer un référentiel APT pour installer des packages personnalisés peut
-sembler un effort inutile, l'infrastructure peut être facilement ré-utilisée
-à une date ultérieure pour offrir les mises à jour des paquets modifiés.
+Si créer un dépôt APT pour installer des paquets personnalisés peut sembler
+un effort inutile, l'infrastructure peut être facilement ré-utilisée à une
+date ultérieure pour offrir les mises à jour des paquets modifiés.
3~ Les paquets personnalisés et APT
live-build utilise apt pour installer tous les paquets dans le système live
-donc il héritera des comportements de ce logiciel. Un exemple pertinent est
-que (en supposant une configuration par défaut), étant donné un paquet
-disponible dans deux référentiels différents avec différents numéros de
-version, APT choisira d'installer le paquet avec la numéro de version
-supérieur.
+donc il héritera les comportements de ce logiciel. Un exemple pertinent est
+que (en supposant une configuration par défaut), s'il y a un paquet
+disponible dans deux dépôts différents avec différents numéros de version,
+APT choisira d'installer le paquet avec la numéro de version supérieur.
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 référentiels
+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
plus d'informations.
@@ -521,13 +519,13 @@ La contrepartie ici est que si vous n'installez pas les paquets recommandés
par un paquet, c’est-à-dire, "paquets qu'on trouverai avec celui-ci dans
toute installation standard" (Debian Policy Manual, section 7.2), certains
paquets que vous avez vraiment besoin peuvent être omis. Par conséquent,
-nous vous suggérons d'examiner la différence de désactiver recommends rend à
-votre liste de paquets (voir le fichier #{binary.packages}# généré par #{lb
-build}#) et re-inclure 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
-recommends activé et défini une priorité APT pin négative sur les paquets
-sélectionnés pour éviter les installér, comme expliqué dans {APT
+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
+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.
3~ Passer des options à apt ou aptitude
@@ -547,11 +545,11 @@ de construction, ou encore pendant l'exécution. Pour le premier, 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 depuis
-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:
+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:
code{
diff --git a/manual/fr/user_customization-runtime.ssi b/manual/fr/user_customization-runtime.ssi
index 63b65ff..c0e31ad 100644
--- a/manual/fr/user_customization-runtime.ssi
+++ b/manual/fr/user_customization-runtime.ssi
@@ -3,7 +3,7 @@
1~customizing-run-time-behaviours Personnalisation des comportements au
moment de l'exécution
-Toute la configuration qui est fait pendant l'exécution est fait par
+Toute la configuration qui est faite pendant l'exécution est faite par
live-config. Voici quelques options les plus courantes de live-config
d'intérêt pour les utilisateurs. Une liste complète de toutes les
possibilités peut être trouvée dans la page de manuel de live-config.
@@ -41,7 +41,7 @@ spécifier dans votre config:
code{
-$ lb config --bootappend-live "username=live-user"
+ $ lb config --bootappend-live "username=live-user"
}code
@@ -93,8 +93,8 @@ code{
}code
-Pour obtenir les fichiers des paramètres régionaux pour les claviers
-allemand et suisse allemand dans X utiliser:
+Pour obtenir les fichiers des paramètres régionaux de l'allemand et la
+disposition du clavier suisse allemand dans X utiliser:
code{
@@ -130,7 +130,7 @@ code{
2~persistence Persistance
-Un paradigme d'un Live CD est être un système pré-installé qui se démarre du
+Un paradigme d'un Live CD est être un système pré-installé qui amorce sur un
support en lecture seule, comme un cdrom, où les données et les
modifications ne survivent pas aux redémarrages du matériel hôte qui
l'exécute.
@@ -138,7 +138,7 @@ l'exécute.
Un système Debian Live est une généralisation de ce paradigme et soutient
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
-d'exécution du système sont perdus à l'arrêt.
+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
@@ -150,26 +150,53 @@ inscriptibles, typiquement un disque ram (tmpfs) et aux disques RAM les
données ne survivent pas à un redémarrage.
Les données stockées sur ce disque virtuel doivent être enregistrées sur un
-support inscriptible persistant comme un disque dur, une clé USB, 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 mais le dernier nécessitent un paramètre de démarrage spéciale à
-préciser au moment du démarrage: #{persistent}#.
+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}#.
-3~ Persistance pleine
+Si le paramètre de démarrage #{persistent}# est réglé (et #{nopersistent}#
+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:
-Par «persistance pleine» on entend que plutôt que d'utiliser un tmpfs pour
-le stockage des modifications au support en lecture seule (avec le système
+_* une partition, identifiée par son nom GPT.
+
+_* un système de fichiers, identifié par son étiquette de système de
+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".
+
+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
+live-boot(7). Les "étiquettes d'identification" mentionnées ci-dessus
+peuvent être un des éléments suivants:
+
+_* #{full-ov}# pour couches de persistance pleine.
+
+_* #{custom-ov}# pour couches personalisées
+
+_* #{live-sn}# pour instantanés du système complet.
+
+_* #{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
copy-on-write, COW) une partition accessible en écriture est utilisée. Pour
-utiliser cette fonction une partition avec un système de fichiers accessible
-en écriture avec l'étiquette "live-rw" doit être fixé sur le système au
-moment du démarrage et le système doit être démarré avec le paramètre de
-démarrage "persistent". Cette partition peut être une partition ext2 du
-disque dur ou sur une clé USB créé avec, par exemple:
+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:
code{
- # mkfs.ext2 -L live-rw /dev/sdb1
+ # mkfs.ext2 -L full-ov /dev/sdb1
}code
@@ -181,67 +208,93 @@ modifier l'étiquette avec l'un des suivants:
code{
- # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems
+ $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems
}code
-Mais puisque les utilisateurs du système live ne peuvent pas toujours
-utiliser une partition du disque dur, et considérant que la plupart des clés
-USB ont des vitesses d'écriture pauvres, «pleine» persistance pourrait
-également être utilisé avec des fichiers image, si vous pouviez créer un
-fichier qui représente une partition et mettre cette image fichier, même sur
-une partition NTFS d'un système d'exploitation étranger, avec quelque chose
-comme:
+Voici un exemple de comment créer un fichier image ext2 utilisé pour la
+persistance pleine:
code{
- $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file
- $ /sbin/mkfs.ext2 -F live-rw
+ $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file
+ $ /sbin/mkfs.ext2 -F full-ov
}code
-Ensuite, copiez le fichier #{live-rw}# sur une partition accessible en
-écriture et redémarrer avec le paramètre de démarrage "persistent".
+Ensuite, copiez le fichier #{full-ov}# sur une partition accessible en
+écriture et redémarrer.
+
+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.
+
+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:
-3~ Montage automatique de Home
+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
+
+}code
-Si lors de l'initialisation une partition (système de fichiers) un fichier
-image ou une partition étiquetée #{home-rw}# est découverte, ce système de
-fichiers sera monté directement comme #{/home}#, permettant ainsi la
-persistance des fichiers qui appartiennent à l'utilisateur par défaut. Elle
-peut être combinée avec la persistance complète.
+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).
3~ Instantanés
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 contenu d'un instantané
-pourrait résider sur une partition ou un fichier image (comme les types
-mentionnés ci-dessus) étiquetés #{live-sn}#, mais il est par défaut à une
-archive cpio simple appelé #{live-sn.cpio.gz}#. Comme ci-dessus, au moment
-du démarrage, les périphériques connectés à le système sont examinés pour
-voir si une partition ou un fichier nommé comme ça pourrait être trouvé. 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é à synchroniser des changements importants. Ce type de persistance,
-car elle n'écrit pas continuellement dans les supports persistants, est le
-plus respectueux avec les dispositifs flash et le plus rapide de tous les
-systèmes de persistance.
-
-Une version instantané de /home existe aussi, et son étiquette est
+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 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é.
+
+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.
Les instantanés ne peuvent pas actuellement gérer la suppression de
-fichiers, mais la persistance pleine et le montage automatique de home si
-peuvent le faire.
+fichiers.
3~ SubText persistant
Si un utilisateur a besoin de multiples stockages persistants du même type
-pour différents endroits ou l'essai, tel que #{live-rw-nonwork}# et
-#{live-rw-work}#, le paramètre de démarrage #{persistent-subtext}# utilisé
+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é
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index fb9dfd1..5c96aa7 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -12,7 +12,7 @@ vous aideront à utiliser et à comprendre les exemples restants.
Pour utiliser ces exemples vous avez besoin d'un système pour les
construire, lequel répond aux exigences énumérées dans
-{Exigences}#requirements et vous avez live-build installe comme décrit à
+{Exigences}#requirements et qui a live-build installé comme décrit à
{Installation de live-build}#installing-live-build.
Notez que, pour des raisons de concision, dans ces exemples, nous ne
@@ -141,7 +141,7 @@ code{
#!/bin/sh
lb config noauto \
- --architecture i386 \
+ --architectures i386 \
--linux-flavours 686-pae \
--package-lists lxde \
"${@}"
@@ -156,7 +156,7 @@ code{
}code
-Tout d'abord, #{--architecture i386}# assure que sur notre système de
+Tout d'abord, #{--architectures i386}# assure que sur notre système de
construction #{amd64}#, nous construisons une version 32 bits qui peut être
utilisé sur la plupart des machines. Deuxièmement, nous utilisons
#{--linux-flavours 686-pae}# parce que nous ne prévoyons pas utiliser cette
@@ -235,11 +235,11 @@ code{
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, il suffit de prendre
-soin de ne pas modifier à la main ou commit 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/}#. 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.
Nous sommes arrivés à la fin de notre série de tutoriels. Alors que de
nombreux types de personnalisations sont possibles, même juste en utilisant
@@ -338,12 +338,12 @@ 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 s'attendre à
-être là, tel que #{firmware-linux-free}# qui peuvent être nécessaires pour
-prise en charge matérielle de 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 perte de fonctionnalité.
+détriment d'omettre certains paquets 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
+perte de fonctionnalité.
2~ Un bureau KDE localisé et installateur
@@ -411,7 +411,7 @@ code{
}code
Notez que nous avons inclus le paquet #{debian-installer-launcher}# pour
-lancer l'installateur depuis le bureau live, et ont également précisé que le
-noyau 486, tel qu'il est actuellement nécessaire pour faire que
-l'installateur et le noyau du systéme live matchent pour que le lanceur
+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 07e4e94..ec8d672 100644
--- a/manual/fr/user_installation.ssi
+++ b/manual/fr/user_installation.ssi
@@ -25,16 +25,16 @@ avec les exigences ci-dessus.
Vous pouvez installer live-build dans un certain nombre de façons
différentes:
-_* Depuis le référentiel Debian
+_* À partir du dépôt Debian
-_* Depuis le code source
+_* À partir du code source
_* À partir des instantanés
Si vous utilisez Debian, la méthode recommandée consiste à installer
-live-build depuis le référentiel Debian.
+live-build à partir du dépôt Debian.
-3~ Depuis le référentiel Debian
+3~ À partir du dépôt Debian
Il suffit d'installer live-build comme n'importe quel autre paquet:
@@ -52,7 +52,7 @@ code{
}code
-3~ Depuis le code source
+3~ À partir du code source
live-build est développé en utilisant le système de contrôle de version
Git. Dans les systèmes basés sur Debian, cela est fourni par le paquet
@@ -74,8 +74,8 @@ code{
}code
-Maintenant, installez celui des fichiers récemment construits que vous
-intéresse, p. ex
+Maintenant, installez les fichiers récemment construits que vous intéresse,
+p. ex
code{
@@ -102,21 +102,21 @@ code{
3~ À partir des instantanés
-Si vous ne souhaitez pas de créer ou d'installer live-build depuis les
+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
disponibles à http://live.debian.net/debian/.
2~ live-boot et live-config
-*{Remarque:}* Vous n'avez pas besoin d'installer live-boot ou live-config sur votre système afin de créer des systèmes Debian Live. Cependant, cela ne fera aucun mal et est utile à des fins de référence. Si vous voulez seulement la documentation, vous pouvez maintenant installer les paquets live-boot-doc et live-config-doc séparément.
+*{Remarque:}* Vous n'avez pas besoin d'installer live-boot ou live-config sur votre système afin de créer des systèmes Debian Live. Cependant, cela ne fera aucun mal et est utile à des fins de référence. Si vous voulez seulement la documentation, vous pouvez maintenant installer les paquets /{live-boot-doc}/ et /{live-config-doc}/ séparément.
-3~ Depuis le référentiel Debian
+3~ À partir du dépôt Debian
-Tous deux live-boot et live-config sont disponibles dans le référentiel
-Debian comme {Installation de live-build}#installing-live-build.
+Tous deux live-boot et live-config sont disponibles dans le dépôt Debian
+comme {Installation de live-build}#installing-live-build.
-3~ Depuis le code source
+3~ À partir du code source
Pour utiliser les dernières sources du git, vous pouvez suivre le procédure
ci-dessous. S'il vous plaît assurer que vous êtes familiarisé avec les
@@ -133,7 +133,7 @@ code{
Consultez les pages de manuel de live-boot et live-config pour plus de
détails sur la personnalisation si c'est votre raison pour la création de
-vos paquets depuis les sources.
+vos paquets à partir des sources.
_* Créer les fichiers .deb de live-boot et live-config
@@ -165,13 +165,13 @@ l'installation des paquets dans le système hôte ne suffit pas: vous devez
traiter les fichiers .deb générés comme aucun autre paquet
personnalisé. S'il vous plaît voir {Personnalisation de l'installation de
paquets}#customizing-package-installation pour plus d'informations. Vous
-devriez prêter une attention particulière à {Référentiels
-supplémentaires}#additional-repositories.
+devriez prêter une attention particulière à {Dépôts
+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 référentiel de tierce
+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}#:
diff --git a/manual/fr/user_managing_a_configuration.ssi b/manual/fr/user_managing_a_configuration.ssi
index dd3dc97..f87047a 100644
--- a/manual/fr/user_managing_a_configuration.ssi
+++ b/manual/fr/user_managing_a_configuration.ssi
@@ -6,7 +6,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.
-2~ Utilisez auto pour gérer les modifications de configuration
+2~ Utiliser auto pour gérer les modifications de configuration
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
@@ -20,13 +20,13 @@ Par exemple, lorsque la distribution est d'abord définie, nombreuses
variables sont assignées des valeurs par défaut qui conviennent à cette
distribution. Cependant, si vous décidez ultérieurement de modifier la
distribution, ces variables dépendantes conservent les anciennes valeurs qui
-ne sont plus appropriés.
+ne sont plus appropriées.
-Un deuxième problème connexe 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 dans votre #{config/*}# fichiers, que vous devrez ensuite utiliser
-pour définir l'option appropriée à nouveau.
+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
+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
@@ -34,11 +34,12 @@ auto/* simples emballages pour les commandes #{lb config}#, #{lb build}# et
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
-vous #{lb config}# et #{lb clean}#, ces fichiers seront 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 (même si
-vous aurez encore de prendre soin et lire la documentation lorsque vous
-faites un mise à niveau et faites les ajustements nécessaires ).
+vous lancez #{lb config}# et #{lb clean}#, ces fichiers seront
+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 ).
2~ Exemples de scripts auto
@@ -95,4 +96,4 @@ Editer #{auto/config}#, en changeant ou en ajoutant des options comme bon
vous semble. Dans l'exemple ci-dessus, #{--package-lists standard}# est fixé
à la valeur par défaut. Changez ce à une valeur appropriée pour votre image
(ou le supprimer si vous voulez utiliser par défaut) et ajouter des options
-supplémentaires dans les lignes de continuation qui suivent.
+supplémentaires dans les lignes suivantes.
diff --git a/manual/fr/user_overview.ssi b/manual/fr/user_overview.ssi
index eb86b08..22ea572 100644
--- a/manual/fr/user_overview.ssi
+++ b/manual/fr/user_overview.ssi
@@ -14,8 +14,8 @@ 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 dans les outils de le paquet
-Debian debhelper écrit par Joey Hess:
+Plusieurs concepts sont similaires à celles 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
@@ -29,7 +29,7 @@ _* 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 de squelette, #{lb config}#. Cela pourrait être
+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.
@@ -63,8 +63,9 @@ en squelette #{auto/}#.
code{
$ lb config
+ [2012-03-19 15:17:14] lb_config
P: Considering defaults defined in /etc/live/build.conf
- P: Creating config tree
+ P: Creating config tree for a debian system
}code
@@ -87,7 +88,7 @@ Il est possible de spécifier plusieurs options, telles que:
code{
- $ lb config --binary-images net --hostname live-machine --username live-user ...
+ $ lb config --binary-images net --bootappend-live "hostname=live-machine username=live-user" ...
}code
@@ -97,15 +98,15 @@ Une liste complète des options est disponible dans la page de manuel de
3~lb-build La commande #{lb build}#
La commande #{lb build}# lit dans votre configuration à partir du répertoire
-#{config/}#. Il exécute alors les commandes de niveau inférieur nécessaires
-pour construire votre système Live.
+#{config/}#. Elle exécute alors les commandes de niveau inférieur
+nécessaires pour construire votre système Live.
3~lb-clean La commande #{lb clean}#
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 stades #{chroot}#,
-#{binary}# et #{source}# sont nettoyées, mais la cache est laissé intact. En
+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
@@ -116,10 +117,10 @@ la page de manuel de #{lb_clean}# pour une liste complète des options.
live-boot est une collection de scripts fournissant hooks pour
initramfs-tools, utilisé pour générer un initramfs capable de démarrer des
systèmes live, comme ceux créés par live-build. Cela inclut les ISOs de
-Debian Live, netboot tarballs, et les images clé USB.
+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 de
+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é,
il va créer un environnement accessible en écriture, en utilisant aufs, afin
que systémes similaires à Debian puissent démarrer à partir de ça.
diff --git a/manual/it/about_manual.ssi b/manual/it/about_manual.ssi
index 24321dc..2fd4e11 100644
--- a/manual/it/about_manual.ssi
+++ b/manual/it/about_manual.ssi
@@ -2,13 +2,14 @@
1~about-manual A proposito di questo manuale
-L'obiettivo principale di questo manuale è quello di servire come unico
-punto d'accesso per tutta la documentazione relativa al progetto Debian
-Live. 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
+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
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.
@@ -194,7 +195,7 @@ code{
}code
-Or combine both, e.g:
+O entrambi:
code{
@@ -258,7 +259,7 @@ code{
}code
-_* Then
+quindi
code{
@@ -286,7 +287,7 @@ code{
}code
-3~ Traduzione
+3~translation Traduzione
Per inviare una traduzione per una nuova lingua, seguire questi tre passi:
@@ -305,4 +306,4 @@ che i manuali tradotti siano aggiornati partendo dai file po, quindi si
possono verificare le modifiche con #{make build}# prima di #{git add .}#,
#{git commit -a -m "Traduzione..."}# e #{git push}#.
-*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.
+*{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 21a1b81..42c0b64 100644
--- a/manual/it/about_project.ssi
+++ b/manual/it/about_project.ssi
@@ -103,8 +103,3 @@ _* *{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.
-
-_* *{Wiki}*: Il wiki di Debian Live all'indirizzo
-http://wiki.debian.org/DebianLive è un posto dove raccogliere informazioni,
-discutere di tecnologie applicate e documenti sull'infrastruttura dei
-sistemi Debian Live che vanno oltre lo scopo di questo manuale.
diff --git a/manual/it/live-manual.ssm b/manual/it/live-manual.ssm
index b4bce8a..59f2f9c 100644
--- a/manual/it/live-manual.ssm
+++ b/manual/it/live-manual.ssm
@@ -9,7 +9,7 @@
: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-02-06
+ :published: 2012-04-03
@publisher: Debian Live Project <debian-live at lists.debian.org>
@@ -60,3 +60,7 @@
:B~ Esempi
<< user_examples.ssi
+
+:B~ Appendix
+
+<< style_guide.ssi
diff --git a/manual/it/style_guide.ssi b/manual/it/style_guide.ssi
new file mode 100644
index 0000000..8b01cc3
--- /dev/null
+++ b/manual/it/style_guide.ssi
@@ -0,0 +1,371 @@
+:B~ Appendix
+
+1~style-guide Style guide
+
+2~ Guidelines for authors
+
+This section deals with some general considerations to be taken into account
+when writing technical documentation for live-manual. They are divided into
+linguistic features and recommended procedures.
+
+*{Note:}* Authors should first read {Contributing to this document}#how-to-contribute
+
+3~ Linguistic features
+
+_* /{Use plain English}/
+
+Keep in mind that a high percentage of your readers are not native
+speakers. So as a general rule try to use short, meaningful sentences,
+followed by a full stop.
+
+This does not mean that you have to use a simplistic, naive style. It is a
+suggestion to try to avoid, as much as possible, complex subordinate
+sentences that make the text difficult to understand for non-native
+speakers.
+
+_* /{Variety of English}/
+
+The most widely spread varieties of English are British and American so it
+is very likely that most authors will use either one or the other. In a
+collaborative environment, the ideal variety would be "International
+English" but it is very difficult, not to say impossible, to decide on which
+variety among all the existing ones, is the best to use.
+
+We expect that different varieties may mix without creating
+misunderstandings but in general terms you should try to be coherent and
+before deciding on using British, American or any other English flavour at
+your discretion, please take a look at how other people write and try to
+imitate them.
+
+_* /{Be balanced}/
+
+Do not be biased. Avoid including references to ideologies completely
+unrelated to live-manual. Technical writing should be as neutral as
+possible. It is in the very nature of scientific writing.
+
+_* /{Be politically correct}/
+
+Try to avoid sexist language as much as possible. If you need to make
+references to the third person singular preferably use "they" rather than
+"he" or "she" or awkward inventions such as "s/he", "s(he)" and the like.
+
+_* /{Be concise}/
+
+Go straight to the point and do not wander around aimlessly. Give as much
+information as necessary but do not give more information than necessary,
+this is to say, do not explain unnecessary details. Your readers are
+intelligent. Presume some previous knowledge on their part.
+
+_* /{Minimize translation work}/
+
+Keep in mind that whatever you write will have to be translated into several
+other languages. This implies that a number of people will have to do an
+extra work if you add useless or redundant information.
+
+_* /{Be coherent}/
+
+As suggested before, it is almost impossible to standardize a collaborative
+document into a perfectly unified whole. However, every effort on your side
+to write in a coherent way with the rest of the authors will be appreciated.
+
+_* /{Be cohesive}/
+
+Use as many text-forming devices as necessary to make your text cohesive and
+unambiguous. (Text-forming devices are linguistic markers such as
+connectors).
+
+_* /{Be descriptive}/
+
+It is preferable to describe the point in one or several paragraphs than
+merely using a number of sentences in a typical "changelog" style. Describe
+it! Your readers will appreciate it.
+
+_* /{Dictionary}/
+
+Look up the meaning of words in a dictionary or encyclopedia if you do not
+know how to express certain concepts in English. But keep in mind that a
+dictionary can either be your best friend or can turn into your worst enemy
+if you do not know how to use it correctly.
+
+English has the largest vocabulary that exists (With over one million
+words). Many of these words are borrowings from other languages. When
+looking up the meaning of words in a bilingual dictionary the tendency of a
+non-native speaker is to choose the one that sounds more similar in their
+mother tongue. This often turns into an excessively formal discourse which
+does not sound quite natural in English.
+
+As a general rule, if a concept can be expressed using different synonyms,
+it is a good advice to choose the first word proposed by the dictionary. If
+in doubt, choosing words of Germanic origin (Usually monosyllabic words) is
+often the right thing to do. Be warned that these two techniques might
+produce a rather informal discourse but at least your choice of words will
+be of wide use and generally accepted.
+
+Using a dictionary of collocations is recommended. They are extremely
+helpful when it comes to know which words usually occur together.
+
+Again it is a good practice to learn from the work of others. Using a search
+engine to check how other authors use certain expressions may help a lot.
+
+_* /{False friends, idioms and other idiomatic expressions}/
+
+Watch out for false friends. No matter how proficient you are in a foreign
+language you cannot help falling from time to time in the trap of the so
+called "false friends", words that look similar in two languages but whose
+meanings or uses might be completely different.
+
+Try to avoid idioms as much as possible. "Idioms" are expressions that may
+convey a completely different meaning from what their individual words seem
+to mean. Sometimes, idioms are difficult to understand even for native
+speakers!
+
+_* /{Avoid slang, abbreviations, contractions...}/
+
+Even though you are encouraged to use plain, everyday English, technical
+writing belongs to the formal register of the language.
+
+Try to avoid slang, unusual abbreviations that are difficult to understand
+and above all contractions that try to imitate the spoken language. Not to
+mention typical irc and family friendly expressions.
+
+3~ Procedures
+
+_* /{Test before write}/
+
+It is important that authors test their examples before adding them to
+live-manual to ensure that everything works as described. Testing on a clean
+chroot or VM can be a good starting point. Besides, it would be ideal if the
+tests were then carried out on different machines with different hardware to
+spot possible problems that may arise.
+
+_* /{Examples}/
+
+When providing an example try to be as specific as you can. An example is,
+after all, just an example.
+
+It is often better to use a line that only applies to an specific case than
+using abstractions that may confuse your readers. In this case you can
+provide a brief explanation of the effects of the proposed example.
+
+There may be some exceptions when the example suggests using some
+potentially dangerous commands that, if misused, may cause data loss or
+other similar undesirable effects. In this case you should provide a
+thorough explanation of the possible side effects.
+
+_* /{External links}/
+
+Links to external sites should only be used when the information on those
+sites is crucial when it comes to understanding a special point. Even so,
+try to use links to external sites as sparsely as possible. Internet links
+are likely to change from time to time resulting in broken links and leaving
+your arguments in an incomplete state.
+
+Besides, people who read the manual offline will not have the chance to
+follow those links.
+
+_* /{Avoid branding and things that violate the license under which the
+manual is published}/
+
+Try to avoid branding as much as possible. Keep in mind that other
+downstream projects might make use of the documentation you write. So you
+are complicating things for them if you add certain specific material.
+
+live-manual is licensed under the GNU GPL. This has a number of implications
+that apply to the distribution of the material (of any kind, including
+copyrighted graphics or logos) that is published with it.
+
+_* /{Write a first draft, revise, edit, improve, redo if necessary}/
+
+ - Brainstorm!. You need to organize your ideas first in a logical sequence
+ of events.
+
+ - Once you have somehow organized those ideas in your mind write a first
+ draft.
+
+ - Revise grammar, syntax and spelling.
+
+ - Improve your statements and redo any part if necessary.
+
+_* /{Chapters}/
+
+Use the conventional numbering system for chapters and subtitles. e.g. 1,
+1.1, 1.1.1, 1.1.2 ... 1.2, 1.2.1, 1.2.2 ... 2, 2.1 ... and so on. See markup
+below.
+
+If you have to enumerate a series of steps or stages in your description,
+you can also use ordinal numbers: First, second, third ... or First, Then,
+After that, Finally ... Alternatively you can use bulleted items.
+
+_* /{Markup}/
+
+And last but not least, live-manual uses {SiSU}http://www.sisudoc.org to
+process the text files and produce a multiple format output. It is
+recommended to take a look at {SiSU's
+manual}http://www.sisudoc.org/sisu/sisu_manual/markup.html to get familiar
+with its markup, or else type:
+
+code{
+
+ $ sisu --help markup
+
+}code
+
+Here are some markup examples that may prove useful:
+
+ - For emphasis/bold text:
+
+code{
+
+*{foo}* or !{foo}!
+
+}code
+
+produces: *{foo}* or !{foo}!. Use it to emphasize certain key words.
+
+ - For italics:
+
+code{
+
+/{foo}/
+
+}code
+
+produces: /{foo}/. Use them e.g. for the names of debian packages.
+
+ - For monospace:
+
+code{
+
+#{foo}#
+
+}code
+
+produces: #{foo}#. Use it e.g. for the names of commands. And also to
+highlight some key words or things like paths.
+
+ - For code blocks:
+
+code{
+
+ code{
+
+ $ foo
+ # bar
+
+ }code
+
+}code
+
+produces:
+
+code{
+
+ $ foo
+ # bar
+
+}code
+
+Use #{code{}# to open and #{}code}# to close the tags. It is important to
+remember to leave a space at the beginning of each line of code.
+
+2~ Guidelines for translators
+
+This section deals with some general considerations to be taken into account
+when translating the contents of live-manual.
+
+As a general recommendation, translators should have read and understood the
+translation rules that apply to their specific languages. Usually,
+translation groups and mailing lists provide information on how to produce
+translated work that complies with Debian quality standards.
+
+*{Note:}* Translators should also read {Contributing to this document}#how-to-contribute. In particular the section {Translation}#translation
+
+3~ Translation hints
+
+_* /{Comments}/
+
+The role of the translator is to convey as faithfully as possible the
+meaning of words, sentences, paragraphs and texts as written by the original
+authors into their target language.
+
+So they should refrain from adding personal comments or extra bits of
+information of their own. If they want to add a comment for other
+translators working on the same documents, they can leave it in the space
+reserved for that. That is, the header of the strings in the *{po}* files
+preceded by a number sign *{#}*. Most graphical translation programs can
+automatically handle those types of comments.
+
+_* /{TN, Translator's Note}/
+
+It is perfectly acceptable however, to include a word or an expression in
+brackets in the translated text if, and only if, that makes the meaning of a
+difficult word or expression clearer to the reader. Inside the brackets the
+translator should make evident that the addition was theirs using the
+abbreviation "TN" or "Translator's Note".
+
+_* /{Impersonal sentences}/
+
+Documents written in English make an extensive use of the impersonal form
+"you". In some other languages that do not share this characteristic, this
+might give the false impression that the original texts are directly
+addressing the reader when they are actually not doing so. Translators must
+be aware of that fact and reflect it in their language as accurately as
+possible.
+
+_* /{False friends}/
+
+The trap of "false friends" explained before especially applies to
+translators. Double check the meaning of suspicious false friends if in
+doubt.
+
+_* /{Markup}/
+
+Translators working initially with *{pot}* files and later on with *{po}*
+files will find many markup features in the strings. They can translate the
+text anyway, as long as it is translatable, but it is extremely important
+that they use exactly the same markup as the original English version.
+
+_* /{Code blocks}/
+
+Some translators decide to include the code blocks in the translated files
+because it is easier for them to identify what has already been translated
+and what has not by looking at the percentages if they use a graphical
+translation program.
+
+Include the code blocks if you want to score a 100% complete translation.
+
+On the other hand some translators prefer to leave the code blocks
+"untranslated" (i.e. not including them). This makes the translation easier
+to maintain once finished because it does not require translators
+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}/
+
+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.
+
+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.
+
+_* /{Untranslatable strings}/
+
+Translators should never translate:
+
+ - The code names of releases
+
+ - The names of programs
+
+ - 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.
+
+ - Links
+
+ - Paths
diff --git a/manual/it/user_customization-binary.ssi b/manual/it/user_customization-binary.ssi
index c5c7260..0ec2a1e 100644
--- a/manual/it/user_customization-binary.ssi
+++ b/manual/it/user_customization-binary.ssi
@@ -4,13 +4,36 @@ B~ Personalizzare l'immagine binaria
2~ Bootloader
-live-build uses syslinux and some of its derivatives (depending on the image
-type) as bootloaders by default. You can easily modify their options using
-different methods, like {includes}#includes or {hooks}#hooks.
+live-build uses /{syslinux}/ and some of its derivatives (depending on the
+image type) as bootloaders by default. You can easily customize them in a
+number of ways that range from providing a full theme to changing the boot
+timeout or simply adding a personalized splash image. Some of the following
+examples of customization make use of different methods, like
+{includes}#includes or {hooks}#hooks.
-For example, these derivatives are configured by default with a timeout of 0
-(zero) which means that they will pause indefinitely at their splash screen
-until you press a key.
+If you want to use a full theme you can specify the #{--syslinux-theme}#
+option (see man #{lb_config}#). live-build will then retrieve the theme from
+the mirror and install it.
+
+Imagine that you want to build a progress client but you prefer to include
+the server's theme because you want to have the help menu. Then you would
+launch #{lb config}# as follows:
+
+code{
+
+ $ lb config --mode progress --syslinux-theme progress-server
+
+}code
+
+You can also create your own theme or modify an already existing one and if
+you do not have a mirror, you can add the package to
+#{config/packages.chroot}#. In this case it is not necessary to specify any
+option.
+
+There is also the possibility of making smaller changes. For instance,
+syslinux derivatives are configured by default with a timeout of 0 (zero)
+which means that they will pause indefinitely at their splash screen until
+you press a key.
To modify the boot timeout of a default #{iso-hybrid}# image you can edit a
default *{isolinux.cfg}* file specifying the timeout in units of seconds and
@@ -40,7 +63,8 @@ code{
}code
-For more information please see man syslinux(1).
+Likewise, if you want to use a personalized splash.png image you can add a
+picture of 640x480 pixels to #{config/includes.binary/isolinux/}#
2~ Metadati ISO
diff --git a/manual/it/user_customization-installer.ssi b/manual/it/user_customization-installer.ssi
index f9294a4..e1ebe0a 100644
--- a/manual/it/user_customization-installer.ssi
+++ b/manual/it/user_customization-installer.ssi
@@ -52,7 +52,7 @@ l'architettura specificata. Per esempio:
code{
- $ lb config --architecture i386 --linux-flavours 486 \
+ $ lb config --architectures i386 --linux-flavours 486 \
--debian-installer live
$ echo debian-installer-launcher >> config/package-lists/my.list.chroot
diff --git a/manual/it/user_customization-packages.ssi b/manual/it/user_customization-packages.ssi
index 665e559..cad1bf7 100644
--- a/manual/it/user_customization-packages.ssi
+++ b/manual/it/user_customization-packages.ssi
@@ -34,7 +34,7 @@ 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:
+*{unstable}*, Sid, specificare:
code{
@@ -70,13 +70,13 @@ 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 è
+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 seguito, nella fase *binaria* vengono usati i valori
-di #{--mirror-binary}# e #{--mirror-binary-security}# sostituendo qualsiasi
-altro mirror usato nelle fasi iniziali.
+*{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.
3~distribution-mirrors-build-time Mirror delle distribuzioni usati in fase
di compilazione
@@ -124,9 +124,9 @@ destinazione. Questi possono essere, per esempio, pacchetti di backport,
sperimentali o personalizzati. Per configurare repository aggiuntivi, creare
i file #{config/archives/vostro-repository.list.chroot}#, o
#{config/archives/vostro-repository.list.binary}#. Come per le opzioni
-#{--mirror-*}#, queste controlleranno i repository usati nella fase *chroot*
-quando si compila l'immagine, e nella fase *binary*, ad esempio per usarli
-quando il sistema live è avviato.
+#{--mirror-*}#, queste controlleranno i repository usati nella fase
+*{chroot}* quando si compila l'immagine, e nella fase *{binary}*, ad esempio
+per usarli quando il sistema live è avviato.
Per esempio, #{config/archives/live.list.chroot}# permette di installare
pacchetti dal repository snapshot di debian live al momento della creazione
@@ -238,26 +238,26 @@ istruzioni condizionali nell'elenco dei pacchetti. In genere questo
significa qualsiasi opzione di #{lb config}# in maiuscolo e con trattini
cambiati in trattini bassi; ma in pratica è la sola ad influenzare la
selezione dei pacchetti che abbia senso, come #{DISTRIBUTION}#,
-#{ARCHITECTURE}# o #{ARCHIVE_AREAS}#.
+#{ARCHITECTURES}# o #{ARCHIVE_AREAS}#.
-Per esempio, per installare #{ia32-libs}# se è specificata #{--architecture
+Per esempio, per installare #{ia32-libs}# se è specificata #{--architectures
amd64}#:
code{
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
ia32-libs
#endif
}code
Si può verificare per ognuna di una serie di valori, ad esempio per
-installare #{memtest86+}# specificando sia #{--architecture i386}# sia
-#{--architecture amd64}#:
+installare #{memtest86+}# specificando sia #{--architectures i386}# sia
+#{--architectures amd64}#:
code{
- #if ARCHITECTURE i386 amd64
+ #if ARCHITECTURES i386 amd64
memtest86+
#endif
@@ -279,7 +279,7 @@ Una condizione può coinvolegere una direttiva #{#include}#:
code{
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
#include <gnome-full>
#endif
diff --git a/manual/it/user_customization-runtime.ssi b/manual/it/user_customization-runtime.ssi
index fc0cea0..51cacd9 100644
--- a/manual/it/user_customization-runtime.ssi
+++ b/manual/it/user_customization-runtime.ssi
@@ -31,22 +31,21 @@ code{
}code
-It is also possible to change the default username "user" and the default
-password "live". If you want to do that for any reason, you can easily
-achieve it as follows:
+È inoltre possibile modificare facilmente il nome utente "user" e la
+password "live" predefiniti.
-To change the default username you can simply specify it in your config:
+Per cambiare il nome utente specificare quanto segue nella configurazione:
code{
-$ lb config --bootappend-live "username=live-user"
+ $ lb config --bootappend-live "username=live-user"
}code
-One possible way of changing the default password is by means of a hook as
-described in {Boot-time hooks}#boot-time-hooks. In order to do that you can
-use the "passwd" hook from #{/usr/share/doc/live-config/examples/hooks}#,
-prefix it accordingly (e.g. 200-passwd) and add it to
+Un modo per cambiare la password è tramite un hook come descritto in {Hook
+in fase di avvio}#boot-time-hooks. Si può usare l'hook "passwd" da
+#{/usr/share/doc/live-config/examples/hooks}#, anteponendolo di conseguenza
+(ad esempio, 200-passwd) e aggiungerlo al file
#{config/includes.chroot/lib/live/config/}#
2~customizing-locale-and-language Personalizzare la localizzazione e la
@@ -142,30 +141,55 @@ vengono scritte su uno scrivibile, tipicamente un ram disk (tmpfs) e i dati
sui ram disk non sopravvivono ai riavvii.
I dati immagazzinati su questo ramdisk andrebbero salvati un supporto
-scrivibile persistente come un hard disk, una chiave USB, 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}#.
-
-3~ Persistenza completa
-
-Con "persistenza completa" si intende l'uso di una partizione scrivibile
-invece di un filesystem temporaneo (tmpfs) per salvare le modifiche al
-supporto in sola lettura (con il sistema COW, copy-on-write). Per utilizzare
-questa caratteristica, una partizione con un filesystem scrivibile e
-supportato ed etichettata come "live-rw" deve essere collegata al sistema in
-fase di avvio e il sistema va fatto partire con il parametro
-"persistent". Questa partizione potrebbe essere di tipo ext2 su un hard disk
-o una penna usb creata ad esempio con:
+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}#.
+
+Se il parametro di boot #{persistent}# è impostato (e non lo è
+#{nopersistent}#), i supporti di memorizzazione locali (hard disk,
+dispositivi USB) saranno rilevati come volumi persistenti durante
+l'avvio. Un volume persistente è uno dei seguenti:
+
+_* una partizione, identificata dal suo nome GPT (GUID Partition Table).
+
+_* un filesystem, identificato dalla sua label.
+
+_* 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".
+
+È possibile limitare i tipi di volume persistenti da usare specificando
+certi parametri di boot descritti nella manpage di live-boot(7). Le "label
+identificative" di cui sopra possono essere una delle seguenti:
+
+_* #{full-ov}# per strati di persistenza completa.
+
+_* #{custom-ov}# per strati personalizzati.
+
+_* #{live-sn}# per istantanee del sistema completo.
+
+_* #{home-sn}# per istantanee della /home.
+
+3~ Strati di persistenza completa
+
+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
+con:
code{
- # mkfs.ext2 -L live-rw /dev/sdb1
+ # mkfs.ext2 -L full-ov /dev/sdb1
}code
-Si veda anche {Usare lo spazio rimanente su una penna
+Vedee anche {Usare lo spazio rimanente su una penna
USB}#using-usb-extra-space.
Se si possiede già una partizione sul dispositivo basta solo cambiare
@@ -173,61 +197,87 @@ l'etichetta con una delle seguenti:
code{
- # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems
+ $ tune2fs -L full-ov /dev/sdb1 # per filesystems ext2,3,4
}code
-Ma siccome gli utenti dei sistemi live non hanno sempre la possibilità di
-utilizzare una partizione su disco rigido, e considerando che la maggior
-parte delle chiavi USB hanno scarse velocità di scrittura, la persistenza
-"completa" può anche essere usata con dei file immagine, è possibile creare
-un file che rappresenta una partizione e inserire questo file immagine anche
-su una partizione NTFS di un sistema operativo estraneo, qualcosa come:
+Ecco un esempio di come creare un file immagine ext2 da utilizzare per la
+persistenza completa:
code{
- $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file
- $ /sbin/mkfs.ext2 -F live-rw
+ $ dd if=/dev/null of=full-ov bs=1G seek=1 # per un file immagine da 1GB
+ $ /sbin/mkfs.ext2 -F full-ov
}code
-Quindi copiare il file #{live-rw}# su una partizione scrivibile e riavviare
-con il parametro d'avvio "persistent".
+Quindi copiare il file #{full-ov}# nella directory radice di una partizione
+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
+persistenti e in che modo.
+
+Nella manpage di live.persist(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:
-3~ Mount automatico della home
+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
+
+}code
-Se durante l'avvio viene trovata una partizione (filesystem) su file
-immagine o una partizione etichettata come #{home-rw}#, questa verrà montata
-direttamente come #{/home}#, permettendo quindi la persistenza dei file che
-appartengono ad esempio all'utente predefinito. Può essere unita alla
-persistenza completa.
+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).
+
+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.
3~ Istantanee
Le istantanee sono raccolte di file e directory che non vengono montate
-durante l'esecuzione ma copiate all'avvio da un dispositivo persistente al
-sistema (tmpfs) e risincronizzate al riavvio e spegnimento. Il contenuto di
-un'istantanea può risiedere su una partizione o file immagine (come i tipi
-menzionati poc'anzi) etichettati come #{live-sn}#, ma sotto forma di un
-semplice archivio cpio nominato #{live-sn.cpio.gz}#. Come sopra, all'avvio,
-i device a blocchi collegati al sistema vengono analizzati alla ricerca di
-una partizione o file così nominati. Un'interruzione di corrente durante
-l'esecuzione potrebbe portare ad una perdita di dati, per cui si può usare
-uno strumento che richiama #{live-snapshot --refresh}# per sincronizzare i
-cambiamenti importanti. Giacché non scrive continuamente sul dispositivo,
+durante l'esecuzione ma copiate all'avvio da un volume persistente al
+sistema (tmpfs) e risincronizzate al riavvio e spegnimento. Il volume deve
+essere etichettato come #{live-sn}# sotto forma di un semplice archivio cpio
+nominato #{live-sn.cpio.gz}#. Un'interruzione di corrente durante
+l'esecuzione potrebbe portare ad una perdita di dati, se son state fatte
+modifiche importanti si può usare usare #{live-snapshot --refresh}# tante
+volte quanto necessario.Giacché non scrive continuamente sul dispositivo,
questo tipo di persistenza è il sistema più comodo e veloce per dispositivi
-basati su memoria flash.
+basati su memoria flash ma occupa tanta RAM quanta è la dimensione
+dell'istantanea decompressa.
Esiste anche un'istantanea della /home con etichetta #{home-sn.*}#; funziona
come la principale ma viene applicata solo ad /home.
-Attualmente le istantanee non possono gestire la cancellazione dei file, al
-contrario della persistenza completa e il mount automatico della home.
+Attualmente le istantanee non possono gestire la cancellazione dei file.
3~ Sottotesto persistente
Se un utente avesse bisogno di archiviazioni multiple dello stesso tipo per
-differenti posti o per test, come #{live-rw-casa}# e #{live-rw-lavoro}#, il
+differenti posti o per test, come #{full-ov-casa}# e #{full-ov-lavoro}#, il
parametro d'avvio #{persistent-subtext}# usato in congiunzione con
#{persistent}# permetterà supporti persistenti multipli ma univoci. Un
esempio potrebbe essere un utente che vuole usare una partizione etichettata
diff --git a/manual/it/user_examples.ssi b/manual/it/user_examples.ssi
index 4c632d8..911904f 100644
--- a/manual/it/user_examples.ssi
+++ b/manual/it/user_examples.ssi
@@ -137,7 +137,7 @@ code{
#!/bin/sh
lb config noauto \
- --architecture i386 \
+ --architectures i386 \
--linux-flavours 686-pae \
--package-lists lxde \
"${@}"
@@ -152,7 +152,7 @@ code{
}code
-Per prima cosa, #{--architecture i386}# assicura che sul nostro sistema
+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,
diff --git a/manual/it/user_installation.ssi b/manual/it/user_installation.ssi
index fe9f9bd..2976841 100644
--- a/manual/it/user_installation.ssi
+++ b/manual/it/user_installation.ssi
@@ -108,7 +108,7 @@ presente su Git e disponibili su http://live.debian.net/debian/.
2~ live-boot e live-config
-*{Nota:}* non è necessario installare live-boot o live-config sul proprio sistema per creare sistemi Debian Live personalizzati. Tuttavia, farlo non nuoce. Se si vuole la documentazione è possibile installare i pacchetti live-boot-doc e live-config-doc separatamente.
+*{Nota:}* non è necessario installare live-boot o live-config sul proprio sistema per creare sistemi Debian Live personalizzati. Tuttavia, farlo non nuoce. Se si vuole la documentazione è possibile installare i pacchetti /{live-boot-doc}/ e /{live-config-doc}/ separatamente.
3~ Dal repository Debian
diff --git a/manual/it/user_overview.ssi b/manual/it/user_overview.ssi
index 72b6e21..e2961d4 100644
--- a/manual/it/user_overview.ssi
+++ b/manual/it/user_overview.ssi
@@ -61,8 +61,9 @@ sottodirectory in #{auto/}#.
code{
$ lb config
+ [2012-03-19 15:17:14] lb_config
P: Considering defaults defined in /etc/live/build.conf
- P: Creating config tree
+ P: Creating config tree for a debian system
}code
@@ -84,7 +85,7 @@ code{
code{
- $ lb config --binary-images net --hostname live-machine --username live-user ...
+ $ lb config --binary-images net --bootappend-live "hostname=live-machine username=live-user" ...
}code
diff --git a/manual/po/de/about_manual.ssi.po b/manual/po/de/about_manual.ssi.po
index 11139d2..7dea398 100644
--- a/manual/po/de/about_manual.ssi.po
+++ b/manual/po/de/about_manual.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-05 17:13+0100\n"
+"POT-Creation-Date: 2012-03-07 08:59-0400\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -29,8 +29,9 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:6
msgid ""
-"The main goal of this manual is to serve as a single access point to all "
-"documentation related to the Debian Live project. While it is primarily "
+"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, "
@@ -318,15 +319,16 @@ msgstr ""
#: 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/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/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/user_customization-installer.ssi:32
@@ -390,15 +392,16 @@ msgstr ""
#: 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/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/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/user_customization-installer.ssi:38
@@ -629,7 +632,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:203
-msgid "3~ Translation"
+msgid "3~translation Translation"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/about_project.ssi.po b/manual/po/de/about_project.ssi.po
index 84006c2..49678a2 100644
--- a/manual/po/de/about_project.ssi.po
+++ b/manual/po/de/about_project.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-08-29 08:54-0200\n"
+"POT-Creation-Date: 2012-02-19 22:16+0100\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -234,18 +234,10 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_project.ssi:70
+#: 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."
msgstr ""
-
-#. type: Plain text
-#: en/about_project.ssi:71
-msgid ""
-"_* *{Wiki}*: The Debian Live wiki at http://wiki.debian.org/DebianLive is a "
-"place to gather information, discuss applied technologies, and document "
-"frameworks of Debian Live systems that go beyond the scope of this document."
-msgstr ""
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index 8c56e88..9690fb2 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-06 18:57+0100\n"
+"POT-Creation-Date: 2012-04-03 00:19+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -48,7 +48,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-02-06\n"
+" :published: 2012-04-03\n"
msgstr ""
#. type: Plain text
@@ -173,6 +173,16 @@ msgid ":B~ Examples"
msgstr ":B~ Beispiele"
#. type: Plain text
-#: en/live-manual.ssm:62
+#: en/live-manual.ssm:63
msgid "<< user_examples.ssi"
msgstr "<< user_examples.ssi"
+
+#. type: Plain text
+#: en/live-manual.ssm:65 en/style_guide.ssi:2
+msgid ":B~ Appendix"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:66
+msgid "<< style_guide.ssi"
+msgstr "<< style_guide.ssi"
diff --git a/manual/po/de/project_coding-style.ssi.po b/manual/po/de/project_coding-style.ssi.po
index f091630..d93d24d 100644
--- a/manual/po/de/project_coding-style.ssi.po
+++ b/manual/po/de/project_coding-style.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2012-03-31 16:32+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,129 +18,141 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/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/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/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/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/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: 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 ""
@@ -366,7 +378,7 @@ msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:132
msgid ""
-"_* Use \"#{|}#\" (without the surround quotes) as a seperator in calls to "
+"_* Use \"#{|}#\" (without the surround quotes) as a separator in calls to "
"sed, e.g. \"#{sed -e 's|foo|bar|'}#\" (without \"\")."
msgstr ""
diff --git a/manual/po/de/style_guide.ssi.po b/manual/po/de/style_guide.ssi.po
new file mode 100644
index 0000000..b2173dd
--- /dev/null
+++ b/manual/po/de/style_guide.ssi.po
@@ -0,0 +1,894 @@
+# 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"
+"PO-Revision-Date: 2012-02-11 16:42+0100\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: de\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/live-manual.ssm:65 en/style_guide.ssi:2
+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/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
+#: 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: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: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/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
+#: 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: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
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
+msgid "}code"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:4
+msgid "1~style-guide Style guide"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:6
+msgid "2~ Guidelines for authors"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:8
+msgid ""
+"This section deals with some general considerations to be taken into account "
+"when writing technical documentation for live-manual. They are divided into "
+"linguistic features and recommended procedures."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:10
+#, no-wrap
+msgid "*{Note:}* Authors should first read {Contributing to this document}#how-to-contribute\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:12
+msgid "3~ Linguistic features"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:14
+msgid "_* /{Use plain English}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:16
+msgid ""
+"Keep in mind that a high percentage of your readers are not native speakers. "
+"So as a general rule try to use short, meaningful sentences, followed by a "
+"full stop."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:18
+msgid ""
+"This does not mean that you have to use a simplistic, naive style. It is a "
+"suggestion to try to avoid, as much as possible, complex subordinate "
+"sentences that make the text difficult to understand for non-native speakers."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:20
+msgid "_* /{Variety of English}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:22
+msgid ""
+"The most widely spread varieties of English are British and American so it "
+"is very likely that most authors will use either one or the other. In a "
+"collaborative environment, the ideal variety would be \"International English"
+"\" but it is very difficult, not to say impossible, to decide on which "
+"variety among all the existing ones, is the best to use."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:24
+msgid ""
+"We expect that different varieties may mix without creating "
+"misunderstandings but in general terms you should try to be coherent and "
+"before deciding on using British, American or any other English flavour at "
+"your discretion, please take a look at how other people write and try to "
+"imitate them."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:26
+msgid "_* /{Be balanced}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:28
+msgid ""
+"Do not be biased. Avoid including references to ideologies completely "
+"unrelated to live-manual. Technical writing should be as neutral as "
+"possible. It is in the very nature of scientific writing."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:30
+msgid "_* /{Be politically correct}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:32
+msgid ""
+"Try to avoid sexist language as much as possible. If you need to make "
+"references to the third person singular preferably use \"they\" rather than "
+"\"he\" or \"she\" or awkward inventions such as \"s/he\", \"s(he)\" and the "
+"like."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:34
+msgid "_* /{Be concise}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:36
+msgid ""
+"Go straight to the point and do not wander around aimlessly. Give as much "
+"information as necessary but do not give more information than necessary, "
+"this is to say, do not explain unnecessary details. Your readers are "
+"intelligent. Presume some previous knowledge on their part."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:38
+msgid "_* /{Minimize translation work}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:40
+msgid ""
+"Keep in mind that whatever you write will have to be translated into several "
+"other languages. This implies that a number of people will have to do an "
+"extra work if you add useless or redundant information."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:42
+msgid "_* /{Be coherent}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:44
+msgid ""
+"As suggested before, it is almost impossible to standardize a collaborative "
+"document into a perfectly unified whole. However, every effort on your side "
+"to write in a coherent way with the rest of the authors will be appreciated."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:46
+msgid "_* /{Be cohesive}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:48
+msgid ""
+"Use as many text-forming devices as necessary to make your text cohesive and "
+"unambiguous. (Text-forming devices are linguistic markers such as "
+"connectors)."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:50
+msgid "_* /{Be descriptive}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:52
+msgid ""
+"It is preferable to describe the point in one or several paragraphs than "
+"merely using a number of sentences in a typical \"changelog\" style. "
+"Describe it! Your readers will appreciate it."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:54
+msgid "_* /{Dictionary}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:56
+msgid ""
+"Look up the meaning of words in a dictionary or encyclopedia if you do not "
+"know how to express certain concepts in English. But keep in mind that a "
+"dictionary can either be your best friend or can turn into your worst enemy "
+"if you do not know how to use it correctly."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:58
+msgid ""
+"English has the largest vocabulary that exists (With over one million "
+"words). Many of these words are borrowings from other languages. When "
+"looking up the meaning of words in a bilingual dictionary the tendency of a "
+"non-native speaker is to choose the one that sounds more similar in their "
+"mother tongue. This often turns into an excessively formal discourse which "
+"does not sound quite natural in English."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:60
+msgid ""
+"As a general rule, if a concept can be expressed using different synonyms, "
+"it is a good advice to choose the first word proposed by the dictionary. If "
+"in doubt, choosing words of Germanic origin (Usually monosyllabic words) is "
+"often the right thing to do. Be warned that these two techniques might "
+"produce a rather informal discourse but at least your choice of words will "
+"be of wide use and generally accepted."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:62
+msgid ""
+"Using a dictionary of collocations is recommended. They are extremely "
+"helpful when it comes to know which words usually occur together."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:64
+msgid ""
+"Again it is a good practice to learn from the work of others. Using a search "
+"engine to check how other authors use certain expressions may help a lot."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:66
+msgid "_* /{False friends, idioms and other idiomatic expressions}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:68
+msgid ""
+"Watch out for false friends. No matter how proficient you are in a foreign "
+"language you cannot help falling from time to time in the trap of the so "
+"called \"false friends\", words that look similar in two languages but whose "
+"meanings or uses might be completely different."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:70
+msgid ""
+"Try to avoid idioms as much as possible. \"Idioms\" are expressions that may "
+"convey a completely different meaning from what their individual words seem "
+"to mean. Sometimes, idioms are difficult to understand even for native "
+"speakers!"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:72
+msgid "_* /{Avoid slang, abbreviations, contractions...}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:74
+msgid ""
+"Even though you are encouraged to use plain, everyday English, technical "
+"writing belongs to the formal register of the language."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:76
+msgid ""
+"Try to avoid slang, unusual abbreviations that are difficult to understand "
+"and above all contractions that try to imitate the spoken language. Not to "
+"mention typical irc and family friendly expressions."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:78
+msgid "3~ Procedures"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:80
+msgid "_* /{Test before write}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:82
+msgid ""
+"It is important that authors test their examples before adding them to live-"
+"manual to ensure that everything works as described. Testing on a clean "
+"chroot or VM can be a good starting point. Besides, it would be ideal if the "
+"tests were then carried out on different machines with different hardware to "
+"spot possible problems that may arise."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:84
+msgid "_* /{Examples}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:86
+msgid ""
+"When providing an example try to be as specific as you can. An example is, "
+"after all, just an example."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:88
+msgid ""
+"It is often better to use a line that only applies to an specific case than "
+"using abstractions that may confuse your readers. In this case you can "
+"provide a brief explanation of the effects of the proposed example."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:90
+msgid ""
+"There may be some exceptions when the example suggests using some "
+"potentially dangerous commands that, if misused, may cause data loss or "
+"other similar undesirable effects. In this case you should provide a "
+"thorough explanation of the possible side effects."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:92
+msgid "_* /{External links}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:94
+msgid ""
+"Links to external sites should only be used when the information on those "
+"sites is crucial when it comes to understanding a special point. Even so, "
+"try to use links to external sites as sparsely as possible. Internet links "
+"are likely to change from time to time resulting in broken links and leaving "
+"your arguments in an incomplete state."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:96
+msgid ""
+"Besides, people who read the manual offline will not have the chance to "
+"follow those links."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:98
+msgid ""
+"_* /{Avoid branding and things that violate the license under which the "
+"manual is published}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:100
+msgid ""
+"Try to avoid branding as much as possible. Keep in mind that other "
+"downstream projects might make use of the documentation you write. So you "
+"are complicating things for them if you add certain specific material."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:102
+msgid ""
+"live-manual is licensed under the GNU GPL. This has a number of implications "
+"that apply to the distribution of the material (of any kind, including "
+"copyrighted graphics or logos) that is published with it."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:104
+msgid "_* /{Write a first draft, revise, edit, improve, redo if necessary}/"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:106
+msgid ""
+"Brainstorm!. You need to organize your ideas first in a logical sequence of "
+"events."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:108
+msgid ""
+"Once you have somehow organized those ideas in your mind write a first draft."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:110
+msgid "Revise grammar, syntax and spelling."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:112
+msgid "Improve your statements and redo any part if necessary."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:114
+msgid "_* /{Chapters}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:116
+msgid ""
+"Use the conventional numbering system for chapters and subtitles. e.g. 1, "
+"1.1, 1.1.1, 1.1.2 ... 1.2, 1.2.1, 1.2.2 ... 2, 2.1 ... and so on. See markup "
+"below."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:118
+msgid ""
+"If you have to enumerate a series of steps or stages in your description, "
+"you can also use ordinal numbers: First, second, third ... or First, Then, "
+"After that, Finally ... Alternatively you can use bulleted items."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:120 en/style_guide.ssi:214
+msgid "_* /{Markup}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:122
+msgid ""
+"And last but not least, live-manual uses {SiSU}http://www.sisudoc.org to "
+"process the text files and produce a multiple format output. It is "
+"recommended to take a look at {SiSU's manual}http://www.sisudoc.org/sisu/"
+"sisu_manual/markup.html to get familiar with its markup, or else type:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:126
+#, no-wrap
+msgid " $ sisu --help markup\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:130
+msgid "Here are some markup examples that may prove useful:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:132
+msgid "For emphasis/bold text:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:136
+#, no-wrap
+msgid "*{foo}* or !{foo}!\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:140
+msgid "produces: *{foo}* or !{foo}!. Use it to emphasize certain key words."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:142
+msgid "For italics:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:146
+msgid "/{foo}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:150
+msgid "produces: /{foo}/. Use them e.g. for the names of debian packages."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:152
+msgid "For monospace:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:156
+msgid "#{foo}#"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:160
+msgid ""
+"produces: #{foo}#. Use it e.g. for the names of commands. And also to "
+"highlight some key words or things like paths."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:162
+msgid "For code blocks:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:166
+#, no-wrap
+msgid " code{\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:169
+#, no-wrap
+msgid ""
+" $ foo\n"
+" # bar\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:171
+#, no-wrap
+msgid " }code\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:175
+msgid "produces:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:180
+#, no-wrap
+msgid ""
+" $ foo\n"
+" # bar\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:184
+msgid ""
+"Use #{code{}# to open and #{}code}# to close the tags. It is important to "
+"remember to leave a space at the beginning of each line of code."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:186
+msgid "2~ Guidelines for translators"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:188
+msgid ""
+"This section deals with some general considerations to be taken into account "
+"when translating the contents of live-manual."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:190
+msgid ""
+"As a general recommendation, translators should have read and understood the "
+"translation rules that apply to their specific languages. Usually, "
+"translation groups and mailing lists provide information on how to produce "
+"translated work that complies with Debian quality standards."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:192
+#, no-wrap
+msgid "*{Note:}* Translators should also read {Contributing to this document}#how-to-contribute. In particular the section {Translation}#translation\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:194
+msgid "3~ Translation hints"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:196
+msgid "_* /{Comments}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:198
+msgid ""
+"The role of the translator is to convey as faithfully as possible the "
+"meaning of words, sentences, paragraphs and texts as written by the original "
+"authors into their target language."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:200
+msgid ""
+"So they should refrain from adding personal comments or extra bits of "
+"information of their own. If they want to add a comment for other "
+"translators working on the same documents, they can leave it in the space "
+"reserved for that. That is, the header of the strings in the *{po}* files "
+"preceded by a number sign *{#}*. Most graphical translation programs can "
+"automatically handle those types of comments."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:202
+msgid "_* /{TN, Translator's Note}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:204
+msgid ""
+"It is perfectly acceptable however, to include a word or an expression in "
+"brackets in the translated text if, and only if, that makes the meaning of a "
+"difficult word or expression clearer to the reader. Inside the brackets the "
+"translator should make evident that the addition was theirs using the "
+"abbreviation \"TN\" or \"Translator's Note\"."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:206
+msgid "_* /{Impersonal sentences}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:208
+msgid ""
+"Documents written in English make an extensive use of the impersonal form "
+"\"you\". In some other languages that do not share this characteristic, this "
+"might give the false impression that the original texts are directly "
+"addressing the reader when they are actually not doing so. Translators must "
+"be aware of that fact and reflect it in their language as accurately as "
+"possible."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:210
+msgid "_* /{False friends}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:212
+msgid ""
+"The trap of \"false friends\" explained before especially applies to "
+"translators. Double check the meaning of suspicious false friends if in "
+"doubt."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:216
+msgid ""
+"Translators working initially with *{pot}* files and later on with *{po}* "
+"files will find many markup features in the strings. They can translate the "
+"text anyway, as long as it is translatable, but it is extremely important "
+"that they use exactly the same markup as the original English version."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:218
+msgid "_* /{Code blocks}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:220
+msgid ""
+"Some translators decide to include the code blocks in the translated files "
+"because it is easier for them to identify what has already been translated "
+"and what has not by looking at the percentages if they use a graphical "
+"translation program."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:222
+msgid ""
+"Include the code blocks if you want to score a 100% complete translation."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:224
+msgid ""
+"On the other hand some translators prefer to leave the code blocks "
+"\"untranslated\" (i.e. not including them). This makes the translation "
+"easier to maintain once finished because it does not require translators "
+"intervention if the code changes."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:226
+msgid ""
+"Leave the code blocks empty (they will be automatically added then) if you "
+"want to make your translation easier to maintain."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:228
+msgid "_* /{New lines}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:230
+msgid ""
+"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."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:232
+msgid ""
+"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."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:234
+msgid "_* /{Untranslatable strings}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:236
+msgid "Translators should never translate:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:238
+msgid "The code names of releases"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:240
+msgid "The names of programs"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:242
+msgid "The commands given as examples"
+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."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:246
+msgid "Links"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:247
+msgid "Paths"
+msgstr ""
diff --git a/manual/po/de/user_customization-binary.ssi.po b/manual/po/de/user_customization-binary.ssi.po
index af88b7e..d97664e 100644
--- a/manual/po/de/user_customization-binary.ssi.po
+++ b/manual/po/de/user_customization-binary.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-01-15 20:48+0100\n"
+"POT-Creation-Date: 2012-02-25 21:42+0100\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,23 +18,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -84,23 +86,25 @@ 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/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/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/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/user_customization-installer.ssi:38
@@ -166,36 +170,70 @@ msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:8
msgid ""
-"live-build uses syslinux and some of its derivatives (depending on the image "
-"type) as bootloaders by default. You can easily modify their options using "
-"different methods, like {includes}#includes or {hooks}#hooks."
+"live-build uses /{syslinux}/ and some of its derivatives (depending on the "
+"image type) as bootloaders by default. You can easily customize them in a "
+"number of ways that range from providing a full theme to changing the boot "
+"timeout or simply adding a personalized splash image. Some of the following "
+"examples of customization make use of different methods, like {includes}"
+"#includes or {hooks}#hooks."
msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:10
msgid ""
-"For example, these derivatives are configured by default with a timeout of 0 "
-"(zero) which means that they will pause indefinitely at their splash screen "
-"until you press a key."
+"If you want to use a full theme you can specify the #{--syslinux-theme}# "
+"option (see man #{lb_config}#). live-build will then retrieve the theme from "
+"the mirror and install it."
msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:12
msgid ""
+"Imagine that you want to build a progress client but you prefer to include "
+"the server's theme because you want to have the help menu. Then you would "
+"launch #{lb config}# as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:16
+#, no-wrap
+msgid " $ lb config --mode progress --syslinux-theme progress-server\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:20
+msgid ""
+"You can also create your own theme or modify an already existing one and if "
+"you do not have a mirror, you can add the package to #{config/packages."
+"chroot}#. In this case it is not necessary to specify any option."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:22
+msgid ""
+"There is also the possibility of making smaller changes. For instance, "
+"syslinux derivatives are configured by default with a timeout of 0 (zero) "
+"which means that they will pause indefinitely at their splash screen until "
+"you press a key."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:24
+msgid ""
"To modify the boot timeout of a default #{iso-hybrid}# image you can edit a "
"default *{isolinux.cfg}* file specifying the timeout in units of seconds and "
"add it to #{config/includes.binary/isolinux/}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:26
msgid ""
"A modified *{isolinux.cfg}* to boot after five seconds would be similar to "
"this:"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:21
+#: en/user_customization-binary.ssi:33
#, no-wrap
msgid ""
" include menu.cfg\n"
@@ -205,7 +243,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:25
+#: en/user_customization-binary.ssi:37
msgid ""
"An alternative way of achieving the same goal could be writing a hook and "
"adding it to #{config/hooks/}# Remember to add the #{.binary}# suffix to run "
@@ -213,29 +251,31 @@ msgid ""
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 ""
#. type: Plain text
-#: en/user_customization-binary.ssi:31
+#: en/user_customization-binary.ssi:43
#, no-wrap
msgid " sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:35
-msgid "For more information please see man syslinux(1)."
+#: en/user_customization-binary.ssi:47
+msgid ""
+"Likewise, if you want to use a personalized splash.png image you can add a "
+"picture of 640x480 pixels to #{config/includes.binary/isolinux/}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:37
+#: en/user_customization-binary.ssi:49
msgid "2~ ISO metadata"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:39
+#: en/user_customization-binary.ssi:51
msgid ""
"When creating an ISO9660 binary image, you can use the following options to "
"add various textual metadata for your image. This can help you easily "
@@ -243,7 +283,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:41
+#: en/user_customization-binary.ssi:53
msgid ""
"_* #{LB_ISO_APPLICATION/--iso-application NAME}#: This should describe the "
"application that will be on the image. The maximum length for this field is "
@@ -251,7 +291,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:43
+#: en/user_customization-binary.ssi:55
msgid ""
"_* #{LB_ISO_PREPARER/--iso-preparer NAME}#: This should describe the "
"preparer of the image, usually with some contact details. The default for "
@@ -260,7 +300,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:45
+#: en/user_customization-binary.ssi:57
msgid ""
"_* #{LB_ISO_PUBLISHER/--iso-publisher NAME}#: This should describe the "
"publisher of the image, usually with some contact details. The maximum "
@@ -268,7 +308,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:46
+#: en/user_customization-binary.ssi:58
msgid ""
"_* #{LB_ISO_VOLUME/--iso-volume NAME}#: This should specify the volume ID of "
"the image. This is used as a user-visible label on some platforms such as "
diff --git a/manual/po/de/user_customization-installer.ssi.po b/manual/po/de/user_customization-installer.ssi.po
index 2c9c46d..b0250d5 100644
--- a/manual/po/de/user_customization-installer.ssi.po
+++ b/manual/po/de/user_customization-installer.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-07 21:19-0400\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,22 +18,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -77,28 +80,31 @@ msgstr ""
#: 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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -141,8 +147,8 @@ msgstr ""
#: 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 ""
@@ -186,7 +192,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-installer.ssi:14
#, no-wrap
-msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a seperate 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"
+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 ""
#. type: Plain text
@@ -258,7 +264,7 @@ msgstr ""
#: en/user_customization-installer.ssi:36
#, no-wrap
msgid ""
-" $ lb config --architecture i386 --linux-flavours 486 \\\n"
+" $ lb config --architectures i386 --linux-flavours 486 \\\n"
" --debian-installer live\n"
" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
msgstr ""
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index cac34dd..6276c19 100644
--- a/manual/po/de/user_customization-packages.ssi.po
+++ b/manual/po/de/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-01-18 18:00-0400\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,23 +18,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -78,29 +80,31 @@ msgstr ""
#: 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/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/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/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/user_customization-installer.ssi:38
@@ -143,8 +147,8 @@ msgstr ""
#: 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 ""
@@ -198,7 +202,7 @@ msgid ""
"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, "
+"distribution. For example, to build against the *{unstable}* release, Sid, "
"specify:"
msgstr ""
@@ -252,13 +256,13 @@ msgid ""
"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."
+"{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 ""
#. type: Plain text
@@ -330,9 +334,9 @@ msgid ""
"backports, experimental or custom packages. To configure additional "
"repositories, create #{config/archives/your-repository.list.chroot}#, and/or "
"#{config/archives/your-repository.list.binary}# files. As with the #{--"
-"mirror-*}# options, these govern the repositories used in the *chroot* stage "
-"when building the image, and in the *binary* stage, i.e. for use when "
-"running the live system."
+"mirror-*}# options, these govern the repositories used in the *{chroot}* "
+"stage when building the image, and in the *{binary}* stage, i.e. for use "
+"when running the live system."
msgstr ""
#. type: Plain text
@@ -530,14 +534,14 @@ msgid ""
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
"Generally, this means any #{lb config}# option uppercased and with dashes "
"changed to underscores. But in practice, it is only the ones that influence "
-"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURE}"
+"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURES}"
"# or #{ARCHIVE_AREAS}#."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:138
msgid ""
-"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+"For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
"specified:"
msgstr ""
@@ -545,7 +549,7 @@ msgstr ""
#: en/user_customization-packages.ssi:144
#, no-wrap
msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
" ia32-libs\n"
" #endif\n"
msgstr ""
@@ -554,14 +558,15 @@ msgstr ""
#: en/user_customization-packages.ssi:148
msgid ""
"You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
+"# if either #{--architectures i386}# or #{--architectures amd64}# is "
+"specified:"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:154
#, no-wrap
msgid ""
-" #if ARCHITECTURE i386 amd64\n"
+" #if ARCHITECTURES i386 amd64\n"
" memtest86+\n"
" #endif\n"
msgstr ""
@@ -592,7 +597,7 @@ msgstr ""
#: en/user_customization-packages.ssi:174
#, no-wrap
msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
" #include <gnome-full>\n"
" #endif\n"
msgstr ""
@@ -991,7 +996,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:308
msgid ""
-"If there is not an #{lb config}# option to alter APT's behaviour in the way "
+"If there is not a #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
"options through to your configured APT tool. See the man pages for #{apt}# "
"and #{aptitude}# for details."
diff --git a/manual/po/de/user_customization-runtime.ssi.po b/manual/po/de/user_customization-runtime.ssi.po
index 22995c9..d415657 100644
--- a/manual/po/de/user_customization-runtime.ssi.po
+++ b/manual/po/de/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-07 21:01-0400\n"
+"POT-Creation-Date: 2012-03-24 15:08+0100\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,22 +18,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -59,46 +62,50 @@ 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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -124,25 +131,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 ""
@@ -215,7 +223,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:29
-msgid "$ lb config --bootappend-live \"username=live-user\""
+#, no-wrap
+msgid " $ lb config --bootappend-live \"username=live-user\"\n"
msgstr ""
#. type: Plain text
@@ -377,7 +386,7 @@ msgstr ""
#: en/user_customization-runtime.ssi:98
msgid ""
"The data stored on this ramdisk should be saved on a writable persistent "
-"medium like a Hard Disk, a USB key, a network share or even a session of a "
+"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}#."
@@ -385,130 +394,221 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:100
-msgid "3~ Full persistence"
+msgid ""
+"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:"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:102
+msgid "_* a partition, identified by its GPT name."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:104
+msgid "_* a filesystem, identified by its filesystem label."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:106
+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\"."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:108
+msgid ""
+"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:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:110
+msgid "_* #{full-ov}# for full persistent overlays."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:112
+msgid "_* #{custom-ov}# for custom overlays."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:114
+msgid "_* #{live-sn}# for full system snapshots."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:116
+msgid "_* #{home-sn}# for /home snapshots."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:118
+msgid "3~ Full persistent overlays"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:120
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 "
-"writable partition is used. In order to use this feature a partition with a "
-"clean writable supported filesystem on it labeled \"live-rw\" must be "
-"attached on the system at boot time and the system must be started with the "
-"boot parameter 'persistent'. This partition could be an ext2 partition on "
-"the hard disk or on a usb key created with, e.g.:"
+"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.:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:124
#, no-wrap
-msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
+msgid " # mkfs.ext2 -L full-ov /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:128
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:112
+#: en/user_customization-runtime.ssi:130
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:116
+#: en/user_customization-runtime.ssi:134
#, no-wrap
-msgid " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
+msgid " $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:120
+#: en/user_customization-runtime.ssi:138
msgid ""
-"But since live system users cannot always use a hard drive partition, and "
-"considering that most USB keys have poor write speeds, 'full' persistence "
-"could be also used with just image files, so you could create a file "
-"representing a partition and put this image file even on a NTFS partition of "
-"a foreign OS, with something like:"
+"Here's an example of how to create an ext2-based image file used for full "
+"persistence:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:125
+#: en/user_customization-runtime.ssi:143
#, no-wrap
msgid ""
-" $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
-" $ /sbin/mkfs.ext2 -F live-rw\n"
+" $ 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"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:129
+#: en/user_customization-runtime.ssi:147
msgid ""
-"Then copy the #{live-rw}# file to a writable partition and reboot with the "
-"boot parameter 'persistent'."
+"Then copy the #{full-ov}# file to the root of a writable partition and "
+"reboot."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:149
+msgid "3~ Custom overlays"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:131
-msgid "3~ Home automounting"
+#: 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."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:153
msgid ""
-"If during the boot a partition (filesystem) image file or a partition "
-"labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
-"as #{/home}#, thus permitting persistence of files that belong to e.g. the "
-"default user. It can be combined with full persistence."
+"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:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:135
+#: 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"
+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 ""
+
+#. 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 "
+"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 ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:168
msgid "3~ Snapshots"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:137
+#: 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 device to the system "
+"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 "
-"content of a snapshot could reside on a partition or an image file (like the "
-"above mentioned types) labeled #{live-sn}#, but it defaults to a simple cpio "
-"archive named #{live-sn.cpio.gz}#. As above, at boot time, the block devices "
-"connected to the system are traversed to see if a partition or a file named "
-"like that could be found. A power interruption during run time could lead to "
-"data loss, hence a tool invoked #{live-snapshot --refresh}# could be called "
-"to sync important changes. 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."
+"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:139
+#: en/user_customization-runtime.ssi:172
msgid ""
"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:141
-msgid ""
-"Snapshots cannot currently handle file deletion but full persistence and "
-"home automounting can."
+#: en/user_customization-runtime.ssi:174
+msgid "Snapshots cannot currently handle file deletion."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:176
msgid "3~ Persistent SubText"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:145
+#: en/user_customization-runtime.ssi:178
msgid ""
"If a user would need multiple persistent storage of the same type for "
-"different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
+"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 "
@@ -517,12 +617,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:147
+#: en/user_customization-runtime.ssi:180
msgid "3~ Partial remastering"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:148
+#: en/user_customization-runtime.ssi:181
msgid ""
"The run-time modification of the tmpfs could be collected using live-"
"snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index b2a9535..75705a5 100644
--- a/manual/po/de/user_examples.ssi.po
+++ b/manual/po/de/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-01-18 18:00-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -23,25 +23,27 @@ 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: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/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/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/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: 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/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,25 +91,27 @@ 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/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/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/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: 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/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
@@ -376,7 +380,7 @@ msgstr ""
#, no-wrap
msgid ""
" lb config noauto \\\n"
-" --architecture i386 \\\n"
+" --architectures i386 \\\n"
" --linux-flavours 686-pae \\\n"
" --package-lists lxde \\\n"
" \"${@}\"\n"
@@ -396,7 +400,7 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:113
msgid ""
-"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
+"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 "
diff --git a/manual/po/de/user_installation.ssi.po b/manual/po/de/user_installation.ssi.po
index 08c96cf..68590fe 100644
--- a/manual/po/de/user_installation.ssi.po
+++ b/manual/po/de/user_installation.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-07 17:40-0400\n"
+"POT-Creation-Date: 2012-03-31 16:32+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,22 +18,26 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -56,49 +60,54 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 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: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: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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -120,29 +129,30 @@ msgstr ""
#: en/user_customization-packages.ssi:302
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 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-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: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 ""
@@ -352,7 +362,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:102
#, no-wrap
-msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the live-boot-doc and live-config-doc packages separately.\n"
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the /{live-boot-doc}/ and /{live-config-doc}/ packages separately.\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_managing_a_configuration.ssi.po b/manual/po/de/user_managing_a_configuration.ssi.po
index d00b67a..2477772 100644
--- a/manual/po/de/user_managing_a_configuration.ssi.po
+++ b/manual/po/de/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-02 12:23-0200\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,22 +18,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -42,33 +45,33 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
#: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:204
-#: 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:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi: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:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: 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
@@ -77,28 +80,31 @@ msgstr ""
#: 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/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/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/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/user_customization-installer.ssi:38
@@ -107,33 +113,33 @@ msgstr ""
#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:208
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: 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: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:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: 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
@@ -141,8 +147,8 @@ msgstr ""
#: 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 ""
@@ -207,7 +213,7 @@ msgid ""
"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 #{lb config}# and #{lb clean}#, these "
+"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 "
diff --git a/manual/po/de/user_overview.ssi.po b/manual/po/de/user_overview.ssi.po
index 1f1f5c7..67349d8 100644
--- a/manual/po/de/user_overview.ssi.po
+++ b/manual/po/de/user_overview.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-07 08:16-0400\n"
+"POT-Creation-Date: 2012-03-19 18:09+0100\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,22 +18,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -56,11 +59,11 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.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: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
@@ -77,28 +80,31 @@ msgstr ""
#: 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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -120,12 +126,12 @@ msgstr ""
#: en/user_customization-packages.ssi:302
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: 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: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
@@ -141,8 +147,8 @@ msgstr ""
#: 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 ""
@@ -268,16 +274,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:40
+#: en/user_overview.ssi:41
#, no-wrap
msgid ""
" $ lb config\n"
+" [2012-03-19 15:17:14] lb_config\n"
" P: Considering defaults defined in /etc/live/build.conf\n"
-" P: Creating config tree\n"
+" P: Creating config tree for a debian system\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:44
+#: en/user_overview.ssi:45
msgid ""
"Using #{lb config}# without any arguments would be suitable for users who "
"need a very basic image, or who intend to later provide a more complete "
@@ -286,41 +293,41 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:46
+#: en/user_overview.ssi:47
msgid ""
"Normally, you will want to specify some options. For example, to include the "
"'gnome' package list in your configuration:"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:50
+#: en/user_overview.ssi:51
#, no-wrap
msgid " $ lb config -p gnome\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:54
+#: en/user_overview.ssi:55
msgid "It is possible to specify many options, such as:"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:58
+#: en/user_overview.ssi:59
#, no-wrap
-msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
+msgid " $ lb config --binary-images net --bootappend-live \"hostname=live-machine username=live-user\" ...\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:62
+#: en/user_overview.ssi:63
msgid "A full list of options is available in the #{lb_config}# man page."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:64
+#: en/user_overview.ssi:65
msgid "3~lb-build The #{lb build}# command"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:66
+#: en/user_overview.ssi:67
msgid ""
"The #{lb build}# command reads in your configuration from the #{config/}# "
"directory. It then runs the lower level commands needed to build your Live "
@@ -328,12 +335,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:68
+#: en/user_overview.ssi:69
msgid "3~lb-clean The #{lb clean}# command"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:70
+#: en/user_overview.ssi:71
msgid ""
"It is the job of the #{lb clean}# command to remove various parts of a build "
"so subsequent builds can start from a clean state. By default, #{chroot}#, #"
@@ -345,12 +352,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:72
+#: en/user_overview.ssi:73
msgid "2~live-boot The live-boot package"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:74
+#: en/user_overview.ssi:75
msgid ""
"live-boot is a collection of scripts providing hooks for the initramfs-"
"tools, used to generate an initramfs capable of booting live systems, such "
@@ -359,7 +366,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:76
+#: en/user_overview.ssi:77
msgid ""
"At boot time it will look for read-only media containing a #{/live/}# "
"directory where a root filesystem (often a compressed filesystem image like "
@@ -368,7 +375,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:78
+#: en/user_overview.ssi:79
msgid ""
"More information on initial ramfs in Debian can be found in the Debian Linux "
"Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
@@ -376,12 +383,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:80
+#: en/user_overview.ssi:81
msgid "2~live-config The live-config package"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:81
+#: en/user_overview.ssi:82
msgid ""
"live-config consists of the scripts that run at boot time after live-boot to "
"configure the live system automatically. It handles such tasks as setting "
diff --git a/manual/po/es/about_manual.ssi.po b/manual/po/es/about_manual.ssi.po
index 87a723a..c086678 100644
--- a/manual/po/es/about_manual.ssi.po
+++ b/manual/po/es/about_manual.ssi.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-05 17:13+0100\n"
-"PO-Revision-Date: 2012-02-05 17:36+0100\n"
+"POT-Creation-Date: 2012-03-07 08:59-0400\n"
+"PO-Revision-Date: 2012-03-07 22:32+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"
@@ -34,8 +34,9 @@ msgstr "1~about-manual Acerca de este manual"
#. type: Plain text
#: en/about_manual.ssi:6
msgid ""
-"The main goal of this manual is to serve as a single access point to all "
-"documentation related to the Debian Live project. While it is primarily "
+"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, "
@@ -44,16 +45,17 @@ msgid ""
"selecting a keyboard layout and locale, and using persistence."
msgstr ""
"El objetivo principal de este manual es servir como único punto de acceso a "
-"toda la documentación referente al projecto Debian Live. Está principalmente "
+"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 "
-"cubre la preparación de las imágenes para arrancar un sistema desde un medio "
-"de almacenamiento o desde red local. {Personalización del comportamiento en "
-"tiempo de ejecución}#customizing-run-time-behaviours describe alguna 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."
+"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.
@@ -113,12 +115,12 @@ msgstr ""
"{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 ejemplos}#using-the-examples, seguido de "
+"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, "
+"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-"
@@ -443,15 +445,16 @@ msgstr ""
#: 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/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/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/user_customization-installer.ssi:32
@@ -502,7 +505,7 @@ msgstr "code{"
#. type: Plain text
#: en/about_manual.ssi:86
msgid "$ git clone git://live.debian.net/git/live-manual.git"
-msgstr "$ git clone git://live.debian.net/git/live-manual.git"
+msgstr ""
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
@@ -515,15 +518,16 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: 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/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/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/user_customization-installer.ssi:38
@@ -580,14 +584,13 @@ msgid ""
msgstr ""
"Antes de enviar una contribución se debería realizar una visualización del "
"trabajo realizado. Para ello asegurarse de tener instalados los paquetes "
-"necesarios para la construcción del live-manual ejecutando la siguiente "
-"orden:"
+"necesarios para la construcción de live-manual ejecutando la siguiente orden:"
#. type: Plain text
#: en/about_manual.ssi:94
#, no-wrap
msgid " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
-msgstr " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
+msgstr ""
#. type: Plain text
#: en/about_manual.ssi:98
@@ -603,7 +606,7 @@ msgstr ""
#: en/about_manual.ssi:102
#, no-wrap
msgid " $ make build\n"
-msgstr " $ make build\n"
+msgstr ""
#. type: Plain text
#: en/about_manual.ssi:106
@@ -620,7 +623,7 @@ msgstr ""
#: en/about_manual.ssi:110
#, no-wrap
msgid " $ make build LANGUAGES=en\n"
-msgstr "$ make build LANGUAGES=en\n"
+msgstr ""
#. type: Plain text
#: en/about_manual.ssi:114
@@ -631,7 +634,7 @@ msgstr "Es posible generar el documento por formato:"
#: en/about_manual.ssi:118
#, no-wrap
msgid " $ make build FORMATS=pdf\n"
-msgstr " $ make build FORMATS=pdf\n"
+msgstr ""
#. type: Plain text
#: en/about_manual.ssi:122
@@ -642,7 +645,7 @@ msgstr "O combinar ambos, por ejemplo:"
#: en/about_manual.ssi:126
#, no-wrap
msgid " $ make build FORMATS=html LANGUAGES=it\n"
-msgstr " $ make build FORMATS=html LANGUAGES=it\n"
+msgstr ""
#. type: Plain text
#: en/about_manual.ssi:130
@@ -677,12 +680,6 @@ msgid ""
" -O ~/.ssh/identity.d/git at live.debian.net.pub\n"
" $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*\n"
msgstr ""
-" $ mkdir -p ~/.ssh/identity.d\n"
-" $ wget http://live.debian.net/other/keys/git@live.debian.net \\\n"
-" -O ~/.ssh/identity.d/git at live.debian.net\n"
-" $ wget http://live.debian.net/other/keys/git@live.debian.net.pub \\\n"
-" -O ~/.ssh/identity.d/git at live.debian.net.pub\n"
-" $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*\n"
#. type: Plain text
#: en/about_manual.ssi:147
@@ -702,12 +699,6 @@ msgid ""
" IdentityFile ~/.ssh/identity.d/git at live.debian.net\n"
" EOF\n"
msgstr ""
-" $ cat >> ~/.ssh/config << EOF\n"
-" Host live.debian.net\n"
-" Hostname live.debian.net\n"
-" User git\n"
-" IdentityFile ~/.ssh/identity.d/git at live.debian.net\n"
-" EOF\n"
#. type: Plain text
#: en/about_manual.ssi:160
@@ -721,8 +712,6 @@ msgid ""
" $ git clone git at live.debian.net:/live-manual.git\n"
" $ cd live-manual && git checkout debian-next\n"
msgstr ""
-" $ git clone git at live.debian.net:/live-manual.git\n"
-" $ cd live-manual && git checkout debian-next\n"
#. type: Plain text
#: en/about_manual.ssi:169
@@ -748,7 +737,7 @@ msgstr ""
#: en/about_manual.ssi:175
#, no-wrap
msgid " $ make commit\n"
-msgstr " $ make commit\n"
+msgstr ""
#. type: Plain text
#: en/about_manual.ssi:179
@@ -759,7 +748,7 @@ msgstr "_* Entonces"
#: en/about_manual.ssi:183
#, no-wrap
msgid " $ git add .\n"
-msgstr " $ git add .\n"
+msgstr ""
#. type: Plain text
#: en/about_manual.ssi:187
@@ -770,8 +759,8 @@ msgid ""
"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. Se deberá escribir un mensaje de entrega que consistirá en una "
-"o varias frases en ingles, comenzando con una letra mayúscula y acabando con "
+"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"
@@ -779,7 +768,7 @@ msgstr ""
#: en/about_manual.ssi:191
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
-msgstr "$ git commit -a -m \"Adding a section on applying patches.\"\n"
+msgstr ""
#. type: Plain text
#: en/about_manual.ssi:195
@@ -792,12 +781,12 @@ msgstr ""
#: en/about_manual.ssi:199
#, no-wrap
msgid " $ git push\n"
-msgstr " $ git push\n"
+msgstr ""
#. type: Plain text
#: en/about_manual.ssi:203
-msgid "3~ Translation"
-msgstr "3~ Traducciones"
+msgid "3~translation Translation"
+msgstr "3~translation Traducción"
#. type: Plain text
#: en/about_manual.ssi:205
@@ -849,4 +838,4 @@ msgstr ""
#: en/about_manual.ssi:212
#, 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"
+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 8b52d28..6996bad 100644
--- a/manual/po/es/about_project.ssi.po
+++ b/manual/po/es/about_project.ssi.po
@@ -10,9 +10,10 @@ msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-29 08:54-0200\n"
-"PO-Revision-Date: 2011-08-29 22:21+0200\n"
-"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
+"POT-Creation-Date: 2012-02-19 22:16+0100\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"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
@@ -132,7 +133,7 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:32
msgid "_* It would be a subproject of Debian."
-msgstr "_* Debería ser un subproyecto de Debian."
+msgstr "_* Sería un subproyecto de Debian."
#. type: Plain text
#: en/about_project.ssi:34
@@ -293,7 +294,7 @@ msgstr ""
"no llega, se puede enviar la pregunta a la lista de correos."
#. type: Plain text
-#: en/about_project.ssi:70
+#: 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 "
@@ -304,15 +305,3 @@ msgstr ""
"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."
-
-#. type: Plain text
-#: en/about_project.ssi:71
-msgid ""
-"_* *{Wiki}*: The Debian Live wiki at http://wiki.debian.org/DebianLive is a "
-"place to gather information, discuss applied technologies, and document "
-"frameworks of Debian Live systems that go beyond the scope of this document."
-msgstr ""
-"_* *{Wiki}*: El wiki de Debian Live en http://wiki.debian.org/DebianLive es "
-"el lugar donde obtener información, discutir sobre la aplicación de "
-"tecnologías y de documentar herramientas para los sistemas Debian Live que "
-"vayan más allá del ámbito de este documento."
diff --git a/manual/po/es/live-manual.ssm.po b/manual/po/es/live-manual.ssm.po
index f788ace..beec0ed 100644
--- a/manual/po/es/live-manual.ssm.po
+++ b/manual/po/es/live-manual.ssm.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-06 18:57+0100\n"
+"POT-Creation-Date: 2012-04-03 00:19+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"
@@ -53,7 +53,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-02-06\n"
+" :published: 2012-04-03\n"
msgstr ""
#. type: Plain text
@@ -178,6 +178,16 @@ msgid ":B~ Examples"
msgstr ":B~ Ejemplos"
#. type: Plain text
-#: en/live-manual.ssm:62
+#: en/live-manual.ssm:63
msgid "<< user_examples.ssi"
msgstr "<< user_examples.ssi"
+
+#. type: Plain text
+#: en/live-manual.ssm:65 en/style_guide.ssi:2
+msgid ":B~ Appendix"
+msgstr ":B~ Apéndice"
+
+#. type: Plain text
+#: en/live-manual.ssm:66
+msgid "<< style_guide.ssi"
+msgstr "<< style_guide.ssi"
diff --git a/manual/po/es/project_bugs.ssi.po b/manual/po/es/project_bugs.ssi.po
index 4b86e1c..c6e60bb 100644
--- a/manual/po/es/project_bugs.ssi.po
+++ b/manual/po/es/project_bugs.ssi.po
@@ -9,8 +9,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-24 14:17-0400\n"
-"PO-Revision-Date: 2011-03-12 13:16+0100\n"
+"POT-Creation-Date: 2011-04-23 14: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"
"Language-Team: Debian live Spanish translation team <debian-live at lists."
@@ -24,21 +24,21 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi: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: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/project_procedures.ssi:58 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_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-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
@@ -64,7 +64,7 @@ msgstr ""
#: 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-runtime.ssi:97 en/user_customization-runtime.ssi:105
#: 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
@@ -88,21 +88,21 @@ msgstr "code{"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi: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: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/project_procedures.ssi:131 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_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-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
@@ -124,11 +124,11 @@ msgstr "code{"
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi: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:102 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
#: 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
@@ -141,7 +141,7 @@ msgstr "code{"
#: 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_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
@@ -237,8 +237,8 @@ msgid ""
"always default to the *{stable}* release."
msgstr ""
"Si esto causa mucha dificultad, no se debe crear un sistema basado en *"
-"{testing}* o *{unstable}*, sino que debe utilizarse *{stable}*. Live-build "
-"siempre utiliza por defecto la versión *{stable}* ."
+"{testing}* o *{unstable}*, sino que debe utilizarse *{stable}*. live-build "
+"siempre crea, por defecto, la versión *{stable}* ."
#. type: Plain text
#: en/project_bugs.ssi:24
@@ -386,7 +386,7 @@ msgstr ""
#: en/project_bugs.ssi:62
#, no-wrap
msgid " # lb build 2>&1 | tee build.log\n"
-msgstr " # lb build 2>&1 | tee build.log\n"
+msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:66
@@ -447,7 +447,7 @@ msgid ""
"increments."
msgstr ""
"Si es posible, aislar el caso del fallo al menor cambio posible que lo "
-"produzca. No siempre es fácil hacer esto, así que si no se consigue para su "
+"produzca. No siempre es fácil hacer esto, así que si no se consigue para el "
"informe, no hay que preocuparse. Sin embargo, si se planea el ciclo de "
"desarrollo bién, con conjuntos de cambios lo bastante pequeños por "
"iteración, puede ser posible aislar el problema mediante la construcción de "
diff --git a/manual/po/es/project_coding-style.ssi.po b/manual/po/es/project_coding-style.ssi.po
index c67fa1f..ca5567f 100644
--- a/manual/po/es/project_coding-style.ssi.po
+++ b/manual/po/es/project_coding-style.ssi.po
@@ -9,8 +9,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-01-20 16:58-0400\n"
-"PO-Revision-Date: 2011-03-18 14:29+0100\n"
+"POT-Creation-Date: 2012-03-31 16:32+0300\n"
+"PO-Revision-Date: 2012-02-19 18:18+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."
@@ -23,129 +23,141 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi: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/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/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/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/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/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/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/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/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/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: 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"
@@ -178,7 +190,7 @@ msgid ""
"example, the use of array constructs."
msgstr ""
"_* No utilizar sintaxis o semántica que sea única para el intérprete de "
-"comandos Bash. Por ejemplo, el uso de matrices."
+"comandos Bash. Por ejemplo, el uso de arrays."
#. type: Plain text
#: en/project_coding-style.ssi:12
@@ -233,9 +245,6 @@ msgid ""
" bar\n"
" fi\n"
msgstr ""
-" if foo; then\n"
-" bar\n"
-" fi\n"
#. type: Plain text
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:59
@@ -252,10 +261,6 @@ msgid ""
" bar\n"
" fi\n"
msgstr ""
-" if foo\n"
-" then\n"
-" bar\n"
-" fi\n"
#. type: Plain text
#: en/project_coding-style.ssi:47
@@ -270,9 +275,6 @@ msgid ""
" bar\n"
" }\n"
msgstr ""
-" foo () {\n"
-" bar\n"
-" }\n"
#. type: Plain text
#: en/project_coding-style.ssi:66
@@ -283,10 +285,6 @@ msgid ""
" bar\n"
" }\n"
msgstr ""
-" foo ()\n"
-" {\n"
-" bar\n"
-" }\n"
#. type: Plain text
#: en/project_coding-style.ssi:70
@@ -366,13 +364,13 @@ msgstr ""
#: en/project_coding-style.ssi:94
#, no-wrap
msgid " FOO=bar\n"
-msgstr " FOO=bar\n"
+msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:102
#, no-wrap
msgid " FOO=\"bar\"\n"
-msgstr " FOO=\"bar\"\n"
+msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:106
@@ -390,10 +388,6 @@ msgid ""
" foobar\n"
" fi\n"
msgstr ""
-" if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
-" then\n"
-" foobar\n"
-" fi\n"
#. type: Plain text
#: en/project_coding-style.ssi:126
@@ -404,10 +398,6 @@ msgid ""
" foobar\n"
" fi\n"
msgstr ""
-" if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
-" then\n"
-" foobar\n"
-" fi\n"
#. type: Plain text
#: en/project_coding-style.ssi:130
@@ -417,7 +407,7 @@ msgstr "2~ Miscelánea"
#. type: Plain text
#: en/project_coding-style.ssi:132
msgid ""
-"_* Use \"#{|}#\" (without the surround quotes) as a seperator in calls to "
+"_* Use \"#{|}#\" (without the surround quotes) as a separator in calls to "
"sed, e.g. \"#{sed -e 's|foo|bar|'}#\" (without \"\")."
msgstr ""
"_* Se debe utilizar \"#{|}#\" (sin comillas) como separador cuando se "
diff --git a/manual/po/es/project_procedures.ssi.po b/manual/po/es/project_procedures.ssi.po
index 7f51594..1dfe77f 100644
--- a/manual/po/es/project_procedures.ssi.po
+++ b/manual/po/es/project_procedures.ssi.po
@@ -9,8 +9,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-19 20:37-0400\n"
-"PO-Revision-Date: 2011-03-18 14:48+0100\n"
+"POT-Creation-Date: 2011-04-23 14:15+0300\n"
+"PO-Revision-Date: 2012-02-19 18:24+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."
@@ -24,21 +24,21 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:58
+#: 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: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/project_procedures.ssi:58 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_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-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
@@ -64,7 +64,7 @@ msgstr ""
#: 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-runtime.ssi:97 en/user_customization-runtime.ssi:105
#: 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
@@ -88,21 +88,21 @@ 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/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: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/project_procedures.ssi:131 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_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-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
@@ -124,11 +124,11 @@ msgstr "code{"
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi: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:102 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
#: 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
@@ -141,7 +141,7 @@ msgstr "code{"
#: 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_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
@@ -185,7 +185,7 @@ msgstr ""
#: en/project_procedures.ssi:14
#, no-wrap
msgid " $ ../../scripts/l10n/output-l10n-changes . -d\n"
-msgstr " $ ../../scripts/l10n/output-l10n-changes . -d\n"
+msgstr ""
#. type: Plain text
#: en/project_procedures.ssi:18
@@ -291,11 +291,6 @@ msgid ""
" -e 's|%codename%|lenny|g' \\\n"
" -e 's|%release_mail%|2009/msg00007.html|g'\n"
msgstr ""
-" $ sed \\\n"
-" -e 's|%major%|5.0|g' \\\n"
-" -e 's|%minor%|5.0.2|g' \\\n"
-" -e 's|%codename%|lenny|g' \\\n"
-" -e 's|%release_mail%|2009/msg00007.html|g'\n"
#. type: Plain text
#: en/project_procedures.ssi:56
@@ -310,7 +305,7 @@ msgstr ""
#: en/project_procedures.ssi:60
#, no-wrap
msgid " Debian Live images for Debian GNU/Linux %major% updated\n"
-msgstr "Imágenes de Debian en vivo para Debian GNU/Linux %major% actualizadas\n"
+msgstr ""
#. type: Plain text
#: en/project_procedures.ssi:64
@@ -320,20 +315,18 @@ msgid ""
" updated Live images for its stable distribution Debian GNU/Linux %major%\n"
" (codename \"%codename%\").\n"
msgstr ""
-"El proyecto Debian Live se complace en anunciar la disponibilidad de las imágenes en vivo actualizadas para su distribución estable de Debian GNU / Linux %major%\n"
-" (nombre en clave \"%codename%\").\n"
#. type: Plain text
#: en/project_procedures.ssi:66
#, no-wrap
msgid " The images are available for download at:\n"
-msgstr " Las imágenes están disponibles para su descarga en:\n"
+msgstr ""
#. type: Plain text
#: en/project_procedures.ssi:68
#, no-wrap
msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
-msgstr " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
+msgstr ""
#. type: Plain text
#: en/project_procedures.ssi:73
@@ -344,32 +337,28 @@ msgid ""
" along with a few adjustments for serious problems. A full list of the\n"
" changes may be viewed at:\n"
msgstr ""
-" Esta actualización incorpora las modificaciones introducidas en la nueva versión, %minor% \n"
-" la cual añade correcciones para problemas de seguridad a la versión estable\n"
-" junto con algunos ajustes para problemas graves. Se puede consultar\n"
-" una lista completa de los cambios en:\n"
#. type: Plain text
#: en/project_procedures.ssi:75
#, no-wrap
msgid " <http://lists.debian.org/debian-announce/%release_mail%>\n"
-msgstr " <http://lists.debian.org/debian-announce/%release_mail%>\n"
+msgstr ""
#. type: Plain text
#: en/project_procedures.ssi:77
#, no-wrap
msgid " It also includes the following Live-specific changes:\n"
-msgstr "También incluye los siguientes cambios específicos del proyecto Live:\n"
+msgstr ""
#. type: Bullet: ' * '
#: en/project_procedures.ssi:81
msgid "[INSERT LIVE-SPECIFIC CHANGE HERE]"
-msgstr "[INSERTAR CAMBIOS ESPECÍFICOS DEL PROYECTO LIVE AQUI]"
+msgstr ""
#. type: Bullet: ' * '
#: en/project_procedures.ssi:81
msgid "[LARGER ISSUES MAY DESERVE THEIR OWN SECTION]"
-msgstr "[LAS CUESTIONES MÁS IMPORTANTES PUEDEN MERECER SU PROPIA SECCIÓN]"
+msgstr ""
#. type: Plain text
#: en/project_procedures.ssi:85
@@ -378,68 +367,66 @@ msgid ""
" URLs\n"
" ----\n"
msgstr ""
-" URLs\n"
-" ----\n"
#. type: Plain text
#: en/project_procedures.ssi:87
#, no-wrap
msgid " Download location of updated images:\n"
-msgstr "Sitio de descarga de imágenes actualizadas:\n"
+msgstr ""
#. type: Plain text
#: en/project_procedures.ssi:89
#, no-wrap
msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
-msgstr " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
+msgstr ""
#. type: Plain text
#: en/project_procedures.ssi:91
#, no-wrap
msgid " Debian Live project homepage:\n"
-msgstr "Página principal del proyecto Debian Live\n"
+msgstr ""
#. type: Plain text
#: en/project_procedures.ssi:93
#, no-wrap
msgid " <http://live.debian.net/>\n"
-msgstr " <http://live.debian.net/>\n"
+msgstr ""
#. type: Plain text
#: en/project_procedures.ssi:95
#, no-wrap
msgid " The current stable distribution:\n"
-msgstr " La distribución estable actual:\n"
+msgstr ""
#. type: Plain text
#: en/project_procedures.ssi:97
#, no-wrap
msgid " <http://ftp.debian.org/debian/dists/stable>\n"
-msgstr " <http://ftp.debian.org/debian/dists/stable>\n"
+msgstr ""
#. type: Plain text
#: en/project_procedures.ssi:99
#, no-wrap
msgid " stable distribution information (release notes, errata etc.):\n"
-msgstr "Información acerca de la distribución estable (notas de publicación, errores, etc.):\n"
+msgstr ""
#. type: Plain text
#: en/project_procedures.ssi:101
#, no-wrap
msgid " <http://www.debian.org/releases/stable/>\n"
-msgstr " <http://www.debian.org/releases/stable/>\n"
+msgstr ""
#. type: Plain text
#: en/project_procedures.ssi:103
#, no-wrap
msgid " Security announcements and information:\n"
-msgstr "Anuncios de seguridad e información\n"
+msgstr ""
#. type: Plain text
#: en/project_procedures.ssi:105
#, no-wrap
msgid " <http://www.debian.org/security/>\n"
-msgstr " <http://www.debian.org/security/>\n"
+msgstr ""
#. type: Plain text
#: en/project_procedures.ssi:109
@@ -448,8 +435,6 @@ msgid ""
" About Debian\n"
" -------------\n"
msgstr ""
-" Acerca de Debian\n"
-" -------------\n"
#. type: Plain text
#: en/project_procedures.ssi:113
@@ -459,9 +444,6 @@ msgid ""
" volunteer their time and effort in order to produce the completely free\n"
" operating system Debian GNU/Linux.\n"
msgstr ""
-" El Proyecto Debian es una asociación de desarrolladores de Software Libre que\n"
-" ofrecen voluntariamente su tiempo y esfuerzo con el fin de producir el\n"
-" sistema operativo libre Debian GNU/Linux.\n"
#. type: Plain text
#: en/project_procedures.ssi:117
@@ -470,8 +452,6 @@ msgid ""
" About Debian Live\n"
" -----------------\n"
msgstr ""
-" Acerca de Debian Live\n"
-" -----------------\n"
#. type: Plain text
#: en/project_procedures.ssi:122
@@ -482,10 +462,6 @@ msgid ""
" for CD/DVD discs, USB sticks and PXE netbooting as well as a bare\n"
" filesystem images for booting directly from the internet.\n"
msgstr ""
-" Debian Live es un sub-proyecto oficial de Debian que produce sistemas\n"
-" Debian que no requieren una instalación clásica. Las imágenes están disponibles\n"
-" para CD/DVD, llaves USB y arranque en red PXE, así como\n"
-" imágenes de un sistema de ficheros básico para el arranque directamente desde Internet.\n"
#. type: Plain text
#: en/project_procedures.ssi:126
@@ -494,8 +470,6 @@ msgid ""
" Contact Information\n"
" -------------------\n"
msgstr ""
-" Información de contacto\n"
-" -------------------\n"
#. type: Plain text
#: en/project_procedures.ssi:130
@@ -505,6 +479,3 @@ msgid ""
" <http://live.debian.net/> or alternatively send mail to\n"
" <debian-live at lists.debian.org>.\n"
msgstr ""
-"Para más información, visitar las páginas web de Debian Live\n"
-"<http://live.debian.net/> o bien enviar un correo a\n"
-"<debian-live at lists.debian.org>.\n"
diff --git a/manual/po/es/style_guide.ssi.po b/manual/po/es/style_guide.ssi.po
new file mode 100644
index 0000000..a893b5b
--- /dev/null
+++ b/manual/po/es/style_guide.ssi.po
@@ -0,0 +1,894 @@
+# 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"
+"PO-Revision-Date: 2012-02-11 16:42+0100\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: es\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/live-manual.ssm:65 en/style_guide.ssi:2
+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/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
+#: 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: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: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/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
+#: 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: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
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/style_guide.ssi:4
+msgid "1~style-guide Style guide"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:6
+msgid "2~ Guidelines for authors"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:8
+msgid ""
+"This section deals with some general considerations to be taken into account "
+"when writing technical documentation for live-manual. They are divided into "
+"linguistic features and recommended procedures."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:10
+#, no-wrap
+msgid "*{Note:}* Authors should first read {Contributing to this document}#how-to-contribute\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:12
+msgid "3~ Linguistic features"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:14
+msgid "_* /{Use plain English}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:16
+msgid ""
+"Keep in mind that a high percentage of your readers are not native speakers. "
+"So as a general rule try to use short, meaningful sentences, followed by a "
+"full stop."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:18
+msgid ""
+"This does not mean that you have to use a simplistic, naive style. It is a "
+"suggestion to try to avoid, as much as possible, complex subordinate "
+"sentences that make the text difficult to understand for non-native speakers."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:20
+msgid "_* /{Variety of English}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:22
+msgid ""
+"The most widely spread varieties of English are British and American so it "
+"is very likely that most authors will use either one or the other. In a "
+"collaborative environment, the ideal variety would be \"International English"
+"\" but it is very difficult, not to say impossible, to decide on which "
+"variety among all the existing ones, is the best to use."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:24
+msgid ""
+"We expect that different varieties may mix without creating "
+"misunderstandings but in general terms you should try to be coherent and "
+"before deciding on using British, American or any other English flavour at "
+"your discretion, please take a look at how other people write and try to "
+"imitate them."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:26
+msgid "_* /{Be balanced}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:28
+msgid ""
+"Do not be biased. Avoid including references to ideologies completely "
+"unrelated to live-manual. Technical writing should be as neutral as "
+"possible. It is in the very nature of scientific writing."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:30
+msgid "_* /{Be politically correct}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:32
+msgid ""
+"Try to avoid sexist language as much as possible. If you need to make "
+"references to the third person singular preferably use \"they\" rather than "
+"\"he\" or \"she\" or awkward inventions such as \"s/he\", \"s(he)\" and the "
+"like."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:34
+msgid "_* /{Be concise}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:36
+msgid ""
+"Go straight to the point and do not wander around aimlessly. Give as much "
+"information as necessary but do not give more information than necessary, "
+"this is to say, do not explain unnecessary details. Your readers are "
+"intelligent. Presume some previous knowledge on their part."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:38
+msgid "_* /{Minimize translation work}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:40
+msgid ""
+"Keep in mind that whatever you write will have to be translated into several "
+"other languages. This implies that a number of people will have to do an "
+"extra work if you add useless or redundant information."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:42
+msgid "_* /{Be coherent}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:44
+msgid ""
+"As suggested before, it is almost impossible to standardize a collaborative "
+"document into a perfectly unified whole. However, every effort on your side "
+"to write in a coherent way with the rest of the authors will be appreciated."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:46
+msgid "_* /{Be cohesive}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:48
+msgid ""
+"Use as many text-forming devices as necessary to make your text cohesive and "
+"unambiguous. (Text-forming devices are linguistic markers such as "
+"connectors)."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:50
+msgid "_* /{Be descriptive}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:52
+msgid ""
+"It is preferable to describe the point in one or several paragraphs than "
+"merely using a number of sentences in a typical \"changelog\" style. "
+"Describe it! Your readers will appreciate it."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:54
+msgid "_* /{Dictionary}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:56
+msgid ""
+"Look up the meaning of words in a dictionary or encyclopedia if you do not "
+"know how to express certain concepts in English. But keep in mind that a "
+"dictionary can either be your best friend or can turn into your worst enemy "
+"if you do not know how to use it correctly."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:58
+msgid ""
+"English has the largest vocabulary that exists (With over one million "
+"words). Many of these words are borrowings from other languages. When "
+"looking up the meaning of words in a bilingual dictionary the tendency of a "
+"non-native speaker is to choose the one that sounds more similar in their "
+"mother tongue. This often turns into an excessively formal discourse which "
+"does not sound quite natural in English."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:60
+msgid ""
+"As a general rule, if a concept can be expressed using different synonyms, "
+"it is a good advice to choose the first word proposed by the dictionary. If "
+"in doubt, choosing words of Germanic origin (Usually monosyllabic words) is "
+"often the right thing to do. Be warned that these two techniques might "
+"produce a rather informal discourse but at least your choice of words will "
+"be of wide use and generally accepted."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:62
+msgid ""
+"Using a dictionary of collocations is recommended. They are extremely "
+"helpful when it comes to know which words usually occur together."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:64
+msgid ""
+"Again it is a good practice to learn from the work of others. Using a search "
+"engine to check how other authors use certain expressions may help a lot."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:66
+msgid "_* /{False friends, idioms and other idiomatic expressions}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:68
+msgid ""
+"Watch out for false friends. No matter how proficient you are in a foreign "
+"language you cannot help falling from time to time in the trap of the so "
+"called \"false friends\", words that look similar in two languages but whose "
+"meanings or uses might be completely different."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:70
+msgid ""
+"Try to avoid idioms as much as possible. \"Idioms\" are expressions that may "
+"convey a completely different meaning from what their individual words seem "
+"to mean. Sometimes, idioms are difficult to understand even for native "
+"speakers!"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:72
+msgid "_* /{Avoid slang, abbreviations, contractions...}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:74
+msgid ""
+"Even though you are encouraged to use plain, everyday English, technical "
+"writing belongs to the formal register of the language."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:76
+msgid ""
+"Try to avoid slang, unusual abbreviations that are difficult to understand "
+"and above all contractions that try to imitate the spoken language. Not to "
+"mention typical irc and family friendly expressions."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:78
+msgid "3~ Procedures"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:80
+msgid "_* /{Test before write}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:82
+msgid ""
+"It is important that authors test their examples before adding them to live-"
+"manual to ensure that everything works as described. Testing on a clean "
+"chroot or VM can be a good starting point. Besides, it would be ideal if the "
+"tests were then carried out on different machines with different hardware to "
+"spot possible problems that may arise."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:84
+msgid "_* /{Examples}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:86
+msgid ""
+"When providing an example try to be as specific as you can. An example is, "
+"after all, just an example."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:88
+msgid ""
+"It is often better to use a line that only applies to an specific case than "
+"using abstractions that may confuse your readers. In this case you can "
+"provide a brief explanation of the effects of the proposed example."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:90
+msgid ""
+"There may be some exceptions when the example suggests using some "
+"potentially dangerous commands that, if misused, may cause data loss or "
+"other similar undesirable effects. In this case you should provide a "
+"thorough explanation of the possible side effects."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:92
+msgid "_* /{External links}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:94
+msgid ""
+"Links to external sites should only be used when the information on those "
+"sites is crucial when it comes to understanding a special point. Even so, "
+"try to use links to external sites as sparsely as possible. Internet links "
+"are likely to change from time to time resulting in broken links and leaving "
+"your arguments in an incomplete state."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:96
+msgid ""
+"Besides, people who read the manual offline will not have the chance to "
+"follow those links."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:98
+msgid ""
+"_* /{Avoid branding and things that violate the license under which the "
+"manual is published}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:100
+msgid ""
+"Try to avoid branding as much as possible. Keep in mind that other "
+"downstream projects might make use of the documentation you write. So you "
+"are complicating things for them if you add certain specific material."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:102
+msgid ""
+"live-manual is licensed under the GNU GPL. This has a number of implications "
+"that apply to the distribution of the material (of any kind, including "
+"copyrighted graphics or logos) that is published with it."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:104
+msgid "_* /{Write a first draft, revise, edit, improve, redo if necessary}/"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:106
+msgid ""
+"Brainstorm!. You need to organize your ideas first in a logical sequence of "
+"events."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:108
+msgid ""
+"Once you have somehow organized those ideas in your mind write a first draft."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:110
+msgid "Revise grammar, syntax and spelling."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:112
+msgid "Improve your statements and redo any part if necessary."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:114
+msgid "_* /{Chapters}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:116
+msgid ""
+"Use the conventional numbering system for chapters and subtitles. e.g. 1, "
+"1.1, 1.1.1, 1.1.2 ... 1.2, 1.2.1, 1.2.2 ... 2, 2.1 ... and so on. See markup "
+"below."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:118
+msgid ""
+"If you have to enumerate a series of steps or stages in your description, "
+"you can also use ordinal numbers: First, second, third ... or First, Then, "
+"After that, Finally ... Alternatively you can use bulleted items."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:120 en/style_guide.ssi:214
+msgid "_* /{Markup}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:122
+msgid ""
+"And last but not least, live-manual uses {SiSU}http://www.sisudoc.org to "
+"process the text files and produce a multiple format output. It is "
+"recommended to take a look at {SiSU's manual}http://www.sisudoc.org/sisu/"
+"sisu_manual/markup.html to get familiar with its markup, or else type:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:126
+#, no-wrap
+msgid " $ sisu --help markup\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:130
+msgid "Here are some markup examples that may prove useful:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:132
+msgid "For emphasis/bold text:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:136
+#, no-wrap
+msgid "*{foo}* or !{foo}!\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:140
+msgid "produces: *{foo}* or !{foo}!. Use it to emphasize certain key words."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:142
+msgid "For italics:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:146
+msgid "/{foo}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:150
+msgid "produces: /{foo}/. Use them e.g. for the names of debian packages."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:152
+msgid "For monospace:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:156
+msgid "#{foo}#"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:160
+msgid ""
+"produces: #{foo}#. Use it e.g. for the names of commands. And also to "
+"highlight some key words or things like paths."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:162
+msgid "For code blocks:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:166
+#, no-wrap
+msgid " code{\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:169
+#, no-wrap
+msgid ""
+" $ foo\n"
+" # bar\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:171
+#, no-wrap
+msgid " }code\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:175
+msgid "produces:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:180
+#, no-wrap
+msgid ""
+" $ foo\n"
+" # bar\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:184
+msgid ""
+"Use #{code{}# to open and #{}code}# to close the tags. It is important to "
+"remember to leave a space at the beginning of each line of code."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:186
+msgid "2~ Guidelines for translators"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:188
+msgid ""
+"This section deals with some general considerations to be taken into account "
+"when translating the contents of live-manual."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:190
+msgid ""
+"As a general recommendation, translators should have read and understood the "
+"translation rules that apply to their specific languages. Usually, "
+"translation groups and mailing lists provide information on how to produce "
+"translated work that complies with Debian quality standards."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:192
+#, no-wrap
+msgid "*{Note:}* Translators should also read {Contributing to this document}#how-to-contribute. In particular the section {Translation}#translation\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:194
+msgid "3~ Translation hints"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:196
+msgid "_* /{Comments}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:198
+msgid ""
+"The role of the translator is to convey as faithfully as possible the "
+"meaning of words, sentences, paragraphs and texts as written by the original "
+"authors into their target language."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:200
+msgid ""
+"So they should refrain from adding personal comments or extra bits of "
+"information of their own. If they want to add a comment for other "
+"translators working on the same documents, they can leave it in the space "
+"reserved for that. That is, the header of the strings in the *{po}* files "
+"preceded by a number sign *{#}*. Most graphical translation programs can "
+"automatically handle those types of comments."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:202
+msgid "_* /{TN, Translator's Note}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:204
+msgid ""
+"It is perfectly acceptable however, to include a word or an expression in "
+"brackets in the translated text if, and only if, that makes the meaning of a "
+"difficult word or expression clearer to the reader. Inside the brackets the "
+"translator should make evident that the addition was theirs using the "
+"abbreviation \"TN\" or \"Translator's Note\"."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:206
+msgid "_* /{Impersonal sentences}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:208
+msgid ""
+"Documents written in English make an extensive use of the impersonal form "
+"\"you\". In some other languages that do not share this characteristic, this "
+"might give the false impression that the original texts are directly "
+"addressing the reader when they are actually not doing so. Translators must "
+"be aware of that fact and reflect it in their language as accurately as "
+"possible."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:210
+msgid "_* /{False friends}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:212
+msgid ""
+"The trap of \"false friends\" explained before especially applies to "
+"translators. Double check the meaning of suspicious false friends if in "
+"doubt."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:216
+msgid ""
+"Translators working initially with *{pot}* files and later on with *{po}* "
+"files will find many markup features in the strings. They can translate the "
+"text anyway, as long as it is translatable, but it is extremely important "
+"that they use exactly the same markup as the original English version."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:218
+msgid "_* /{Code blocks}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:220
+msgid ""
+"Some translators decide to include the code blocks in the translated files "
+"because it is easier for them to identify what has already been translated "
+"and what has not by looking at the percentages if they use a graphical "
+"translation program."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:222
+msgid ""
+"Include the code blocks if you want to score a 100% complete translation."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:224
+msgid ""
+"On the other hand some translators prefer to leave the code blocks "
+"\"untranslated\" (i.e. not including them). This makes the translation "
+"easier to maintain once finished because it does not require translators "
+"intervention if the code changes."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:226
+msgid ""
+"Leave the code blocks empty (they will be automatically added then) if you "
+"want to make your translation easier to maintain."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:228
+msgid "_* /{New lines}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:230
+msgid ""
+"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."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:232
+msgid ""
+"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."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:234
+msgid "_* /{Untranslatable strings}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:236
+msgid "Translators should never translate:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:238
+msgid "The code names of releases"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:240
+msgid "The names of programs"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:242
+msgid "The commands given as examples"
+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."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:246
+msgid "Links"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:247
+msgid "Paths"
+msgstr ""
diff --git a/manual/po/es/user_basics.ssi.po b/manual/po/es/user_basics.ssi.po
index 30b5675..7783e2a 100644
--- a/manual/po/es/user_basics.ssi.po
+++ b/manual/po/es/user_basics.ssi.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
"POT-Creation-Date: 2012-01-12 08:28-0400\n"
-"PO-Revision-Date: 2012-01-14 18:42+0100\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"
"Language-Team: Debian live Spanish translation team <debian-live at lists."
@@ -181,15 +181,14 @@ msgstr ""
"imágenes más utilizadas. El tipo de imagen más versátil, #{iso-hybrid}#, se "
"puede utilizar en una máquina virtual, en medios ópticos u otros dispositivo "
"de almacenamiento USB. En ciertos casos especiales, como para el uso de la "
-"persistencia («persistence» N. del T.) las imágenes #{hdd}#, pueden ser las "
-"más adecuadas para dispositivos USB. El capítulo termina con instrucciones "
-"para crear y usar una imagen de tipo #{net}#, que es un poco más complicado "
-"debido a la configuración necesaria en el servidor. Es un tema ligeramente "
-"avanzado para cualquier persona que no esté familiarizada con el arranque en "
-"red, pero se incluye aquí porque una vez que se realiza la instalación, es "
-"una forma muy conveniente para probar y desplegar imágenes de arranque en "
-"red local sin la molestia de tratar con los dispositivos de almacenamiento "
-"de la imagen."
+"persistencia, las imágenes #{hdd}#, pueden ser las más adecuadas para "
+"dispositivos USB. El capítulo termina con instrucciones para crear y usar "
+"una imagen de tipo #{net}#, que es un poco más complicado debido a la "
+"configuración necesaria en el servidor. Es un tema ligeramente avanzado para "
+"cualquier persona que no esté familiarizada con el arranque en red, pero se "
+"incluye aquí porque una vez que se realiza la instalación, es una forma muy "
+"conveniente para probar y desplegar imágenes de arranque en red local sin la "
+"molestia de tratar con los dispositivos de almacenamiento de la imagen."
#. type: Plain text
#: en/user_basics.ssi:8
@@ -341,7 +340,7 @@ msgstr ""
#: en/user_basics.ssi:34
#, no-wrap
msgid " $ lb config\n"
-msgstr " $ lb config\n"
+msgstr ""
#. type: Plain text
#: en/user_basics.ssi:38
@@ -417,13 +416,13 @@ msgstr ""
#: en/user_basics.ssi:60
#, no-wrap
msgid " # apt-get install wodim\n"
-msgstr " # apt-get install wodim\n"
+msgstr ""
#. type: Plain text
#: en/user_basics.ssi:62
#, no-wrap
msgid " $ wodim binary-hybrid.iso\n"
-msgstr " $ wodim binary-hybrid.iso\n"
+msgstr ""
#. type: Plain text
#: en/user_basics.ssi:66
@@ -448,12 +447,12 @@ msgstr ""
"imágenes del tipo #{iso-hybrid}# producidas por defecto, pueden "
"sencillamente copiarse a una llave USB con #{dd}# o con un programa "
"equivalente. Conectar una llave USB con un tamaño suficiente para la imagen "
-"y determinar qué dispositivo es, («device» N. del T.) al cual nos "
-"referiremos de ahora en adelante como #{${USBSTICK}}#. Este nombre de "
-"«dispositivo» se refiere a la llave entera como por ejemplo #{/dev/sdb}# y "
-"¡No a una partición como #{/dev/sdb1}#! Se puede encontrar el nombre del "
-"dispositivo correcto mirando la salida de #{dmesg}# después de conectar la "
-"llave, o mejor aún ejecutando #{ls -l /dev/disk/by-id}#."
+"y determinar qué dispositivo es, al cual nos referiremos de ahora en "
+"adelante como #{${USBSTICK}}#. Este nombre de «dispositivo» se refiere a la "
+"llave entera como por ejemplo #{/dev/sdb}# y ¡No a una partición como #{/dev/"
+"sdb1}#! Se puede encontrar el nombre del dispositivo correcto mirando la "
+"salida de #{dmesg}# después de conectar la llave, o mejor aún ejecutando #"
+"{ls -l /dev/disk/by-id}#."
#. type: Plain text
#: en/user_basics.ssi:71
@@ -470,7 +469,7 @@ msgstr ""
#: en/user_basics.ssi:75
#, no-wrap
msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
-msgstr "$ dd if=binary-hybrid.iso of=${USBSTICK}\n"
+msgstr ""
#. type: Plain text
#: en/user_basics.ssi:80
@@ -629,7 +628,7 @@ msgstr ""
#: en/user_basics.ssi:110
#, no-wrap
msgid " # apt-get install qemu-kvm qemu-utils\n"
-msgstr " # apt-get install qemu-kvm qemu-utils\n"
+msgstr ""
#. type: Plain text
#: en/user_basics.ssi:114
@@ -640,7 +639,7 @@ msgstr "Arrancar una imagen ISO es sencillo:"
#: en/user_basics.ssi:118
#, no-wrap
msgid " $ kvm -cdrom binary-hybrid.iso\n"
-msgstr " $ kvm -cdrom binary-hybrid.iso\n"
+msgstr ""
#. type: Plain text
#: en/user_basics.ssi:122
@@ -662,13 +661,13 @@ msgstr "Para probar una imagen ISO con #{virtualbox-ose}#:"
#: en/user_basics.ssi:130
#, no-wrap
msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
-msgstr " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
+msgstr ""
#. type: Plain text
#: en/user_basics.ssi:132
#, no-wrap
msgid " $ virtualbox\n"
-msgstr " $ virtualbox\n"
+msgstr ""
#. type: Plain text
#: en/user_basics.ssi:136
@@ -697,7 +696,7 @@ msgstr ""
#: en/user_basics.ssi:142
#, no-wrap
msgid " $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot\n"
-msgstr " $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot\n"
+msgstr ""
#. type: Plain text
#: en/user_basics.ssi:146
@@ -741,7 +740,7 @@ msgstr ""
#: en/user_basics.ssi:154 en/user_basics.ssi:220
#, no-wrap
msgid " # lb clean --binary\n"
-msgstr " # lb clean --binary\n"
+msgstr ""
#. type: Plain text
#: en/user_basics.ssi:158
@@ -756,7 +755,7 @@ msgstr ""
#: en/user_basics.ssi:162
#, no-wrap
msgid " $ lb config -b hdd\n"
-msgstr " $ lb config -b hdd\n"
+msgstr ""
#. type: Plain text
#: en/user_basics.ssi:166 en/user_basics.ssi:234
@@ -815,7 +814,7 @@ msgstr ""
#: en/user_basics.ssi:186
#, no-wrap
msgid " $ kvm -hda binary.img\n"
-msgstr " $ kvm -hda binary.img\n"
+msgstr ""
#. type: Plain text
#: en/user_basics.ssi:190
@@ -839,7 +838,7 @@ msgstr ""
#: en/user_basics.ssi:196
#, no-wrap
msgid " # gparted ${USBSTICK}\n"
-msgstr " # gparted ${USBSTICK}\n"
+msgstr ""
#. type: Plain text
#: en/user_basics.ssi:200
@@ -856,7 +855,7 @@ msgstr ""
#: en/user_basics.ssi:204
#, no-wrap
msgid " # mkfs.ext4 ${PARTITION}\n"
-msgstr " # mkfs.ext4 ${PARTITION}\n"
+msgstr ""
#. type: Plain text
#: en/user_basics.ssi:208
@@ -915,7 +914,7 @@ msgstr ""
#: en/user_basics.ssi:228
#, no-wrap
msgid " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
-msgstr " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
+msgstr ""
#. type: Plain text
#: en/user_basics.ssi:232
@@ -1011,7 +1010,7 @@ msgstr " # /etc/dhcp/dhcpd.conf - fichero de configuración para isc-dhcp-server
#: en/user_basics.ssi:258
#, no-wrap
msgid " ddns-update-style none;\n"
-msgstr " ddns-update-style none;\n"
+msgstr ""
#. type: Plain text
#: en/user_basics.ssi:261
@@ -1020,8 +1019,6 @@ msgid ""
" option domain-name \"example.org\";\n"
" option domain-name-servers ns1.example.org, ns2.example.org;\n"
msgstr ""
-" option domain-name \"example.org\";\n"
-" option domain-name-servers ns1.example.org, ns2.example.org;\n"
#. type: Plain text
#: en/user_basics.ssi:264
@@ -1030,14 +1027,12 @@ msgid ""
" default-lease-time 600;\n"
" max-lease-time 7200;\n"
msgstr ""
-" default-lease-time 600;\n"
-" max-lease-time 7200;\n"
#. type: Plain text
#: en/user_basics.ssi:266
#, no-wrap
msgid " log-facility local7;\n"
-msgstr " log-facility local7;\n"
+msgstr ""
#. type: Plain text
#: en/user_basics.ssi:272
@@ -1049,11 +1044,6 @@ msgid ""
" filename \"pxelinux.0\";\n"
"}\n"
msgstr ""
-" subnet 192.168.0.0 netmask 255.255.255.0 {\n"
-" range 192.168.0.1 192.168.0.254;\n"
-" next-server servername;\n"
-" filename \"pxelinux.0\";\n"
-"}\n"
#. type: Plain text
#: en/user_basics.ssi:276
@@ -1082,7 +1072,7 @@ msgstr ""
#: en/user_basics.ssi:284
#, no-wrap
msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
-msgstr " # dpkg-reconfigure -plow tftpd-hpa\n"
+msgstr ""
#. type: Plain text
#: en/user_basics.ssi:288
@@ -1124,7 +1114,7 @@ msgstr ""
#: en/user_basics.ssi:300
#, no-wrap
msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
-msgstr " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
+msgstr ""
#. type: Plain text
#: en/user_basics.ssi:304
@@ -1138,7 +1128,7 @@ msgstr ""
#: en/user_basics.ssi:308
#, no-wrap
msgid " # exportfs -rv\n"
-msgstr " # exportfs -rv\n"
+msgstr ""
#. type: Plain text
#: en/user_basics.ssi:312
@@ -1209,14 +1199,6 @@ msgid ""
" sudo /usr/sbin/brctl addif br0 $1\n"
" sleep 2\n"
msgstr ""
-" #!/bin/sh\n"
-" sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1\n"
-" echo \"Executing /etc/qemu-ifup\"\n"
-" echo \"Bringing up $1 for bridged mode...\"\n"
-" sudo /sbin/ifconfig $1 0.0.0.0 promisc up\n"
-" echo \"Adding $1 to br0...\"\n"
-" sudo /usr/sbin/brctl addif br0 $1\n"
-" sleep 2\n"
#. type: Plain text
#: en/user_basics.ssi:339
@@ -1264,11 +1246,6 @@ msgid ""
" memsize = \"512\"\n"
" MemAllowAutoScaleDown = \"FALSE\"\n"
msgstr ""
-" #!/usr/bin/vmware\n"
-" config.version = \"8\"\n"
-" virtualHW.version = \"4\"\n"
-" memsize = \"512\"\n"
-" MemAllowAutoScaleDown = \"FALSE\"\n"
#. type: Plain text
#: en/user_basics.ssi:363
@@ -1280,11 +1257,6 @@ msgid ""
" sound.present = \"FALSE\"\n"
" tools.remindInstall = \"FALSE\"\n"
msgstr ""
-" ide0:0.present = \"FALSE\"\n"
-" ide1:0.present = \"FALSE\"\n"
-" floppy0.present = \"FALSE\"\n"
-" sound.present = \"FALSE\"\n"
-" tools.remindInstall = \"FALSE\"\n"
#. type: Plain text
#: en/user_basics.ssi:366
@@ -1293,8 +1265,6 @@ msgid ""
" ethernet0.present = \"TRUE\"\n"
" ethernet0.addressType = \"generated\"\n"
msgstr ""
-" ethernet0.present = \"TRUE\"\n"
-" ethernet0.addressType = \"generated\"\n"
#. type: Plain text
#: en/user_basics.ssi:369
@@ -1303,8 +1273,6 @@ msgid ""
" displayName = \"Test Boot PXE\"\n"
" guestOS = \"other\"\n"
msgstr ""
-" displayName = \"Test Boot PXE\"\n"
-" guestOS = \"other\"\n"
#. type: Plain text
#: en/user_basics.ssi:374
@@ -1315,10 +1283,6 @@ msgid ""
" uuid.bios = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
" ethernet0.generatedAddressOffset = \"0\"\n"
msgstr ""
-" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
-" uuid.location = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
-" uuid.bios = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
-" ethernet0.generatedAddressOffset = \"0\"\n"
#. type: Plain text
#: en/user_basics.ssi:378
diff --git a/manual/po/es/user_customization-binary.ssi.po b/manual/po/es/user_customization-binary.ssi.po
index 431767d..0b309e2 100644
--- a/manual/po/es/user_customization-binary.ssi.po
+++ b/manual/po/es/user_customization-binary.ssi.po
@@ -9,8 +9,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-01-15 20:48+0100\n"
-"PO-Revision-Date: 2012-02-05 16:00+0100\n"
+"POT-Creation-Date: 2012-02-25 21:42+0100\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"
"Language-Team: Debian live Spanish translation team <debian-live at lists."
@@ -23,23 +23,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -89,23 +91,25 @@ 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/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/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/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/user_customization-installer.ssi:38
@@ -171,29 +175,76 @@ msgstr "2~ Gestor de arranque"
#. type: Plain text
#: en/user_customization-binary.ssi:8
msgid ""
-"live-build uses syslinux and some of its derivatives (depending on the image "
-"type) as bootloaders by default. You can easily modify their options using "
-"different methods, like {includes}#includes or {hooks}#hooks."
+"live-build uses /{syslinux}/ and some of its derivatives (depending on the "
+"image type) as bootloaders by default. You can easily customize them in a "
+"number of ways that range from providing a full theme to changing the boot "
+"timeout or simply adding a personalized splash image. Some of the following "
+"examples of customization make use of different methods, like {includes}"
+"#includes or {hooks}#hooks."
msgstr ""
-"live-build usa syslinux y algunos de sus derivados (en función del tipo de "
-"imagen) como gestores de arranque por defecto. Se puede modificar fácilmente "
-"algunas opciones utilizando distintos métodos, como {includes}#includes o "
-"{scripts gancho (hooks)}#hooks."
+"live-build usa /{syslinux}/ y algunos de sus derivados (en función del "
+"tipo de imagen) como gestores de arranque por defecto. Se pueden "
+"personalizar fácilmente de formas diferentes que varían desde usar un tema "
+"completo a cambiar el tiempo de arranque por defecto o simplemente añadir "
+"una imagen splash. Algunos de los siguientes ejemplos de personalización "
+"usan distintos métodos, como {includes}#includes o {scripts gancho (hooks)}"
+"#hooks."
#. type: Plain text
#: en/user_customization-binary.ssi:10
msgid ""
-"For example, these derivatives are configured by default with a timeout of 0 "
-"(zero) which means that they will pause indefinitely at their splash screen "
-"until you press a key."
+"If you want to use a full theme you can specify the #{--syslinux-theme}# "
+"option (see man #{lb_config}#). live-build will then retrieve the theme from "
+"the mirror and install it."
msgstr ""
-"Por ejemplo, estos derivados están configurados por defecto con un tiempo de "
-"espera de 0 (cero) lo que significa que harán una pausa indefinida en su "
-"pantalla de inicio hasta que se pulse una tecla."
+"Si se quiere usar un tema completo se puede especificar la opción #{--"
+"syslinux-theme}# (ver man #{lb_config}#). live-build lo descargará de la "
+"réplica y lo instalará. "
#. type: Plain text
#: en/user_customization-binary.ssi:12
msgid ""
+"Imagine that you want to build a progress client but you prefer to include "
+"the server's theme because you want to have the help menu. Then you would "
+"launch #{lb config}# as follows:"
+msgstr ""
+"Si se desea crear un cliente progress pero se quiere usar el tema del "
+"servidor que incluye el menú de ayuda. Se puede configurar como se explica a "
+"continuación:"
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:16
+#, no-wrap
+msgid " $ lb config --mode progress --syslinux-theme progress-server\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:20
+msgid ""
+"You can also create your own theme or modify an already existing one and if "
+"you do not have a mirror, you can add the package to #{config/packages."
+"chroot}#. In this case it is not necessary to specify any option."
+msgstr ""
+"También se puede crear un tema propio o modificar uno que ya exista y si no "
+"se dispone de una réplica, se puede añadir el paquete a #{config/packages."
+"chroot}#. En este caso no es necesario especificar ninguna opción."
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:22
+msgid ""
+"There is also the possibility of making smaller changes. For instance, "
+"syslinux derivatives are configured by default with a timeout of 0 (zero) "
+"which means that they will pause indefinitely at their splash screen until "
+"you press a key."
+msgstr ""
+"Se pueden hacer cambios más pequeños. Por ejemplo, los derivados de syslinux "
+"están configurados por defecto con un tiempo de espera de 0 (cero) lo que "
+"significa que harán una pausa indefinida en su pantalla de inicio hasta que "
+"se pulse una tecla."
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:24
+msgid ""
"To modify the boot timeout of a default #{iso-hybrid}# image you can edit a "
"default *{isolinux.cfg}* file specifying the timeout in units of seconds and "
"add it to #{config/includes.binary/isolinux/}#"
@@ -204,7 +255,7 @@ msgstr ""
"isolinux/}#"
#. type: Plain text
-#: en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:26
msgid ""
"A modified *{isolinux.cfg}* to boot after five seconds would be similar to "
"this:"
@@ -213,7 +264,7 @@ msgstr ""
"segundos sería así:"
#. type: Plain text
-#: en/user_customization-binary.ssi:21
+#: en/user_customization-binary.ssi:33
#, no-wrap
msgid ""
" include menu.cfg\n"
@@ -223,7 +274,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:25
+#: en/user_customization-binary.ssi:37
msgid ""
"An alternative way of achieving the same goal could be writing a hook and "
"adding it to #{config/hooks/}# Remember to add the #{.binary}# suffix to run "
@@ -234,29 +285,33 @@ msgstr ""
"binary para que sea ejecutado en la etapa binary. Un ejemplo podría ser:"
#. 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"
#. type: Plain text
-#: en/user_customization-binary.ssi:31
+#: en/user_customization-binary.ssi:43
#, no-wrap
msgid " sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg\n"
-msgstr " sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg\n"
+msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:35
-msgid "For more information please see man syslinux(1)."
-msgstr "Para más información ver la página del manual de syslinux(1)."
+#: en/user_customization-binary.ssi:47
+msgid ""
+"Likewise, if you want to use a personalized splash.png image you can add a "
+"picture of 640x480 pixels to #{config/includes.binary/isolinux/}#"
+msgstr ""
+"Del mismo modo, si se quiere usar una splash.png personalizada basta con "
+"añadir una imagen de 640x480 píxeles en #{config/includes.binary/isolinux/}#"
#. type: Plain text
-#: en/user_customization-binary.ssi:37
+#: en/user_customization-binary.ssi:49
msgid "2~ ISO metadata"
msgstr "2~ Metadatos ISO"
#. type: Plain text
-#: en/user_customization-binary.ssi:39
+#: en/user_customization-binary.ssi:51
msgid ""
"When creating an ISO9660 binary image, you can use the following options to "
"add various textual metadata for your image. This can help you easily "
@@ -268,7 +323,7 @@ msgstr ""
"sin arrancarla."
#. type: Plain text
-#: en/user_customization-binary.ssi:41
+#: en/user_customization-binary.ssi:53
msgid ""
"_* #{LB_ISO_APPLICATION/--iso-application NAME}#: This should describe the "
"application that will be on the image. The maximum length for this field is "
@@ -279,7 +334,7 @@ msgstr ""
"de 128 caracteres."
#. type: Plain text
-#: en/user_customization-binary.ssi:43
+#: en/user_customization-binary.ssi:55
msgid ""
"_* #{LB_ISO_PREPARER/--iso-preparer NAME}#: This should describe the "
"preparer of the image, usually with some contact details. The default for "
@@ -293,7 +348,7 @@ msgstr ""
"longitud máxima para este campo es de 128 caracteres."
#. type: Plain text
-#: en/user_customization-binary.ssi:45
+#: en/user_customization-binary.ssi:57
msgid ""
"_* #{LB_ISO_PUBLISHER/--iso-publisher NAME}#: This should describe the "
"publisher of the image, usually with some contact details. The maximum "
@@ -304,7 +359,7 @@ msgstr ""
"longitud máxima para este campo es de 128 caracteres."
#. type: Plain text
-#: en/user_customization-binary.ssi:46
+#: en/user_customization-binary.ssi:58
msgid ""
"_* #{LB_ISO_VOLUME/--iso-volume NAME}#: This should specify the volume ID of "
"the image. This is used as a user-visible label on some platforms such as "
diff --git a/manual/po/es/user_customization-contents.ssi.po b/manual/po/es/user_customization-contents.ssi.po
index 5c5dde5..47bf4d8 100644
--- a/manual/po/es/user_customization-contents.ssi.po
+++ b/manual/po/es/user_customization-contents.ssi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
"POT-Creation-Date: 2012-01-15 16:28+0100\n"
-"PO-Revision-Date: 2012-01-15 16:53+0100\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"
"Language-Team: none\n"
@@ -172,12 +172,12 @@ msgstr ""
"Este capítulo trata, no solamente de una mera descripción de cómo "
"seleccionar los paquetes a incluir en el sistema en vivo, sino que además "
"presenta cómo hacer el «ajuste fino» de la personalización de los contenidos "
-"del propio sistema. Los «añadidos» (includes) permiten adjuntar o reemplazar "
-"cualquier fichero en la imagen Debian Live a crear, los scripts gancho "
-"(hooks) permiten ejecutar cualquier orden en las diferentes etapas de "
-"creación y en el momento del arranque y por último, la preconfiguración "
-"permite configurar paquetes cuando son instalados, suministrando las "
-"respuestas a las preguntas de debconf."
+"del propio sistema. Los includes permiten adjuntar o reemplazar cualquier "
+"fichero en la imagen Debian Live a crear, los scripts gancho (hooks) "
+"permiten ejecutar cualquier orden en las diferentes etapas de creación y en "
+"el momento del arranque y por último, la preconfiguración permite configurar "
+"paquetes cuando son instalados, suministrando las respuestas a las preguntas "
+"de debconf."
#. type: Plain text
#: en/user_customization-contents.ssi:8
@@ -196,9 +196,9 @@ msgstr ""
"Idealmente, un sistema Debain Live debería incluir solamente ficheros que "
"son obtenidos de paquetes Debian no modificados. Sin embargo, algunas veces "
"es conveniente incluir o modificar algún contenido mediante ficheros. La "
-"utilización de «añadidos» (includes) posibilita la inclusión, modificación o "
-"cambio de cualquier fichero en la imagen Debian Live a crear. live-build "
-"tiene tres mecanismos:"
+"utilización de includes posibilita la inclusión, modificación o cambio de "
+"cualquier fichero en la imagen Debian Live a crear. live-build tiene tres "
+"mecanismos:"
#. type: Plain text
#: en/user_customization-contents.ssi:12
@@ -208,8 +208,8 @@ msgid ""
"local-includes for more information."
msgstr ""
"_* Includes locales en chroot : Estos includes permiten incluir o reemplazar "
-"ficheros del entorno chroot. Para más información ver {Includes locales en "
-"Live/chroot}#live-chroot-local-includes"
+"ficheros en el sistema de ficheros chroot. Para más información ver "
+"{Includes locales en Live/chroot}#live-chroot-local-includes"
#. type: Plain text
#: en/user_customization-contents.ssi:14
@@ -261,16 +261,13 @@ msgid ""
msgstr ""
"Los includes locales en chroot se utilizan para incluir o reemplazar "
"ficheros en el sistema de ficheros Live/chroot de manera que puedan ser "
-"utilizados en el sistema en vivo. Una utilización típica de estos Includes "
-"puede ser el rellenar el directorio (#{/etc/skel}#) del sistema en vivo para "
-"que sea utilizado en la creación del directorio home al dar de alta usuarios "
-"en el sistema en vivo. Otra utilización típica es suministrar ficheros de "
-"configuración que puedan ser incluidos o reemplazados en la imagen sin "
-"necesidad de realizar proceso alguno (Los ficheros son simplemente copiados "
-"sin realizar ningún proceso de los mismos para adecuarlos al sistema "
-"concreto. N. del T); Si se necesita realizar algún procesado de estos "
-"ficheros ver la sección {Scripts gancho locales en Live/chroot}#live-chroot-"
-"local-hooks"
+"utilizados en el sistema en vivo. Una utilización típica de estos includes "
+"puede ser rellenar el directorio (#{/etc/skel}#) usado por el sistema Live "
+"para crear el directorio home del usuario. Otra utilización típica es "
+"suministrar ficheros de configuración que pueden ser incluidos o "
+"reemplazados en la imagen sin necesidad de realizar procesado alguno; Si se "
+"necesita realizar algún procesado de estos ficheros ver la sección {Scripts "
+"gancho locales en Live/chroot}#live-chroot-local-hooks"
#. type: Plain text
#: en/user_customization-contents.ssi:24
@@ -293,8 +290,6 @@ msgid ""
" $ mkdir -p config/includes.chroot/var/www\n"
" $ cp /path/to/my/index.html config/includes.chroot/var/www\n"
msgstr ""
-" $ mkdir -p config/includes.chroot/var/www\n"
-" $ cp /path/to/my/index.html config/includes.chroot/var/www\n"
#. type: Plain text
#: en/user_customization-contents.ssi:33
@@ -314,14 +309,6 @@ msgid ""
" [...]\n"
" `-- templates\n"
msgstr ""
-" -- config\n"
-" [...]\n"
-" |-- includes.chroot\n"
-" | `-- var\n"
-" | `-- www\n"
-" | `-- index.html\n"
-" [...]\n"
-" `-- templates\n"
#. type: Plain text
#: en/user_customization-contents.ssi:48
@@ -365,7 +352,7 @@ msgstr ""
#: en/user_customization-contents.ssi:56
#, no-wrap
msgid " $ cp ~/video_demo.* config/includes.binary/\n"
-msgstr " $ cp ~/video_demo.* config/includes.binary/\n"
+msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:60
@@ -393,7 +380,7 @@ msgstr ""
#: en/user_customization-contents.ssi:68
#, no-wrap
msgid " $ lb config --includes none\n"
-msgstr " $ lb config --includes none\n"
+msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:72
diff --git a/manual/po/es/user_customization-installer.ssi.po b/manual/po/es/user_customization-installer.ssi.po
index 78f677f..a33ad84 100644
--- a/manual/po/es/user_customization-installer.ssi.po
+++ b/manual/po/es/user_customization-installer.ssi.po
@@ -9,8 +9,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-07 21:19-0400\n"
-"PO-Revision-Date: 2011-11-08 14:21+0100\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\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"
"Language-Team: none\n"
@@ -25,22 +25,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -84,28 +87,31 @@ msgstr ""
#: 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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -148,8 +154,8 @@ msgstr "code{"
#: 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"
@@ -200,7 +206,7 @@ msgstr "Principalmente existen tres tipos de imágenes según el instalador:"
#. type: Plain text
#: en/user_customization-installer.ssi:14
#, no-wrap
-msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a seperate 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"
+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 "*{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».\n"
#. type: Plain text
@@ -298,13 +304,10 @@ msgstr ""
#: en/user_customization-installer.ssi:36
#, no-wrap
msgid ""
-" $ lb config --architecture i386 --linux-flavours 486 \\\n"
+" $ lb config --architectures i386 --linux-flavours 486 \\\n"
" --debian-installer live\n"
" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
msgstr ""
-" $ lb config --architecture i386 --linux-flavours 486 \\\n"
-" --debian-installer live\n"
-" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
#. type: Plain text
#: en/user_customization-installer.ssi:40
@@ -343,8 +346,6 @@ msgid ""
" $ echo \"d-i debian-installer/locale string en_US\" \\\n"
" >> config/binary_debian-installer/preseed.cfg\n"
msgstr ""
-" $ echo \"d-i debian-installer/locale string es_ES\" \\\n"
-" >> config/binary_debian-installer/preseed.cfg\n"
#. type: Plain text
#: en/user_customization-installer.ssi:51
diff --git a/manual/po/es/user_customization-overview.ssi.po b/manual/po/es/user_customization-overview.ssi.po
index 8fbeabc..89f0d73 100644
--- a/manual/po/es/user_customization-overview.ssi.po
+++ b/manual/po/es/user_customization-overview.ssi.po
@@ -2,15 +2,15 @@
# 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:
+# Translated and revised by:
# José Luis Zabalza <jlz.3008 at gmail.com> and
# Carlos Zuferri «chals» <chals at altorricon.com>
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
-"PO-Revision-Date: 2011-03-19 18:16+0100\n"
+"POT-Creation-Date: 2011-04-23 14:15+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"
"Language-Team: Debian live Spanish translation team <debian-live at lists."
@@ -94,7 +94,7 @@ msgid ""
"within them are executed unless the system is configured as a live system."
msgstr ""
"Las opciones de configuración en tiempo de creación se describen en la "
-"página del manual del comando #{lb config}#. Las opciones en tiempo de "
+"página de manual del comando #{lb config}#. Las opciones en tiempo de "
"arranque se describen en las páginas de manual de los paquetes live-boot y "
"live-config. Aunque los paquetes live-boot y live-config se instalan en el "
"sistema en vivo que se está creando, también se recomienda que sean "
@@ -203,7 +203,7 @@ msgid "2~ Customization tasks"
msgstr "2~ Tareas de personalización"
#. 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-"
@@ -215,5 +215,5 @@ msgstr ""
"usuario realiza típicamente: Los capítulos de {Personalización de la "
"instalación de paquetes}#customizing-package-installation, {Personalización "
"de contenidos}#customizing-contents y {Personalización de las variantes "
-"locales e idioma}#customizing-locale-and-language cubre solamente unas pocas "
-"de las tareas que pueden realizarse."
+"locales e idioma}#customizing-locale-and-language cubren solamente unas "
+"pocas de las tareas que pueden realizarse."
diff --git a/manual/po/es/user_customization-packages.ssi.po b/manual/po/es/user_customization-packages.ssi.po
index f8b8356..1f4e7b9 100644
--- a/manual/po/es/user_customization-packages.ssi.po
+++ b/manual/po/es/user_customization-packages.ssi.po
@@ -9,8 +9,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-01-18 18:00-0400\n"
-"PO-Revision-Date: 2012-01-18 23:32+0100\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\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"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -25,23 +25,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -85,29 +87,31 @@ msgstr ""
#: 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/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/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/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/user_customization-installer.ssi:38
@@ -150,8 +154,8 @@ msgstr "code{"
#: 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"
@@ -194,17 +198,17 @@ msgstr ""
"son las que más influyen a la hora de conocer qué paquetes estarán "
"disponibles para su instalación en la imagen. Para asegurar una buena "
"velocidad de descarga de paquetes, se debería elegir el repositorio Debian "
-"más cercano. Se pueden añadir repositorios para paquetes backports, "
-"experimentales, paquetes personalizados o incluir ficheros de paquetes "
-"directamente. Se pueden definir listas de paquetes a incluir personalizadas, "
-"utilizar listas 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."
+"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 "
+"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."
#. type: Plain text
#: en/user_customization-packages.ssi:8
@@ -226,7 +230,7 @@ msgid ""
"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, "
+"distribution. For example, to build against the *{unstable}* release, Sid, "
"specify:"
msgstr ""
"La distribución seleccionada tiene gran impacto en qué paquetes están "
@@ -237,14 +241,14 @@ msgstr ""
"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: "
+"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
#, no-wrap
msgid " $ lb config --distribution sid\n"
-msgstr " $ lb config --distribution sid\n"
+msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:20
@@ -265,7 +269,7 @@ msgstr ""
#: en/user_customization-packages.ssi:24
#, no-wrap
msgid " $ lb config --archive-areas \"main contrib\"\n"
-msgstr " $ lb config --archive-areas \"main contrib\"\n"
+msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:28
@@ -303,28 +307,28 @@ msgid ""
"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."
+"{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 ""
"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 "
"de obtener la mejor velocidad de descarga. Cada una de las opciones #{--"
"mirror-*}# gobierna qué réplica de repositorio Debian se utiliza en las "
"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 "
+"#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."
+"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
@@ -354,9 +358,6 @@ msgid ""
" --mirror-chroot-security http://localhost/debian-security/ \\\n"
"\t --mirror-chroot-backports http://localhost/debian-backports/\n"
msgstr ""
-" $ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
-" --mirror-chroot-security http://localhost/debian-security/ \\\n"
-"\t --mirror-chroot-backports http://localhost/debian-backports/\n"
#. type: Plain text
#: en/user_customization-packages.ssi:48
@@ -401,8 +402,6 @@ msgid ""
" $ lb config --mirror-binary http://mirror/debian/ \\\n"
" --mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
-" $ lb config --mirror-binary http://mirror/debian/ \\\n"
-" --mirror-binary-security http://mirror/debian-security/\n"
#. type: Plain text
#: en/user_customization-packages.ssi:61
@@ -417,9 +416,9 @@ msgid ""
"backports, experimental or custom packages. To configure additional "
"repositories, create #{config/archives/your-repository.list.chroot}#, and/or "
"#{config/archives/your-repository.list.binary}# files. As with the #{--"
-"mirror-*}# options, these govern the repositories used in the *chroot* stage "
-"when building the image, and in the *binary* stage, i.e. for use when "
-"running the live system."
+"mirror-*}# options, these govern the repositories used in the *{chroot}* "
+"stage when building the image, and in the *{binary}* stage, i.e. for use "
+"when running the live system."
msgstr ""
"Se pueden añadir más repositorios, ampliando la lista de paquetes "
"seleccionables más alla de aquellos disponibles para la distribución "
@@ -428,8 +427,8 @@ msgstr ""
"ficheros #{config/archives/your-repository.list.chroot}# y/o #{config/"
"archives/your-repository.list.binary}#. Al igual que en las opciones #{--"
"mirror-*}#, estos ficheros gobiernan los repositorios utilizados en las "
-"etapas *chroot* y *binary* respectivamente, esto es, los repositorios que "
-"serán utilizados cuando se ejecute el sistema en vivo."
+"etapas *{chroot}* y *{binary}* respectivamente, esto es, los repositorios "
+"que serán utilizados cuando se ejecute el sistema en vivo."
#. type: Plain text
#: en/user_customization-packages.ssi:65
@@ -445,7 +444,7 @@ msgstr ""
#: en/user_customization-packages.ssi:69
#, no-wrap
msgid " deb http://live.debian.net/ sid-snapshots main contrib non-free\n"
-msgstr " deb http://live.debian.net/ sid-snapshots main contrib non-free\n"
+msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:73
@@ -559,7 +558,7 @@ msgstr ""
#: en/user_customization-packages.ssi:103
#, no-wrap
msgid " $ lb config --package-lists \"gnome rescue\"\n"
-msgstr " $ lb config --package-lists \"gnome rescue\"\n"
+msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:107
@@ -625,11 +624,11 @@ msgid ""
msgstr ""
"Para crear una lista para la etapa «binary» crear un fichero con el sufijo #"
"{.list.binary}# en #{config/package-lists/}#. Estos paquetes no son "
-"instalados en el sistema en vivo, pero son incluidos en él en #{pool/}#. El "
-"uso típico de una de estas lista sería para una de las variantes de "
-"instalador normal («non-live» N.del T.). Tal y como se mencionaba "
-"anteriormente, si se desea usar la misma lista para la etapa «chroot» basta "
-"con solamente añadir el sufijo #{.list}#"
+"instalados en el sistema en vivo, pero son incluidos en #{pool/}#. El uso "
+"típico de una de estas lista sería para una de las variantes de instalador "
+"normal («non-live» N.del T.). Tal y como se mencionaba anteriormente, si se "
+"desea usar la misma lista para la etapa «chroot» basta con solamente añadir "
+"el sufijo #{.list}#"
#. type: Plain text
#: en/user_customization-packages.ssi:121
@@ -667,8 +666,6 @@ msgid ""
" #include <gnome>\n"
" iceweasel\n"
msgstr ""
-" #include <gnome>\n"
-" iceweasel\n"
#. type: Plain text
#: en/user_customization-packages.ssi:134
@@ -682,7 +679,7 @@ msgid ""
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
"Generally, this means any #{lb config}# option uppercased and with dashes "
"changed to underscores. But in practice, it is only the ones that influence "
-"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURE}"
+"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURES}"
"# or #{ARCHIVE_AREAS}#."
msgstr ""
"En las sentencias condicionales de las listas de paquetes pueden utilizarse "
@@ -691,52 +688,47 @@ msgstr ""
"opción válida para #{lb config}# cambiando las letras minúsculas por "
"mayúsculas y los guiones por subrayados. En la práctica solamente tiene "
"sentido utilizar aquellas variables relacionadas con la selección de "
-"paquetes, como pueden ser #{DISTRIBUTION}#, #{ARCHITECTURE}# o #"
+"paquetes, como pueden ser #{DISTRIBUTION}#, #{ARCHITECTURES}# o #"
"{ARCHIVE_AREAS}#."
#. type: Plain text
#: en/user_customization-packages.ssi:138
msgid ""
-"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+"For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
"specified:"
msgstr ""
"Por ejemplo, para instalar el paquete #{ia32-libs}# si se ha especificado la "
-"arquitectura amd64 (#{--architecture amd64}#) se puede utilizar:"
+"arquitectura amd64 (#{--architectures amd64}#) se puede utilizar:"
#. type: Plain text
#: en/user_customization-packages.ssi:144
#, no-wrap
msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
" ia32-libs\n"
" #endif\n"
msgstr ""
-" #if ARCHITECTURE amd64\n"
-" ia32-libs\n"
-" #endif\n"
#. 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 #{--architecture i386}# or #{--architecture amd64}# is specified:"
+"# 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 (#{--"
-"architecture i386}#) o es amd64 (#{--architecture amd64}#) se puede "
+"architectures i386}#) o es amd64 (#{--architectures amd64}#) se puede "
"especificar:"
#. type: Plain text
#: en/user_customization-packages.ssi:154
#, no-wrap
msgid ""
-" #if ARCHITECTURE i386 amd64\n"
+" #if ARCHITECTURES i386 amd64\n"
" memtest86+\n"
" #endif\n"
msgstr ""
-" #if ARCHITECTURE i386 amd64\n"
-" memtest86+\n"
-" #endif\n"
#. type: Plain text
#: en/user_customization-packages.ssi:158
@@ -758,9 +750,6 @@ msgid ""
" vrms\n"
" #endif\n"
msgstr ""
-" #if ARCHIVE_AREAS contrib non-free\n"
-" vrms\n"
-" #endif\n"
#. type: Plain text
#: en/user_customization-packages.ssi:168
@@ -771,13 +760,10 @@ msgstr "Es habitual que una condición incluya una directiva «include»:"
#: en/user_customization-packages.ssi:174
#, no-wrap
msgid ""
-" #if ARCHITECTURE amd64\n"
-" #include <gnome-full>\n"
-" #endif\n"
-msgstr ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
" #include <gnome-full>\n"
" #endif\n"
+msgstr " "
#. type: Plain text
#: en/user_customization-packages.ssi:178
@@ -815,8 +801,6 @@ msgid ""
" $ lb config\n"
" $ echo \"mail-server file-server\" >> config/task-lists/my.list.chroot\n"
msgstr ""
-" $ lb config\n"
-" $ echo \"mail-server file-server\" >> config/task-lists/my.list.chroot\n"
#. type: Plain text
#: en/user_customization-packages.ssi:191
@@ -903,9 +887,6 @@ msgid ""
" $ echo \"gnome-desktop desktop standard laptop\" >> config/task-lists/my.list.chroot\n"
" $ echo \"japanese japanese-desktop japanese-gnome-desktop\" >> config/task-lists/my.list.chroot\n"
msgstr ""
-" $ lb config\n"
-" $ echo \"gnome-desktop desktop standard laptop\" >> config/task-lists/my.list.chroot\n"
-" $ echo \"japanese japanese-desktop japanese-gnome-desktop\" >> config/task-lists/my.list.chroot\n"
#. type: Plain text
#: en/user_customization-packages.ssi:209
@@ -928,8 +909,6 @@ msgid ""
" $ lb config\n"
" $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot\n"
msgstr ""
-" $ lb config\n"
-" $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot\n"
#. type: Plain text
#: en/user_customization-packages.ssi:218
@@ -1051,7 +1030,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:242
msgid "_* It is not possible to use secure APT."
-msgstr "_* No es posible utilizar APT seguro."
+msgstr "_* No es posible utilizar secure APT."
#. type: Plain text
#: en/user_customization-packages.ssi:244
@@ -1059,8 +1038,8 @@ msgid ""
"_* You must install all appropriate packages in the #{config/packages."
"chroot/}# directory."
msgstr ""
-"_* Se deben depositar todos los paquetes necesarios para cumplir "
-"dependencias en el directorio #{config/packages.chroot/}#."
+"_* Se deben depositar todos los paquetes apropiados en el directorio #"
+"{config/packages.chroot/}#."
#. type: Plain text
#: en/user_customization-packages.ssi:246
@@ -1217,7 +1196,7 @@ msgstr ""
#: en/user_customization-packages.ssi:278
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
-msgstr " $ lb config --apt-http-proxy http://proxy/\n"
+msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:282
@@ -1231,7 +1210,7 @@ msgid ""
"which case one or the other or both of the following options may be of "
"interest."
msgstr ""
-"En ocasiones será necesario ahorrar algún espacio en el medio de "
+"En ocasiones es necesario ahorrar un poco de espacio en el medio de "
"instalación. Las dos opciones descritas a continuación pueden ser de interes."
#. type: Plain text
@@ -1247,7 +1226,7 @@ msgstr ""
#: en/user_customization-packages.ssi:290
#, no-wrap
msgid " $ lb config --apt-indices false\n"
-msgstr " $ lb config --apt-indices false\n"
+msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:294
@@ -1280,7 +1259,7 @@ msgstr ""
#: en/user_customization-packages.ssi:300
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
-msgstr " $ lb config --apt-recommends false\n"
+msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:304
@@ -1318,7 +1297,7 @@ msgstr "3~ Pasar opciones a apt o a aptitude"
#. type: Plain text
#: en/user_customization-packages.ssi:308
msgid ""
-"If there is not an #{lb config}# option to alter APT's behaviour in the way "
+"If there is not a #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
"options through to your configured APT tool. See the man pages for #{apt}# "
"and #{aptitude}# for details."
@@ -1376,11 +1355,6 @@ msgid ""
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
-" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
-" $ cat >> config/chroot_apt/preferences << END\n"
-" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
-" Pin: release n=sid\n"
-" Pin-Priority: 600\n"
#. type: Plain text
#: en/user_customization-packages.ssi:327
@@ -1391,10 +1365,6 @@ msgid ""
" Pin-Priority: 1\n"
" END\n"
msgstr ""
-" Package: *\n"
-" Pin: release n=sid\n"
-" Pin-Priority: 1\n"
-" END\n"
#. type: Plain text
#: en/user_customization-packages.ssi:331
@@ -1405,7 +1375,7 @@ msgstr "*{Nota:}* Se pueden usar comodines en los nombres de los paquetes a fija
#. type: Plain text
#: en/user_customization-packages.ssi:335
msgid "$ lb config --distribution wheezy"
-msgstr "$ lb config --distribution wheezy"
+msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:339
@@ -1437,6 +1407,3 @@ msgid ""
" Pin: version *\n"
" Pin-Priority: -1\n"
msgstr ""
-" Package: gnome-keyring\n"
-" Pin: version *\n"
-" Pin-Priority: -1\n"
diff --git a/manual/po/es/user_customization-runtime.ssi.po b/manual/po/es/user_customization-runtime.ssi.po
index ade4504..9fd26d2 100644
--- a/manual/po/es/user_customization-runtime.ssi.po
+++ b/manual/po/es/user_customization-runtime.ssi.po
@@ -9,8 +9,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-07 21:01-0400\n"
-"PO-Revision-Date: 2011-11-08 14:28+0100\n"
+"POT-Creation-Date: 2012-03-24 15:08+0100\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"
"Language-Team: Debian live Spanish translation team <debian-live at lists."
@@ -23,22 +23,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -64,46 +67,50 @@ 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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -129,25 +136,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"
@@ -174,7 +182,7 @@ msgstr ""
"Toda la configuración que se hace en tiempo de ejecución es realizada por "
"live-config. Éstas son algunas de las opciones más comunes de live-config en "
"las que los usuarios están más interesados. Se puede encontrar una lista "
-"completa de todas las posibilidades en la página del manual de live-config."
+"completa de todas las posibilidades en la página de manual de live-config."
#. type: Plain text
#: en/user_customization-runtime.ssi:8
@@ -221,10 +229,6 @@ msgid ""
" dip floppy video plugdev netdev powerdev scanner bluetooth fuse \\\n"
" >> config/preseed/my.preseed.chroot\n"
msgstr ""
-" $ lb config\n"
-" $ echo user-setup passwd/user-default-groups string audio cdrom \\\n"
-" dip floppy video plugdev netdev powerdev scanner bluetooth fuse \\\n"
-" >> config/preseed/my.preseed.chroot\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:23
@@ -247,8 +251,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:29
-msgid "$ lb config --bootappend-live \"username=live-user\""
-msgstr "$ lb config --bootappend-live \"username=live-user\""
+#, no-wrap
+msgid " $ lb config --bootappend-live \"username=live-user\"\n"
+msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:33
@@ -310,7 +315,7 @@ msgstr ""
#: en/user_customization-runtime.ssi:49
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
-msgstr " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
+msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:53
@@ -319,8 +324,8 @@ msgid ""
"a locale by a full #{language_country.encoding}# word."
msgstr ""
"Este parámetro también se puede utilizar en la línea de comandos del kernel. "
-"Se puede especificar una variante local usando una palabra completa #"
-"{language_country.encoding}#."
+"Se puede especificar una variante local de esta forma: #{language_country."
+"encoding}#."
#. type: Plain text
#: en/user_customization-runtime.ssi:55
@@ -347,8 +352,6 @@ msgid ""
" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
" <name>se</name>\n"
msgstr ""
-" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
-" <name>se</name>\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:64
@@ -362,7 +365,7 @@ msgstr ""
#: en/user_customization-runtime.ssi:68
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
-msgstr " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
+msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:72
@@ -380,8 +383,6 @@ msgid ""
" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
" do basename $i | head -c -9; echo; done | sort | less\n"
msgstr ""
-" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
-" do basename $i | head -c -9; echo; done | sort | less\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:81
@@ -410,13 +411,11 @@ msgid ""
" $ lb config --bootappend-live \\\n"
" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
msgstr ""
-" $ lb config --bootappend-live \\\n"
-" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:90
msgid "2~persistence Persistence"
-msgstr "2~persistence Persistencia (Modo guardar cambios)"
+msgstr "2~persistence Persistencia"
#. type: Plain text
#: en/user_customization-runtime.ssi:92
@@ -454,72 +453,136 @@ msgid ""
"directories are written on writable media, typically a ram disk (tmpfs) and "
"ram disks' data do not survive reboots."
msgstr ""
-"La persistencia (o modo guardar cambios) es un nombre común que se dá 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 almacenamiento de sólo lectura, las modificaciones de "
-"los ficheros y 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."
+"La persistencia es un nombre común que se dá 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 "
+"almacenamiento de sólo lectura, las modificaciones de los ficheros y "
+"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."
#. type: Plain text
#: en/user_customization-runtime.ssi:98
msgid ""
"The data stored on this ramdisk should be saved on a writable persistent "
-"medium like a Hard Disk, a USB key, a network share or even a session of a "
+"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}#."
msgstr ""
"Los datos almacenados en esta memoria ram se pueden guardar en un soporte "
-"grabable como un disco duro, una memoria USB, un recurso compartido de red o "
-"incluso en una sesión de un CD/DVD regrabable en multisesión. Todos estos "
+"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}#."
#. type: Plain text
#: en/user_customization-runtime.ssi:100
-msgid "3~ Full persistence"
-msgstr "3~ Persistencia total"
+msgid ""
+"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:"
+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. "
+"discos duros, llaves USB) volúmenes con persistencia durante el arranque. Un "
+"volumen persistente es cualquiera de los siguientes: "
#. type: Plain text
#: en/user_customization-runtime.ssi:102
+msgid "_* a partition, identified by its GPT name."
+msgstr "_* una partición, identificada por su nombre GPT."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:104
+msgid "_* a filesystem, identified by its filesystem label."
+msgstr ""
+"_* Un sistema de ficheros, identificado por su etiqueta de sistema de "
+"ficheros."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:106
+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\"."
+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\"."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:108
+msgid ""
+"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:"
+msgstr ""
+"Es posible restringir qué tipos de volúmenes persistentes se pueden usar "
+"especificando ciertos parámetros de arranque descritos en la página del "
+"manual de live-boot(7). Las \"etiquetas identificadoras\" referidas "
+"anteriormente pueden ser cualquiera de las siguientes:"
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:110
+msgid "_* #{full-ov}# for full persistent overlays."
+msgstr "_* #{full-ov}# para capas de persistencia total."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:112
+msgid "_* #{custom-ov}# for custom overlays."
+msgstr "_* #{custom-ov}# para capas personalizadas."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:114
+msgid "_* #{live-sn}# for full system snapshots."
+msgstr "_* #{live-sn}# para instantáneas del sistema entero."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:116
+msgid "_* #{home-sn}# for /home snapshots."
+msgstr "_* #{home-sn}# para instantáneas de /home."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:118
+msgid "3~ Full persistent overlays"
+msgstr "3~ Capas de persistencia total "
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:120
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 "
-"writable partition is used. In order to use this feature a partition with a "
-"clean writable supported filesystem on it labeled \"live-rw\" must be "
-"attached on the system at boot time and the system must be started with the "
-"boot parameter 'persistent'. This partition could be an ext2 partition on "
-"the hard disk or on a usb key created with, e.g.:"
+"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.:"
msgstr ""
"Por «Persistencia total» se entiende la utilización de una partición de "
"escritura en lugar de usar un tmpfs (sistema de ficheros temporal) para "
-"guardar los cambios realizados a los medios de sólo lectura (con el sistema "
-"copiar-al-escribir o COW «copy-on-write» N. del T.). Para utilizar esta "
-"función se debe crear una partición grabable vacía con la etiqueta «live-rw» "
-"formateada con un sistema de ficheros compatible en el medio usado para "
-"arracar el sistema en vivo. En el momento de arrancar se debe iniciar el "
-"sistema con el parámetro de arranque 'persistent'. Esta partición puede ser "
-"una partición ext2 en el disco duro o en una memoria USB creada con, por "
-"ejemplo:"
+"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 "
+"con. p.ej:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:124
#, no-wrap
-msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
-msgstr " # mkfs.ext2 -L live-rw /dev/sdb1\n"
+msgid " # mkfs.ext2 -L full-ov /dev/sdb1\n"
+msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:128
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
"Ver {Usar el espacio libre en el dispositivo USB}#using-usb-extra-space."
#. type: Plain text
-#: en/user_customization-runtime.ssi:112
+#: en/user_customization-runtime.ssi:130
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
@@ -528,105 +591,157 @@ msgstr ""
"etiqueta con uno de los siguientes:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:116
+#: en/user_customization-runtime.ssi:134
#, no-wrap
-msgid " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
-msgstr " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
+msgid " $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems\n"
+msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:120
+#: en/user_customization-runtime.ssi:138
msgid ""
-"But since live system users cannot always use a hard drive partition, and "
-"considering that most USB keys have poor write speeds, 'full' persistence "
-"could be also used with just image files, so you could create a file "
-"representing a partition and put this image file even on a NTFS partition of "
-"a foreign OS, with something like:"
+"Here's an example of how to create an ext2-based image file used for full "
+"persistence:"
msgstr ""
-"Pero ya que los usuarios de un sistema en vivo no siempre pueden utilizar "
-"una partición del disco duro, y teniendo en cuenta que la mayoría de "
-"memorias USB tienen velocidades de escritura lentas, la persistencia total "
-"también puede ser usada con ficheros imagen, de este modo se puede crear un "
-"fichero que represente una partición y poner ese fichero imagen incluso en "
-"una partición NTFS de un sistema operativo no nativo, con algo similar a "
-"esto:"
+"Un ejemplo de cómo crear un fichero imagen basado en ext2 usando "
+"persistencia total."
#. type: Plain text
-#: en/user_customization-runtime.ssi:125
+#: en/user_customization-runtime.ssi:143
#, no-wrap
msgid ""
-" $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
-" $ /sbin/mkfs.ext2 -F live-rw\n"
+" $ 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"
msgstr ""
-" $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
-" $ /sbin/mkfs.ext2 -F live-rw\n"
#. type: Plain text
-#: en/user_customization-runtime.ssi:129
+#: en/user_customization-runtime.ssi:147
msgid ""
-"Then copy the #{live-rw}# file to a writable partition and reboot with the "
-"boot parameter 'persistent'."
+"Then copy the #{full-ov}# file to the root of a writable partition and "
+"reboot."
msgstr ""
-"A continuación, copiar el fichero #{live-rw}# a un partición grabable y "
-"reiniciar el sistema con el parámetro de arranque «persistent»."
+"A continuación, copiar el fichero #{full-ov}# en una partición grabable y "
+"reiniciar el sistema."
#. type: Plain text
-#: en/user_customization-runtime.ssi:131
-msgid "3~ Home automounting"
-msgstr "3~ Montar Home de forma automática"
+#: en/user_customization-runtime.ssi:149
+msgid "3~ Custom overlays"
+msgstr "3~ Capas personalizadas"
+
+#. type: Plain text
+#: 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."
+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."
#. type: Plain text
-#: en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:153
msgid ""
-"If during the boot a partition (filesystem) image file or a partition "
-"labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
-"as #{/home}#, thus permitting persistence of files that belong to e.g. the "
-"default user. It can be combined with full persistence."
+"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:"
msgstr ""
-"Si durante el arranque se encuentra una partición (sistema de ficheros) con "
-"un fichero imagen o una partición con la etiqueta #{home-rw}# el sistema de "
-"ficheros será montado de forma automática como #{/home}#, lo que permite la "
-"persistencia de los ficheros que pertenecen a, por ejemplo, el usuario por "
-"defecto. Se puede combinar con persistencia total."
+"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:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:135
+#: 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"
+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 "
+"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."
+
+#. 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 "
+"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 ""
+"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)."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:168
msgid "3~ Snapshots"
msgstr "3~ Instantáneas"
#. type: Plain text
-#: en/user_customization-runtime.ssi:137
+#: 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 device to the system "
+"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 "
-"content of a snapshot could reside on a partition or an image file (like the "
-"above mentioned types) labeled #{live-sn}#, but it defaults to a simple cpio "
-"archive named #{live-sn.cpio.gz}#. As above, at boot time, the block devices "
-"connected to the system are traversed to see if a partition or a file named "
-"like that could be found. A power interruption during run time could lead to "
-"data loss, hence a tool invoked #{live-snapshot --refresh}# could be called "
-"to sync important changes. 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."
+"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."
msgstr ""
"Las instantáneas son colecciones de ficheros y directorios que no se montan "
-"durante la ejecución, pero que se copian desde un dispositivo persistente al "
+"durante la ejecución, pero que se copian desde un volumen persistente al "
"sistema (tmpfs) en el arranque y que se resincroniza en el reinicio/apagado "
-"del sistema. El contenido de una instantánea puede residir en una partición "
-"o en un fichero imagen (como los tipos mencionados anteriormente) con la "
-"etiqueta #{live-sn}#, pero el valor predeterminado es un archivo cpio simple "
-"denominado #{live-sn.cpio.gz}#. Como en el caso anterior, en el momento del "
-"arranque los dispositivos conectados al sistema se recorren buscando una "
-"partición o un fichero llamado así. Una interrupción de la alimentación en "
-"tiempo de ejecución podría conducir a la pérdida de datos, por lo tanto, se "
-"puede usar la herramienta #{live-snapshot --refresh}# para sincronizar "
-"cambios importantes. Este tipo de persistencia es la menos agresiva con "
-"dispositivos tipo flash y el más rápido de todos los sistemas de "
-"persistencia, ya que no escribe continuamente en los medios de "
-"almacenamiento."
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:139
+"del sistema. El volumen debe tener la etiqueta #{live-sn}#, y su valor "
+"predeterminado es un simple archivo cpio denominado #{live-sn.cpio.gz}#. Una "
+"interrupción del suministro eléctrico en tiempo de ejecución podría conducir "
+"a la pérdida de datos, por lo tanto, se puede usar la herramienta #{live-"
+"snapshot --refresh}# para sincronizar cambios importantes. Este tipo de "
+"persistencia es la menos agresiva con los dispositivos tipo flash y el más "
+"rápido de todos los sistemas de persistencia, ya que no escribe "
+"continuamente en los medios de almacenamiento, pero ocupa tanta RAM como el "
+"tamaño de la instantánea sin comprimir."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:172
msgid ""
"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."
@@ -636,24 +751,20 @@ msgstr ""
"a /home."
#. type: Plain text
-#: en/user_customization-runtime.ssi:141
-msgid ""
-"Snapshots cannot currently handle file deletion but full persistence and "
-"home automounting can."
-msgstr ""
-"Las instantáneas actualmente no pueden manejar el borrado de ficheros pero "
-"la persistencia total y el montaje automático sí pueden."
+#: en/user_customization-runtime.ssi:174
+msgid "Snapshots cannot currently handle file deletion."
+msgstr "Las instantáneas no pueden manejar el borrado de ficheros."
#. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:176
msgid "3~ Persistent SubText"
msgstr "3~ SubText persistente"
#. type: Plain text
-#: en/user_customization-runtime.ssi:145
+#: en/user_customization-runtime.ssi:178
msgid ""
"If a user would need multiple persistent storage of the same type for "
-"different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
+"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 "
@@ -661,20 +772,20 @@ msgid ""
"#{persistent}# #{persistent-subtext=subText}#."
msgstr ""
"Si un usuario necesita un almacenamiento persistente múltiple del mismo tipo "
-"para diferentes lugares o pruebas, tales como #{live-rw-nonwork}# y #{live-"
-"rw-work}#, el parámetro de arranque #{persistent-subtext}# usado junto con "
+"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 "
-"persistentes múltiples pero únicos. Un ejemplo sería si un usuario desea "
+"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 de: #{persistent}# #{persistent-subtext=subText}#."
+"parámetros de arranque: #{persistent}# #{persistent-subtext=subText}#."
#. type: Plain text
-#: en/user_customization-runtime.ssi:147
+#: en/user_customization-runtime.ssi:180
msgid "3~ Partial remastering"
msgstr "3~ Remasterización parcial"
#. type: Plain text
-#: en/user_customization-runtime.ssi:148
+#: en/user_customization-runtime.ssi:181
msgid ""
"The run-time modification of the tmpfs could be collected using live-"
"snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/po/es/user_examples.ssi.po b/manual/po/es/user_examples.ssi.po
index 17e80d3..e8e6f1b 100644
--- a/manual/po/es/user_examples.ssi.po
+++ b/manual/po/es/user_examples.ssi.po
@@ -9,8 +9,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-01-18 18:00-0400\n"
-"PO-Revision-Date: 2012-01-18 23:24+0100\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\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"
"Language-Team: Debian live Spanish translation team <debian-live at lists."
@@ -28,25 +28,27 @@ 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: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/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/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/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: 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/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
@@ -94,25 +96,27 @@ 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/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/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/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: 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/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
@@ -186,7 +190,7 @@ msgid ""
msgstr ""
"Este capítulo ofrece ejemplos de creación de imágenes para casos de uso "
"específicos de Debian Live. Si se es nuevo en la creación de una imagen "
-"propia de Debian Live, se recomienda mirar primero a los tres tutoriales en "
+"propia de Debian Live, se recomienda leer primero los tres tutoriales en "
"secuencia, ya que cada uno enseña nuevas técnicas que ayudan a utilizar y "
"entender los ejemplos restantes."
@@ -239,9 +243,6 @@ msgid ""
" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
" LB_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
msgstr ""
-" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
-" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
-" LB_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
#. type: Plain text
#: en/user_examples.ssi:22
@@ -275,7 +276,7 @@ msgstr "No puede ser más fácil que esto:"
#: en/user_examples.ssi:32
#, no-wrap
msgid " $ mkdir tutorial1 ; cd tutorial1 ; lb config\n"
-msgstr " $ mkdir tutorial1 ; cd tutorial1 ; lb config\n"
+msgstr ""
#. type: Plain text
#: en/user_examples.ssi:36
@@ -301,7 +302,7 @@ msgstr ""
#: en/user_examples.ssi:42 en/user_examples.ssi:69 en/user_examples.ssi:234
#, no-wrap
msgid " # lb build 2>&1 | tee binary.log\n"
-msgstr " # lb build 2>&1 | tee binary.log\n"
+msgstr ""
#. type: Plain text
#: en/user_examples.ssi:46
@@ -354,10 +355,6 @@ msgid ""
" $ lb config -p lxde\n"
" $ echo iceweasel >> config/package-lists/my.list.chroot\n"
msgstr ""
-" $ mkdir tutorial2\n"
-" $ cd tutorial2\n"
-" $ lb config -p lxde\n"
-" $ echo iceweasel >> config/package-lists/my.list.chroot\n"
#. type: Plain text
#: en/user_examples.ssi:63
@@ -435,9 +432,6 @@ msgid ""
" $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/\n"
" $ cd tutorial3\n"
msgstr ""
-" $ mkdir -p tutorial3/auto\n"
-" $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/\n"
-" $ cd tutorial3\n"
#. type: Plain text
#: en/user_examples.ssi:91
@@ -449,16 +443,11 @@ msgstr "Editar #{auto/config}# del siguiente modo:"
#, no-wrap
msgid ""
" lb config noauto \\\n"
-" --architecture i386 \\\n"
+" --architectures i386 \\\n"
" --linux-flavours 686-pae \\\n"
" --package-lists lxde \\\n"
" \"${@}\"\n"
msgstr ""
-" lb config noauto \\\n"
-" --architecture i386 \\\n"
-" --linux-flavours 686-pae \\\n"
-" --package-lists lxde \\\n"
-" \"${@}\"\n"
#. type: Plain text
#: en/user_examples.ssi:105
@@ -469,19 +458,19 @@ msgstr "Completar la lista de paquetes local:"
#: en/user_examples.ssi:109
#, no-wrap
msgid " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
-msgstr " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
+msgstr ""
#. type: Plain text
#: en/user_examples.ssi:113
msgid ""
-"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
+"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}#."
msgstr ""
-"En primer lugar con #{--architecture i386}# se asegura de que en nuestro "
+"En primer lugar con #{--architectures i386}# se asegura de que en nuestro "
"sistema de creación #{amd64}# se crea una versión de 32-bits adecuada para "
"ser usada en la mayoría de máquinas. En segundo lugar, se usa #{--linux-"
"flavours 686-pae}# porque no se espera usar esta imagen en sistemas mucho "
@@ -524,9 +513,6 @@ msgid ""
" $ git add auto\n"
" $ git commit -a -m \"Initial import.\"\n"
msgstr ""
-" $ git init\n"
-" $ git add auto\n"
-" $ git commit -a -m \"Initial import.\"\n"
#. type: Plain text
#: en/user_examples.ssi:135
@@ -561,7 +547,7 @@ msgstr ""
#: en/user_examples.ssi:143
#, no-wrap
msgid " # lb clean\n"
-msgstr " # lb clean\n"
+msgstr ""
#. type: Plain text
#: en/user_examples.ssi:147
@@ -576,7 +562,7 @@ msgstr ""
#: en/user_examples.ssi:151
#, no-wrap
msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
-msgstr " $ echo vlc >> config/package-lists/my.list.chroot\n"
+msgstr " "
#. type: Plain text
#: en/user_examples.ssi:155
@@ -586,7 +572,7 @@ msgstr "Crear de nuevo:"
#. type: Plain text
#: en/user_examples.ssi:159
msgid "# lb build"
-msgstr "# lb build"
+msgstr ""
#. type: Plain text
#: en/user_examples.ssi:163
@@ -598,7 +584,7 @@ msgstr ""
#: en/user_examples.ssi:167
#, no-wrap
msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
-msgstr " $ git commit -a -m \"Adding vlc media player.\"\n"
+msgstr ""
#. type: Plain text
#: en/user_examples.ssi:171
@@ -666,11 +652,6 @@ msgid ""
" --apt-recommends false\n"
" $ echo \"gdm3 metacity xvnc4viewer\" >> config/package-lists/my.list.chroot\n"
msgstr ""
-" $ mkdir vnc_kiosk_client\n"
-" $ cd vnc_kiosk_client\n"
-" $ lb config -a i386 -k 686-pae -p standard-x11 \\\n"
-" --apt-recommends false\n"
-" $ echo \"gdm3 metacity xvnc4viewer\" >> config/package-lists/my.list.chroot\n"
#. type: Plain text
#: en/user_examples.ssi:191
@@ -692,9 +673,6 @@ msgid ""
" $ cat > config/includes.chroot/etc/skel/.xsession << END\n"
" #!/bin/sh\n"
msgstr ""
-" $ mkdir -p config/includes.chroot/etc/skel\n"
-" $ cat > config/includes.chroot/etc/skel/.xsession << END\n"
-" #!/bin/sh\n"
#. type: Plain text
#: en/user_examples.ssi:200
@@ -703,8 +681,6 @@ msgid ""
" /usr/bin/metacity &\n"
" /usr/bin/xvncviewer 192.168.1.2:1\n"
msgstr ""
-" /usr/bin/metacity &\n"
-" /usr/bin/xvncviewer 192.168.1.2:1\n"
#. type: Plain text
#: en/user_examples.ssi:203
@@ -713,8 +689,6 @@ msgid ""
" exit\n"
" END\n"
msgstr ""
-" exit\n"
-" END\n"
#. type: Plain text
#: en/user_examples.ssi:207
@@ -724,7 +698,7 @@ msgstr "Crear la imagen:"
#. type: Plain text
#: en/user_examples.ssi:215
msgid "Enjoy."
-msgstr "Disfrutar."
+msgstr "Disfrutarlo."
#. type: Plain text
#: en/user_examples.ssi:217
@@ -768,8 +742,6 @@ msgid ""
" $ lb config -k 486 -p minimal --apt-indices false \\\n"
" --memtest none --apt-recommends false --includes none\n"
msgstr ""
-" $ lb config -k 486 -p minimal --apt-indices false \\\n"
-" --memtest none --apt-recommends false --includes none\n"
#. type: Plain text
#: en/user_examples.ssi:230
@@ -862,7 +834,7 @@ msgstr ""
#: en/user_examples.ssi:252
#, no-wrap
msgid " # apt-get install dctrl-tools tasksel-data\n"
-msgstr " # apt-get install dctrl-tools tasksel-data\n"
+msgstr " "
#. type: Plain text
#: en/user_examples.ssi:256
@@ -876,8 +848,6 @@ msgid ""
" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese\n"
msgstr ""
-" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
-" Task: brazilian-portuguese\n"
#. type: Plain text
#: en/user_examples.ssi:265
@@ -896,9 +866,6 @@ msgid ""
" Task: brazilian-portuguese-desktop\n"
" Task: brazilian-portuguese-kde-desktop\n"
msgstr ""
-" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
-" Task: brazilian-portuguese-desktop\n"
-" Task: brazilian-portuguese-kde-desktop\n"
#. type: Plain text
#: en/user_examples.ssi:275
@@ -932,17 +899,6 @@ msgid ""
" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
msgstr ""
-" $ mkdir live-pt_BR-kde\n"
-" $ cd live-pt_BR-kde\n"
-" $ lb config \\\n"
-" -a i386 \\\n"
-" -k 486 \\\n"
-" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
-" --debian-installer live\n"
-" $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
-" brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
-" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
-" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
#. type: Plain text
#: en/user_examples.ssi:292
diff --git a/manual/po/es/user_installation.ssi.po b/manual/po/es/user_installation.ssi.po
index a8c05d1..92b9bdd 100644
--- a/manual/po/es/user_installation.ssi.po
+++ b/manual/po/es/user_installation.ssi.po
@@ -9,8 +9,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-07 17:40-0400\n"
-"PO-Revision-Date: 2011-11-07 22:05+0100\n"
+"POT-Creation-Date: 2012-03-31 16:32+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"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -22,22 +22,26 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -60,49 +64,54 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 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: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: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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -124,29 +133,30 @@ msgstr "code{"
#: en/user_customization-packages.ssi:302
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 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-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: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"
@@ -238,7 +248,7 @@ msgstr "_* A partir del código fuente"
#. type: Plain text
#: en/user_installation.ssi:30
msgid "_* From snapshots"
-msgstr "_* Desde «instantáneas»"
+msgstr "_* Usando instantáneas"
#. type: Plain text
#: en/user_installation.ssi:32
@@ -263,7 +273,7 @@ msgstr "Simplemente instalar live-build como cualquier otro paquete:"
#: en/user_installation.ssi:40
#, no-wrap
msgid " # apt-get install live-build\n"
-msgstr " # apt-get install live-build\n"
+msgstr ""
#. type: Plain text
#: en/user_installation.ssi:44
@@ -274,7 +284,7 @@ msgstr "o"
#: en/user_installation.ssi:48
#, no-wrap
msgid " # aptitude install live-build\n"
-msgstr " # aptitude install live-build\n"
+msgstr ""
#. type: Plain text
#: en/user_installation.ssi:52 en/user_installation.ssi:108
@@ -296,7 +306,7 @@ msgstr ""
#: en/user_installation.ssi:58
#, no-wrap
msgid " $ git clone git://live.debian.net/git/live-build.git\n"
-msgstr " $ git clone git://live.debian.net/git/live-build.git\n"
+msgstr ""
#. type: Plain text
#: en/user_installation.ssi:62
@@ -311,9 +321,6 @@ msgid ""
" $ dpkg-buildpackage -rfakeroot -b -uc -us\n"
" $ cd ..\n"
msgstr ""
-" $ cd live-build\n"
-" $ dpkg-buildpackage -rfakeroot -b -uc -us\n"
-" $ cd ..\n"
#. type: Plain text
#: en/user_installation.ssi:72
@@ -328,7 +335,7 @@ msgstr ""
#: en/user_installation.ssi:76
#, no-wrap
msgid " # dpkg -i live-build_2.0.8-1_all.deb\n"
-msgstr " # dpkg -i live-build_2.0.8-1_all.deb\n"
+msgstr ""
#. type: Plain text
#: en/user_installation.ssi:80
@@ -340,7 +347,7 @@ msgstr ""
#: en/user_installation.ssi:84
#, no-wrap
msgid " # make install\n"
-msgstr " # make install\n"
+msgstr ""
#. type: Plain text
#: en/user_installation.ssi:88
@@ -351,7 +358,7 @@ msgstr "y desinstalarlo con:"
#: en/user_installation.ssi:92
#, no-wrap
msgid " # make uninstall\n"
-msgstr " # make uninstall\n"
+msgstr ""
#. type: Plain text
#: en/user_installation.ssi:96 en/user_installation.ssi:142
@@ -377,8 +384,8 @@ msgstr "2~ live-boot y live-config"
#. type: Plain text
#: en/user_installation.ssi:102
#, no-wrap
-msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the live-boot-doc and live-config-doc packages separately.\n"
-msgstr "*{Nota:}* No es necesario instalar live-boot o live-config en el sistema para crear sistemas personalizados de Debian Live. Sin embargo, eso no causará ningún daño y es útil por motivos de referencia. Si únicamente se desea tener la documentación, es posible instalar los paquetes live-boot-doc y live-config-doc de forma independiente.\n"
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the /{live-boot-doc}/ and /{live-config-doc}/ packages separately.\n"
+msgstr "*{Nota:}* No es necesario instalar live-boot o live-config en el sistema para crear sistemas personalizados de Debian Live. Sin embargo, eso no causará ningún daño y es útil por motivos de referencia. Si únicamente se desea tener la documentación, es posible instalar los paquetes /{live-boot-doc}/ y /{live-config-doc}/ de forma independiente.\n"
#. type: Plain text
#: en/user_installation.ssi:106
@@ -387,7 +394,8 @@ msgid ""
"per {Installing live-build}#installing-live-build."
msgstr ""
"Tanto live-boot como live-config están disponibles en el repositorio Debian "
-"siguiendo la {Instalación de live-build}#installing-live-build."
+"siguiendo un procedimiento similar al explicado en la {Instalación de live-"
+"build}#installing-live-build."
#. type: Plain text
#: en/user_installation.ssi:110
@@ -411,8 +419,6 @@ msgid ""
" $ git clone git://live.debian.net/git/live-boot.git\n"
" $ git clone git://live.debian.net/git/live-config.git\n"
msgstr ""
-" $ git clone git://live.debian.net/git/live-boot.git\n"
-" $ git clone git://live.debian.net/git/live-config.git\n"
#. type: Plain text
#: en/user_installation.ssi:121
@@ -467,10 +473,6 @@ msgid ""
" $ cd ../live-config\n"
" $ dpkg-buildpackage -b -uc -us\n"
msgstr ""
-" $ cd live-boot\n"
-" $ dpkg-buildpackage -b -uc -us\n"
-" $ cd ../live-config\n"
-" $ dpkg-buildpackage -b -uc -us\n"
#. type: Plain text
#: en/user_installation.ssi:138
diff --git a/manual/po/es/user_managing_a_configuration.ssi.po b/manual/po/es/user_managing_a_configuration.ssi.po
index 1372fc8..b6fa722 100644
--- a/manual/po/es/user_managing_a_configuration.ssi.po
+++ b/manual/po/es/user_managing_a_configuration.ssi.po
@@ -9,8 +9,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-02 12:23-0200\n"
-"PO-Revision-Date: 2011-11-13 17:28+0100\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\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"
"Language-Team: Debian live Spanish translation team <debian-live at lists."
@@ -23,22 +23,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -47,33 +50,33 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
#: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:204
-#: 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:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi: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:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: 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
@@ -82,28 +85,31 @@ msgstr ""
#: 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/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/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/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/user_customization-installer.ssi:38
@@ -112,33 +118,33 @@ msgstr "code{"
#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:208
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: 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: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:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: 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
@@ -146,8 +152,8 @@ msgstr "code{"
#: 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"
@@ -239,7 +245,7 @@ msgid ""
"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 #{lb config}# and #{lb clean}#, these "
+"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 "
@@ -275,12 +281,12 @@ msgid ""
"auto/*}#)."
msgstr ""
"Se debe utilizar scripts auto similares a los ejemplos que se muestran a "
-"continuación como punto de partida para nueva configuración de las "
-"herramientas live-build. Hay que hacer notar que, cuando se ejecuta el "
+"continuación como punto de partida para una nueva configuración de la "
+"herramienta live-build. Hay que hacer notar que, cuando se ejecuta el "
"comando #{lb}# dentro del script auto, se debe especificar la opción #"
-"{noauto}# para asegurar que el script auto no es vuelto a ejecutar "
-"repetitivamente. Tampoco se debe olvidar el asegurar que los scripts auto "
-"deben ser ejecutables (por ejemplo #{chmod 755 auto/*}#). "
+"{noauto}# para asegurar que el script auto no se vuelve a ejecutar "
+"repetitivamente. Tampoco se debe olvidar asegurarse de que los scripts auto "
+"sean ejecutables (por ejemplo #{chmod 755 auto/*}#). "
#. type: Plain text
#: en/user_managing_a_configuration.ssi:22
@@ -296,10 +302,6 @@ msgid ""
" --package-lists \"standard\" \\\n"
" \"${@}\"\n"
msgstr ""
-" #!/bin/sh\n"
-" lb config noauto \\\n"
-" --package-lists \"standard\" \\\n"
-" \"${@}\"\n"
#. type: Plain text
#: en/user_managing_a_configuration.ssi:33
@@ -316,11 +318,6 @@ msgid ""
" config/chroot config/common config/source\n"
" rm -f binary.log\n"
msgstr ""
-" #!/bin/sh\n"
-" lb clean noauto \"${@}\"\n"
-" rm -f config/binary config/bootstrap \\\n"
-" config/chroot config/common config/source\n"
-" rm -f binary.log\n"
#. type: Plain text
#: en/user_managing_a_configuration.ssi:45
@@ -334,8 +331,6 @@ msgid ""
" #!/bin/sh\n"
" lb build noauto \"${@}\" 2>&1 | tee binary.log\n"
msgstr ""
-" #!/bin/sh\n"
-" lb build noauto \"${@}\" 2>&1 | tee binary.log\n"
#. type: Plain text
#: en/user_managing_a_configuration.ssi:54
@@ -350,7 +345,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:58
#, no-wrap
msgid " $ cp /usr/share/live/build/examples/auto/* auto/\n"
-msgstr " $ cp /usr/share/live/build/examples/auto/* auto/\n"
+msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:61
@@ -363,8 +358,7 @@ msgid ""
msgstr ""
"Se puede editar el script #{auto/config}#, modificándolo o añadiendo "
"cualquier opción que se acomode a las necesidades requeridas. En el ejemplo "
-"anterior, se asignará la opción #{--package-lists standard}# como si fuese "
-"asignada por defecto. Se puede cambiar este valor a uno adecuado o "
-"simplemente eliminarlo si no es necesario añadiendo cualquier otra opción "
-"que se adecue a las necesidades requeridas por la imagen a crear, en líneas "
-"como las siguientes. "
+"anterior, se asigna la opción por defecto #{--package-lists standard}#. Se "
+"puede cambiar este valor por uno adecuado o simplemente eliminarlo si no es "
+"necesario, añadiendo en las líneas siguientes cualquier otra opción que se "
+"adecue a las necesidades requeridas para la imagen a crear. "
diff --git a/manual/po/es/user_overview.ssi.po b/manual/po/es/user_overview.ssi.po
index 1498a6b..a73e8ee 100644
--- a/manual/po/es/user_overview.ssi.po
+++ b/manual/po/es/user_overview.ssi.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-07 08:16-0400\n"
+"POT-Creation-Date: 2012-03-19 18:09+0100\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"
@@ -23,22 +23,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -61,11 +64,11 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.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: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
@@ -82,28 +85,31 @@ msgstr ""
#: 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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -125,12 +131,12 @@ msgstr "code{"
#: en/user_customization-packages.ssi:302
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: 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: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
@@ -146,8 +152,8 @@ msgstr "code{"
#: 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"
@@ -202,7 +208,7 @@ msgid ""
"Many concepts are similar to those in the debhelper Debian package tools "
"written by Joey Hess:"
msgstr ""
-"Muchos conceptos son similares a las del paquete de herramientas de Debian "
+"Muchos conceptos son similares a los del paquete de herramientas de Debian "
"debhelper escrito por Joey Hess:"
#. type: Plain text
@@ -311,19 +317,17 @@ msgstr ""
"forma de esqueleto #{auto/}#:"
#. type: Plain text
-#: en/user_overview.ssi:40
+#: en/user_overview.ssi:41
#, no-wrap
msgid ""
" $ lb config\n"
+" [2012-03-19 15:17:14] lb_config\n"
" P: Considering defaults defined in /etc/live/build.conf\n"
-" P: Creating config tree\n"
+" P: Creating config tree for a debian system\n"
msgstr ""
-" $ lb config\n"
-" P: Considering defaults defined in /etc/live/build.conf\n"
-" P: Creating config tree\n"
#. type: Plain text
-#: en/user_overview.ssi:44
+#: en/user_overview.ssi:45
msgid ""
"Using #{lb config}# without any arguments would be suitable for users who "
"need a very basic image, or who intend to later provide a more complete "
@@ -336,7 +340,7 @@ msgstr ""
"{Gestionar una configuración}#managing-a-configuration para más detalles)."
#. type: Plain text
-#: en/user_overview.ssi:46
+#: en/user_overview.ssi:47
msgid ""
"Normally, you will want to specify some options. For example, to include the "
"'gnome' package list in your configuration:"
@@ -345,36 +349,36 @@ msgstr ""
"incluir la lista del paquete 'gnome' en la configuración:"
#. type: Plain text
-#: en/user_overview.ssi:50
+#: en/user_overview.ssi:51
#, no-wrap
msgid " $ lb config -p gnome\n"
-msgstr " $ lb config -p gnome\n"
+msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:54
+#: en/user_overview.ssi:55
msgid "It is possible to specify many options, such as:"
msgstr "Es posible especificar muchas opciones, tales como:"
#. type: Plain text
-#: en/user_overview.ssi:58
+#: en/user_overview.ssi:59
#, no-wrap
-msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
-msgstr " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
+msgid " $ lb config --binary-images net --bootappend-live \"hostname=live-machine username=live-user\" ...\n"
+msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:62
+#: en/user_overview.ssi:63
msgid "A full list of options is available in the #{lb_config}# man page."
msgstr ""
-"Una lista completa de opciones está disponible en la página del manual #"
+"Una lista completa de opciones está disponible en la página de manual #"
"{lb_config}#."
#. type: Plain text
-#: en/user_overview.ssi:64
+#: en/user_overview.ssi:65
msgid "3~lb-build The #{lb build}# command"
msgstr "3~lb-build El comando #{lb build}#"
#. type: Plain text
-#: en/user_overview.ssi:66
+#: en/user_overview.ssi:67
msgid ""
"The #{lb build}# command reads in your configuration from the #{config/}# "
"directory. It then runs the lower level commands needed to build your Live "
@@ -385,12 +389,12 @@ msgstr ""
"para crear el sistema en vivo."
#. type: Plain text
-#: en/user_overview.ssi:68
+#: en/user_overview.ssi:69
msgid "3~lb-clean The #{lb clean}# command"
msgstr "3~lb-clean El comando #{lb clean}#"
#. type: Plain text
-#: en/user_overview.ssi:70
+#: en/user_overview.ssi:71
msgid ""
"It is the job of the #{lb clean}# command to remove various parts of a build "
"so subsequent builds can start from a clean state. By default, #{chroot}#, #"
@@ -410,12 +414,12 @@ msgstr ""
"opciones"
#. type: Plain text
-#: en/user_overview.ssi:72
+#: en/user_overview.ssi:73
msgid "2~live-boot The live-boot package"
msgstr "2~live-boot El paquete live-boot"
#. type: Plain text
-#: en/user_overview.ssi:74
+#: en/user_overview.ssi:75
msgid ""
"live-boot is a collection of scripts providing hooks for the initramfs-"
"tools, used to generate an initramfs capable of booting live systems, such "
@@ -429,7 +433,7 @@ msgstr ""
"imágenes para llaves USB."
#. type: Plain text
-#: en/user_overview.ssi:76
+#: en/user_overview.ssi:77
msgid ""
"At boot time it will look for read-only media containing a #{/live/}# "
"directory where a root filesystem (often a compressed filesystem image like "
@@ -443,7 +447,7 @@ msgstr ""
"para que arranquen los sistemas tipo Debian."
#. type: Plain text
-#: en/user_overview.ssi:78
+#: en/user_overview.ssi:79
msgid ""
"More information on initial ramfs in Debian can be found in the Debian Linux "
"Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
@@ -454,12 +458,12 @@ msgstr ""
"concretamente en el capítulo sobre initramfs."
#. type: Plain text
-#: en/user_overview.ssi:80
+#: en/user_overview.ssi:81
msgid "2~live-config The live-config package"
msgstr "2~live-config El paquete live-config"
#. type: Plain text
-#: en/user_overview.ssi:81
+#: en/user_overview.ssi:82
msgid ""
"live-config consists of the scripts that run at boot time after live-boot to "
"configure the live system automatically. It handles such tasks as setting "
diff --git a/manual/po/fr/about_manual.ssi.po b/manual/po/fr/about_manual.ssi.po
index 3186556..01fbdec 100644
--- a/manual/po/fr/about_manual.ssi.po
+++ b/manual/po/fr/about_manual.ssi.po
@@ -7,15 +7,15 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-05 17:13+0100\n"
-"PO-Revision-Date: 2012-02-05 17:57+0100\n"
+"POT-Creation-Date: 2012-03-07 08:59-0400\n"
+"PO-Revision-Date: 2012-03-17 19:42+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
#. type: Plain text
#: en/about_manual.ssi:2
@@ -30,8 +30,9 @@ msgstr "1~about-manual À propos de ce manuel"
#. type: Plain text
#: en/about_manual.ssi:6
msgid ""
-"The main goal of this manual is to serve as a single access point to all "
-"documentation related to the Debian Live project. While it is primarily "
+"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, "
@@ -40,15 +41,16 @@ msgid ""
"selecting a keyboard layout and locale, and using persistence."
msgstr ""
"L'objectif principal de ce manuel est servir de point d'accès unique à tous "
-"les documents liés au projet Debian Live. Tandis qu'il est principalement "
-"sur vous aider à construire un système Live et non pas sur des sujets de "
-"l'utilisateur final, un utilisateur final peut trouver des informations "
-"utiles dans ces sections: {Les Bases}#the-basics couvrent la préparation des "
-"images pour être démarrées à partir des supports ou depuis le réseau, et "
-"{Personnalisation des comportements au moment de l'exécution}#customizing-"
-"run-time-behaviours décrit certaines options qui peuvent être spécifiées à "
-"l'invite de démarrage, tels que la sélection d'un clavier, des paramètres "
-"régionaux, et la utilisation de la persistance."
+"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."
#. type: Plain text
#: en/about_manual.ssi:8
@@ -135,7 +137,7 @@ msgstr ""
"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 depuis le "
+"des clés USB. Certains systèmes peuvent également être démarrés sur le "
"réseau."
#. type: Plain text
@@ -156,9 +158,9 @@ msgid ""
"{fetch=URL}#)."
msgstr ""
"_* *{Système Debian Live}*: Un système live qui utilise les logiciels du "
-"système d'exploitation Debian et qui peut être lancé depuis 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}#)."
+"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}#)."
#. type: Plain text
#: en/about_manual.ssi:22
@@ -200,7 +202,7 @@ msgid ""
"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 de démarrage. live-config faisait "
+"système live durant le processus d'amorçage. live-config faisait "
"initialement partie de live-initramfs."
#. type: Plain text
@@ -227,8 +229,8 @@ msgid ""
"_* *{Boot parameters}*: Parameters that can be entered at the bootloader "
"prompt to influence the kernel or live-config."
msgstr ""
-"_* *{Paramètres de démarrage}*: 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 pouvant être entrés à l'invite "
+"de démarrage afin de modifier le noyau ou live-config."
#. type: Plain text
#: en/about_manual.ssi:38
@@ -381,8 +383,8 @@ msgid ""
msgstr ""
"Ce manuel est conçu comme un projet communautaire et toutes les propositions "
"d'améliorations et de contributions sont bienvenues. La meilleure façon de "
-"soumettre une contribution est de l'envoyer à la liste de diffusion. S'il "
-"vous plaît voir {Contact}#contact pour plus d'informations."
+"soumettre une contribution est l'envoyer à la liste de diffusion. S'il vous "
+"plaît voir {Contact}#contact pour plus d'informations."
#. type: Plain text
#: en/about_manual.ssi:80
@@ -417,15 +419,16 @@ msgstr ""
#: 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/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/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/user_customization-installer.ssi:32
@@ -489,15 +492,16 @@ msgstr ""
#: 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/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/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/user_customization-installer.ssi:38
@@ -568,8 +572,8 @@ msgid ""
"You may build the live-manual from the top level directory of your Git "
"checkout by executing:"
msgstr ""
-"Vous pouvez compiler live-manual depuis le répertoire racine de votre Git "
-"checkout en exécutant:"
+"Vous pouvez compiler live-manual dans le répertoire de niveau supérieur de "
+"votre Git checkout en exécutant:"
#. type: Plain text
#: en/about_manual.ssi:102
@@ -629,10 +633,10 @@ msgid ""
"bigger changes to the mailing list to discuss them first. To push to the "
"repository, you must follow this procedure:"
msgstr ""
-"Les contributions directes au référentiel sont possibles pour tout le monde. "
-"Cependant, nous vous demandons d'envoyer les changements importants sur la "
-"liste de diffusion au préalable. Afin de faire un push sur le référentiel, "
-"les étapes suivantes sont nécessaires."
+"Les contributions au dépôt sont possibles pour tout le monde. Cependant, "
+"nous vous demandons d'envoyer les changements importants sur la liste de "
+"diffusion au préalable. Afin de faire un push au dépôt, les étapes suivantes "
+"sont nécessaires."
#. type: Plain text
#: en/about_manual.ssi:134
@@ -698,8 +702,8 @@ msgid ""
"translation files:"
msgstr ""
"_* Après édition des fichiers dans #{manual/en/}#, veuillez appeler 'commit' "
-"dans le dossier racine du répertoire afin de nettoyer les fichier et de "
-"mettre à jour les fichiers de traduction:"
+"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
@@ -729,8 +733,8 @@ 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 en commençant par 'Fixing/Adding/Removing/Correcting/Translating', "
-"par exemple"
+"point, et avec la forme 'Fixing/Adding/Removing/Correcting/Translating', par "
+"exemple"
#. type: Plain text
#: en/about_manual.ssi:191
@@ -751,8 +755,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:203
-msgid "3~ Translation"
-msgstr "3~ Traduction"
+msgid "3~translation Translation"
+msgstr "3~translation Traduction"
#. type: Plain text
#: en/about_manual.ssi:205
diff --git a/manual/po/fr/about_project.ssi.po b/manual/po/fr/about_project.ssi.po
index 03cb989..d072ee3 100644
--- a/manual/po/fr/about_project.ssi.po
+++ b/manual/po/fr/about_project.ssi.po
@@ -2,20 +2,20 @@
# 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-08-29 08:54-0200\n"
-"PO-Revision-Date: 2011-10-22 19:08+0200\n"
+"POT-Creation-Date: 2012-02-19 22:16+0100\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"
"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_project.ssi:2
@@ -176,9 +176,9 @@ msgid ""
"section. The non-free section is not part of Debian and therefore cannot be "
"used for official live system images."
msgstr ""
-"Nous seulement utiliserons les paquets du référentiel de Debian dans la "
-"section «main ». La section non-free ne fait pas partie de Debian et ne peut "
-"donc pas être utilisée pour les images officiels du système live."
+"Nous seulement utiliserons les paquets du dépôt Debian dans la section «main "
+"». La section non-free ne fait pas partie de Debian et ne peut donc pas être "
+"utilisée pour les images officiels du système live."
#. type: Plain text
#: en/about_project.ssi:50
@@ -200,9 +200,8 @@ msgid ""
msgstr ""
"À titre d'exception, nos propres paquets tels que live-boot, live-build ou "
"live-config peuvent être utilisés temporairement à partir de notre propre "
-"référentiel pour raisons de développement (par exemple pour créer des "
-"instantanés de développement). Ils seront téléchargés sur Debian "
-"régulièrement."
+"dépôt pour raisons de développement (par exemple pour créer des instantanés "
+"de développement). Ils seront téléchargés sur Debian régulièrement."
#. type: Plain text
#: en/about_project.ssi:54
@@ -256,8 +255,8 @@ 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 "
-"aussi minimes que possible et devraient être fusionnées au sein du "
-"référentiel Debian s'il est possible."
+"aussi minimes que possible et devraient être fusionnées au sein du dépôt "
+"Debian s'il est possible."
#. type: Plain text
#: en/about_project.ssi:64
@@ -293,7 +292,7 @@ msgstr ""
"à la liste de diffusion."
#. type: Plain text
-#: en/about_project.ssi:70
+#: 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 "
@@ -305,15 +304,3 @@ msgstr ""
"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."
-
-#. type: Plain text
-#: en/about_project.ssi:71
-msgid ""
-"_* *{Wiki}*: The Debian Live wiki at http://wiki.debian.org/DebianLive is a "
-"place to gather information, discuss applied technologies, and document "
-"frameworks of Debian Live systems that go beyond the scope of this document."
-msgstr ""
-"_* *{Wiki}*: Le wiki Debian Live à http://wiki.debian.org/DebianLive est un "
-"lieu pour recueillir des informations, discuter des technologies appliquées, "
-"et structures des systèmes Debian Live qui vont au-delà de la portée de ce "
-"document."
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index 93e3054..c6afd04 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-06 18:57+0100\n"
+"POT-Creation-Date: 2012-04-03 00:19+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,7 +49,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-02-06\n"
+" :published: 2012-04-03\n"
msgstr ""
#. type: Plain text
@@ -169,6 +169,16 @@ msgid ":B~ Examples"
msgstr ":B~ Exemples"
#. type: Plain text
-#: en/live-manual.ssm:62
+#: en/live-manual.ssm:63
msgid "<< user_examples.ssi"
msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:65 en/style_guide.ssi:2
+msgid ":B~ Appendix"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:66
+msgid "<< style_guide.ssi"
+msgstr ""
diff --git a/manual/po/fr/project_bugs.ssi.po b/manual/po/fr/project_bugs.ssi.po
index 1d9dd18..4d858d5 100644
--- a/manual/po/fr/project_bugs.ssi.po
+++ b/manual/po/fr/project_bugs.ssi.po
@@ -2,20 +2,20 @@
# 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: 2010-12-24 14:17-0400\n"
-"PO-Revision-Date: 2011-08-28 12:39+0200\n"
+"PO-Revision-Date: 2012-03-17 17:43+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
@@ -261,8 +261,8 @@ msgstr ""
"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 à partir de *{unstable}* "
-"(voir {APT pinning}#apt-pinning pour plus de détails)."
+"* 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
@@ -292,7 +292,7 @@ msgid ""
"reproduce (and ultimately fix) your problem. Make sure your build system is "
"up-to-date and any packages included in your image are up-to-date as well."
msgstr ""
-"L'utilisation de paquets obsolètes peut causer d'importants problèmes en "
+"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."
@@ -310,10 +310,10 @@ msgid ""
"to reproduce it. Please use common sense and include other relevant "
"information if you think that it might help in solving the problem."
msgstr ""
-"S'il vous plaît fournir assez d'informations à votre rapport. Inclure au "
+"S'il vous plaît fournir assez d'informations à votre rapport. Incluez au "
"moins la version exacte de live-build où le bogue est rencontré et les "
"mesures pour le reproduire. S'il vous plaît utilisez votre bon sens et "
-"inclure d'autres renseignements pertinents, si vous pensez que cela pourrait "
+"incluez d'autres renseignements pertinents, si vous pensez que cela pourrait "
"aider à résoudre le problème."
#. type: Plain text
@@ -478,11 +478,11 @@ msgid ""
"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 (bootstrap) 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é à l'outil d'amorçage lui-même."
+"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 à "
+"l'outil d'amorçage lui-même."
#. type: Plain text
#: en/project_bugs.ssi:84
@@ -534,8 +534,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 depuis "
-"un miroir officiel."
+"problème, s'il vous plaît toujours le reproduire d'abord en amorçant sur un "
+"miroir officiel."
#. type: Plain text
#: en/project_bugs.ssi:94
@@ -591,7 +591,7 @@ msgstr ""
"Avant de présenter le bogue, s'il vous plaît recherchez sur le web pour 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 ya toujours une chance qu'il a été discuté "
+"problème particulier, il y a toujours une chance qu'il a été discuté "
"ailleurs, et une solution possible, un correctif, ou une solution de "
"contournement a été proposé."
@@ -636,7 +636,7 @@ msgstr ""
"Debian Bug Tracking System (BTS). Pour plus d'informations sur la façon "
"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}# "
-"à partir du paquet du même nom."
+"du paquet du même nom."
#. type: Plain text
#: en/project_bugs.ssi:114
@@ -662,6 +662,6 @@ msgid ""
"can be also reproduced on a Debian system using official Debian packages."
msgstr ""
"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 "
+"de Debian (comme Ubuntu et autres) *{ne}* doivent *{pas}* être rapportés au "
"BTS de Debian, sauf qu'ils peuvent être également reproduits sur un système "
"Debian en utilisant les paquets Debian officiels."
diff --git a/manual/po/fr/project_coding-style.ssi.po b/manual/po/fr/project_coding-style.ssi.po
index 887e6ff..3fb69c4 100644
--- a/manual/po/fr/project_coding-style.ssi.po
+++ b/manual/po/fr/project_coding-style.ssi.po
@@ -2,146 +2,158 @@
# 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-01-20 16:58-0400\n"
-"PO-Revision-Date: 2011-09-04 19:20+0200\n"
+"POT-Creation-Date: 2012-03-31 16:32+0300\n"
+"PO-Revision-Date: 2012-03-17 17:46+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi: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/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/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/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/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/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/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/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/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/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: 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"
@@ -172,7 +184,7 @@ msgid ""
"example, the use of array constructs."
msgstr ""
"_* Ne pas utiliser la syntaxe ou la sémantique qui sont uniques à le shell "
-"Bash. Par exemple, l'utilisation de structures de tableau."
+"Bash. Par exemple, l'utilisation d'arrays."
#. type: Plain text
#: en/project_coding-style.ssi:12
@@ -387,7 +399,7 @@ msgstr "2~ Autres"
#. type: Plain text
#: en/project_coding-style.ssi:132
msgid ""
-"_* Use \"#{|}#\" (without the surround quotes) as a seperator in calls to "
+"_* 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 "
diff --git a/manual/po/fr/style_guide.ssi.po b/manual/po/fr/style_guide.ssi.po
new file mode 100644
index 0000000..9715a55
--- /dev/null
+++ b/manual/po/fr/style_guide.ssi.po
@@ -0,0 +1,894 @@
+# 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"
+"PO-Revision-Date: 2012-02-11 16:42+0100\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\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/live-manual.ssm:65 en/style_guide.ssi:2
+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/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
+#: 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: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: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/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
+#: 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: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
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/style_guide.ssi:4
+msgid "1~style-guide Style guide"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:6
+msgid "2~ Guidelines for authors"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:8
+msgid ""
+"This section deals with some general considerations to be taken into account "
+"when writing technical documentation for live-manual. They are divided into "
+"linguistic features and recommended procedures."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:10
+#, no-wrap
+msgid "*{Note:}* Authors should first read {Contributing to this document}#how-to-contribute\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:12
+msgid "3~ Linguistic features"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:14
+msgid "_* /{Use plain English}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:16
+msgid ""
+"Keep in mind that a high percentage of your readers are not native speakers. "
+"So as a general rule try to use short, meaningful sentences, followed by a "
+"full stop."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:18
+msgid ""
+"This does not mean that you have to use a simplistic, naive style. It is a "
+"suggestion to try to avoid, as much as possible, complex subordinate "
+"sentences that make the text difficult to understand for non-native speakers."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:20
+msgid "_* /{Variety of English}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:22
+msgid ""
+"The most widely spread varieties of English are British and American so it "
+"is very likely that most authors will use either one or the other. In a "
+"collaborative environment, the ideal variety would be \"International English"
+"\" but it is very difficult, not to say impossible, to decide on which "
+"variety among all the existing ones, is the best to use."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:24
+msgid ""
+"We expect that different varieties may mix without creating "
+"misunderstandings but in general terms you should try to be coherent and "
+"before deciding on using British, American or any other English flavour at "
+"your discretion, please take a look at how other people write and try to "
+"imitate them."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:26
+msgid "_* /{Be balanced}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:28
+msgid ""
+"Do not be biased. Avoid including references to ideologies completely "
+"unrelated to live-manual. Technical writing should be as neutral as "
+"possible. It is in the very nature of scientific writing."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:30
+msgid "_* /{Be politically correct}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:32
+msgid ""
+"Try to avoid sexist language as much as possible. If you need to make "
+"references to the third person singular preferably use \"they\" rather than "
+"\"he\" or \"she\" or awkward inventions such as \"s/he\", \"s(he)\" and the "
+"like."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:34
+msgid "_* /{Be concise}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:36
+msgid ""
+"Go straight to the point and do not wander around aimlessly. Give as much "
+"information as necessary but do not give more information than necessary, "
+"this is to say, do not explain unnecessary details. Your readers are "
+"intelligent. Presume some previous knowledge on their part."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:38
+msgid "_* /{Minimize translation work}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:40
+msgid ""
+"Keep in mind that whatever you write will have to be translated into several "
+"other languages. This implies that a number of people will have to do an "
+"extra work if you add useless or redundant information."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:42
+msgid "_* /{Be coherent}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:44
+msgid ""
+"As suggested before, it is almost impossible to standardize a collaborative "
+"document into a perfectly unified whole. However, every effort on your side "
+"to write in a coherent way with the rest of the authors will be appreciated."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:46
+msgid "_* /{Be cohesive}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:48
+msgid ""
+"Use as many text-forming devices as necessary to make your text cohesive and "
+"unambiguous. (Text-forming devices are linguistic markers such as "
+"connectors)."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:50
+msgid "_* /{Be descriptive}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:52
+msgid ""
+"It is preferable to describe the point in one or several paragraphs than "
+"merely using a number of sentences in a typical \"changelog\" style. "
+"Describe it! Your readers will appreciate it."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:54
+msgid "_* /{Dictionary}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:56
+msgid ""
+"Look up the meaning of words in a dictionary or encyclopedia if you do not "
+"know how to express certain concepts in English. But keep in mind that a "
+"dictionary can either be your best friend or can turn into your worst enemy "
+"if you do not know how to use it correctly."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:58
+msgid ""
+"English has the largest vocabulary that exists (With over one million "
+"words). Many of these words are borrowings from other languages. When "
+"looking up the meaning of words in a bilingual dictionary the tendency of a "
+"non-native speaker is to choose the one that sounds more similar in their "
+"mother tongue. This often turns into an excessively formal discourse which "
+"does not sound quite natural in English."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:60
+msgid ""
+"As a general rule, if a concept can be expressed using different synonyms, "
+"it is a good advice to choose the first word proposed by the dictionary. If "
+"in doubt, choosing words of Germanic origin (Usually monosyllabic words) is "
+"often the right thing to do. Be warned that these two techniques might "
+"produce a rather informal discourse but at least your choice of words will "
+"be of wide use and generally accepted."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:62
+msgid ""
+"Using a dictionary of collocations is recommended. They are extremely "
+"helpful when it comes to know which words usually occur together."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:64
+msgid ""
+"Again it is a good practice to learn from the work of others. Using a search "
+"engine to check how other authors use certain expressions may help a lot."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:66
+msgid "_* /{False friends, idioms and other idiomatic expressions}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:68
+msgid ""
+"Watch out for false friends. No matter how proficient you are in a foreign "
+"language you cannot help falling from time to time in the trap of the so "
+"called \"false friends\", words that look similar in two languages but whose "
+"meanings or uses might be completely different."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:70
+msgid ""
+"Try to avoid idioms as much as possible. \"Idioms\" are expressions that may "
+"convey a completely different meaning from what their individual words seem "
+"to mean. Sometimes, idioms are difficult to understand even for native "
+"speakers!"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:72
+msgid "_* /{Avoid slang, abbreviations, contractions...}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:74
+msgid ""
+"Even though you are encouraged to use plain, everyday English, technical "
+"writing belongs to the formal register of the language."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:76
+msgid ""
+"Try to avoid slang, unusual abbreviations that are difficult to understand "
+"and above all contractions that try to imitate the spoken language. Not to "
+"mention typical irc and family friendly expressions."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:78
+msgid "3~ Procedures"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:80
+msgid "_* /{Test before write}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:82
+msgid ""
+"It is important that authors test their examples before adding them to live-"
+"manual to ensure that everything works as described. Testing on a clean "
+"chroot or VM can be a good starting point. Besides, it would be ideal if the "
+"tests were then carried out on different machines with different hardware to "
+"spot possible problems that may arise."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:84
+msgid "_* /{Examples}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:86
+msgid ""
+"When providing an example try to be as specific as you can. An example is, "
+"after all, just an example."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:88
+msgid ""
+"It is often better to use a line that only applies to an specific case than "
+"using abstractions that may confuse your readers. In this case you can "
+"provide a brief explanation of the effects of the proposed example."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:90
+msgid ""
+"There may be some exceptions when the example suggests using some "
+"potentially dangerous commands that, if misused, may cause data loss or "
+"other similar undesirable effects. In this case you should provide a "
+"thorough explanation of the possible side effects."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:92
+msgid "_* /{External links}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:94
+msgid ""
+"Links to external sites should only be used when the information on those "
+"sites is crucial when it comes to understanding a special point. Even so, "
+"try to use links to external sites as sparsely as possible. Internet links "
+"are likely to change from time to time resulting in broken links and leaving "
+"your arguments in an incomplete state."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:96
+msgid ""
+"Besides, people who read the manual offline will not have the chance to "
+"follow those links."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:98
+msgid ""
+"_* /{Avoid branding and things that violate the license under which the "
+"manual is published}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:100
+msgid ""
+"Try to avoid branding as much as possible. Keep in mind that other "
+"downstream projects might make use of the documentation you write. So you "
+"are complicating things for them if you add certain specific material."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:102
+msgid ""
+"live-manual is licensed under the GNU GPL. This has a number of implications "
+"that apply to the distribution of the material (of any kind, including "
+"copyrighted graphics or logos) that is published with it."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:104
+msgid "_* /{Write a first draft, revise, edit, improve, redo if necessary}/"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:106
+msgid ""
+"Brainstorm!. You need to organize your ideas first in a logical sequence of "
+"events."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:108
+msgid ""
+"Once you have somehow organized those ideas in your mind write a first draft."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:110
+msgid "Revise grammar, syntax and spelling."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:112
+msgid "Improve your statements and redo any part if necessary."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:114
+msgid "_* /{Chapters}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:116
+msgid ""
+"Use the conventional numbering system for chapters and subtitles. e.g. 1, "
+"1.1, 1.1.1, 1.1.2 ... 1.2, 1.2.1, 1.2.2 ... 2, 2.1 ... and so on. See markup "
+"below."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:118
+msgid ""
+"If you have to enumerate a series of steps or stages in your description, "
+"you can also use ordinal numbers: First, second, third ... or First, Then, "
+"After that, Finally ... Alternatively you can use bulleted items."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:120 en/style_guide.ssi:214
+msgid "_* /{Markup}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:122
+msgid ""
+"And last but not least, live-manual uses {SiSU}http://www.sisudoc.org to "
+"process the text files and produce a multiple format output. It is "
+"recommended to take a look at {SiSU's manual}http://www.sisudoc.org/sisu/"
+"sisu_manual/markup.html to get familiar with its markup, or else type:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:126
+#, no-wrap
+msgid " $ sisu --help markup\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:130
+msgid "Here are some markup examples that may prove useful:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:132
+msgid "For emphasis/bold text:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:136
+#, no-wrap
+msgid "*{foo}* or !{foo}!\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:140
+msgid "produces: *{foo}* or !{foo}!. Use it to emphasize certain key words."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:142
+msgid "For italics:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:146
+msgid "/{foo}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:150
+msgid "produces: /{foo}/. Use them e.g. for the names of debian packages."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:152
+msgid "For monospace:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:156
+msgid "#{foo}#"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:160
+msgid ""
+"produces: #{foo}#. Use it e.g. for the names of commands. And also to "
+"highlight some key words or things like paths."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:162
+msgid "For code blocks:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:166
+#, no-wrap
+msgid " code{\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:169
+#, no-wrap
+msgid ""
+" $ foo\n"
+" # bar\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:171
+#, no-wrap
+msgid " }code\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:175
+msgid "produces:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:180
+#, no-wrap
+msgid ""
+" $ foo\n"
+" # bar\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:184
+msgid ""
+"Use #{code{}# to open and #{}code}# to close the tags. It is important to "
+"remember to leave a space at the beginning of each line of code."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:186
+msgid "2~ Guidelines for translators"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:188
+msgid ""
+"This section deals with some general considerations to be taken into account "
+"when translating the contents of live-manual."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:190
+msgid ""
+"As a general recommendation, translators should have read and understood the "
+"translation rules that apply to their specific languages. Usually, "
+"translation groups and mailing lists provide information on how to produce "
+"translated work that complies with Debian quality standards."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:192
+#, no-wrap
+msgid "*{Note:}* Translators should also read {Contributing to this document}#how-to-contribute. In particular the section {Translation}#translation\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:194
+msgid "3~ Translation hints"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:196
+msgid "_* /{Comments}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:198
+msgid ""
+"The role of the translator is to convey as faithfully as possible the "
+"meaning of words, sentences, paragraphs and texts as written by the original "
+"authors into their target language."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:200
+msgid ""
+"So they should refrain from adding personal comments or extra bits of "
+"information of their own. If they want to add a comment for other "
+"translators working on the same documents, they can leave it in the space "
+"reserved for that. That is, the header of the strings in the *{po}* files "
+"preceded by a number sign *{#}*. Most graphical translation programs can "
+"automatically handle those types of comments."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:202
+msgid "_* /{TN, Translator's Note}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:204
+msgid ""
+"It is perfectly acceptable however, to include a word or an expression in "
+"brackets in the translated text if, and only if, that makes the meaning of a "
+"difficult word or expression clearer to the reader. Inside the brackets the "
+"translator should make evident that the addition was theirs using the "
+"abbreviation \"TN\" or \"Translator's Note\"."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:206
+msgid "_* /{Impersonal sentences}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:208
+msgid ""
+"Documents written in English make an extensive use of the impersonal form "
+"\"you\". In some other languages that do not share this characteristic, this "
+"might give the false impression that the original texts are directly "
+"addressing the reader when they are actually not doing so. Translators must "
+"be aware of that fact and reflect it in their language as accurately as "
+"possible."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:210
+msgid "_* /{False friends}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:212
+msgid ""
+"The trap of \"false friends\" explained before especially applies to "
+"translators. Double check the meaning of suspicious false friends if in "
+"doubt."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:216
+msgid ""
+"Translators working initially with *{pot}* files and later on with *{po}* "
+"files will find many markup features in the strings. They can translate the "
+"text anyway, as long as it is translatable, but it is extremely important "
+"that they use exactly the same markup as the original English version."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:218
+msgid "_* /{Code blocks}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:220
+msgid ""
+"Some translators decide to include the code blocks in the translated files "
+"because it is easier for them to identify what has already been translated "
+"and what has not by looking at the percentages if they use a graphical "
+"translation program."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:222
+msgid ""
+"Include the code blocks if you want to score a 100% complete translation."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:224
+msgid ""
+"On the other hand some translators prefer to leave the code blocks "
+"\"untranslated\" (i.e. not including them). This makes the translation "
+"easier to maintain once finished because it does not require translators "
+"intervention if the code changes."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:226
+msgid ""
+"Leave the code blocks empty (they will be automatically added then) if you "
+"want to make your translation easier to maintain."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:228
+msgid "_* /{New lines}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:230
+msgid ""
+"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."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:232
+msgid ""
+"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."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:234
+msgid "_* /{Untranslatable strings}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:236
+msgid "Translators should never translate:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:238
+msgid "The code names of releases"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:240
+msgid "The names of programs"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:242
+msgid "The commands given as examples"
+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."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:246
+msgid "Links"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:247
+msgid "Paths"
+msgstr ""
diff --git a/manual/po/fr/user_basics.ssi.po b/manual/po/fr/user_basics.ssi.po
index 18b050f..aaae78f 100644
--- a/manual/po/fr/user_basics.ssi.po
+++ b/manual/po/fr/user_basics.ssi.po
@@ -2,20 +2,20 @@
# 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: 2012-01-12 08:28-0400\n"
-"PO-Revision-Date: 2011-06-26 20:10+0200\n"
+"PO-Revision-Date: 2012-03-17 20:08+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
@@ -200,7 +200,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:10
msgid "2~what-is-live What is a live system?"
-msgstr "2~what-is-live Qu'est-ce qu'un système live?"
+msgstr "2~what-is-live Qu'est-ce c'est un système live?"
#. type: Plain text
#: en/user_basics.ssi:12
@@ -423,7 +423,7 @@ msgstr ""
#: en/user_basics.ssi:66
msgid "3~copying-iso-hybrid-to-usb Copying an ISO hybrid image to a USB stick"
msgstr ""
-"3~copying-iso-hybrid-to-usb Copie d'un image ISO hybride sur une clé USB"
+"3~copying-iso-hybrid-to-usb Copie d'une image ISO hybride sur une clé USB"
#. type: Plain text
#: en/user_basics.ssi:68
@@ -444,8 +444,8 @@ msgstr ""
"dispositif il 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 dans la sortie de #{dmesg}# après avoir branché le dispositif, "
-"ou mieux encore, #{ls -l /dev/disk/by-id}#."
+"en regardant la sortie de #{dmesg}# après avoir branché le dispositif, ou "
+"mieux encore, #{ls -l /dev/disk/by-id}#."
#. type: Plain text
#: en/user_basics.ssi:71
@@ -455,7 +455,7 @@ msgid ""
"any previous contents on your stick!}*"
msgstr ""
"Une fois que vous êtes sûr d'avoir le nom correct de l'appareil, utilisez la "
-"commande #{dd}# pour copier l'image sur le clé. *{Ceci écrasera tout fichier "
+"commande #{dd}# pour copier l'image sur la clé. *{Ceci écrasera tout fichier "
"déjà existant sur votre clé!}*"
#. type: Plain text
@@ -482,15 +482,15 @@ 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 PXE, une certaine configuration dans le BIOS "
-"de votre ordinateur peut être d'abord nécessaire. Depuis 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 clé pour "
-"ouvrir un menu d'amorçage au démarrage, qui est le moyen le plus facile si "
-"elle est disponible sur votre système. Sinon, vous avez besoin d'entrer dans "
-"le menu de configuration du BIOS et modifier l'ordre de démarrage pour "
-"placer le dispositif de démarrage pour le système live devant votre "
-"périphérique de démarrage normal."
+"DVD, clé USB, ou le 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 "
+"touche pour ouvrir un menu d'amorçage au démarrage, qui est le moyen le plus "
+"facile si elle est disponible sur votre système. Sinon, vous avez besoin "
+"d'entrer dans le menu de configuration du BIOS et modifier l'ordre de "
+"démarrage pour placer le dispositif de démarrage pour le système live devant "
+"votre périphérique de démarrage normal."
#. type: Plain text
#: en/user_basics.ssi:84
@@ -574,7 +574,7 @@ msgid ""
"_* Occasionally there are bugs that relate only to running in a VM. When in "
"doubt, test your image directly on the hardware."
msgstr ""
-"_* Parfois il ya des bogues que deviennent visibles uniquement pendant "
+"_* Parfois il y a des bogues que deviennent visibles uniquement pendant "
"l'exécution dans une VM. En cas de doute, testez votre image directement sur "
"le matériel."
@@ -612,7 +612,7 @@ msgid ""
"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 supporte. Sinon, "
+"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}#."
@@ -884,7 +884,7 @@ msgid ""
"booting over the network."
msgstr ""
"La séquence de commandes suivante va créer une image NetBoot de base "
-"contenant le système Debian standard sans X.org. Elle peur être démarrée sur "
+"contenant le système Debian standard sans X.org. Elle peut être démarrée sur "
"le réseau."
#. type: Plain text
@@ -921,13 +921,13 @@ msgid ""
"be located at boot time. Make sure these are set to suitable values for your "
"network and server."
msgstr ""
-"Contrairement à les images ISO et HDD netbooting 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."
+"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."
#. type: Plain text
#: en/user_basics.ssi:242
@@ -967,7 +967,7 @@ msgid ""
"DHCP server, the TFTP server and the NFS server."
msgstr ""
"Nous devons maintenant configurer trois services sur le serveur pour activer "
-"netboot: le serveur DHCP, serveur TFTP et le serveur NFS."
+"le démarrage sur le réseau: le serveur DHCP, serveur TFTP et le serveur NFS."
#. type: Plain text
#: en/user_basics.ssi:248
@@ -982,8 +982,8 @@ msgid ""
"bootloader."
msgstr ""
"Nous devons configurer le serveur DHCP de notre réseau pour être sûr de "
-"donner une adresse IP au système client netboot, et pour annoncer "
-"l'emplacement du chargeur de démarrage PXE."
+"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."
#. type: Plain text
#: en/user_basics.ssi:252
@@ -1161,7 +1161,7 @@ msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
"Afin de rendre notre vie plus facile, nous pouvons utiliser la "
-"virtualisation. Il ya deux solutions."
+"virtualisation. Il y a deux solutions."
#. type: Plain text
#: en/user_basics.ssi:320
diff --git a/manual/po/fr/user_customization-binary.ssi.po b/manual/po/fr/user_customization-binary.ssi.po
index 440331d..558ba75 100644
--- a/manual/po/fr/user_customization-binary.ssi.po
+++ b/manual/po/fr/user_customization-binary.ssi.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-15 20:48+0100\n"
-"PO-Revision-Date: 2012-01-15 18:09+0100\n"
+"POT-Creation-Date: 2012-02-25 21:42+0100\n"
+"PO-Revision-Date: 2012-03-17 17:01+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: fr\n"
@@ -19,23 +19,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -85,23 +87,25 @@ 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/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/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/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/user_customization-installer.ssi:38
@@ -167,28 +171,75 @@ msgstr "2~ Chargeur d'amorçage"
#. type: Plain text
#: en/user_customization-binary.ssi:8
msgid ""
-"live-build uses syslinux and some of its derivatives (depending on the image "
-"type) as bootloaders by default. You can easily modify their options using "
-"different methods, like {includes}#includes or {hooks}#hooks."
+"live-build uses /{syslinux}/ and some of its derivatives (depending on the "
+"image type) as bootloaders by default. You can easily customize them in a "
+"number of ways that range from providing a full theme to changing the boot "
+"timeout or simply adding a personalized splash image. Some of the following "
+"examples of customization make use of different methods, like {includes}"
+"#includes or {hooks}#hooks."
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 "
-"modifier leurs options en utilisant différentes méthodes, comme {includes}"
-"#includes ou {hooks}#hooks."
+"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."
#. type: Plain text
#: en/user_customization-binary.ssi:10
msgid ""
-"For example, these derivatives are configured by default with a timeout of 0 "
-"(zero) which means that they will pause indefinitely at their splash screen "
-"until you press a key."
+"If you want to use a full theme you can specify the #{--syslinux-theme}# "
+"option (see man #{lb_config}#). live-build will then retrieve the theme from "
+"the mirror and install it."
msgstr ""
-"Par exemple, ces dérivés sont configurés par défaut avec un timeout de 0 "
+"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 "
+"thème du miroir et l'installera."
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:12
+msgid ""
+"Imagine that you want to build a progress client but you prefer to include "
+"the server's theme because you want to have the help menu. Then you would "
+"launch #{lb config}# as follows:"
+msgstr ""
+"Imaginez que vous voulez construire un client progress, mais vous voulez "
+"inclure le thème du serveur parce que vous voulez avoir le menu d'aide. "
+"Ensuite, vous devez lancer #{lb config}# comme suit:"
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:16
+#, no-wrap
+msgid " $ lb config --mode progress --syslinux-theme progress-server\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:20
+msgid ""
+"You can also create your own theme or modify an already existing one and if "
+"you do not have a mirror, you can add the package to #{config/packages."
+"chroot}#. In this case it is not necessary to specify any option."
+msgstr ""
+"Vous pouvez également créer votre propre thème ou modifier un déjà existant "
+"et si vous n'avez pas un miroir, vous pouvez ajouter le paquet à #{config/"
+"packages.chroot}#. Dans ce cas, il n'est pas nécessaire de spécifier une "
+"autre option."
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:22
+msgid ""
+"There is also the possibility of making smaller changes. For instance, "
+"syslinux derivatives are configured by default with a timeout of 0 (zero) "
+"which means that they will pause indefinitely at their splash screen until "
+"you press a key."
+msgstr ""
+"Il y a aussi la possibilité de faire des petits changements. Par exemple, "
+"les dérivés de syslinux sont configurés par défaut avec un timeout de 0 "
"(zéro) qui signifie qu'ils se mettront en pause indéfiniment à leur écran de "
"démarrage jusqu'à ce que vous pressez une touche."
#. type: Plain text
-#: en/user_customization-binary.ssi:12
+#: en/user_customization-binary.ssi:24
msgid ""
"To modify the boot timeout of a default #{iso-hybrid}# image you can edit a "
"default *{isolinux.cfg}* file specifying the timeout in units of seconds and "
@@ -199,7 +250,7 @@ msgstr ""
"secondes et l'ajouter à #{config/includes.binary/isolinux/}#"
#. type: Plain text
-#: en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:26
msgid ""
"A modified *{isolinux.cfg}* to boot after five seconds would be similar to "
"this:"
@@ -208,7 +259,7 @@ msgstr ""
"à ceci:"
#. type: Plain text
-#: en/user_customization-binary.ssi:21
+#: en/user_customization-binary.ssi:33
#, no-wrap
msgid ""
" include menu.cfg\n"
@@ -218,7 +269,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:25
+#: en/user_customization-binary.ssi:37
msgid ""
"An alternative way of achieving the same goal could be writing a hook and "
"adding it to #{config/hooks/}# Remember to add the #{.binary}# suffix to run "
@@ -229,29 +280,34 @@ msgstr ""
"pour l'exécuter dans l’étape binaire. Un exemple proposé:"
#. 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 ""
#. type: Plain text
-#: en/user_customization-binary.ssi:31
+#: en/user_customization-binary.ssi:43
#, no-wrap
msgid " sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:35
-msgid "For more information please see man syslinux(1)."
-msgstr "Pour plus d'informations s'il vous plaît voir man syslinux(1)."
+#: en/user_customization-binary.ssi:47
+msgid ""
+"Likewise, if you want to use a personalized splash.png image you can add a "
+"picture of 640x480 pixels to #{config/includes.binary/isolinux/}#"
+msgstr ""
+"Également, si vous souhaitez utiliser une splash.png personnalisée, vous "
+"pouvez ajouter une image de 640x480 pixels à #{config/includes.binary/"
+"isolinux/}#"
#. type: Plain text
-#: en/user_customization-binary.ssi:37
+#: en/user_customization-binary.ssi:49
msgid "2~ ISO metadata"
msgstr "2~ Métadonnées ISO"
#. type: Plain text
-#: en/user_customization-binary.ssi:39
+#: en/user_customization-binary.ssi:51
msgid ""
"When creating an ISO9660 binary image, you can use the following options to "
"add various textual metadata for your image. This can help you easily "
@@ -263,7 +319,7 @@ msgstr ""
"d'une image sans la démarrer."
#. type: Plain text
-#: en/user_customization-binary.ssi:41
+#: en/user_customization-binary.ssi:53
msgid ""
"_* #{LB_ISO_APPLICATION/--iso-application NAME}#: This should describe the "
"application that will be on the image. The maximum length for this field is "
@@ -274,7 +330,7 @@ msgstr ""
"128 caractères."
#. type: Plain text
-#: en/user_customization-binary.ssi:43
+#: en/user_customization-binary.ssi:55
msgid ""
"_* #{LB_ISO_PREPARER/--iso-preparer NAME}#: This should describe the "
"preparer of the image, usually with some contact details. The default for "
@@ -288,7 +344,7 @@ msgstr ""
"est de 128 caractères."
#. type: Plain text
-#: en/user_customization-binary.ssi:45
+#: en/user_customization-binary.ssi:57
msgid ""
"_* #{LB_ISO_PUBLISHER/--iso-publisher NAME}#: This should describe the "
"publisher of the image, usually with some contact details. The maximum "
@@ -299,7 +355,7 @@ msgstr ""
"de ce champ est de 128 caractères."
#. type: Plain text
-#: en/user_customization-binary.ssi:46
+#: en/user_customization-binary.ssi:58
msgid ""
"_* #{LB_ISO_VOLUME/--iso-volume NAME}#: This should specify the volume ID of "
"the image. This is used as a user-visible label on some platforms such as "
diff --git a/manual/po/fr/user_customization-contents.ssi.po b/manual/po/fr/user_customization-contents.ssi.po
index 01b5c10..fb85186 100644
--- a/manual/po/fr/user_customization-contents.ssi.po
+++ b/manual/po/fr/user_customization-contents.ssi.po
@@ -8,7 +8,7 @@ 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-01-15 17:57+0100\n"
+"PO-Revision-Date: 2012-03-17 19:20+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: fr\n"
@@ -196,7 +196,7 @@ msgstr ""
"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 "
-"mécanismes de leur utilisation:"
+"mécanismes pour leur utilisation:"
#. type: Plain text
#: en/user_customization-contents.ssi:12
@@ -239,7 +239,7 @@ msgid ""
"the \"Live\" and \"binary\" images."
msgstr ""
"S'il vous plaît voir {Termes}#terms pour plus d'informations sur la "
-"distinction entre les images \"Live\" et \"binaire\"."
+"distinction entre les images \"Live\" et \"binary\"."
#. type: Plain text
#: en/user_customization-contents.ssi:20
@@ -260,11 +260,11 @@ 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 du 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."
+"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."
#. type: Plain text
#: en/user_customization-contents.ssi:24
@@ -332,13 +332,13 @@ msgid ""
"# as follows:"
msgstr ""
"Pour inclure des matériels tels que des documents ou des vidéos sur le "
-"système de fichiers des supports, afin qu'il soit accessible 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écrit par et lié par une page "
-"d'index HTML. Copiez simplement le matériel dans #{config/includes.binary/}# "
-"comme suit:"
+"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:"
#. type: Plain text
#: en/user_customization-contents.ssi:56
@@ -364,7 +364,7 @@ msgid ""
"live-build has some standard files (like documentation) that gets included "
"in the default configuration on every live media. This can be disabled with:"
msgstr ""
-"live-build a certains fichiers standard (comme la documentation) qui sera "
+"live-build a certains fichiers standard (comme la documentation) qui seront "
"inclus dans la configuration par défaut sur tous les supports live. Ceci "
"peut être désactivé avec:"
@@ -383,7 +383,7 @@ msgid ""
msgstr ""
"Sinon, le matériel sera installé par live-build dans #{/includes/}# par "
"défaut sur le système de fichiers du support, ou bien vous pouvez spécifier "
-"un autre chemin avec"
+"un autre chemin d'accès avec #{--includes}#."
#. type: Plain text
#: en/user_customization-contents.ssi:74
@@ -397,7 +397,7 @@ msgid ""
"build in order to customize the image."
msgstr ""
"Les hooks permettent à les commandes être exécutées dans les étapes chroot "
-"et binaire de la construction afin de personnaliser l'image. "
+"et binary de la construction afin de personnaliser l'image. "
#. type: Plain text
#: en/user_customization-contents.ssi:78
@@ -472,11 +472,11 @@ 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, les dernièrs commandes "
-"binaires. 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 "
+"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 "
"construction, ou vous pourriez endommager votre système de construction! "
-"Voir les exemples de scripts hook binaires pour diverses tâches courantes de "
+"Voir les exemples de binary hook scripts pour diverses tâches courantes de "
"personnalisation binaires fournis dans #{/usr/share/live/build/examples/"
"hooks}# que vous pouvez copier ou symlink pour les utiliser dans votre "
"propre configuration."
diff --git a/manual/po/fr/user_customization-installer.ssi.po b/manual/po/fr/user_customization-installer.ssi.po
index deb3ba3..57db8fd 100644
--- a/manual/po/fr/user_customization-installer.ssi.po
+++ b/manual/po/fr/user_customization-installer.ssi.po
@@ -2,13 +2,13 @@
# 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-11-07 21:19-0400\n"
-"PO-Revision-Date: 2011-11-08 14:55+0100\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\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"
"Language: fr\n"
@@ -19,22 +19,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -78,28 +81,31 @@ msgstr ""
#: 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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -142,8 +148,8 @@ msgstr "code{"
#: 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"
@@ -164,7 +170,7 @@ msgid ""
"a number of different types of installation, varying in what is included and "
"how the installer operates."
msgstr ""
-"Les images du système Debian Live peuvent être intégrées à l'installateur "
+"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 "
"en ce qui est inclus et comment fonctionne l'installateur."
@@ -179,7 +185,7 @@ msgstr ""
"S'il vous plaît noter l'utilisation prudente des lettres majuscules pour "
"désigner «l'Installateur Debian» dans cette section - lorsqu'il est utilisé "
"comme cela, nous faisons explicitement référence à l'installateur officiel "
-"pour le système Debian, rien d'autre. On le voit souvent abrégé en «d-i»."
+"pour le système Debian, pas autre chose. On le voit souvent abrégé en «d-i»."
#. type: Plain text
#: en/user_customization-installer.ssi:10
@@ -194,8 +200,8 @@ msgstr "Les trois principaux types de programme d'installation sont:"
#. type: Plain text
#: en/user_customization-installer.ssi:14
#, no-wrap
-msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a seperate 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 séparé et initrd qui (lorsqu'il est sélectionné à partir du chargeur de démarrage approprié) se lance dans une instance d'installateur Debian standard, exactement comme si vous aviez téléchargé une image CD de Debian et la démarré.\n"
+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"
#. type: Plain text
#: en/user_customization-installer.ssi:16
@@ -206,9 +212,9 @@ msgid ""
"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}#, Depuis des "
-"supports locaux ou à partir du réseau basé sur le 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 à partir du 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
@@ -228,7 +234,7 @@ msgstr ""
#: en/user_customization-installer.ssi:20
#, no-wrap
msgid "*{\"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.\n"
-msgstr "*{Installateur Debian \"Live\" }*: C'est une image de Debian Live avec un noyau séparé et initrd qui (lorsqu'il est sélectionné à partir du chargeur de démarrage approprié) se lance dans une instance de l'installateur Debian.\n"
+msgstr "*{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.\n"
#. type: Plain text
#: en/user_customization-installer.ssi:22
@@ -262,15 +268,15 @@ msgid ""
"the same live media, you must disable live-installer by preseeding #{live-"
"installer/enable=false}#."
msgstr ""
-"Remarque: Pour soutenir les deux entrées installateur normal et live dans le "
-"chargeur de démarrage du même support live, vous devez désactiver «live-"
-"installer» en 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}#."
#. type: Plain text
#: en/user_customization-installer.ssi:28
#, no-wrap
msgid "*{\"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.\n"
-msgstr "*{Installateur Debian \"de bureau\"}*: Indépendamment du type d'installateur Debian inclus, #{d-i}# peut être lancé depuis le 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.\n"
+msgstr "*{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.\n"
#. type: Plain text
#: en/user_customization-installer.ssi:30
@@ -291,7 +297,7 @@ msgstr ""
#: en/user_customization-installer.ssi:36
#, no-wrap
msgid ""
-" $ lb config --architecture i386 --linux-flavours 486 \\\n"
+" $ lb config --architectures i386 --linux-flavours 486 \\\n"
" --debian-installer live\n"
" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
msgstr ""
diff --git a/manual/po/fr/user_customization-overview.ssi.po b/manual/po/fr/user_customization-overview.ssi.po
index 1311f44..c79e8c7 100644
--- a/manual/po/fr/user_customization-overview.ssi.po
+++ b/manual/po/fr/user_customization-overview.ssi.po
@@ -2,20 +2,20 @@
# 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-07-16 17:27+0200\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"
"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/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
@@ -39,7 +39,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-overview.ssi:8
msgid "2~ Build time vs. boot time configuration"
-msgstr "2~ Configuration pendant la construction vs. le démarrage"
+msgstr "2~ Configuration pendant la construction vs. l'amorçage"
#. type: Plain text
#: en/user_customization-overview.ssi:10
@@ -62,16 +62,16 @@ msgstr ""
"des options au moment du démarrage, qui sont appliqués 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 de démarrage "
-"peut être modifiée par l'utilisateur en le spécifiant à l'invite de "
-"démarrage. L'image peut également être construite avec les paramètres de "
-"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 "
-"langue}#customizing-locale-and-language, par exemple."
+"arrivent plus tard, appliquées par live-config. Toute option d'amorçage peut "
+"être modifiée par l'utilisateur en le spécifiant à l'invite de démarrage. "
+"L'image peut également être construite avec les paramètres de 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 langue}#customizing-"
+"locale-and-language, par exemple."
#. type: Plain text
#: en/user_customization-overview.ssi:12
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index 25d0720..3a07cbc 100644
--- a/manual/po/fr/user_customization-packages.ssi.po
+++ b/manual/po/fr/user_customization-packages.ssi.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-18 18:00-0400\n"
-"PO-Revision-Date: 2012-01-18 23:41+0100\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\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"
"Language: fr\n"
@@ -19,23 +19,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -79,29 +81,31 @@ msgstr ""
#: 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/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/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/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/user_customization-installer.ssi:38
@@ -144,8 +148,8 @@ msgstr "code{"
#: 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"
@@ -182,16 +186,16 @@ msgid ""
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érents options dans certains moments de la construction pour "
-"personnaliser l'installation des paquets de live-build. Le plus large choix "
-"influençant les paquets qui sont disponibles pour l'installation dans "
+"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 référentiels "
-"pour les backports, paquets expérimentaux ou personnalisés, ou inclure des "
+"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 "
+"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 "
@@ -219,7 +223,7 @@ msgid ""
"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, "
+"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 "
@@ -229,8 +233,8 @@ msgstr ""
"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: "
+"chaque distribution soutenue. Par exemple, pour construire contre *{unstable}"
+"*, Sid, précisez: "
#. type: Plain text
#: en/user_customization-packages.ssi:16
@@ -294,26 +298,26 @@ msgid ""
"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."
+"{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 "
"avec la meilleur vitesse de téléchargement. Chacune des options #{--mirror-*}"
-"# qui régit quel miroir de distribution est utilisée à différents stades de "
-"la construction. Rappelez-vous de {Etapes 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 le *binary* stade les valeurs #{--mirror-"
-"binary}# et #{--mirror-binary-security}# sont utilisées, remplaçant tout "
-"miroir utilisé dans une étape antérieure. "
+"# 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 "
+"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. "
#. type: Plain text
#: en/user_customization-packages.ssi:36
@@ -391,7 +395,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:61
msgid "3~additional-repositories Additional repositories"
-msgstr "3~additional-repositories Référentiels additionnels"
+msgstr "3~additional-repositories Dépôts additionnels"
#. type: Plain text
#: en/user_customization-packages.ssi:63
@@ -401,19 +405,19 @@ msgid ""
"backports, experimental or custom packages. To configure additional "
"repositories, create #{config/archives/your-repository.list.chroot}#, and/or "
"#{config/archives/your-repository.list.binary}# files. As with the #{--"
-"mirror-*}# options, these govern the repositories used in the *chroot* stage "
-"when building the image, and in the *binary* stage, i.e. for use when "
-"running the live system."
+"mirror-*}# options, these govern the repositories used in the *{chroot}* "
+"stage when building the image, and in the *{binary}* stage, i.e. for use "
+"when running the live system."
msgstr ""
-"Vous pouvez ajouter plus de référentiels, élargir vos choix de paquets au-"
+"Vous pouvez ajouter d'autres dépôts, élargissant votre choix de paquets au-"
"delà ceux disponibles dans votre distribution objectif. Il peut être, par "
"exemple, pour backports, expérimentaux ou des paquets personnalisés. Pour "
-"configurer des référentiels supplémentaires, créer les fichiers #{config/"
-"archives/your-repository.list.chroot}#, et/ou #{config/archives/your-"
-"repository.list.binary}#. Comme avec les options #{--mirror-*}#, elles "
-"gouvernent les référentiels utilisés dans l'étape *chroot* lors de la "
-"construction de l'image, et dans l'étape *binaire*, c'est à dire pour une "
-"utilisation au moment de l'exécution du système live."
+"configurer des dépôts supplémentaires, créer les fichiers #{config/archives/"
+"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."
#. type: Plain text
#: en/user_customization-packages.ssi:65
@@ -422,7 +426,7 @@ msgid ""
"packages from the debian live snapshot repository at live system build time."
msgstr ""
"Par exemple, #{config/archives/live.list.chroot}# vous permet d'installer "
-"des paquets du référentiel des instantanés debian live au moment de la "
+"les paquets du dépôt des instantanés debian live au moment de la "
"construction du système live."
#. type: Plain text
@@ -439,7 +443,7 @@ msgid ""
"directory."
msgstr ""
"Si vous ajoutez la même ligne à #{config/archives/live.list.binary}#, le "
-"référentiel sera ajouté au répertoire #{/etc/apt/sources.list.d/}# de votre "
+"dépôt sera ajouté au répertoire #{/etc/apt/sources.list.d/}# de votre "
"système live."
#. type: Plain text
@@ -453,14 +457,14 @@ msgid ""
"You should also put the GPG key used to sign the repository into #{config/"
"archives/your-repository.key.{binary,chroot}}# files."
msgstr ""
-"Vous devriez également mettre la clé GPG utilisée pour signer le référentiel "
-"dans fichiers #{config/archives/your-repository.key.{binary,chroot}}#"
+"Vous devriez également mettre la clé GPG utilisée pour signer le dépôt dans "
+"fichiers #{config/archives/your-repository.key.{binary,chroot}}#"
#. type: Plain text
#: 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 référentiels 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 permettre des instantanés live, une simple commande suffit pour l'activer:\n"
#. type: Plain text
#: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
@@ -489,8 +493,7 @@ msgstr ""
"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 "
"dans votre arbre #{config/}# qui est bien adapté aux essais de nouveaux "
-"paquets ou expérimentaux avant qu'ils ne soient disponibles sur un "
-"référentiel."
+"paquets ou expérimentaux avant qu'ils ne soient disponibles sur un dépôt."
#. type: Plain text
#: en/user_customization-packages.ssi:91
@@ -581,14 +584,15 @@ msgid ""
"or #{.binary}# to indicate which stage the list is for."
msgstr ""
"Les listes de paquets qui existent dans ce répertoire ont besoin d'avoir un "
-"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."
+"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."
#. type: Plain text
#: en/user_customization-packages.ssi:115
#, no-wrap
msgid "*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.\n"
-msgstr "*{Remarque:}* Si vous ne spécifiez pas le suffixe de l'étape, la liste sera utilisée pour les deux étapes. Normalement, vous voulez spécifier #{.list.chroot}# de sorte que les paquets seront seulement installés dans le système de fichiers live et ne pas avoir une copie supplémentaire du #{.deb}# placé sur le support.\n"
+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"
#. type: Plain text
#: en/user_customization-packages.ssi:117
@@ -661,31 +665,31 @@ msgid ""
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
"Generally, this means any #{lb config}# option uppercased and with dashes "
"changed to underscores. But in practice, it is only the ones that influence "
-"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURE}"
+"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURES}"
"# 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 "
"conditionnelles dans les listes de paquets. Généralement, cela signifie une "
"option #{lb config}# majuscule et avec tirets changées en caractères de "
-"soulignement. Mais en pratique, c'est seulement ceux qui influencent "
-"lasélection des paquets qui font sens, comme #{DISTRIBUTION}#, #"
-"{ARCHITECTURE}# ou #{ARCHIVE_AREAS}#."
+"soulignement. Mais en pratique, c'est seulement ceux qui influencent la "
+"sélection des paquets qui font sens, comme #{DISTRIBUTION}#, #{ARCHITECTURES}"
+"# ou #{ARCHIVE_AREAS}#."
#. type: Plain text
#: en/user_customization-packages.ssi:138
msgid ""
-"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+"For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
"specified:"
msgstr ""
-"Par exemple, pour installer #{ia32-libs}# si la #{--architecture amd64}# est "
-"spécifié:"
+"Par exemple, pour installer #{ia32-libs}# si la #{--architectures amd64}# "
+"est spécifié:"
#. type: Plain text
#: en/user_customization-packages.ssi:144
#, no-wrap
msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
" ia32-libs\n"
" #endif\n"
msgstr ""
@@ -694,17 +698,18 @@ msgstr ""
#: en/user_customization-packages.ssi:148
msgid ""
"You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
+"# if either #{--architectures i386}# or #{--architectures amd64}# is "
+"specified:"
msgstr ""
"Vous pouvez tester pour un certain nombre de valeurs, par exemple pour "
-"installer #{memtest86+}# si #{--architecture i386}# ou #{--architecture "
+"installer #{memtest86+}# si #{--architectures i386}# ou #{--architectures "
"amd64}# est spécifié:"
#. type: Plain text
#: en/user_customization-packages.ssi:154
#, no-wrap
msgid ""
-" #if ARCHITECTURE i386 amd64\n"
+" #if ARCHITECTURES i386 amd64\n"
" memtest86+\n"
" #endif\n"
msgstr ""
@@ -738,7 +743,7 @@ msgstr "Un conditionnel peut entourer une directive #{#include}#:"
#: en/user_customization-packages.ssi:174
#, no-wrap
msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
" #include <gnome-full>\n"
" #endif\n"
msgstr ""
@@ -818,7 +823,7 @@ msgstr ""
"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 entrées de menu pour "
+"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."
@@ -833,13 +838,13 @@ msgid ""
"that is not live-build's default behaviour."
msgstr ""
"Lors du développement d'une image de bureau live, l'image généralement "
-"démarre directement à un bureau de travail, le choix des deux "
-"environnements de bureau et la langue par défaut ayant été faite 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 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."
+"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 "
+"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."
#. type: Plain text
#: en/user_customization-packages.ssi:199
@@ -850,12 +855,12 @@ msgid ""
"a GNOME desktop image containing support for Japanese might include these "
"tasks:"
msgstr ""
-"Parce qu'il n'ya pas de disposition fait 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 d'entrée, si vous les voulez, vous "
-"devez les spécifier dans votre configuration. Par exemple, une image de "
-"bureau GNOME contenant de soutien pour le japonais pourrait inclure les "
-"tâches suivantes:"
+"Parce qu'il n'ya 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 "
+"image de bureau GNOME contenant soutien pour le japonais pourrait inclure "
+"les tâches suivantes:"
#. type: Plain text
#: en/user_customization-packages.ssi:205
@@ -918,9 +923,9 @@ msgid ""
msgstr ""
"Tandis qu'il est contre la philosophie de Debian Live, il peut parfois être "
"nécessaire de construire un système live avec des versions modifiées des "
-"paquets qui sont dans le référentiel Debian. C'est peut-être de modifier ou "
-"soutenir des fonctionnalités supplémentaires, des langues et de la marque, "
-"ou même de supprimer des éléments de paquets existants qui sont "
+"paquets qui sont dans le dépôt Debian. C'est peut-être pour modifier ou "
+"soutenir des fonctionnalités supplémentaires, des langues et branding, ou "
+"même pour supprimer des éléments dans les paquets existants qui sont "
"indésirables. De même, les paquets \"de tiers\" peuvent être utilisés pour "
"ajouter des fonctionnalités sur mesure et/ou propriétaires."
@@ -954,7 +959,7 @@ msgstr "_* #{packages.chroot}#"
#. type: Plain text
#: en/user_customization-packages.ssi:230
msgid "_* Using a custom APT repository"
-msgstr "_* En utilisant un référentiel APT personnalisé"
+msgstr "_* Utiliser un dépôt APT personnalisé"
#. type: Plain text
#: en/user_customization-packages.ssi:232
@@ -1030,8 +1035,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:248
msgid "3~ Using an APT repository to install custom packages"
-msgstr ""
-"3~ Utilisant un référentiel APT pour installer des paquets personnalisés."
+msgstr "3~ Utiliser un dépôt APT pour installer des paquets personnalisés."
#. type: Plain text
#: en/user_customization-packages.ssi:250
@@ -1052,9 +1056,9 @@ msgid ""
"custom packages, the infrastructure can be easily re-used at a later date to "
"offer updates of the modified packages."
msgstr ""
-"Si créer un référentiel APT pour installer des packages personnalisés peut "
-"sembler un effort inutile, l'infrastructure peut être facilement ré-utilisée "
-"à une date ultérieure pour offrir les mises à jour des paquets modifiés."
+"Si créer un dépôt APT pour installer des paquets personnalisés peut sembler "
+"un effort inutile, l'infrastructure peut être facilement ré-utilisée à une "
+"date ultérieure pour offrir les mises à jour des paquets modifiés."
#. type: Plain text
#: en/user_customization-packages.ssi:254
@@ -1071,11 +1075,10 @@ msgid ""
"install the package with the higher version number."
msgstr ""
"live-build utilise apt pour installer tous les paquets dans le système live "
-"donc il héritera des comportements de ce logiciel. Un exemple pertinent est "
-"que (en supposant une configuration par défaut), étant donné un paquet "
-"disponible dans deux référentiels différents avec différents numéros de "
-"version, APT choisira d'installer le paquet avec la numéro de version "
-"supérieur."
+"donc il héritera les comportements de ce logiciel. Un exemple pertinent est "
+"que (en supposant une configuration par défaut), s'il y a un paquet "
+"disponible dans deux dépôts différents avec différents numéros de version, "
+"APT choisira d'installer le paquet avec la numéro de version supérieur."
#. type: Plain text
#: en/user_customization-packages.ssi:258
@@ -1088,7 +1091,7 @@ msgid ""
msgstr ""
"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 référentiels "
+"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 "
"plus d'informations."
@@ -1256,14 +1259,14 @@ msgstr ""
"par un paquet, c’est-à-dire, \"paquets qu'on trouverai avec celui-ci dans "
"toute installation standard\" (Debian Policy Manual, section 7.2), certains "
"paquets que vous avez vraiment besoin peuvent être omis. Par conséquent, "
-"nous vous suggérons d'examiner la différence de désactiver recommends rend à "
-"votre liste de paquets (voir le fichier #{binary.packages}# généré par #{lb "
-"build}#) et re-inclure 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 "
-"recommends activé et défini une priorité APT pin négative sur les paquets "
-"sélectionnés pour éviter les installér, comme expliqué dans {APT pinning}"
-"#apt-pinning."
+"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 "
+"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."
#. type: Plain text
#: en/user_customization-packages.ssi:306
@@ -1273,7 +1276,7 @@ msgstr "3~ Passer des options à apt ou aptitude"
#. type: Plain text
#: en/user_customization-packages.ssi:308
msgid ""
-"If there is not an #{lb config}# option to alter APT's behaviour in the way "
+"If there is not a #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
"options through to your configured APT tool. See the man pages for #{apt}# "
"and #{aptitude}# for details."
@@ -1314,11 +1317,11 @@ msgid ""
"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 depuis "
-"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:"
+"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:"
#. type: Plain text
#: en/user_customization-packages.ssi:322
diff --git a/manual/po/fr/user_customization-runtime.ssi.po b/manual/po/fr/user_customization-runtime.ssi.po
index 5e17692..616c2b5 100644
--- a/manual/po/fr/user_customization-runtime.ssi.po
+++ b/manual/po/fr/user_customization-runtime.ssi.po
@@ -2,39 +2,42 @@
# 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-11-07 21:01-0400\n"
-"PO-Revision-Date: 2011-11-08 14:53+0100\n"
+"POT-Creation-Date: 2012-03-24 15:08+0100\n"
+"PO-Revision-Date: 2012-03-24 17:38+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
#. type: Plain text
#: en/about_manual.ssi: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/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/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/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/user_customization-installer.ssi:32
@@ -60,46 +63,50 @@ 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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -125,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"
@@ -167,7 +175,7 @@ msgid ""
"in. A full list of all possibilities can be found in the manpage of live-"
"config."
msgstr ""
-"Toute la configuration qui est fait pendant l'exécution est fait par live-"
+"Toute la configuration qui est faite pendant l'exécution est faite par live-"
"config. Voici quelques options les plus courantes de live-config d'intérêt "
"pour les utilisateurs. Une liste complète de toutes les possibilités peut "
"être trouvée dans la page de manuel de live-config."
@@ -238,7 +246,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:29
-msgid "$ lb config --bootappend-live \"username=live-user\""
+#, no-wrap
+msgid " $ lb config --bootappend-live \"username=live-user\"\n"
msgstr ""
#. type: Plain text
@@ -343,8 +352,8 @@ msgstr ""
msgid ""
"To get the locale files for German and Swiss German keyboard layout in X use:"
msgstr ""
-"Pour obtenir les fichiers des paramètres régionaux pour les claviers "
-"allemand et suisse allemand dans X utiliser:"
+"Pour obtenir les fichiers des paramètres régionaux de l'allemand et la "
+"disposition du clavier suisse allemand dans X utiliser:"
#. type: Plain text
#: en/user_customization-runtime.ssi:68
@@ -409,7 +418,7 @@ msgid ""
"media, like a cdrom, where writes and modifications do not survive reboots "
"of the host hardware which runs it."
msgstr ""
-"Un paradigme d'un Live CD est être un système pré-installé qui se démarre du "
+"Un paradigme d'un Live CD est être un système pré-installé qui amorce sur un "
"support en lecture seule, comme un cdrom, où les données et les "
"modifications ne survivent pas aux redémarrages du matériel hôte qui "
"l'exécute."
@@ -425,7 +434,7 @@ msgstr ""
"Un système Debian Live est une généralisation de ce paradigme et soutient "
"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 "
-"d'exécution du système sont perdus à l'arrêt."
+"pendant l'exécution du système sont perdus à l'arrêt."
#. type: Plain text
#: en/user_customization-runtime.ssi:96
@@ -450,58 +459,124 @@ msgstr ""
#: en/user_customization-runtime.ssi:98
msgid ""
"The data stored on this ramdisk should be saved on a writable persistent "
-"medium like a Hard Disk, a USB key, a network share or even a session of a "
+"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}#."
msgstr ""
"Les données stockées sur ce disque virtuel doivent être enregistrées sur un "
-"support inscriptible persistant comme un disque dur, une clé USB, 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 mais le dernier nécessitent un paramètre de démarrage spéciale à "
-"préciser au moment du démarrage: #{persistent}#."
+"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}#."
#. type: Plain text
#: en/user_customization-runtime.ssi:100
-msgid "3~ Full persistence"
-msgstr "3~ Persistance pleine"
+msgid ""
+"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:"
+msgstr ""
+"Si le paramètre de démarrage #{persistent}# est réglé (et #{nopersistent}# "
+"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:"
#. type: Plain text
#: en/user_customization-runtime.ssi:102
+msgid "_* a partition, identified by its GPT name."
+msgstr "_* une partition, identifiée par son nom GPT."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:104
+msgid "_* a filesystem, identified by its filesystem label."
+msgstr ""
+"_* un système de fichiers, identifié par son étiquette de système de "
+"fichiers."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:106
+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\"."
+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\"."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:108
+msgid ""
+"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:"
+msgstr ""
+"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 "
+"live-boot(7). Les \"étiquettes d'identification\" mentionnées ci-dessus "
+"peuvent être un des éléments suivants:"
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:110
+msgid "_* #{full-ov}# for full persistent overlays."
+msgstr "_* #{full-ov}# pour couches de persistance pleine."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:112
+msgid "_* #{custom-ov}# for custom overlays."
+msgstr "_* #{custom-ov}# pour couches personalisées"
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:114
+msgid "_* #{live-sn}# for full system snapshots."
+msgstr "_* #{live-sn}# pour instantanés du système complet."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:116
+msgid "_* #{home-sn}# for /home snapshots."
+msgstr "_* #{home-sn}# pour instantanés du /home."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:118
+msgid "3~ Full persistent overlays"
+msgstr "3~ Couches de persistance pleine"
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:120
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 "
-"writable partition is used. In order to use this feature a partition with a "
-"clean writable supported filesystem on it labeled \"live-rw\" must be "
-"attached on the system at boot time and the system must be started with the "
-"boot parameter 'persistent'. This partition could be an ext2 partition on "
-"the hard disk or on a usb key created with, e.g.:"
-msgstr ""
-"Par «persistance pleine» on entend que plutôt que 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 "
-"utiliser cette fonction une partition avec un système de fichiers accessible "
-"en écriture avec l'étiquette \"live-rw\" doit être fixé sur le système au "
-"moment du démarrage et le système doit être démarré avec le paramètre de "
-"démarrage \"persistent\". Cette partition peut être une partition ext2 du "
-"disque dur ou sur une clé USB créé avec, par exemple:"
+"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.:"
+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:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:124
#, no-wrap
-msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
+msgid " # mkfs.ext2 -L full-ov /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:128
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
"Voir aussi {Utilisation de l'espace disponible sur une clé USB}#using-usb-"
"extra-space."
#. type: Plain text
-#: en/user_customization-runtime.ssi:112
+#: en/user_customization-runtime.ssi:130
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
@@ -510,131 +585,181 @@ msgstr ""
"modifier l'étiquette avec l'un des suivants:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:116
+#: en/user_customization-runtime.ssi:134
#, no-wrap
-msgid " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
+msgid " $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:120
+#: en/user_customization-runtime.ssi:138
msgid ""
-"But since live system users cannot always use a hard drive partition, and "
-"considering that most USB keys have poor write speeds, 'full' persistence "
-"could be also used with just image files, so you could create a file "
-"representing a partition and put this image file even on a NTFS partition of "
-"a foreign OS, with something like:"
+"Here's an example of how to create an ext2-based image file used for full "
+"persistence:"
msgstr ""
-"Mais puisque les utilisateurs du système live ne peuvent pas toujours "
-"utiliser une partition du disque dur, et considérant que la plupart des clés "
-"USB ont des vitesses d'écriture pauvres, «pleine» persistance pourrait "
-"également être utilisé avec des fichiers image, si vous pouviez créer un "
-"fichier qui représente une partition et mettre cette image fichier, même sur "
-"une partition NTFS d'un système d'exploitation étranger, avec quelque chose "
-"comme:"
+"Voici un exemple de comment créer un fichier image ext2 utilisé pour la "
+"persistance pleine:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:125
+#: en/user_customization-runtime.ssi:143
#, no-wrap
msgid ""
-" $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
-" $ /sbin/mkfs.ext2 -F live-rw\n"
+" $ 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"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:129
+#: en/user_customization-runtime.ssi:147
msgid ""
-"Then copy the #{live-rw}# file to a writable partition and reboot with the "
-"boot parameter 'persistent'."
+"Then copy the #{full-ov}# file to the root of a writable partition and "
+"reboot."
msgstr ""
-"Ensuite, copiez le fichier #{live-rw}# sur une partition accessible en "
-"écriture et redémarrer avec le paramètre de démarrage \"persistent\"."
+"Ensuite, copiez le fichier #{full-ov}# sur une partition accessible en "
+"écriture et redémarrer."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:149
+msgid "3~ Custom overlays"
+msgstr "3~ Couches personnalisées"
#. type: Plain text
-#: en/user_customization-runtime.ssi:131
-msgid "3~ Home automounting"
-msgstr "3~ Montage automatique de Home"
+#: 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."
+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."
#. type: Plain text
-#: en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:153
msgid ""
-"If during the boot a partition (filesystem) image file or a partition "
-"labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
-"as #{/home}#, thus permitting persistence of files that belong to e.g. the "
-"default user. It can be combined with full persistence."
+"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:"
msgstr ""
-"Si lors de l'initialisation une partition (système de fichiers) un fichier "
-"image ou une partition étiquetée #{home-rw}# est découverte, ce système de "
-"fichiers sera monté directement comme #{/home}#, permettant ainsi la "
-"persistance des fichiers qui appartiennent à l'utilisateur par défaut. Elle "
-"peut être combinée avec la persistance complète."
+"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:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:135
+#: 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"
+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 "
+"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 "
+"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)."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:168
msgid "3~ Snapshots"
msgstr "3~ Instantanés"
#. type: Plain text
-#: en/user_customization-runtime.ssi:137
+#: 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 device to the system "
+"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 "
-"content of a snapshot could reside on a partition or an image file (like the "
-"above mentioned types) labeled #{live-sn}#, but it defaults to a simple cpio "
-"archive named #{live-sn.cpio.gz}#. As above, at boot time, the block devices "
-"connected to the system are traversed to see if a partition or a file named "
-"like that could be found. A power interruption during run time could lead to "
-"data loss, hence a tool invoked #{live-snapshot --refresh}# could be called "
-"to sync important changes. 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."
+"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."
msgstr ""
"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 contenu d'un instantané "
-"pourrait résider sur une partition ou un fichier image (comme les types "
-"mentionnés ci-dessus) étiquetés #{live-sn}#, mais il est par défaut à une "
-"archive cpio simple appelé #{live-sn.cpio.gz}#. Comme ci-dessus, au moment "
-"du démarrage, les périphériques connectés à le système sont examinés pour "
-"voir si une partition ou un fichier nommé comme ça pourrait être trouvé. 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é à synchroniser des changements importants. Ce type de persistance, "
-"car elle n'écrit pas continuellement dans les supports persistants, est le "
-"plus respectueux avec les dispositifs flash et le plus rapide de tous les "
-"systèmes de persistance."
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:139
+"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 "
+"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é."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:172
msgid ""
"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."
msgstr ""
-"Une version instantané de /home existe aussi, et son étiquette est #{home-sn."
-"*}#; elle travaille le même que l'instantané principale, mais il est "
+"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."
#. type: Plain text
-#: en/user_customization-runtime.ssi:141
-msgid ""
-"Snapshots cannot currently handle file deletion but full persistence and "
-"home automounting can."
+#: en/user_customization-runtime.ssi:174
+msgid "Snapshots cannot currently handle file deletion."
msgstr ""
-"Les instantanés ne peuvent pas actuellement gérer la suppression de "
-"fichiers, mais la persistance pleine et le montage automatique de home si "
-"peuvent le faire."
+"Les instantanés ne peuvent pas actuellement gérer la suppression de fichiers."
#. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:176
msgid "3~ Persistent SubText"
msgstr "3~ SubText persistant"
#. type: Plain text
-#: en/user_customization-runtime.ssi:145
+#: en/user_customization-runtime.ssi:178
msgid ""
"If a user would need multiple persistent storage of the same type for "
-"different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
+"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 "
@@ -642,8 +767,8 @@ msgid ""
"#{persistent}# #{persistent-subtext=subText}#."
msgstr ""
"Si un utilisateur a besoin de multiples stockages persistants du même type "
-"pour différents endroits ou l'essai, tel que #{live-rw-nonwork}# et #{live-"
-"rw-work}#, le paramètre de démarrage #{persistent-subtext}# utilisé en "
+"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-"
@@ -651,12 +776,12 @@ msgstr ""
"{persistent-subtext=subText}#."
#. type: Plain text
-#: en/user_customization-runtime.ssi:147
+#: en/user_customization-runtime.ssi:180
msgid "3~ Partial remastering"
msgstr "3~ Remasterisation partielle"
#. type: Plain text
-#: en/user_customization-runtime.ssi:148
+#: en/user_customization-runtime.ssi:181
msgid ""
"The run-time modification of the tmpfs could be collected using live-"
"snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index 1264370..c733337 100644
--- a/manual/po/fr/user_examples.ssi.po
+++ b/manual/po/fr/user_examples.ssi.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-18 18:00-0400\n"
-"PO-Revision-Date: 2012-01-18 23:35+0100\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\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"
"Language: fr\n"
@@ -24,25 +24,27 @@ 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: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/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/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/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: 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/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
@@ -90,25 +92,27 @@ 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/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/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/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: 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/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
@@ -200,8 +204,8 @@ msgid ""
msgstr ""
"Pour utiliser ces exemples vous avez besoin d'un système pour les "
"construire, lequel répond aux exigences énumérées dans {Exigences}"
-"#requirements et vous avez live-build installe comme décrit à {Installation "
-"de live-build}#installing-live-build."
+"#requirements et qui a live-build installé comme décrit à {Installation de "
+"live-build}#installing-live-build."
#. type: Plain text
#: en/user_examples.ssi:12
@@ -434,7 +438,7 @@ msgstr "Éditer #{auto/config}# pour lire comme suit: "
#, no-wrap
msgid ""
" lb config noauto \\\n"
-" --architecture i386 \\\n"
+" --architectures i386 \\\n"
" --linux-flavours 686-pae \\\n"
" --package-lists lxde \\\n"
" \"${@}\"\n"
@@ -454,14 +458,14 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:113
msgid ""
-"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
+"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}#."
msgstr ""
-"Tout d'abord, #{--architecture i386}# assure que sur notre système de "
+"Tout d'abord, #{--architectures i386}# assure que sur notre système de "
"construction #{amd64}#, nous construisons une version 32 bits qui peut être "
"utilisé sur la plupart des machines. Deuxièmement, nous utilisons #{--linux-"
"flavours 686-pae}# parce que nous ne prévoyons pas utiliser cette image sur "
@@ -588,9 +592,9 @@ msgid ""
msgstr ""
"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, il suffit de prendre soin de ne "
-"pas modifier à la main ou commit les fichiers de niveau supérieur dans #"
-"{config}# contenant variables #{LB_*}#, car ce sont des produits de "
+"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."
@@ -775,12 +779,12 @@ msgstr ""
"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 s'attendre à être là, tel "
-"que #{firmware-linux-free}# qui peuvent être nécessaires pour prise en "
-"charge matérielle de 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 perte de fonctionnalité."
+"d'omettre certains paquets 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 "
+"perte de fonctionnalité."
#. type: Plain text
#: en/user_examples.ssi:242
@@ -900,7 +904,7 @@ msgid ""
"system kernels match for the launcher to work properly."
msgstr ""
"Notez que nous avons inclus le paquet #{debian-installer-launcher}# pour "
-"lancer l'installateur depuis le bureau live, et ont également précisé que le "
-"noyau 486, tel qu'il est actuellement nécessaire pour faire que "
-"l'installateur et le noyau du systéme live matchent pour que le lanceur "
+"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 99a517d..dc97c48 100644
--- a/manual/po/fr/user_installation.ssi.po
+++ b/manual/po/fr/user_installation.ssi.po
@@ -2,39 +2,43 @@
# 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-11-07 17:40-0400\n"
-"PO-Revision-Date: 2011-10-04 14:42+0200\n"
+"POT-Creation-Date: 2012-03-31 16:32+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"
"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: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/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/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/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/user_customization-installer.ssi:32
@@ -57,49 +61,54 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 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: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: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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -121,29 +130,30 @@ msgstr "code{"
#: en/user_customization-packages.ssi:302
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 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-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: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"
@@ -223,12 +233,12 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:26
msgid "_* From the Debian repository"
-msgstr "_* Depuis le référentiel Debian"
+msgstr "_* À partir du dépôt Debian"
#. type: Plain text
#: en/user_installation.ssi:28
msgid "_* From source"
-msgstr "_* Depuis le code source"
+msgstr "_* À partir du code source"
#. type: Plain text
#: en/user_installation.ssi:30
@@ -242,12 +252,12 @@ msgid ""
"the Debian repository."
msgstr ""
"Si vous utilisez Debian, la méthode recommandée consiste à installer live-"
-"build depuis le référentiel Debian."
+"build à partir du dépôt Debian."
#. type: Plain text
#: en/user_installation.ssi:34 en/user_installation.ssi:104
msgid "3~ From the Debian repository"
-msgstr "3~ Depuis le référentiel Debian"
+msgstr "3~ À partir du dépôt Debian"
#. type: Plain text
#: en/user_installation.ssi:36
@@ -274,7 +284,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:52 en/user_installation.ssi:108
msgid "3~ From source"
-msgstr "3~ Depuis le code source"
+msgstr "3~ À partir du code source"
#. type: Plain text
#: en/user_installation.ssi:54
@@ -314,8 +324,8 @@ msgid ""
"Now install whichever of the freshly built #{.deb}# files you were "
"interested in, e.g."
msgstr ""
-"Maintenant, installez celui des fichiers récemment construits que vous "
-"intéresse, p. ex"
+"Maintenant, installez les fichiers récemment construits que vous intéresse, "
+"p. ex"
#. type: Plain text
#: en/user_installation.ssi:76
@@ -359,7 +369,7 @@ msgid ""
"snapshots. These are built automatically from the latest version in Git and "
"are available on http://live.debian.net/debian/."
msgstr ""
-"Si vous ne souhaitez pas de créer ou d'installer live-build depuis les "
+"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 "
"disponibles à http://live.debian.net/debian/."
@@ -372,8 +382,8 @@ msgstr "2~ live-boot et live-config"
#. type: Plain text
#: en/user_installation.ssi:102
#, no-wrap
-msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the live-boot-doc and live-config-doc packages separately.\n"
-msgstr "*{Remarque:}* Vous n'avez pas besoin d'installer live-boot ou live-config sur votre système afin de créer des systèmes Debian Live. Cependant, cela ne fera aucun mal et est utile à des fins de référence. Si vous voulez seulement la documentation, vous pouvez maintenant installer les paquets live-boot-doc et live-config-doc séparément.\n"
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the /{live-boot-doc}/ and /{live-config-doc}/ packages separately.\n"
+msgstr "*{Remarque:}* Vous n'avez pas besoin d'installer live-boot ou live-config sur votre système afin de créer des systèmes Debian Live. Cependant, cela ne fera aucun mal et est utile à des fins de référence. Si vous voulez seulement la documentation, vous pouvez maintenant installer les paquets /{live-boot-doc}/ et /{live-config-doc}/ séparément.\n"
#. type: Plain text
#: en/user_installation.ssi:106
@@ -381,8 +391,8 @@ msgid ""
"Both live-boot and live-config are available from the Debian repository as "
"per {Installing live-build}#installing-live-build."
msgstr ""
-"Tous deux live-boot et live-config sont disponibles dans le référentiel "
-"Debian comme {Installation de live-build}#installing-live-build."
+"Tous deux live-boot et live-config sont disponibles dans le dépôt Debian "
+"comme {Installation de live-build}#installing-live-build."
#. type: Plain text
#: en/user_installation.ssi:110
@@ -415,7 +425,7 @@ msgid ""
msgstr ""
"Consultez les pages de manuel de live-boot et live-config pour plus de "
"détails sur la personnalisation si c'est votre raison pour la création de "
-"vos paquets depuis les sources. "
+"vos paquets à partir des sources. "
#. type: Plain text
#: en/user_installation.ssi:123
@@ -481,8 +491,8 @@ msgstr ""
"traiter les fichiers .deb générés comme aucun autre paquet personnalisé. "
"S'il vous plaît voir {Personnalisation de l'installation de paquets}"
"#customizing-package-installation pour plus d'informations. Vous devriez "
-"prêter une attention particulière à {Référentiels supplémentaires}"
-"#additional-repositories."
+"prêter une attention particulière à {Dépôts additionnels}#additional-"
+"repositories."
#. type: Plain text
#: en/user_installation.ssi:144
@@ -493,7 +503,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 référentiel de tierce "
+"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}#:"
diff --git a/manual/po/fr/user_managing_a_configuration.ssi.po b/manual/po/fr/user_managing_a_configuration.ssi.po
index f63675d..0a7335f 100644
--- a/manual/po/fr/user_managing_a_configuration.ssi.po
+++ b/manual/po/fr/user_managing_a_configuration.ssi.po
@@ -2,13 +2,13 @@
# 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-11-02 12:23-0200\n"
-"PO-Revision-Date: 2011-11-02 22:27+0100\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\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"
"Language: fr\n"
@@ -19,22 +19,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -43,33 +46,33 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
#: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:204
-#: 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:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi: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:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: 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
@@ -78,28 +81,31 @@ msgstr ""
#: 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/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/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/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/user_customization-installer.ssi:38
@@ -108,33 +114,33 @@ msgstr "code{"
#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:208
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: 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: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:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: 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
@@ -142,8 +148,8 @@ msgstr "code{"
#: 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"
@@ -171,7 +177,7 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:8
msgid "2~ Use auto to manage configuration changes"
-msgstr "2~ Utilisez auto pour gérer les modifications de configuration"
+msgstr "2~ Utiliser auto pour gérer les modifications de configuration"
#. type: Plain text
#: en/user_managing_a_configuration.ssi:10
@@ -203,7 +209,7 @@ msgstr ""
"variables sont assignées des valeurs par défaut qui conviennent à cette "
"distribution. Cependant, si vous décidez ultérieurement de modifier la "
"distribution, ces variables dépendantes conservent les anciennes valeurs qui "
-"ne sont plus appropriés."
+"ne sont plus appropriées."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:14
@@ -214,11 +220,11 @@ msgid ""
"{config/*}# files, which you will then need to use to set the appropriate "
"option again."
msgstr ""
-"Un deuxième problème connexe 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 dans votre #{config/*}# fichiers, que vous devrez ensuite utiliser "
-"pour définir l'option appropriée à nouveau."
+"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 "
+"dans votre fichiers dans #{config/*}#, que vous devrez ensuite utiliser pour "
+"définir l'option appropriée à nouveau."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:16
@@ -228,7 +234,7 @@ msgid ""
"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 #{lb config}# and #{lb clean}#, these "
+"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 "
@@ -240,11 +246,11 @@ msgstr ""
"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 "
-"vous #{lb config}# et #{lb clean}#, ces fichiers seront 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 (même si "
-"vous aurez encore de prendre soin et lire la documentation lorsque vous "
-"faites un mise à niveau et faites les ajustements nécessaires )."
+"vous lancez #{lb config}# et #{lb clean}#, ces fichiers seront 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 )."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:18
@@ -341,4 +347,4 @@ msgstr ""
"vous semble. Dans l'exemple ci-dessus, #{--package-lists standard}# est fixé "
"à la valeur par défaut. Changez ce à une valeur appropriée pour votre image "
"(ou le supprimer si vous voulez utiliser par défaut) et ajouter des options "
-"supplémentaires dans les lignes de continuation qui suivent."
+"supplémentaires dans les lignes suivantes."
diff --git a/manual/po/fr/user_overview.ssi.po b/manual/po/fr/user_overview.ssi.po
index 06fa3c4..5298f33 100644
--- a/manual/po/fr/user_overview.ssi.po
+++ b/manual/po/fr/user_overview.ssi.po
@@ -2,39 +2,42 @@
# 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-11-07 08:16-0400\n"
-"PO-Revision-Date: 2011-11-07 23:15+0100\n"
+"POT-Creation-Date: 2012-03-19 18:09+0100\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"
"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: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/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/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/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/user_customization-installer.ssi:32
@@ -57,11 +60,11 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.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: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
@@ -78,28 +81,31 @@ msgstr ""
#: 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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -121,12 +127,12 @@ msgstr "code{"
#: en/user_customization-packages.ssi:302
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: 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: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
@@ -142,8 +148,8 @@ msgstr "code{"
#: 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"
@@ -197,8 +203,8 @@ msgid ""
"Many concepts are similar to those in the debhelper Debian package tools "
"written by Joey Hess:"
msgstr ""
-"Plusieurs concepts sont similaires à celles dans les outils de le paquet "
-"Debian debhelper écrit par Joey Hess:"
+"Plusieurs concepts sont similaires à celles ceux dans le paquet Debian "
+"debhelper écrit par Joey Hess:"
#. type: Plain text
#: en/user_overview.ssi:16
@@ -235,7 +241,7 @@ msgid ""
"#, 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 de squelette, #{lb config}#. Cela pourrait être "
+"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."
@@ -308,16 +314,17 @@ msgstr ""
"squelette #{auto/}#."
#. type: Plain text
-#: en/user_overview.ssi:40
+#: en/user_overview.ssi:41
#, no-wrap
msgid ""
" $ lb config\n"
+" [2012-03-19 15:17:14] lb_config\n"
" P: Considering defaults defined in /etc/live/build.conf\n"
-" P: Creating config tree\n"
+" P: Creating config tree for a debian system\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:44
+#: en/user_overview.ssi:45
msgid ""
"Using #{lb config}# without any arguments would be suitable for users who "
"need a very basic image, or who intend to later provide a more complete "
@@ -331,7 +338,7 @@ msgstr ""
"détails)."
#. type: Plain text
-#: en/user_overview.ssi:46
+#: en/user_overview.ssi:47
msgid ""
"Normally, you will want to specify some options. For example, to include the "
"'gnome' package list in your configuration:"
@@ -340,52 +347,52 @@ msgstr ""
"inclure la liste du paquet «gnome» dans votre configuration:"
#. type: Plain text
-#: en/user_overview.ssi:50
+#: en/user_overview.ssi:51
#, no-wrap
msgid " $ lb config -p gnome\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:54
+#: en/user_overview.ssi:55
msgid "It is possible to specify many options, such as:"
msgstr "Il est possible de spécifier plusieurs options, telles que:"
#. type: Plain text
-#: en/user_overview.ssi:58
+#: en/user_overview.ssi:59
#, no-wrap
-msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
+msgid " $ lb config --binary-images net --bootappend-live \"hostname=live-machine username=live-user\" ...\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:62
+#: en/user_overview.ssi:63
msgid "A full list of options is available in the #{lb_config}# man page."
msgstr ""
"Une liste complète des options est disponible dans la page de manuel de #"
"{lb_config}#."
#. type: Plain text
-#: en/user_overview.ssi:64
+#: en/user_overview.ssi:65
msgid "3~lb-build The #{lb build}# command"
msgstr "3~lb-build La commande #{lb build}#"
#. type: Plain text
-#: en/user_overview.ssi:66
+#: en/user_overview.ssi:67
msgid ""
"The #{lb build}# command reads in your configuration from the #{config/}# "
"directory. It then runs the lower level commands needed to build your Live "
"system."
msgstr ""
"La commande #{lb build}# lit dans votre configuration à partir du répertoire "
-"#{config/}#. Il exécute alors les commandes de niveau inférieur nécessaires "
-"pour construire votre système Live."
+"#{config/}#. Elle exécute alors les commandes de niveau inférieur "
+"nécessaires pour construire votre système Live."
#. type: Plain text
-#: en/user_overview.ssi:68
+#: en/user_overview.ssi:69
msgid "3~lb-clean The #{lb clean}# command"
msgstr "3~lb-clean La commande #{lb clean}#"
#. type: Plain text
-#: en/user_overview.ssi:70
+#: en/user_overview.ssi:71
msgid ""
"It is the job of the #{lb clean}# command to remove various parts of a build "
"so subsequent builds can start from a clean state. By default, #{chroot}#, #"
@@ -397,20 +404,20 @@ msgid ""
msgstr ""
"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 stades #{chroot}#, #"
-"{binary}# et #{source}# sont nettoyées, mais la cache est laissé intact. En "
+"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."
#. type: Plain text
-#: en/user_overview.ssi:72
+#: en/user_overview.ssi:73
msgid "2~live-boot The live-boot package"
msgstr "2~live-boot Le paquet live-boot"
#. type: Plain text
-#: en/user_overview.ssi:74
+#: en/user_overview.ssi:75
msgid ""
"live-boot is a collection of scripts providing hooks for the initramfs-"
"tools, used to generate an initramfs capable of booting live systems, such "
@@ -420,10 +427,10 @@ msgstr ""
"live-boot est une collection de scripts fournissant hooks pour initramfs-"
"tools, utilisé pour générer un initramfs capable de démarrer des systèmes "
"live, comme ceux créés par live-build. Cela inclut les ISOs de Debian Live, "
-"netboot tarballs, et les images clé USB."
+"netboot tarballs, et les images pour clés USB."
#. type: Plain text
-#: en/user_overview.ssi:76
+#: en/user_overview.ssi:77
msgid ""
"At boot time it will look for read-only media containing a #{/live/}# "
"directory where a root filesystem (often a compressed filesystem image like "
@@ -431,13 +438,13 @@ msgid ""
"aufs, for Debian like systems to boot from."
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 de "
+"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é, "
"il va créer un environnement accessible en écriture, en utilisant aufs, afin "
"que systémes similaires à Debian puissent démarrer à partir de ça."
#. type: Plain text
-#: en/user_overview.ssi:78
+#: en/user_overview.ssi:79
msgid ""
"More information on initial ramfs in Debian can be found in the Debian Linux "
"Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
@@ -448,12 +455,12 @@ msgstr ""
"dans le chapitre sur initramfs."
#. type: Plain text
-#: en/user_overview.ssi:80
+#: en/user_overview.ssi:81
msgid "2~live-config The live-config package"
msgstr "2~live-config Le paquet live-config"
#. type: Plain text
-#: en/user_overview.ssi:81
+#: en/user_overview.ssi:82
msgid ""
"live-config consists of the scripts that run at boot time after live-boot to "
"configure the live system automatically. It handles such tasks as setting "
diff --git a/manual/po/it/about_manual.ssi.po b/manual/po/it/about_manual.ssi.po
index ec4968a..cf7f8b4 100644
--- a/manual/po/it/about_manual.ssi.po
+++ b/manual/po/it/about_manual.ssi.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-05 17:13+0100\n"
-"PO-Revision-Date: 2012-02-06 18:49+0100\n"
+"POT-Creation-Date: 2012-03-07 08:59-0400\n"
+"PO-Revision-Date: 2012-04-02 19:39+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
"Language: it\n"
@@ -30,8 +30,9 @@ msgstr "1~about-manual A proposito di questo manuale"
#. type: Plain text
#: en/about_manual.ssi:6
msgid ""
-"The main goal of this manual is to serve as a single access point to all "
-"documentation related to the Debian Live project. While it is primarily "
+"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, "
@@ -39,13 +40,14 @@ msgid ""
"describes some options that may be specified at the boot prompt, such as "
"selecting a keyboard layout and locale, and using persistence."
msgstr ""
-"L'obiettivo principale di questo manuale è quello di servire come unico "
-"punto d'accesso per tutta la documentazione relativa al progetto Debian "
-"Live. 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}"
+"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 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."
@@ -408,15 +410,16 @@ msgstr ""
#: 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/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/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/user_customization-installer.ssi:32
@@ -480,15 +483,16 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: 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/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/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/user_customization-installer.ssi:38
@@ -599,7 +603,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:122
msgid "Or combine both, e.g:"
-msgstr ""
+msgstr "O entrambi:"
#. type: Plain text
#: en/about_manual.ssi:126
@@ -704,7 +708,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:179
msgid "_* Then"
-msgstr ""
+msgstr "quindi"
#. type: Plain text
#: en/about_manual.ssi:183
@@ -745,8 +749,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:203
-msgid "3~ Translation"
-msgstr "3~ Traduzione"
+msgid "3~translation Translation"
+msgstr "3~translation Traduzione"
#. type: Plain text
#: en/about_manual.ssi:205
@@ -796,4 +800,4 @@ msgstr ""
#: en/about_manual.ssi:212
#, 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 ""
+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 c8955ff..26cdc43 100644
--- a/manual/po/it/about_project.ssi.po
+++ b/manual/po/it/about_project.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-08-29 08:54-0200\n"
+"POT-Creation-Date: 2012-02-19 22:16+0100\n"
"PO-Revision-Date: 2011-09-10 23:03+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -285,7 +285,7 @@ msgstr ""
"scrivere alla mailing list."
#. type: Plain text
-#: en/about_project.ssi:70
+#: 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 "
@@ -296,15 +296,3 @@ msgstr ""
"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."
-
-#. type: Plain text
-#: en/about_project.ssi:71
-msgid ""
-"_* *{Wiki}*: The Debian Live wiki at http://wiki.debian.org/DebianLive is a "
-"place to gather information, discuss applied technologies, and document "
-"frameworks of Debian Live systems that go beyond the scope of this document."
-msgstr ""
-"_* *{Wiki}*: Il wiki di Debian Live all'indirizzo http://wiki.debian.org/"
-"DebianLive è un posto dove raccogliere informazioni, discutere di tecnologie "
-"applicate e documenti sull'infrastruttura dei sistemi Debian Live che vanno "
-"oltre lo scopo di questo manuale."
diff --git a/manual/po/it/live-manual.ssm.po b/manual/po/it/live-manual.ssm.po
index d3d6240..3fe1516 100644
--- a/manual/po/it/live-manual.ssm.po
+++ b/manual/po/it/live-manual.ssm.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-06 18:57+0100\n"
+"POT-Creation-Date: 2012-04-03 00:19+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,7 +49,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-02-06\n"
+" :published: 2012-04-03\n"
msgstr ""
#. type: Plain text
@@ -169,6 +169,16 @@ msgid ":B~ Examples"
msgstr ":B~ Esempi"
#. type: Plain text
-#: en/live-manual.ssm:62
+#: en/live-manual.ssm:63
msgid "<< user_examples.ssi"
msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:65 en/style_guide.ssi:2
+msgid ":B~ Appendix"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:66
+msgid "<< style_guide.ssi"
+msgstr ""
diff --git a/manual/po/it/project_coding-style.ssi.po b/manual/po/it/project_coding-style.ssi.po
index 580a699..e4db250 100644
--- a/manual/po/it/project_coding-style.ssi.po
+++ b/manual/po/it/project_coding-style.ssi.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-01-20 16:58-0400\n"
+"POT-Creation-Date: 2012-03-31 16:32+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"
@@ -20,129 +20,141 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi: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/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/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/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/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/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/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/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/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/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: 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"
@@ -389,7 +401,7 @@ msgstr "2~ Varie"
#. type: Plain text
#: en/project_coding-style.ssi:132
msgid ""
-"_* Use \"#{|}#\" (without the surround quotes) as a seperator in calls to "
+"_* Use \"#{|}#\" (without the surround quotes) as a separator in calls to "
"sed, e.g. \"#{sed -e 's|foo|bar|'}#\" (without \"\")."
msgstr ""
"_* Per le chiamate a sed utilizzare \"#{|}#\" (senza virgolette intorno) "
diff --git a/manual/po/it/style_guide.ssi.po b/manual/po/it/style_guide.ssi.po
new file mode 100644
index 0000000..cf48ab5
--- /dev/null
+++ b/manual/po/it/style_guide.ssi.po
@@ -0,0 +1,894 @@
+# 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"
+"PO-Revision-Date: 2012-02-11 16:42+0100\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: it\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/live-manual.ssm:65 en/style_guide.ssi:2
+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/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
+#: 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: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: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/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
+#: 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: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
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/style_guide.ssi:4
+msgid "1~style-guide Style guide"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:6
+msgid "2~ Guidelines for authors"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:8
+msgid ""
+"This section deals with some general considerations to be taken into account "
+"when writing technical documentation for live-manual. They are divided into "
+"linguistic features and recommended procedures."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:10
+#, no-wrap
+msgid "*{Note:}* Authors should first read {Contributing to this document}#how-to-contribute\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:12
+msgid "3~ Linguistic features"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:14
+msgid "_* /{Use plain English}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:16
+msgid ""
+"Keep in mind that a high percentage of your readers are not native speakers. "
+"So as a general rule try to use short, meaningful sentences, followed by a "
+"full stop."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:18
+msgid ""
+"This does not mean that you have to use a simplistic, naive style. It is a "
+"suggestion to try to avoid, as much as possible, complex subordinate "
+"sentences that make the text difficult to understand for non-native speakers."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:20
+msgid "_* /{Variety of English}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:22
+msgid ""
+"The most widely spread varieties of English are British and American so it "
+"is very likely that most authors will use either one or the other. In a "
+"collaborative environment, the ideal variety would be \"International English"
+"\" but it is very difficult, not to say impossible, to decide on which "
+"variety among all the existing ones, is the best to use."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:24
+msgid ""
+"We expect that different varieties may mix without creating "
+"misunderstandings but in general terms you should try to be coherent and "
+"before deciding on using British, American or any other English flavour at "
+"your discretion, please take a look at how other people write and try to "
+"imitate them."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:26
+msgid "_* /{Be balanced}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:28
+msgid ""
+"Do not be biased. Avoid including references to ideologies completely "
+"unrelated to live-manual. Technical writing should be as neutral as "
+"possible. It is in the very nature of scientific writing."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:30
+msgid "_* /{Be politically correct}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:32
+msgid ""
+"Try to avoid sexist language as much as possible. If you need to make "
+"references to the third person singular preferably use \"they\" rather than "
+"\"he\" or \"she\" or awkward inventions such as \"s/he\", \"s(he)\" and the "
+"like."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:34
+msgid "_* /{Be concise}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:36
+msgid ""
+"Go straight to the point and do not wander around aimlessly. Give as much "
+"information as necessary but do not give more information than necessary, "
+"this is to say, do not explain unnecessary details. Your readers are "
+"intelligent. Presume some previous knowledge on their part."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:38
+msgid "_* /{Minimize translation work}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:40
+msgid ""
+"Keep in mind that whatever you write will have to be translated into several "
+"other languages. This implies that a number of people will have to do an "
+"extra work if you add useless or redundant information."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:42
+msgid "_* /{Be coherent}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:44
+msgid ""
+"As suggested before, it is almost impossible to standardize a collaborative "
+"document into a perfectly unified whole. However, every effort on your side "
+"to write in a coherent way with the rest of the authors will be appreciated."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:46
+msgid "_* /{Be cohesive}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:48
+msgid ""
+"Use as many text-forming devices as necessary to make your text cohesive and "
+"unambiguous. (Text-forming devices are linguistic markers such as "
+"connectors)."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:50
+msgid "_* /{Be descriptive}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:52
+msgid ""
+"It is preferable to describe the point in one or several paragraphs than "
+"merely using a number of sentences in a typical \"changelog\" style. "
+"Describe it! Your readers will appreciate it."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:54
+msgid "_* /{Dictionary}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:56
+msgid ""
+"Look up the meaning of words in a dictionary or encyclopedia if you do not "
+"know how to express certain concepts in English. But keep in mind that a "
+"dictionary can either be your best friend or can turn into your worst enemy "
+"if you do not know how to use it correctly."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:58
+msgid ""
+"English has the largest vocabulary that exists (With over one million "
+"words). Many of these words are borrowings from other languages. When "
+"looking up the meaning of words in a bilingual dictionary the tendency of a "
+"non-native speaker is to choose the one that sounds more similar in their "
+"mother tongue. This often turns into an excessively formal discourse which "
+"does not sound quite natural in English."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:60
+msgid ""
+"As a general rule, if a concept can be expressed using different synonyms, "
+"it is a good advice to choose the first word proposed by the dictionary. If "
+"in doubt, choosing words of Germanic origin (Usually monosyllabic words) is "
+"often the right thing to do. Be warned that these two techniques might "
+"produce a rather informal discourse but at least your choice of words will "
+"be of wide use and generally accepted."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:62
+msgid ""
+"Using a dictionary of collocations is recommended. They are extremely "
+"helpful when it comes to know which words usually occur together."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:64
+msgid ""
+"Again it is a good practice to learn from the work of others. Using a search "
+"engine to check how other authors use certain expressions may help a lot."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:66
+msgid "_* /{False friends, idioms and other idiomatic expressions}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:68
+msgid ""
+"Watch out for false friends. No matter how proficient you are in a foreign "
+"language you cannot help falling from time to time in the trap of the so "
+"called \"false friends\", words that look similar in two languages but whose "
+"meanings or uses might be completely different."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:70
+msgid ""
+"Try to avoid idioms as much as possible. \"Idioms\" are expressions that may "
+"convey a completely different meaning from what their individual words seem "
+"to mean. Sometimes, idioms are difficult to understand even for native "
+"speakers!"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:72
+msgid "_* /{Avoid slang, abbreviations, contractions...}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:74
+msgid ""
+"Even though you are encouraged to use plain, everyday English, technical "
+"writing belongs to the formal register of the language."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:76
+msgid ""
+"Try to avoid slang, unusual abbreviations that are difficult to understand "
+"and above all contractions that try to imitate the spoken language. Not to "
+"mention typical irc and family friendly expressions."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:78
+msgid "3~ Procedures"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:80
+msgid "_* /{Test before write}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:82
+msgid ""
+"It is important that authors test their examples before adding them to live-"
+"manual to ensure that everything works as described. Testing on a clean "
+"chroot or VM can be a good starting point. Besides, it would be ideal if the "
+"tests were then carried out on different machines with different hardware to "
+"spot possible problems that may arise."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:84
+msgid "_* /{Examples}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:86
+msgid ""
+"When providing an example try to be as specific as you can. An example is, "
+"after all, just an example."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:88
+msgid ""
+"It is often better to use a line that only applies to an specific case than "
+"using abstractions that may confuse your readers. In this case you can "
+"provide a brief explanation of the effects of the proposed example."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:90
+msgid ""
+"There may be some exceptions when the example suggests using some "
+"potentially dangerous commands that, if misused, may cause data loss or "
+"other similar undesirable effects. In this case you should provide a "
+"thorough explanation of the possible side effects."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:92
+msgid "_* /{External links}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:94
+msgid ""
+"Links to external sites should only be used when the information on those "
+"sites is crucial when it comes to understanding a special point. Even so, "
+"try to use links to external sites as sparsely as possible. Internet links "
+"are likely to change from time to time resulting in broken links and leaving "
+"your arguments in an incomplete state."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:96
+msgid ""
+"Besides, people who read the manual offline will not have the chance to "
+"follow those links."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:98
+msgid ""
+"_* /{Avoid branding and things that violate the license under which the "
+"manual is published}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:100
+msgid ""
+"Try to avoid branding as much as possible. Keep in mind that other "
+"downstream projects might make use of the documentation you write. So you "
+"are complicating things for them if you add certain specific material."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:102
+msgid ""
+"live-manual is licensed under the GNU GPL. This has a number of implications "
+"that apply to the distribution of the material (of any kind, including "
+"copyrighted graphics or logos) that is published with it."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:104
+msgid "_* /{Write a first draft, revise, edit, improve, redo if necessary}/"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:106
+msgid ""
+"Brainstorm!. You need to organize your ideas first in a logical sequence of "
+"events."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:108
+msgid ""
+"Once you have somehow organized those ideas in your mind write a first draft."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:110
+msgid "Revise grammar, syntax and spelling."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:112
+msgid "Improve your statements and redo any part if necessary."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:114
+msgid "_* /{Chapters}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:116
+msgid ""
+"Use the conventional numbering system for chapters and subtitles. e.g. 1, "
+"1.1, 1.1.1, 1.1.2 ... 1.2, 1.2.1, 1.2.2 ... 2, 2.1 ... and so on. See markup "
+"below."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:118
+msgid ""
+"If you have to enumerate a series of steps or stages in your description, "
+"you can also use ordinal numbers: First, second, third ... or First, Then, "
+"After that, Finally ... Alternatively you can use bulleted items."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:120 en/style_guide.ssi:214
+msgid "_* /{Markup}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:122
+msgid ""
+"And last but not least, live-manual uses {SiSU}http://www.sisudoc.org to "
+"process the text files and produce a multiple format output. It is "
+"recommended to take a look at {SiSU's manual}http://www.sisudoc.org/sisu/"
+"sisu_manual/markup.html to get familiar with its markup, or else type:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:126
+#, no-wrap
+msgid " $ sisu --help markup\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:130
+msgid "Here are some markup examples that may prove useful:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:132
+msgid "For emphasis/bold text:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:136
+#, no-wrap
+msgid "*{foo}* or !{foo}!\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:140
+msgid "produces: *{foo}* or !{foo}!. Use it to emphasize certain key words."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:142
+msgid "For italics:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:146
+msgid "/{foo}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:150
+msgid "produces: /{foo}/. Use them e.g. for the names of debian packages."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:152
+msgid "For monospace:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:156
+msgid "#{foo}#"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:160
+msgid ""
+"produces: #{foo}#. Use it e.g. for the names of commands. And also to "
+"highlight some key words or things like paths."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:162
+msgid "For code blocks:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:166
+#, no-wrap
+msgid " code{\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:169
+#, no-wrap
+msgid ""
+" $ foo\n"
+" # bar\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:171
+#, no-wrap
+msgid " }code\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:175
+msgid "produces:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:180
+#, no-wrap
+msgid ""
+" $ foo\n"
+" # bar\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:184
+msgid ""
+"Use #{code{}# to open and #{}code}# to close the tags. It is important to "
+"remember to leave a space at the beginning of each line of code."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:186
+msgid "2~ Guidelines for translators"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:188
+msgid ""
+"This section deals with some general considerations to be taken into account "
+"when translating the contents of live-manual."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:190
+msgid ""
+"As a general recommendation, translators should have read and understood the "
+"translation rules that apply to their specific languages. Usually, "
+"translation groups and mailing lists provide information on how to produce "
+"translated work that complies with Debian quality standards."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:192
+#, no-wrap
+msgid "*{Note:}* Translators should also read {Contributing to this document}#how-to-contribute. In particular the section {Translation}#translation\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:194
+msgid "3~ Translation hints"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:196
+msgid "_* /{Comments}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:198
+msgid ""
+"The role of the translator is to convey as faithfully as possible the "
+"meaning of words, sentences, paragraphs and texts as written by the original "
+"authors into their target language."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:200
+msgid ""
+"So they should refrain from adding personal comments or extra bits of "
+"information of their own. If they want to add a comment for other "
+"translators working on the same documents, they can leave it in the space "
+"reserved for that. That is, the header of the strings in the *{po}* files "
+"preceded by a number sign *{#}*. Most graphical translation programs can "
+"automatically handle those types of comments."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:202
+msgid "_* /{TN, Translator's Note}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:204
+msgid ""
+"It is perfectly acceptable however, to include a word or an expression in "
+"brackets in the translated text if, and only if, that makes the meaning of a "
+"difficult word or expression clearer to the reader. Inside the brackets the "
+"translator should make evident that the addition was theirs using the "
+"abbreviation \"TN\" or \"Translator's Note\"."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:206
+msgid "_* /{Impersonal sentences}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:208
+msgid ""
+"Documents written in English make an extensive use of the impersonal form "
+"\"you\". In some other languages that do not share this characteristic, this "
+"might give the false impression that the original texts are directly "
+"addressing the reader when they are actually not doing so. Translators must "
+"be aware of that fact and reflect it in their language as accurately as "
+"possible."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:210
+msgid "_* /{False friends}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:212
+msgid ""
+"The trap of \"false friends\" explained before especially applies to "
+"translators. Double check the meaning of suspicious false friends if in "
+"doubt."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:216
+msgid ""
+"Translators working initially with *{pot}* files and later on with *{po}* "
+"files will find many markup features in the strings. They can translate the "
+"text anyway, as long as it is translatable, but it is extremely important "
+"that they use exactly the same markup as the original English version."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:218
+msgid "_* /{Code blocks}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:220
+msgid ""
+"Some translators decide to include the code blocks in the translated files "
+"because it is easier for them to identify what has already been translated "
+"and what has not by looking at the percentages if they use a graphical "
+"translation program."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:222
+msgid ""
+"Include the code blocks if you want to score a 100% complete translation."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:224
+msgid ""
+"On the other hand some translators prefer to leave the code blocks "
+"\"untranslated\" (i.e. not including them). This makes the translation "
+"easier to maintain once finished because it does not require translators "
+"intervention if the code changes."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:226
+msgid ""
+"Leave the code blocks empty (they will be automatically added then) if you "
+"want to make your translation easier to maintain."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:228
+msgid "_* /{New lines}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:230
+msgid ""
+"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."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:232
+msgid ""
+"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."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:234
+msgid "_* /{Untranslatable strings}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:236
+msgid "Translators should never translate:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:238
+msgid "The code names of releases"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:240
+msgid "The names of programs"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:242
+msgid "The commands given as examples"
+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."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:246
+msgid "Links"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:247
+msgid "Paths"
+msgstr ""
diff --git a/manual/po/it/user_customization-binary.ssi.po b/manual/po/it/user_customization-binary.ssi.po
index f6f7fad..4640784 100644
--- a/manual/po/it/user_customization-binary.ssi.po
+++ b/manual/po/it/user_customization-binary.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-15 20:48+0100\n"
+"POT-Creation-Date: 2012-02-25 21:42+0100\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"
@@ -19,23 +19,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -85,23 +87,25 @@ 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/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/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/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/user_customization-installer.ssi:38
@@ -167,36 +171,70 @@ msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:8
msgid ""
-"live-build uses syslinux and some of its derivatives (depending on the image "
-"type) as bootloaders by default. You can easily modify their options using "
-"different methods, like {includes}#includes or {hooks}#hooks."
+"live-build uses /{syslinux}/ and some of its derivatives (depending on the "
+"image type) as bootloaders by default. You can easily customize them in a "
+"number of ways that range from providing a full theme to changing the boot "
+"timeout or simply adding a personalized splash image. Some of the following "
+"examples of customization make use of different methods, like {includes}"
+"#includes or {hooks}#hooks."
msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:10
msgid ""
-"For example, these derivatives are configured by default with a timeout of 0 "
-"(zero) which means that they will pause indefinitely at their splash screen "
-"until you press a key."
+"If you want to use a full theme you can specify the #{--syslinux-theme}# "
+"option (see man #{lb_config}#). live-build will then retrieve the theme from "
+"the mirror and install it."
msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:12
msgid ""
+"Imagine that you want to build a progress client but you prefer to include "
+"the server's theme because you want to have the help menu. Then you would "
+"launch #{lb config}# as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:16
+#, no-wrap
+msgid " $ lb config --mode progress --syslinux-theme progress-server\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:20
+msgid ""
+"You can also create your own theme or modify an already existing one and if "
+"you do not have a mirror, you can add the package to #{config/packages."
+"chroot}#. In this case it is not necessary to specify any option."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:22
+msgid ""
+"There is also the possibility of making smaller changes. For instance, "
+"syslinux derivatives are configured by default with a timeout of 0 (zero) "
+"which means that they will pause indefinitely at their splash screen until "
+"you press a key."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:24
+msgid ""
"To modify the boot timeout of a default #{iso-hybrid}# image you can edit a "
"default *{isolinux.cfg}* file specifying the timeout in units of seconds and "
"add it to #{config/includes.binary/isolinux/}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:26
msgid ""
"A modified *{isolinux.cfg}* to boot after five seconds would be similar to "
"this:"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:21
+#: en/user_customization-binary.ssi:33
#, no-wrap
msgid ""
" include menu.cfg\n"
@@ -206,7 +244,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:25
+#: en/user_customization-binary.ssi:37
msgid ""
"An alternative way of achieving the same goal could be writing a hook and "
"adding it to #{config/hooks/}# Remember to add the #{.binary}# suffix to run "
@@ -214,30 +252,32 @@ msgid ""
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 ""
#. type: Plain text
-#: en/user_customization-binary.ssi:31
+#: en/user_customization-binary.ssi:43
#, no-wrap
msgid " sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:35
-msgid "For more information please see man syslinux(1)."
+#: en/user_customization-binary.ssi:47
+msgid ""
+"Likewise, if you want to use a personalized splash.png image you can add a "
+"picture of 640x480 pixels to #{config/includes.binary/isolinux/}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:37
+#: en/user_customization-binary.ssi:49
msgid "2~ ISO metadata"
msgstr "2~ Metadati ISO"
# da rivedere l'ultimo periodo
#. type: Plain text
-#: en/user_customization-binary.ssi:39
+#: en/user_customization-binary.ssi:51
msgid ""
"When creating an ISO9660 binary image, you can use the following options to "
"add various textual metadata for your image. This can help you easily "
@@ -249,7 +289,7 @@ msgstr ""
"avviarla."
#. type: Plain text
-#: en/user_customization-binary.ssi:41
+#: en/user_customization-binary.ssi:53
msgid ""
"_* #{LB_ISO_APPLICATION/--iso-application NAME}#: This should describe the "
"application that will be on the image. The maximum length for this field is "
@@ -260,7 +300,7 @@ msgstr ""
"caratteri."
#. type: Plain text
-#: en/user_customization-binary.ssi:43
+#: en/user_customization-binary.ssi:55
msgid ""
"_* #{LB_ISO_PREPARER/--iso-preparer NAME}#: This should describe the "
"preparer of the image, usually with some contact details. The default for "
@@ -274,7 +314,7 @@ msgstr ""
"per questo campo è di 128 caratteri."
#. type: Plain text
-#: en/user_customization-binary.ssi:45
+#: en/user_customization-binary.ssi:57
msgid ""
"_* #{LB_ISO_PUBLISHER/--iso-publisher NAME}#: This should describe the "
"publisher of the image, usually with some contact details. The maximum "
@@ -285,7 +325,7 @@ msgstr ""
"lunghezza massima lunghezza per questo campo è di 128 caratteri."
#. type: Plain text
-#: en/user_customization-binary.ssi:46
+#: en/user_customization-binary.ssi:58
msgid ""
"_* #{LB_ISO_VOLUME/--iso-volume NAME}#: This should specify the volume ID of "
"the image. This is used as a user-visible label on some platforms such as "
diff --git a/manual/po/it/user_customization-installer.ssi.po b/manual/po/it/user_customization-installer.ssi.po
index fddc1be..c3b3a6a 100644
--- a/manual/po/it/user_customization-installer.ssi.po
+++ b/manual/po/it/user_customization-installer.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 21:19-0400\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\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"
@@ -19,22 +19,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -78,28 +81,31 @@ msgstr ""
#: 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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -142,8 +148,8 @@ msgstr "code{"
#: 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"
@@ -194,7 +200,7 @@ msgstr "I tre principali tipi dell'installer sono:"
#. type: Plain text
#: en/user_customization-installer.ssi:14
#, no-wrap
-msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a seperate 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"
+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 "*{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\".\n"
#. type: Plain text
@@ -289,7 +295,7 @@ msgstr ""
#: en/user_customization-installer.ssi:36
#, no-wrap
msgid ""
-" $ lb config --architecture i386 --linux-flavours 486 \\\n"
+" $ lb config --architectures i386 --linux-flavours 486 \\\n"
" --debian-installer live\n"
" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
msgstr ""
diff --git a/manual/po/it/user_customization-packages.ssi.po b/manual/po/it/user_customization-packages.ssi.po
index d308afd..09ff35a 100644
--- a/manual/po/it/user_customization-packages.ssi.po
+++ b/manual/po/it/user_customization-packages.ssi.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2012-01-18 18:00-0400\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
"PO-Revision-Date: 2012-02-06 18:35+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -20,23 +20,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -80,29 +82,31 @@ msgstr ""
#: 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/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/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/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/user_customization-installer.ssi:38
@@ -145,8 +149,8 @@ msgstr "code{"
#: 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"
@@ -219,7 +223,7 @@ msgid ""
"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, "
+"distribution. For example, to build against the *{unstable}* release, Sid, "
"specify:"
msgstr ""
"La distribuzione che viene scelta ha un ampio impatto su quali pacchetti "
@@ -230,7 +234,7 @@ msgstr ""
"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, "
+"supportata. Ad esempio se si vuole costruire un rilascio *{unstable}*, Sid, "
"specificare:"
#. type: Plain text
@@ -294,25 +298,25 @@ msgid ""
"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."
+"{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'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 "
+"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 "
+"seguito, nella fase *{binaria}* vengono usati i valori di #{--mirror-binary}"
+"# e #{--mirror-binary-security}# sostituendo qualsiasi altro mirror usato "
"nelle fasi iniziali."
#. type: Plain text
@@ -401,9 +405,9 @@ msgid ""
"backports, experimental or custom packages. To configure additional "
"repositories, create #{config/archives/your-repository.list.chroot}#, and/or "
"#{config/archives/your-repository.list.binary}# files. As with the #{--"
-"mirror-*}# options, these govern the repositories used in the *chroot* stage "
-"when building the image, and in the *binary* stage, i.e. for use when "
-"running the live system."
+"mirror-*}# options, these govern the repositories used in the *{chroot}* "
+"stage when building the image, and in the *{binary}* stage, i.e. for use "
+"when running the live system."
msgstr ""
"Si possono aggiungere altri repository, ampliando così la scelta dei "
"pacchetti al di là di quelli disponibili nella distribuzione di "
@@ -411,8 +415,8 @@ msgstr ""
"sperimentali o personalizzati. Per configurare repository aggiuntivi, creare "
"i file #{config/archives/vostro-repository.list.chroot}#, o #{config/"
"archives/vostro-repository.list.binary}#. Come per le opzioni #{--mirror-*}"
-"#, queste controlleranno i repository usati nella fase *chroot* quando si "
-"compila l'immagine, e nella fase *binary*, ad esempio per usarli quando il "
+"#, queste controlleranno i repository usati nella fase *{chroot}* quando si "
+"compila l'immagine, e nella fase *{binary}*, ad esempio per usarli quando il "
"sistema live è avviato."
#. type: Plain text
@@ -650,7 +654,7 @@ msgid ""
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
"Generally, this means any #{lb config}# option uppercased and with dashes "
"changed to underscores. But in practice, it is only the ones that influence "
-"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURE}"
+"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURES}"
"# or #{ARCHIVE_AREAS}#."
msgstr ""
"Ognuna delle variabili di configurazione di live-build situate in #{config/*}"
@@ -658,22 +662,22 @@ msgstr ""
"condizionali nell'elenco dei pacchetti. In genere questo significa qualsiasi "
"opzione di #{lb config}# in maiuscolo e con trattini cambiati in trattini "
"bassi; ma in pratica è la sola ad influenzare la selezione dei pacchetti che "
-"abbia senso, come #{DISTRIBUTION}#, #{ARCHITECTURE}# o #{ARCHIVE_AREAS}#."
+"abbia senso, come #{DISTRIBUTION}#, #{ARCHITECTURES}# o #{ARCHIVE_AREAS}#."
#. type: Plain text
#: en/user_customization-packages.ssi:138
msgid ""
-"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+"For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
"specified:"
msgstr ""
-"Per esempio, per installare #{ia32-libs}# se è specificata #{--architecture "
+"Per esempio, per installare #{ia32-libs}# se è specificata #{--architectures "
"amd64}#:"
#. type: Plain text
#: en/user_customization-packages.ssi:144
#, no-wrap
msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
" ia32-libs\n"
" #endif\n"
msgstr ""
@@ -682,17 +686,18 @@ msgstr ""
#: en/user_customization-packages.ssi:148
msgid ""
"You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
+"# 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 #{--architecture i386}# sia #{--"
-"architecture amd64}#:"
+"installare #{memtest86+}# specificando sia #{--architectures i386}# sia #{--"
+"architectures amd64}#:"
#. type: Plain text
#: en/user_customization-packages.ssi:154
#, no-wrap
msgid ""
-" #if ARCHITECTURE i386 amd64\n"
+" #if ARCHITECTURES i386 amd64\n"
" memtest86+\n"
" #endif\n"
msgstr ""
@@ -726,7 +731,7 @@ msgstr "Una condizione può coinvolegere una direttiva #{#include}#:"
#: en/user_customization-packages.ssi:174
#, no-wrap
msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
" #include <gnome-full>\n"
" #endif\n"
msgstr ""
@@ -1237,7 +1242,7 @@ msgstr "3~ Passare opzioni ad apt o aptitude"
#. type: Plain text
#: en/user_customization-packages.ssi:308
msgid ""
-"If there is not an #{lb config}# option to alter APT's behaviour in the way "
+"If there is not a #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
"options through to your configured APT tool. See the man pages for #{apt}# "
"and #{aptitude}# for details."
diff --git a/manual/po/it/user_customization-runtime.ssi.po b/manual/po/it/user_customization-runtime.ssi.po
index d5958d7..5fa55b8 100644
--- a/manual/po/it/user_customization-runtime.ssi.po
+++ b/manual/po/it/user_customization-runtime.ssi.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 21:01-0400\n"
-"PO-Revision-Date: 2011-12-06 08:11+0100\n"
+"POT-Creation-Date: 2012-03-24 15:08+0100\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"
"Language: it\n"
@@ -19,22 +19,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -60,46 +63,50 @@ 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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -125,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"
@@ -222,16 +230,20 @@ msgid ""
"password \"live\". If you want to do that for any reason, you can easily "
"achieve it as follows:"
msgstr ""
+"È inoltre possibile modificare facilmente il nome utente \"user\" e la "
+"password \"live\" predefiniti."
#. type: Plain text
#: en/user_customization-runtime.ssi:25
msgid ""
"To change the default username you can simply specify it in your config:"
msgstr ""
+"Per cambiare il nome utente specificare quanto segue nella configurazione:"
#. type: Plain text
#: en/user_customization-runtime.ssi:29
-msgid "$ lb config --bootappend-live \"username=live-user\""
+#, no-wrap
+msgid " $ lb config --bootappend-live \"username=live-user\"\n"
msgstr ""
#. type: Plain text
@@ -243,6 +255,11 @@ msgid ""
"prefix it accordingly (e.g. 200-passwd) and add it to #{config/includes."
"chroot/lib/live/config/}#"
msgstr ""
+"Un modo per cambiare la password è tramite un hook come descritto in {Hook "
+"in fase di avvio}#boot-time-hooks. Si può usare l'hook \"passwd\" da #{/usr/"
+"share/doc/live-config/examples/hooks}#, anteponendolo di conseguenza (ad "
+"esempio, 200-passwd) e aggiungerlo al file #{config/includes.chroot/lib/live/"
+"config/}#"
#. type: Plain text
#: en/user_customization-runtime.ssi:35
@@ -432,58 +449,122 @@ msgstr ""
#: en/user_customization-runtime.ssi:98
msgid ""
"The data stored on this ramdisk should be saved on a writable persistent "
-"medium like a Hard Disk, a USB key, a network share or even a session of a "
+"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}#."
msgstr ""
"I dati immagazzinati su questo ramdisk andrebbero salvati un supporto "
-"scrivibile persistente come un hard disk, una chiave USB, 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}#."
+"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}#."
#. type: Plain text
#: en/user_customization-runtime.ssi:100
-msgid "3~ Full persistence"
-msgstr "3~ Persistenza completa"
+msgid ""
+"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:"
+msgstr ""
+"Se il parametro di boot #{persistent}# è impostato (e non lo è #"
+"{nopersistent}#), i supporti di memorizzazione locali (hard disk, "
+"dispositivi USB) saranno rilevati come volumi persistenti durante l'avvio. "
+"Un volume persistente è uno dei seguenti:"
#. type: Plain text
#: en/user_customization-runtime.ssi:102
+msgid "_* a partition, identified by its GPT name."
+msgstr ""
+"_* una partizione, identificata dal suo nome GPT (GUID Partition Table)."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:104
+msgid "_* a filesystem, identified by its filesystem label."
+msgstr "_* un filesystem, identificato dalla sua label."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:106
+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\"."
+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\"."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:108
+msgid ""
+"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:"
+msgstr ""
+"È possibile limitare i tipi di volume persistenti da usare specificando "
+"certi parametri di boot descritti nella manpage di live-boot(7). Le \"label "
+"identificative\" di cui sopra possono essere una delle seguenti:"
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:110
+msgid "_* #{full-ov}# for full persistent overlays."
+msgstr "_* #{full-ov}# per strati di persistenza completa."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:112
+msgid "_* #{custom-ov}# for custom overlays."
+msgstr "_* #{custom-ov}# per strati personalizzati."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:114
+msgid "_* #{live-sn}# for full system snapshots."
+msgstr "_* #{live-sn}# per istantanee del sistema completo."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:116
+msgid "_* #{home-sn}# for /home snapshots."
+msgstr "_* #{home-sn}# per istantanee della /home."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:118
+msgid "3~ Full persistent overlays"
+msgstr "3~ Strati di persistenza completa"
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:120
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 "
-"writable partition is used. In order to use this feature a partition with a "
-"clean writable supported filesystem on it labeled \"live-rw\" must be "
-"attached on the system at boot time and the system must be started with the "
-"boot parameter 'persistent'. This partition could be an ext2 partition on "
-"the hard disk or on a usb key created with, e.g.:"
+"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.:"
msgstr ""
-"Con \"persistenza completa\" si intende l'uso di una partizione scrivibile "
+"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 utilizzare "
-"questa caratteristica, una partizione con un filesystem scrivibile e "
-"supportato ed etichettata come \"live-rw\" deve essere collegata al sistema "
-"in fase di avvio e il sistema va fatto partire con il parametro \"persistent"
-"\". Questa partizione potrebbe essere di tipo ext2 su un hard disk o una "
-"penna usb creata ad esempio con:"
+"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 con:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:124
#, no-wrap
-msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
+msgid " # mkfs.ext2 -L full-ov /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:128
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
-"Si veda anche {Usare lo spazio rimanente su una penna USB}#using-usb-extra-"
+"Vedee anche {Usare lo spazio rimanente su una penna USB}#using-usb-extra-"
"space."
#. type: Plain text
-#: en/user_customization-runtime.ssi:112
+#: en/user_customization-runtime.ssi:130
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
@@ -492,101 +573,157 @@ msgstr ""
"l'etichetta con una delle seguenti:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:116
+#: en/user_customization-runtime.ssi:134
#, no-wrap
-msgid " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
-msgstr ""
+msgid " $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems\n"
+msgstr " $ tune2fs -L full-ov /dev/sdb1 # per filesystems ext2,3,4\n"
#. type: Plain text
-#: en/user_customization-runtime.ssi:120
+#: en/user_customization-runtime.ssi:138
msgid ""
-"But since live system users cannot always use a hard drive partition, and "
-"considering that most USB keys have poor write speeds, 'full' persistence "
-"could be also used with just image files, so you could create a file "
-"representing a partition and put this image file even on a NTFS partition of "
-"a foreign OS, with something like:"
+"Here's an example of how to create an ext2-based image file used for full "
+"persistence:"
msgstr ""
-"Ma siccome gli utenti dei sistemi live non hanno sempre la possibilità di "
-"utilizzare una partizione su disco rigido, e considerando che la maggior "
-"parte delle chiavi USB hanno scarse velocità di scrittura, la persistenza "
-"\"completa\" può anche essere usata con dei file immagine, è possibile "
-"creare un file che rappresenta una partizione e inserire questo file "
-"immagine anche su una partizione NTFS di un sistema operativo estraneo, "
-"qualcosa come:"
+"Ecco un esempio di come creare un file immagine ext2 da utilizzare per la "
+"persistenza completa:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:125
+#: en/user_customization-runtime.ssi:143
#, no-wrap
msgid ""
-" $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
-" $ /sbin/mkfs.ext2 -F live-rw\n"
+" $ 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"
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"
#. type: Plain text
-#: en/user_customization-runtime.ssi:129
+#: en/user_customization-runtime.ssi:147
msgid ""
-"Then copy the #{live-rw}# file to a writable partition and reboot with the "
-"boot parameter 'persistent'."
+"Then copy the #{full-ov}# file to the root of a writable partition and "
+"reboot."
msgstr ""
-"Quindi copiare il file #{live-rw}# su una partizione scrivibile e riavviare "
-"con il parametro d'avvio \"persistent\"."
+"Quindi copiare il file #{full-ov}# nella directory radice di una partizione "
+"scrivibile e riavviare."
#. type: Plain text
-#: en/user_customization-runtime.ssi:131
-msgid "3~ Home automounting"
-msgstr "3~ Mount automatico della home"
+#: en/user_customization-runtime.ssi:149
+msgid "3~ Custom overlays"
+msgstr "3~ Strati personalizzati"
+
+#. type: Plain text
+#: 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."
+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 "
+"persistenti e in che modo."
#. type: Plain text
-#: en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:153
msgid ""
-"If during the boot a partition (filesystem) image file or a partition "
-"labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
-"as #{/home}#, thus permitting persistence of files that belong to e.g. the "
-"default user. It can be combined with full persistence."
+"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:"
msgstr ""
-"Se durante l'avvio viene trovata una partizione (filesystem) su file "
-"immagine o una partizione etichettata come #{home-rw}#, questa verrà montata "
-"direttamente come #{/home}#, permettendo quindi la persistenza dei file che "
-"appartengono ad esempio all'utente predefinito. Può essere unita alla "
-"persistenza completa."
+"Nella manpage di live.persist(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:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:135
+#: 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"
+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)."
+
+#. 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 "
+"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 ""
+"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."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:168
msgid "3~ Snapshots"
msgstr "3~ Istantanee"
#. type: Plain text
-#: en/user_customization-runtime.ssi:137
+#: 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 device to the system "
+"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 "
-"content of a snapshot could reside on a partition or an image file (like the "
-"above mentioned types) labeled #{live-sn}#, but it defaults to a simple cpio "
-"archive named #{live-sn.cpio.gz}#. As above, at boot time, the block devices "
-"connected to the system are traversed to see if a partition or a file named "
-"like that could be found. A power interruption during run time could lead to "
-"data loss, hence a tool invoked #{live-snapshot --refresh}# could be called "
-"to sync important changes. 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."
+"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."
msgstr ""
"Le istantanee sono raccolte di file e directory che non vengono montate "
-"durante l'esecuzione ma copiate all'avvio da un dispositivo persistente al "
-"sistema (tmpfs) e risincronizzate al riavvio e spegnimento. Il contenuto di "
-"un'istantanea può risiedere su una partizione o file immagine (come i tipi "
-"menzionati poc'anzi) etichettati come #{live-sn}#, ma sotto forma di un "
-"semplice archivio cpio nominato #{live-sn.cpio.gz}#. Come sopra, all'avvio, "
-"i device a blocchi collegati al sistema vengono analizzati alla ricerca di "
-"una partizione o file così nominati. Un'interruzione di corrente durante "
-"l'esecuzione potrebbe portare ad una perdita di dati, per cui si può usare "
-"uno strumento che richiama #{live-snapshot --refresh}# per sincronizzare i "
-"cambiamenti importanti. Giacché non scrive continuamente sul dispositivo, "
+"durante l'esecuzione ma copiate all'avvio da un volume persistente al "
+"sistema (tmpfs) e risincronizzate al riavvio e spegnimento. Il volume deve "
+"essere etichettato come #{live-sn}# sotto forma di un semplice archivio cpio "
+"nominato #{live-sn.cpio.gz}#. Un'interruzione di corrente durante "
+"l'esecuzione potrebbe portare ad una perdita di dati, se son state fatte "
+"modifiche importanti si può usare usare #{live-snapshot --refresh}# tante "
+"volte quanto necessario.Giacché non scrive continuamente sul dispositivo, "
"questo tipo di persistenza è il sistema più comodo e veloce per dispositivi "
-"basati su memoria flash."
+"basati su memoria flash ma occupa tanta RAM quanta è la dimensione "
+"dell'istantanea decompressa."
#. type: Plain text
-#: en/user_customization-runtime.ssi:139
+#: en/user_customization-runtime.ssi:172
msgid ""
"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."
@@ -595,24 +732,21 @@ msgstr ""
"come la principale ma viene applicata solo ad /home."
#. type: Plain text
-#: en/user_customization-runtime.ssi:141
-msgid ""
-"Snapshots cannot currently handle file deletion but full persistence and "
-"home automounting can."
+#: en/user_customization-runtime.ssi:174
+msgid "Snapshots cannot currently handle file deletion."
msgstr ""
-"Attualmente le istantanee non possono gestire la cancellazione dei file, al "
-"contrario della persistenza completa e il mount automatico della home. "
+"Attualmente le istantanee non possono gestire la cancellazione dei file."
#. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:176
msgid "3~ Persistent SubText"
msgstr "3~ Sottotesto persistente"
#. type: Plain text
-#: en/user_customization-runtime.ssi:145
+#: en/user_customization-runtime.ssi:178
msgid ""
"If a user would need multiple persistent storage of the same type for "
-"different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
+"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 "
@@ -620,7 +754,7 @@ msgid ""
"#{persistent}# #{persistent-subtext=subText}#."
msgstr ""
"Se un utente avesse bisogno di archiviazioni multiple dello stesso tipo per "
-"differenti posti o per test, come #{live-rw-casa}# e #{live-rw-lavoro}#, il "
+"differenti posti o per test, come #{full-ov-casa}# e #{full-ov-lavoro}#, il "
"parametro d'avvio #{persistent-subtext}# usato in congiunzione con #"
"{persistent}# permetterà supporti persistenti multipli ma univoci. Un "
"esempio potrebbe essere un utente che vuole usare una partizione etichettata "
@@ -628,12 +762,12 @@ msgstr ""
"subtext=sottotesto}#."
#. type: Plain text
-#: en/user_customization-runtime.ssi:147
+#: en/user_customization-runtime.ssi:180
msgid "3~ Partial remastering"
msgstr "3~ Rimasterizzazione parziale"
#. type: Plain text
-#: en/user_customization-runtime.ssi:148
+#: en/user_customization-runtime.ssi:181
msgid ""
"The run-time modification of the tmpfs could be collected using live-"
"snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/po/it/user_examples.ssi.po b/manual/po/it/user_examples.ssi.po
index 99ec522..7c90745 100644
--- a/manual/po/it/user_examples.ssi.po
+++ b/manual/po/it/user_examples.ssi.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-18 18:00-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
"PO-Revision-Date: 2012-02-06 18:43+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -25,25 +25,27 @@ 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: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/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/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/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: 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/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,25 +93,27 @@ 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/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/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/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: 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/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
@@ -433,7 +437,7 @@ msgstr "Modificare #{auto/config}# come segue:"
#, no-wrap
msgid ""
" lb config noauto \\\n"
-" --architecture i386 \\\n"
+" --architectures i386 \\\n"
" --linux-flavours 686-pae \\\n"
" --package-lists lxde \\\n"
" \"${@}\"\n"
@@ -453,14 +457,14 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:113
msgid ""
-"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
+"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}#."
msgstr ""
-"Per prima cosa, #{--architecture i386}# assicura che sul nostro sistema #"
+"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, "
diff --git a/manual/po/it/user_installation.ssi.po b/manual/po/it/user_installation.ssi.po
index 086a478..b2cd872 100644
--- a/manual/po/it/user_installation.ssi.po
+++ b/manual/po/it/user_installation.ssi.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 17:40-0400\n"
+"POT-Creation-Date: 2012-03-31 16:32+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"
@@ -20,22 +20,26 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -58,49 +62,54 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 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: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: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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -122,29 +131,30 @@ msgstr "code{"
#: en/user_customization-packages.ssi:302
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 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-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: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"
@@ -371,8 +381,8 @@ msgstr "2~ live-boot e live-config"
#. type: Plain text
#: en/user_installation.ssi:102
#, no-wrap
-msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the live-boot-doc and live-config-doc packages separately.\n"
-msgstr "*{Nota:}* non è necessario installare live-boot o live-config sul proprio sistema per creare sistemi Debian Live personalizzati. Tuttavia, farlo non nuoce. Se si vuole la documentazione è possibile installare i pacchetti live-boot-doc e live-config-doc separatamente.\n"
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the /{live-boot-doc}/ and /{live-config-doc}/ packages separately.\n"
+msgstr "*{Nota:}* non è necessario installare live-boot o live-config sul proprio sistema per creare sistemi Debian Live personalizzati. Tuttavia, farlo non nuoce. Se si vuole la documentazione è possibile installare i pacchetti /{live-boot-doc}/ e /{live-config-doc}/ separatamente.\n"
#. type: Plain text
#: en/user_installation.ssi:106
diff --git a/manual/po/it/user_managing_a_configuration.ssi.po b/manual/po/it/user_managing_a_configuration.ssi.po
index 2e24735..8ba8e91 100644
--- a/manual/po/it/user_managing_a_configuration.ssi.po
+++ b/manual/po/it/user_managing_a_configuration.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-02 12:23-0200\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\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"
@@ -19,22 +19,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -43,33 +46,33 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
#: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:204
-#: 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:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi: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:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: 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
@@ -78,28 +81,31 @@ msgstr ""
#: 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/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/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/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/user_customization-installer.ssi:38
@@ -108,33 +114,33 @@ msgstr "code{"
#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:208
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: 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: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:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: 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
@@ -142,8 +148,8 @@ msgstr "code{"
#: 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"
@@ -226,7 +232,7 @@ msgid ""
"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 #{lb config}# and #{lb clean}#, these "
+"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 "
diff --git a/manual/po/it/user_overview.ssi.po b/manual/po/it/user_overview.ssi.po
index b2b6e9e..9f68063 100644
--- a/manual/po/it/user_overview.ssi.po
+++ b/manual/po/it/user_overview.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 08:16-0400\n"
+"POT-Creation-Date: 2012-03-19 18:09+0100\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"
@@ -19,22 +19,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -57,11 +60,11 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.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: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
@@ -78,28 +81,31 @@ msgstr ""
#: 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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -121,12 +127,12 @@ msgstr "code{"
#: en/user_customization-packages.ssi:302
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: 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: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
@@ -142,8 +148,8 @@ msgstr "code{"
#: 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"
@@ -307,16 +313,17 @@ msgstr ""
"sottodirectory in #{auto/}#."
#. type: Plain text
-#: en/user_overview.ssi:40
+#: en/user_overview.ssi:41
#, no-wrap
msgid ""
" $ lb config\n"
+" [2012-03-19 15:17:14] lb_config\n"
" P: Considering defaults defined in /etc/live/build.conf\n"
-" P: Creating config tree\n"
+" P: Creating config tree for a debian system\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:44
+#: en/user_overview.ssi:45
msgid ""
"Using #{lb config}# without any arguments would be suitable for users who "
"need a very basic image, or who intend to later provide a more complete "
@@ -329,7 +336,7 @@ msgstr ""
"configurazione}#managing-a-configuration)."
#. type: Plain text
-#: en/user_overview.ssi:46
+#: en/user_overview.ssi:47
msgid ""
"Normally, you will want to specify some options. For example, to include the "
"'gnome' package list in your configuration:"
@@ -338,35 +345,35 @@ msgstr ""
"nella propria configurazione l'elenco del pacchetto \"gnome\":"
#. type: Plain text
-#: en/user_overview.ssi:50
+#: en/user_overview.ssi:51
#, no-wrap
msgid " $ lb config -p gnome\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:54
+#: en/user_overview.ssi:55
msgid "It is possible to specify many options, such as:"
msgstr "È possibile specificare molte opzioni, come:"
#. type: Plain text
-#: en/user_overview.ssi:58
+#: en/user_overview.ssi:59
#, no-wrap
-msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
+msgid " $ lb config --binary-images net --bootappend-live \"hostname=live-machine username=live-user\" ...\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:62
+#: en/user_overview.ssi:63
msgid "A full list of options is available in the #{lb_config}# man page."
msgstr ""
"Una lista completa delle opzioni è disponibile nel manuale di #{lb_config}#."
#. type: Plain text
-#: en/user_overview.ssi:64
+#: en/user_overview.ssi:65
msgid "3~lb-build The #{lb build}# command"
msgstr "3~lb-build Il comando #{lb build}#"
#. type: Plain text
-#: en/user_overview.ssi:66
+#: en/user_overview.ssi:67
msgid ""
"The #{lb build}# command reads in your configuration from the #{config/}# "
"directory. It then runs the lower level commands needed to build your Live "
@@ -377,12 +384,12 @@ msgstr ""
"live."
#. type: Plain text
-#: en/user_overview.ssi:68
+#: en/user_overview.ssi:69
msgid "3~lb-clean The #{lb clean}# command"
msgstr "3~lb-clean Il comando #{lb clean}#"
#. type: Plain text
-#: en/user_overview.ssi:70
+#: en/user_overview.ssi:71
msgid ""
"It is the job of the #{lb clean}# command to remove various parts of a build "
"so subsequent builds can start from a clean state. By default, #{chroot}#, #"
@@ -402,12 +409,12 @@ msgstr ""
"{lb_clean}#."
#. type: Plain text
-#: en/user_overview.ssi:72
+#: en/user_overview.ssi:73
msgid "2~live-boot The live-boot package"
msgstr "2~live-boot Il pacchetto live-boot"
#. type: Plain text
-#: en/user_overview.ssi:74
+#: en/user_overview.ssi:75
msgid ""
"live-boot is a collection of scripts providing hooks for the initramfs-"
"tools, used to generate an initramfs capable of booting live systems, such "
@@ -420,7 +427,7 @@ msgstr ""
"per l'avvio da rete e immagini per penne USB."
#. type: Plain text
-#: en/user_overview.ssi:76
+#: en/user_overview.ssi:77
msgid ""
"At boot time it will look for read-only media containing a #{/live/}# "
"directory where a root filesystem (often a compressed filesystem image like "
@@ -433,7 +440,7 @@ msgstr ""
"avviarsi da sistemi simili a Debian."
#. type: Plain text
-#: en/user_overview.ssi:78
+#: en/user_overview.ssi:79
msgid ""
"More information on initial ramfs in Debian can be found in the Debian Linux "
"Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
@@ -444,12 +451,12 @@ msgstr ""
"handbook.alioth.debian.org/."
#. type: Plain text
-#: en/user_overview.ssi:80
+#: en/user_overview.ssi:81
msgid "2~live-config The live-config package"
msgstr "2~live-config Il pacchetto live-config"
#. type: Plain text
-#: en/user_overview.ssi:81
+#: en/user_overview.ssi:82
msgid ""
"live-config consists of the scripts that run at boot time after live-boot to "
"configure the live system automatically. It handles such tasks as setting "
diff --git a/manual/po/pt_BR/about_manual.ssi.po b/manual/po/pt_BR/about_manual.ssi.po
index a95f572..0392b51 100644
--- a/manual/po/pt_BR/about_manual.ssi.po
+++ b/manual/po/pt_BR/about_manual.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-05 17:13+0100\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"
@@ -28,8 +28,9 @@ msgstr "1~about-manual Sobre esse manual"
#. type: Plain text
#: en/about_manual.ssi:6
msgid ""
-"The main goal of this manual is to serve as a single access point to all "
-"documentation related to the Debian Live project. While it is primarily "
+"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, "
@@ -369,15 +370,16 @@ msgstr ""
#: 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/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/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/user_customization-installer.ssi:32
@@ -441,15 +443,16 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: 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/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/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/user_customization-installer.ssi:38
@@ -706,7 +709,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:203
-msgid "3~ Translation"
+msgid "3~translation Translation"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/about_project.ssi.po b/manual/po/pt_BR/about_project.ssi.po
index 3021d2a..5574a81 100644
--- a/manual/po/pt_BR/about_project.ssi.po
+++ b/manual/po/pt_BR/about_project.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-08-29 08:54-0200\n"
+"POT-Creation-Date: 2012-02-19 22:16+0100\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -234,18 +234,10 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_project.ssi:70
+#: 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."
msgstr ""
-
-#. type: Plain text
-#: en/about_project.ssi:71
-msgid ""
-"_* *{Wiki}*: The Debian Live wiki at http://wiki.debian.org/DebianLive is a "
-"place to gather information, discuss applied technologies, and document "
-"frameworks of Debian Live systems that go beyond the scope of this document."
-msgstr ""
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index e29e0b9..3e813d5 100644
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-06 18:57+0100\n"
+"POT-Creation-Date: 2012-04-03 00:19+0300\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-02-06\n"
+" :published: 2012-04-03\n"
msgstr ""
#. type: Plain text
@@ -165,6 +165,16 @@ msgid ":B~ Examples"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:62
+#: en/live-manual.ssm:63
msgid "<< user_examples.ssi"
msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:65 en/style_guide.ssi:2
+msgid ":B~ Appendix"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:66
+msgid "<< style_guide.ssi"
+msgstr ""
diff --git a/manual/po/pt_BR/project_coding-style.ssi.po b/manual/po/pt_BR/project_coding-style.ssi.po
index 2951489..5d8758e 100644
--- a/manual/po/pt_BR/project_coding-style.ssi.po
+++ b/manual/po/pt_BR/project_coding-style.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-01-20 16:58-0400\n"
+"POT-Creation-Date: 2012-03-31 16:32+0300\n"
"PO-Revision-Date: 2010-11-30 11:05+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,129 +18,141 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi: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/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/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/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/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/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/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/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/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/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: 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"
@@ -366,7 +378,7 @@ msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:132
msgid ""
-"_* Use \"#{|}#\" (without the surround quotes) as a seperator in calls to "
+"_* Use \"#{|}#\" (without the surround quotes) as a separator in calls to "
"sed, e.g. \"#{sed -e 's|foo|bar|'}#\" (without \"\")."
msgstr ""
diff --git a/manual/po/pt_BR/style_guide.ssi.po b/manual/po/pt_BR/style_guide.ssi.po
new file mode 100644
index 0000000..5e76aff
--- /dev/null
+++ b/manual/po/pt_BR/style_guide.ssi.po
@@ -0,0 +1,894 @@
+# 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"
+"PO-Revision-Date: 2012-02-11 16:42+0100\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: pt_BR\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/live-manual.ssm:65 en/style_guide.ssi:2
+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/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
+#: 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: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: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/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
+#: 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: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
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/style_guide.ssi:4
+msgid "1~style-guide Style guide"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:6
+msgid "2~ Guidelines for authors"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:8
+msgid ""
+"This section deals with some general considerations to be taken into account "
+"when writing technical documentation for live-manual. They are divided into "
+"linguistic features and recommended procedures."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:10
+#, no-wrap
+msgid "*{Note:}* Authors should first read {Contributing to this document}#how-to-contribute\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:12
+msgid "3~ Linguistic features"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:14
+msgid "_* /{Use plain English}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:16
+msgid ""
+"Keep in mind that a high percentage of your readers are not native speakers. "
+"So as a general rule try to use short, meaningful sentences, followed by a "
+"full stop."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:18
+msgid ""
+"This does not mean that you have to use a simplistic, naive style. It is a "
+"suggestion to try to avoid, as much as possible, complex subordinate "
+"sentences that make the text difficult to understand for non-native speakers."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:20
+msgid "_* /{Variety of English}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:22
+msgid ""
+"The most widely spread varieties of English are British and American so it "
+"is very likely that most authors will use either one or the other. In a "
+"collaborative environment, the ideal variety would be \"International English"
+"\" but it is very difficult, not to say impossible, to decide on which "
+"variety among all the existing ones, is the best to use."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:24
+msgid ""
+"We expect that different varieties may mix without creating "
+"misunderstandings but in general terms you should try to be coherent and "
+"before deciding on using British, American or any other English flavour at "
+"your discretion, please take a look at how other people write and try to "
+"imitate them."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:26
+msgid "_* /{Be balanced}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:28
+msgid ""
+"Do not be biased. Avoid including references to ideologies completely "
+"unrelated to live-manual. Technical writing should be as neutral as "
+"possible. It is in the very nature of scientific writing."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:30
+msgid "_* /{Be politically correct}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:32
+msgid ""
+"Try to avoid sexist language as much as possible. If you need to make "
+"references to the third person singular preferably use \"they\" rather than "
+"\"he\" or \"she\" or awkward inventions such as \"s/he\", \"s(he)\" and the "
+"like."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:34
+msgid "_* /{Be concise}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:36
+msgid ""
+"Go straight to the point and do not wander around aimlessly. Give as much "
+"information as necessary but do not give more information than necessary, "
+"this is to say, do not explain unnecessary details. Your readers are "
+"intelligent. Presume some previous knowledge on their part."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:38
+msgid "_* /{Minimize translation work}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:40
+msgid ""
+"Keep in mind that whatever you write will have to be translated into several "
+"other languages. This implies that a number of people will have to do an "
+"extra work if you add useless or redundant information."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:42
+msgid "_* /{Be coherent}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:44
+msgid ""
+"As suggested before, it is almost impossible to standardize a collaborative "
+"document into a perfectly unified whole. However, every effort on your side "
+"to write in a coherent way with the rest of the authors will be appreciated."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:46
+msgid "_* /{Be cohesive}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:48
+msgid ""
+"Use as many text-forming devices as necessary to make your text cohesive and "
+"unambiguous. (Text-forming devices are linguistic markers such as "
+"connectors)."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:50
+msgid "_* /{Be descriptive}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:52
+msgid ""
+"It is preferable to describe the point in one or several paragraphs than "
+"merely using a number of sentences in a typical \"changelog\" style. "
+"Describe it! Your readers will appreciate it."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:54
+msgid "_* /{Dictionary}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:56
+msgid ""
+"Look up the meaning of words in a dictionary or encyclopedia if you do not "
+"know how to express certain concepts in English. But keep in mind that a "
+"dictionary can either be your best friend or can turn into your worst enemy "
+"if you do not know how to use it correctly."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:58
+msgid ""
+"English has the largest vocabulary that exists (With over one million "
+"words). Many of these words are borrowings from other languages. When "
+"looking up the meaning of words in a bilingual dictionary the tendency of a "
+"non-native speaker is to choose the one that sounds more similar in their "
+"mother tongue. This often turns into an excessively formal discourse which "
+"does not sound quite natural in English."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:60
+msgid ""
+"As a general rule, if a concept can be expressed using different synonyms, "
+"it is a good advice to choose the first word proposed by the dictionary. If "
+"in doubt, choosing words of Germanic origin (Usually monosyllabic words) is "
+"often the right thing to do. Be warned that these two techniques might "
+"produce a rather informal discourse but at least your choice of words will "
+"be of wide use and generally accepted."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:62
+msgid ""
+"Using a dictionary of collocations is recommended. They are extremely "
+"helpful when it comes to know which words usually occur together."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:64
+msgid ""
+"Again it is a good practice to learn from the work of others. Using a search "
+"engine to check how other authors use certain expressions may help a lot."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:66
+msgid "_* /{False friends, idioms and other idiomatic expressions}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:68
+msgid ""
+"Watch out for false friends. No matter how proficient you are in a foreign "
+"language you cannot help falling from time to time in the trap of the so "
+"called \"false friends\", words that look similar in two languages but whose "
+"meanings or uses might be completely different."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:70
+msgid ""
+"Try to avoid idioms as much as possible. \"Idioms\" are expressions that may "
+"convey a completely different meaning from what their individual words seem "
+"to mean. Sometimes, idioms are difficult to understand even for native "
+"speakers!"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:72
+msgid "_* /{Avoid slang, abbreviations, contractions...}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:74
+msgid ""
+"Even though you are encouraged to use plain, everyday English, technical "
+"writing belongs to the formal register of the language."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:76
+msgid ""
+"Try to avoid slang, unusual abbreviations that are difficult to understand "
+"and above all contractions that try to imitate the spoken language. Not to "
+"mention typical irc and family friendly expressions."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:78
+msgid "3~ Procedures"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:80
+msgid "_* /{Test before write}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:82
+msgid ""
+"It is important that authors test their examples before adding them to live-"
+"manual to ensure that everything works as described. Testing on a clean "
+"chroot or VM can be a good starting point. Besides, it would be ideal if the "
+"tests were then carried out on different machines with different hardware to "
+"spot possible problems that may arise."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:84
+msgid "_* /{Examples}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:86
+msgid ""
+"When providing an example try to be as specific as you can. An example is, "
+"after all, just an example."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:88
+msgid ""
+"It is often better to use a line that only applies to an specific case than "
+"using abstractions that may confuse your readers. In this case you can "
+"provide a brief explanation of the effects of the proposed example."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:90
+msgid ""
+"There may be some exceptions when the example suggests using some "
+"potentially dangerous commands that, if misused, may cause data loss or "
+"other similar undesirable effects. In this case you should provide a "
+"thorough explanation of the possible side effects."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:92
+msgid "_* /{External links}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:94
+msgid ""
+"Links to external sites should only be used when the information on those "
+"sites is crucial when it comes to understanding a special point. Even so, "
+"try to use links to external sites as sparsely as possible. Internet links "
+"are likely to change from time to time resulting in broken links and leaving "
+"your arguments in an incomplete state."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:96
+msgid ""
+"Besides, people who read the manual offline will not have the chance to "
+"follow those links."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:98
+msgid ""
+"_* /{Avoid branding and things that violate the license under which the "
+"manual is published}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:100
+msgid ""
+"Try to avoid branding as much as possible. Keep in mind that other "
+"downstream projects might make use of the documentation you write. So you "
+"are complicating things for them if you add certain specific material."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:102
+msgid ""
+"live-manual is licensed under the GNU GPL. This has a number of implications "
+"that apply to the distribution of the material (of any kind, including "
+"copyrighted graphics or logos) that is published with it."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:104
+msgid "_* /{Write a first draft, revise, edit, improve, redo if necessary}/"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:106
+msgid ""
+"Brainstorm!. You need to organize your ideas first in a logical sequence of "
+"events."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:108
+msgid ""
+"Once you have somehow organized those ideas in your mind write a first draft."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:110
+msgid "Revise grammar, syntax and spelling."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:112
+msgid "Improve your statements and redo any part if necessary."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:114
+msgid "_* /{Chapters}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:116
+msgid ""
+"Use the conventional numbering system for chapters and subtitles. e.g. 1, "
+"1.1, 1.1.1, 1.1.2 ... 1.2, 1.2.1, 1.2.2 ... 2, 2.1 ... and so on. See markup "
+"below."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:118
+msgid ""
+"If you have to enumerate a series of steps or stages in your description, "
+"you can also use ordinal numbers: First, second, third ... or First, Then, "
+"After that, Finally ... Alternatively you can use bulleted items."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:120 en/style_guide.ssi:214
+msgid "_* /{Markup}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:122
+msgid ""
+"And last but not least, live-manual uses {SiSU}http://www.sisudoc.org to "
+"process the text files and produce a multiple format output. It is "
+"recommended to take a look at {SiSU's manual}http://www.sisudoc.org/sisu/"
+"sisu_manual/markup.html to get familiar with its markup, or else type:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:126
+#, no-wrap
+msgid " $ sisu --help markup\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:130
+msgid "Here are some markup examples that may prove useful:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:132
+msgid "For emphasis/bold text:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:136
+#, no-wrap
+msgid "*{foo}* or !{foo}!\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:140
+msgid "produces: *{foo}* or !{foo}!. Use it to emphasize certain key words."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:142
+msgid "For italics:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:146
+msgid "/{foo}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:150
+msgid "produces: /{foo}/. Use them e.g. for the names of debian packages."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:152
+msgid "For monospace:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:156
+msgid "#{foo}#"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:160
+msgid ""
+"produces: #{foo}#. Use it e.g. for the names of commands. And also to "
+"highlight some key words or things like paths."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:162
+msgid "For code blocks:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:166
+#, no-wrap
+msgid " code{\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:169
+#, no-wrap
+msgid ""
+" $ foo\n"
+" # bar\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:171
+#, no-wrap
+msgid " }code\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:175
+msgid "produces:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:180
+#, no-wrap
+msgid ""
+" $ foo\n"
+" # bar\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:184
+msgid ""
+"Use #{code{}# to open and #{}code}# to close the tags. It is important to "
+"remember to leave a space at the beginning of each line of code."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:186
+msgid "2~ Guidelines for translators"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:188
+msgid ""
+"This section deals with some general considerations to be taken into account "
+"when translating the contents of live-manual."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:190
+msgid ""
+"As a general recommendation, translators should have read and understood the "
+"translation rules that apply to their specific languages. Usually, "
+"translation groups and mailing lists provide information on how to produce "
+"translated work that complies with Debian quality standards."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:192
+#, no-wrap
+msgid "*{Note:}* Translators should also read {Contributing to this document}#how-to-contribute. In particular the section {Translation}#translation\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:194
+msgid "3~ Translation hints"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:196
+msgid "_* /{Comments}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:198
+msgid ""
+"The role of the translator is to convey as faithfully as possible the "
+"meaning of words, sentences, paragraphs and texts as written by the original "
+"authors into their target language."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:200
+msgid ""
+"So they should refrain from adding personal comments or extra bits of "
+"information of their own. If they want to add a comment for other "
+"translators working on the same documents, they can leave it in the space "
+"reserved for that. That is, the header of the strings in the *{po}* files "
+"preceded by a number sign *{#}*. Most graphical translation programs can "
+"automatically handle those types of comments."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:202
+msgid "_* /{TN, Translator's Note}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:204
+msgid ""
+"It is perfectly acceptable however, to include a word or an expression in "
+"brackets in the translated text if, and only if, that makes the meaning of a "
+"difficult word or expression clearer to the reader. Inside the brackets the "
+"translator should make evident that the addition was theirs using the "
+"abbreviation \"TN\" or \"Translator's Note\"."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:206
+msgid "_* /{Impersonal sentences}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:208
+msgid ""
+"Documents written in English make an extensive use of the impersonal form "
+"\"you\". In some other languages that do not share this characteristic, this "
+"might give the false impression that the original texts are directly "
+"addressing the reader when they are actually not doing so. Translators must "
+"be aware of that fact and reflect it in their language as accurately as "
+"possible."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:210
+msgid "_* /{False friends}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:212
+msgid ""
+"The trap of \"false friends\" explained before especially applies to "
+"translators. Double check the meaning of suspicious false friends if in "
+"doubt."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:216
+msgid ""
+"Translators working initially with *{pot}* files and later on with *{po}* "
+"files will find many markup features in the strings. They can translate the "
+"text anyway, as long as it is translatable, but it is extremely important "
+"that they use exactly the same markup as the original English version."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:218
+msgid "_* /{Code blocks}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:220
+msgid ""
+"Some translators decide to include the code blocks in the translated files "
+"because it is easier for them to identify what has already been translated "
+"and what has not by looking at the percentages if they use a graphical "
+"translation program."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:222
+msgid ""
+"Include the code blocks if you want to score a 100% complete translation."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:224
+msgid ""
+"On the other hand some translators prefer to leave the code blocks "
+"\"untranslated\" (i.e. not including them). This makes the translation "
+"easier to maintain once finished because it does not require translators "
+"intervention if the code changes."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:226
+msgid ""
+"Leave the code blocks empty (they will be automatically added then) if you "
+"want to make your translation easier to maintain."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:228
+msgid "_* /{New lines}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:230
+msgid ""
+"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."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:232
+msgid ""
+"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."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:234
+msgid "_* /{Untranslatable strings}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:236
+msgid "Translators should never translate:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:238
+msgid "The code names of releases"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:240
+msgid "The names of programs"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:242
+msgid "The commands given as examples"
+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."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:246
+msgid "Links"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:247
+msgid "Paths"
+msgstr ""
diff --git a/manual/po/pt_BR/user_customization-binary.ssi.po b/manual/po/pt_BR/user_customization-binary.ssi.po
index 7967ad3..2da678b 100644
--- a/manual/po/pt_BR/user_customization-binary.ssi.po
+++ b/manual/po/pt_BR/user_customization-binary.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-15 20:48+0100\n"
+"POT-Creation-Date: 2012-02-25 21:42+0100\n"
"PO-Revision-Date: 2010-11-30 11:20+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,23 +18,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -84,23 +86,25 @@ 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/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/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/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/user_customization-installer.ssi:38
@@ -166,36 +170,70 @@ msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:8
msgid ""
-"live-build uses syslinux and some of its derivatives (depending on the image "
-"type) as bootloaders by default. You can easily modify their options using "
-"different methods, like {includes}#includes or {hooks}#hooks."
+"live-build uses /{syslinux}/ and some of its derivatives (depending on the "
+"image type) as bootloaders by default. You can easily customize them in a "
+"number of ways that range from providing a full theme to changing the boot "
+"timeout or simply adding a personalized splash image. Some of the following "
+"examples of customization make use of different methods, like {includes}"
+"#includes or {hooks}#hooks."
msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:10
msgid ""
-"For example, these derivatives are configured by default with a timeout of 0 "
-"(zero) which means that they will pause indefinitely at their splash screen "
-"until you press a key."
+"If you want to use a full theme you can specify the #{--syslinux-theme}# "
+"option (see man #{lb_config}#). live-build will then retrieve the theme from "
+"the mirror and install it."
msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:12
msgid ""
+"Imagine that you want to build a progress client but you prefer to include "
+"the server's theme because you want to have the help menu. Then you would "
+"launch #{lb config}# as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:16
+#, no-wrap
+msgid " $ lb config --mode progress --syslinux-theme progress-server\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:20
+msgid ""
+"You can also create your own theme or modify an already existing one and if "
+"you do not have a mirror, you can add the package to #{config/packages."
+"chroot}#. In this case it is not necessary to specify any option."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:22
+msgid ""
+"There is also the possibility of making smaller changes. For instance, "
+"syslinux derivatives are configured by default with a timeout of 0 (zero) "
+"which means that they will pause indefinitely at their splash screen until "
+"you press a key."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:24
+msgid ""
"To modify the boot timeout of a default #{iso-hybrid}# image you can edit a "
"default *{isolinux.cfg}* file specifying the timeout in units of seconds and "
"add it to #{config/includes.binary/isolinux/}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:26
msgid ""
"A modified *{isolinux.cfg}* to boot after five seconds would be similar to "
"this:"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:21
+#: en/user_customization-binary.ssi:33
#, no-wrap
msgid ""
" include menu.cfg\n"
@@ -205,7 +243,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:25
+#: en/user_customization-binary.ssi:37
msgid ""
"An alternative way of achieving the same goal could be writing a hook and "
"adding it to #{config/hooks/}# Remember to add the #{.binary}# suffix to run "
@@ -213,29 +251,31 @@ msgid ""
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 ""
#. type: Plain text
-#: en/user_customization-binary.ssi:31
+#: en/user_customization-binary.ssi:43
#, no-wrap
msgid " sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:35
-msgid "For more information please see man syslinux(1)."
+#: en/user_customization-binary.ssi:47
+msgid ""
+"Likewise, if you want to use a personalized splash.png image you can add a "
+"picture of 640x480 pixels to #{config/includes.binary/isolinux/}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:37
+#: en/user_customization-binary.ssi:49
msgid "2~ ISO metadata"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:39
+#: en/user_customization-binary.ssi:51
msgid ""
"When creating an ISO9660 binary image, you can use the following options to "
"add various textual metadata for your image. This can help you easily "
@@ -243,7 +283,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:41
+#: en/user_customization-binary.ssi:53
msgid ""
"_* #{LB_ISO_APPLICATION/--iso-application NAME}#: This should describe the "
"application that will be on the image. The maximum length for this field is "
@@ -251,7 +291,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:43
+#: en/user_customization-binary.ssi:55
msgid ""
"_* #{LB_ISO_PREPARER/--iso-preparer NAME}#: This should describe the "
"preparer of the image, usually with some contact details. The default for "
@@ -260,7 +300,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:45
+#: en/user_customization-binary.ssi:57
msgid ""
"_* #{LB_ISO_PUBLISHER/--iso-publisher NAME}#: This should describe the "
"publisher of the image, usually with some contact details. The maximum "
@@ -268,7 +308,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:46
+#: en/user_customization-binary.ssi:58
msgid ""
"_* #{LB_ISO_VOLUME/--iso-volume NAME}#: This should specify the volume ID of "
"the image. This is used as a user-visible label on some platforms such as "
diff --git a/manual/po/pt_BR/user_customization-installer.ssi.po b/manual/po/pt_BR/user_customization-installer.ssi.po
index ee1681c..ef1b05f 100644
--- a/manual/po/pt_BR/user_customization-installer.ssi.po
+++ b/manual/po/pt_BR/user_customization-installer.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 21:19-0400\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
"PO-Revision-Date: 2010-11-30 10:53+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,22 +18,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -77,28 +80,31 @@ msgstr ""
#: 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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -141,8 +147,8 @@ msgstr "code{"
#: 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"
@@ -186,7 +192,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-installer.ssi:14
#, no-wrap
-msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a seperate 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"
+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 ""
#. type: Plain text
@@ -258,7 +264,7 @@ msgstr ""
#: en/user_customization-installer.ssi:36
#, no-wrap
msgid ""
-" $ lb config --architecture i386 --linux-flavours 486 \\\n"
+" $ lb config --architectures i386 --linux-flavours 486 \\\n"
" --debian-installer live\n"
" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
msgstr ""
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index 78fff44..5f05987 100644
--- a/manual/po/pt_BR/user_customization-packages.ssi.po
+++ b/manual/po/pt_BR/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-18 18:00-0400\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,23 +18,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -78,29 +80,31 @@ msgstr ""
#: 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/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/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/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/user_customization-installer.ssi:38
@@ -143,8 +147,8 @@ msgstr "code{"
#: 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"
@@ -198,7 +202,7 @@ msgid ""
"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, "
+"distribution. For example, to build against the *{unstable}* release, Sid, "
"specify:"
msgstr ""
@@ -252,13 +256,13 @@ msgid ""
"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."
+"{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 ""
#. type: Plain text
@@ -330,9 +334,9 @@ msgid ""
"backports, experimental or custom packages. To configure additional "
"repositories, create #{config/archives/your-repository.list.chroot}#, and/or "
"#{config/archives/your-repository.list.binary}# files. As with the #{--"
-"mirror-*}# options, these govern the repositories used in the *chroot* stage "
-"when building the image, and in the *binary* stage, i.e. for use when "
-"running the live system."
+"mirror-*}# options, these govern the repositories used in the *{chroot}* "
+"stage when building the image, and in the *{binary}* stage, i.e. for use "
+"when running the live system."
msgstr ""
#. type: Plain text
@@ -530,14 +534,14 @@ msgid ""
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
"Generally, this means any #{lb config}# option uppercased and with dashes "
"changed to underscores. But in practice, it is only the ones that influence "
-"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURE}"
+"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURES}"
"# or #{ARCHIVE_AREAS}#."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:138
msgid ""
-"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+"For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
"specified:"
msgstr ""
@@ -545,7 +549,7 @@ msgstr ""
#: en/user_customization-packages.ssi:144
#, no-wrap
msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
" ia32-libs\n"
" #endif\n"
msgstr ""
@@ -554,14 +558,15 @@ msgstr ""
#: en/user_customization-packages.ssi:148
msgid ""
"You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
+"# if either #{--architectures i386}# or #{--architectures amd64}# is "
+"specified:"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:154
#, no-wrap
msgid ""
-" #if ARCHITECTURE i386 amd64\n"
+" #if ARCHITECTURES i386 amd64\n"
" memtest86+\n"
" #endif\n"
msgstr ""
@@ -592,7 +597,7 @@ msgstr ""
#: en/user_customization-packages.ssi:174
#, no-wrap
msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
" #include <gnome-full>\n"
" #endif\n"
msgstr ""
@@ -991,7 +996,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:308
msgid ""
-"If there is not an #{lb config}# option to alter APT's behaviour in the way "
+"If there is not a #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
"options through to your configured APT tool. See the man pages for #{apt}# "
"and #{aptitude}# for details."
diff --git a/manual/po/pt_BR/user_customization-runtime.ssi.po b/manual/po/pt_BR/user_customization-runtime.ssi.po
index 9e46904..257dde9 100644
--- a/manual/po/pt_BR/user_customization-runtime.ssi.po
+++ b/manual/po/pt_BR/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 21:01-0400\n"
+"POT-Creation-Date: 2012-03-24 15:08+0100\n"
"PO-Revision-Date: 2010-11-30 11:40+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,22 +18,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -59,46 +62,50 @@ 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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -124,25 +131,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"
@@ -215,7 +223,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:29
-msgid "$ lb config --bootappend-live \"username=live-user\""
+#, no-wrap
+msgid " $ lb config --bootappend-live \"username=live-user\"\n"
msgstr ""
#. type: Plain text
@@ -377,7 +386,7 @@ msgstr ""
#: en/user_customization-runtime.ssi:98
msgid ""
"The data stored on this ramdisk should be saved on a writable persistent "
-"medium like a Hard Disk, a USB key, a network share or even a session of a "
+"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}#."
@@ -385,130 +394,221 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:100
-msgid "3~ Full persistence"
+msgid ""
+"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:"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:102
+msgid "_* a partition, identified by its GPT name."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:104
+msgid "_* a filesystem, identified by its filesystem label."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:106
+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\"."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:108
+msgid ""
+"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:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:110
+msgid "_* #{full-ov}# for full persistent overlays."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:112
+msgid "_* #{custom-ov}# for custom overlays."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:114
+msgid "_* #{live-sn}# for full system snapshots."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:116
+msgid "_* #{home-sn}# for /home snapshots."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:118
+msgid "3~ Full persistent overlays"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:120
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 "
-"writable partition is used. In order to use this feature a partition with a "
-"clean writable supported filesystem on it labeled \"live-rw\" must be "
-"attached on the system at boot time and the system must be started with the "
-"boot parameter 'persistent'. This partition could be an ext2 partition on "
-"the hard disk or on a usb key created with, e.g.:"
+"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.:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:124
#, no-wrap
-msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
+msgid " # mkfs.ext2 -L full-ov /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:128
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:112
+#: en/user_customization-runtime.ssi:130
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:116
+#: en/user_customization-runtime.ssi:134
#, no-wrap
-msgid " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
+msgid " $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:120
+#: en/user_customization-runtime.ssi:138
msgid ""
-"But since live system users cannot always use a hard drive partition, and "
-"considering that most USB keys have poor write speeds, 'full' persistence "
-"could be also used with just image files, so you could create a file "
-"representing a partition and put this image file even on a NTFS partition of "
-"a foreign OS, with something like:"
+"Here's an example of how to create an ext2-based image file used for full "
+"persistence:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:125
+#: en/user_customization-runtime.ssi:143
#, no-wrap
msgid ""
-" $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
-" $ /sbin/mkfs.ext2 -F live-rw\n"
+" $ 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"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:129
+#: en/user_customization-runtime.ssi:147
msgid ""
-"Then copy the #{live-rw}# file to a writable partition and reboot with the "
-"boot parameter 'persistent'."
+"Then copy the #{full-ov}# file to the root of a writable partition and "
+"reboot."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:149
+msgid "3~ Custom overlays"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:131
-msgid "3~ Home automounting"
+#: 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."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:153
msgid ""
-"If during the boot a partition (filesystem) image file or a partition "
-"labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
-"as #{/home}#, thus permitting persistence of files that belong to e.g. the "
-"default user. It can be combined with full persistence."
+"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:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:135
+#: 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"
+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 ""
+
+#. 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 "
+"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 ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:168
msgid "3~ Snapshots"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:137
+#: 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 device to the system "
+"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 "
-"content of a snapshot could reside on a partition or an image file (like the "
-"above mentioned types) labeled #{live-sn}#, but it defaults to a simple cpio "
-"archive named #{live-sn.cpio.gz}#. As above, at boot time, the block devices "
-"connected to the system are traversed to see if a partition or a file named "
-"like that could be found. A power interruption during run time could lead to "
-"data loss, hence a tool invoked #{live-snapshot --refresh}# could be called "
-"to sync important changes. 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."
+"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:139
+#: en/user_customization-runtime.ssi:172
msgid ""
"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:141
-msgid ""
-"Snapshots cannot currently handle file deletion but full persistence and "
-"home automounting can."
+#: en/user_customization-runtime.ssi:174
+msgid "Snapshots cannot currently handle file deletion."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:176
msgid "3~ Persistent SubText"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:145
+#: en/user_customization-runtime.ssi:178
msgid ""
"If a user would need multiple persistent storage of the same type for "
-"different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
+"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 "
@@ -517,12 +617,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:147
+#: en/user_customization-runtime.ssi:180
msgid "3~ Partial remastering"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:148
+#: en/user_customization-runtime.ssi:181
msgid ""
"The run-time modification of the tmpfs could be collected using live-"
"snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/po/pt_BR/user_examples.ssi.po b/manual/po/pt_BR/user_examples.ssi.po
index fc4ec25..f3f1f51 100644
--- a/manual/po/pt_BR/user_examples.ssi.po
+++ b/manual/po/pt_BR/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-18 18:00-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -23,25 +23,27 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: 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/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/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: 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/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,25 +91,27 @@ 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/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/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/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: 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/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
@@ -376,7 +380,7 @@ msgstr ""
#, no-wrap
msgid ""
" lb config noauto \\\n"
-" --architecture i386 \\\n"
+" --architectures i386 \\\n"
" --linux-flavours 686-pae \\\n"
" --package-lists lxde \\\n"
" \"${@}\"\n"
@@ -396,7 +400,7 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:113
msgid ""
-"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
+"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 "
diff --git a/manual/po/pt_BR/user_installation.ssi.po b/manual/po/pt_BR/user_installation.ssi.po
index eaa54fd..db27275 100644
--- a/manual/po/pt_BR/user_installation.ssi.po
+++ b/manual/po/pt_BR/user_installation.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 17:40-0400\n"
+"POT-Creation-Date: 2012-03-31 16:32+0300\n"
"PO-Revision-Date: 2010-10-16 20:36-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,22 +18,26 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -56,49 +60,54 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 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: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: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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -120,29 +129,30 @@ msgstr "code{"
#: en/user_customization-packages.ssi:302
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 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-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: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"
@@ -352,7 +362,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:102
#, no-wrap
-msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the live-boot-doc and live-config-doc packages separately.\n"
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the /{live-boot-doc}/ and /{live-config-doc}/ packages separately.\n"
msgstr ""
#. type: Plain text
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 9b761b5..3f3b09c 100644
--- a/manual/po/pt_BR/user_managing_a_configuration.ssi.po
+++ b/manual/po/pt_BR/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-02 12:23-0200\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
"PO-Revision-Date: 2010-10-13 17:00+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,22 +18,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -42,33 +45,33 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
#: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:204
-#: 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:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi: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:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: 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
@@ -77,28 +80,31 @@ msgstr ""
#: 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/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/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/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/user_customization-installer.ssi:38
@@ -107,33 +113,33 @@ msgstr "code{"
#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:208
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: 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: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:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: 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
@@ -141,8 +147,8 @@ msgstr "code{"
#: 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"
@@ -207,7 +213,7 @@ msgid ""
"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 #{lb config}# and #{lb clean}#, these "
+"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 "
diff --git a/manual/po/pt_BR/user_overview.ssi.po b/manual/po/pt_BR/user_overview.ssi.po
index bef20fc..d52e9cb 100644
--- a/manual/po/pt_BR/user_overview.ssi.po
+++ b/manual/po/pt_BR/user_overview.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 08:16-0400\n"
+"POT-Creation-Date: 2012-03-19 18:09+0100\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,22 +18,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -56,11 +59,11 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.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: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
@@ -77,28 +80,31 @@ msgstr ""
#: 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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -120,12 +126,12 @@ msgstr "code{"
#: en/user_customization-packages.ssi:302
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: 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: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
@@ -141,8 +147,8 @@ msgstr "code{"
#: 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"
@@ -268,16 +274,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:40
+#: en/user_overview.ssi:41
#, no-wrap
msgid ""
" $ lb config\n"
+" [2012-03-19 15:17:14] lb_config\n"
" P: Considering defaults defined in /etc/live/build.conf\n"
-" P: Creating config tree\n"
+" P: Creating config tree for a debian system\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:44
+#: en/user_overview.ssi:45
msgid ""
"Using #{lb config}# without any arguments would be suitable for users who "
"need a very basic image, or who intend to later provide a more complete "
@@ -286,41 +293,41 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:46
+#: en/user_overview.ssi:47
msgid ""
"Normally, you will want to specify some options. For example, to include the "
"'gnome' package list in your configuration:"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:50
+#: en/user_overview.ssi:51
#, no-wrap
msgid " $ lb config -p gnome\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:54
+#: en/user_overview.ssi:55
msgid "It is possible to specify many options, such as:"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:58
+#: en/user_overview.ssi:59
#, no-wrap
-msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
+msgid " $ lb config --binary-images net --bootappend-live \"hostname=live-machine username=live-user\" ...\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:62
+#: en/user_overview.ssi:63
msgid "A full list of options is available in the #{lb_config}# man page."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:64
+#: en/user_overview.ssi:65
msgid "3~lb-build The #{lb build}# command"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:66
+#: en/user_overview.ssi:67
msgid ""
"The #{lb build}# command reads in your configuration from the #{config/}# "
"directory. It then runs the lower level commands needed to build your Live "
@@ -328,12 +335,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:68
+#: en/user_overview.ssi:69
msgid "3~lb-clean The #{lb clean}# command"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:70
+#: en/user_overview.ssi:71
msgid ""
"It is the job of the #{lb clean}# command to remove various parts of a build "
"so subsequent builds can start from a clean state. By default, #{chroot}#, #"
@@ -345,12 +352,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:72
+#: en/user_overview.ssi:73
msgid "2~live-boot The live-boot package"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:74
+#: en/user_overview.ssi:75
msgid ""
"live-boot is a collection of scripts providing hooks for the initramfs-"
"tools, used to generate an initramfs capable of booting live systems, such "
@@ -359,7 +366,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:76
+#: en/user_overview.ssi:77
msgid ""
"At boot time it will look for read-only media containing a #{/live/}# "
"directory where a root filesystem (often a compressed filesystem image like "
@@ -368,7 +375,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:78
+#: en/user_overview.ssi:79
msgid ""
"More information on initial ramfs in Debian can be found in the Debian Linux "
"Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
@@ -376,12 +383,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:80
+#: en/user_overview.ssi:81
msgid "2~live-config The live-config package"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:81
+#: en/user_overview.ssi:82
msgid ""
"live-config consists of the scripts that run at boot time after live-boot to "
"configure the live system automatically. It handles such tasks as setting "
diff --git a/manual/po/ro/about_manual.ssi.po b/manual/po/ro/about_manual.ssi.po
index 26b3a1c..d511c41 100644
--- a/manual/po/ro/about_manual.ssi.po
+++ b/manual/po/ro/about_manual.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-05 17:13+0100\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"
@@ -27,8 +27,9 @@ msgstr "1~about-manual Despre acest manual"
#. type: Plain text
#: en/about_manual.ssi:6
msgid ""
-"The main goal of this manual is to serve as a single access point to all "
-"documentation related to the Debian Live project. While it is primarily "
+"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, "
@@ -369,15 +370,16 @@ msgstr ""
#: 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/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/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/user_customization-installer.ssi:32
@@ -441,15 +443,16 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: 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/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/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/user_customization-installer.ssi:38
@@ -702,7 +705,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:203
-msgid "3~ Translation"
+msgid "3~translation Translation"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/about_project.ssi.po b/manual/po/ro/about_project.ssi.po
index dbdb2d7..0cbc76b 100644
--- a/manual/po/ro/about_project.ssi.po
+++ b/manual/po/ro/about_project.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 2.0.0\n"
-"POT-Creation-Date: 2011-08-29 08:54-0200\n"
+"POT-Creation-Date: 2012-02-19 22:16+0100\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"
@@ -284,7 +284,7 @@ msgstr ""
"raspuns , folositi mailing list."
#. type: Plain text
-#: en/about_project.ssi:70
+#: 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 "
@@ -295,15 +295,3 @@ msgstr ""
"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."
-
-#. type: Plain text
-#: en/about_project.ssi:71
-msgid ""
-"_* *{Wiki}*: The Debian Live wiki at http://wiki.debian.org/DebianLive is a "
-"place to gather information, discuss applied technologies, and document "
-"frameworks of Debian Live systems that go beyond the scope of this document."
-msgstr ""
-"_* *{Wiki}*: Debian Live are un wiki la http://wiki.debian.org/DebianLive , "
-"si este locul unde pot fi gasite diferite informatii, se discuta modul de "
-"aplicare de tehnologii, sau sunt documentate alte lucrari legate de debian "
-"live si care pot depasi cadrul acestui document."
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index 011c22d..f54a60c 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-06 18:57+0100\n"
+"POT-Creation-Date: 2012-04-03 00:19+0300\n"
"PO-Revision-Date: 2010-10-23 00:04+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -46,7 +46,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-02-06\n"
+" :published: 2012-04-03\n"
msgstr ""
#. type: Plain text
@@ -166,6 +166,16 @@ msgid ":B~ Examples"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:62
+#: en/live-manual.ssm:63
msgid "<< user_examples.ssi"
msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:65 en/style_guide.ssi:2
+msgid ":B~ Appendix"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:66
+msgid "<< style_guide.ssi"
+msgstr ""
diff --git a/manual/po/ro/project_coding-style.ssi.po b/manual/po/ro/project_coding-style.ssi.po
index 07c0410..a8657c8 100644
--- a/manual/po/ro/project_coding-style.ssi.po
+++ b/manual/po/ro/project_coding-style.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-01-20 16:58-0400\n"
+"POT-Creation-Date: 2012-03-31 16:32+0300\n"
"PO-Revision-Date: 2010-11-30 11:05+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,129 +19,141 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi: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/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/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/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/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/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/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/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/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/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: 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"
@@ -367,7 +379,7 @@ msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:132
msgid ""
-"_* Use \"#{|}#\" (without the surround quotes) as a seperator in calls to "
+"_* Use \"#{|}#\" (without the surround quotes) as a separator in calls to "
"sed, e.g. \"#{sed -e 's|foo|bar|'}#\" (without \"\")."
msgstr ""
diff --git a/manual/po/ro/style_guide.ssi.po b/manual/po/ro/style_guide.ssi.po
new file mode 100644
index 0000000..649aead
--- /dev/null
+++ b/manual/po/ro/style_guide.ssi.po
@@ -0,0 +1,895 @@
+# 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"
+"PO-Revision-Date: 2012-02-11 16:42+0100\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\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=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
+
+#. type: Plain text
+#: en/live-manual.ssm:65 en/style_guide.ssi:2
+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/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
+#: 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: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: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/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
+#: 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: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
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/style_guide.ssi:4
+msgid "1~style-guide Style guide"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:6
+msgid "2~ Guidelines for authors"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:8
+msgid ""
+"This section deals with some general considerations to be taken into account "
+"when writing technical documentation for live-manual. They are divided into "
+"linguistic features and recommended procedures."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:10
+#, no-wrap
+msgid "*{Note:}* Authors should first read {Contributing to this document}#how-to-contribute\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:12
+msgid "3~ Linguistic features"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:14
+msgid "_* /{Use plain English}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:16
+msgid ""
+"Keep in mind that a high percentage of your readers are not native speakers. "
+"So as a general rule try to use short, meaningful sentences, followed by a "
+"full stop."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:18
+msgid ""
+"This does not mean that you have to use a simplistic, naive style. It is a "
+"suggestion to try to avoid, as much as possible, complex subordinate "
+"sentences that make the text difficult to understand for non-native speakers."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:20
+msgid "_* /{Variety of English}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:22
+msgid ""
+"The most widely spread varieties of English are British and American so it "
+"is very likely that most authors will use either one or the other. In a "
+"collaborative environment, the ideal variety would be \"International English"
+"\" but it is very difficult, not to say impossible, to decide on which "
+"variety among all the existing ones, is the best to use."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:24
+msgid ""
+"We expect that different varieties may mix without creating "
+"misunderstandings but in general terms you should try to be coherent and "
+"before deciding on using British, American or any other English flavour at "
+"your discretion, please take a look at how other people write and try to "
+"imitate them."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:26
+msgid "_* /{Be balanced}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:28
+msgid ""
+"Do not be biased. Avoid including references to ideologies completely "
+"unrelated to live-manual. Technical writing should be as neutral as "
+"possible. It is in the very nature of scientific writing."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:30
+msgid "_* /{Be politically correct}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:32
+msgid ""
+"Try to avoid sexist language as much as possible. If you need to make "
+"references to the third person singular preferably use \"they\" rather than "
+"\"he\" or \"she\" or awkward inventions such as \"s/he\", \"s(he)\" and the "
+"like."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:34
+msgid "_* /{Be concise}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:36
+msgid ""
+"Go straight to the point and do not wander around aimlessly. Give as much "
+"information as necessary but do not give more information than necessary, "
+"this is to say, do not explain unnecessary details. Your readers are "
+"intelligent. Presume some previous knowledge on their part."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:38
+msgid "_* /{Minimize translation work}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:40
+msgid ""
+"Keep in mind that whatever you write will have to be translated into several "
+"other languages. This implies that a number of people will have to do an "
+"extra work if you add useless or redundant information."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:42
+msgid "_* /{Be coherent}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:44
+msgid ""
+"As suggested before, it is almost impossible to standardize a collaborative "
+"document into a perfectly unified whole. However, every effort on your side "
+"to write in a coherent way with the rest of the authors will be appreciated."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:46
+msgid "_* /{Be cohesive}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:48
+msgid ""
+"Use as many text-forming devices as necessary to make your text cohesive and "
+"unambiguous. (Text-forming devices are linguistic markers such as "
+"connectors)."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:50
+msgid "_* /{Be descriptive}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:52
+msgid ""
+"It is preferable to describe the point in one or several paragraphs than "
+"merely using a number of sentences in a typical \"changelog\" style. "
+"Describe it! Your readers will appreciate it."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:54
+msgid "_* /{Dictionary}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:56
+msgid ""
+"Look up the meaning of words in a dictionary or encyclopedia if you do not "
+"know how to express certain concepts in English. But keep in mind that a "
+"dictionary can either be your best friend or can turn into your worst enemy "
+"if you do not know how to use it correctly."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:58
+msgid ""
+"English has the largest vocabulary that exists (With over one million "
+"words). Many of these words are borrowings from other languages. When "
+"looking up the meaning of words in a bilingual dictionary the tendency of a "
+"non-native speaker is to choose the one that sounds more similar in their "
+"mother tongue. This often turns into an excessively formal discourse which "
+"does not sound quite natural in English."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:60
+msgid ""
+"As a general rule, if a concept can be expressed using different synonyms, "
+"it is a good advice to choose the first word proposed by the dictionary. If "
+"in doubt, choosing words of Germanic origin (Usually monosyllabic words) is "
+"often the right thing to do. Be warned that these two techniques might "
+"produce a rather informal discourse but at least your choice of words will "
+"be of wide use and generally accepted."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:62
+msgid ""
+"Using a dictionary of collocations is recommended. They are extremely "
+"helpful when it comes to know which words usually occur together."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:64
+msgid ""
+"Again it is a good practice to learn from the work of others. Using a search "
+"engine to check how other authors use certain expressions may help a lot."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:66
+msgid "_* /{False friends, idioms and other idiomatic expressions}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:68
+msgid ""
+"Watch out for false friends. No matter how proficient you are in a foreign "
+"language you cannot help falling from time to time in the trap of the so "
+"called \"false friends\", words that look similar in two languages but whose "
+"meanings or uses might be completely different."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:70
+msgid ""
+"Try to avoid idioms as much as possible. \"Idioms\" are expressions that may "
+"convey a completely different meaning from what their individual words seem "
+"to mean. Sometimes, idioms are difficult to understand even for native "
+"speakers!"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:72
+msgid "_* /{Avoid slang, abbreviations, contractions...}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:74
+msgid ""
+"Even though you are encouraged to use plain, everyday English, technical "
+"writing belongs to the formal register of the language."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:76
+msgid ""
+"Try to avoid slang, unusual abbreviations that are difficult to understand "
+"and above all contractions that try to imitate the spoken language. Not to "
+"mention typical irc and family friendly expressions."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:78
+msgid "3~ Procedures"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:80
+msgid "_* /{Test before write}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:82
+msgid ""
+"It is important that authors test their examples before adding them to live-"
+"manual to ensure that everything works as described. Testing on a clean "
+"chroot or VM can be a good starting point. Besides, it would be ideal if the "
+"tests were then carried out on different machines with different hardware to "
+"spot possible problems that may arise."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:84
+msgid "_* /{Examples}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:86
+msgid ""
+"When providing an example try to be as specific as you can. An example is, "
+"after all, just an example."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:88
+msgid ""
+"It is often better to use a line that only applies to an specific case than "
+"using abstractions that may confuse your readers. In this case you can "
+"provide a brief explanation of the effects of the proposed example."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:90
+msgid ""
+"There may be some exceptions when the example suggests using some "
+"potentially dangerous commands that, if misused, may cause data loss or "
+"other similar undesirable effects. In this case you should provide a "
+"thorough explanation of the possible side effects."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:92
+msgid "_* /{External links}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:94
+msgid ""
+"Links to external sites should only be used when the information on those "
+"sites is crucial when it comes to understanding a special point. Even so, "
+"try to use links to external sites as sparsely as possible. Internet links "
+"are likely to change from time to time resulting in broken links and leaving "
+"your arguments in an incomplete state."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:96
+msgid ""
+"Besides, people who read the manual offline will not have the chance to "
+"follow those links."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:98
+msgid ""
+"_* /{Avoid branding and things that violate the license under which the "
+"manual is published}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:100
+msgid ""
+"Try to avoid branding as much as possible. Keep in mind that other "
+"downstream projects might make use of the documentation you write. So you "
+"are complicating things for them if you add certain specific material."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:102
+msgid ""
+"live-manual is licensed under the GNU GPL. This has a number of implications "
+"that apply to the distribution of the material (of any kind, including "
+"copyrighted graphics or logos) that is published with it."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:104
+msgid "_* /{Write a first draft, revise, edit, improve, redo if necessary}/"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:106
+msgid ""
+"Brainstorm!. You need to organize your ideas first in a logical sequence of "
+"events."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:108
+msgid ""
+"Once you have somehow organized those ideas in your mind write a first draft."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:110
+msgid "Revise grammar, syntax and spelling."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:112
+msgid "Improve your statements and redo any part if necessary."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:114
+msgid "_* /{Chapters}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:116
+msgid ""
+"Use the conventional numbering system for chapters and subtitles. e.g. 1, "
+"1.1, 1.1.1, 1.1.2 ... 1.2, 1.2.1, 1.2.2 ... 2, 2.1 ... and so on. See markup "
+"below."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:118
+msgid ""
+"If you have to enumerate a series of steps or stages in your description, "
+"you can also use ordinal numbers: First, second, third ... or First, Then, "
+"After that, Finally ... Alternatively you can use bulleted items."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:120 en/style_guide.ssi:214
+msgid "_* /{Markup}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:122
+msgid ""
+"And last but not least, live-manual uses {SiSU}http://www.sisudoc.org to "
+"process the text files and produce a multiple format output. It is "
+"recommended to take a look at {SiSU's manual}http://www.sisudoc.org/sisu/"
+"sisu_manual/markup.html to get familiar with its markup, or else type:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:126
+#, no-wrap
+msgid " $ sisu --help markup\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:130
+msgid "Here are some markup examples that may prove useful:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:132
+msgid "For emphasis/bold text:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:136
+#, no-wrap
+msgid "*{foo}* or !{foo}!\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:140
+msgid "produces: *{foo}* or !{foo}!. Use it to emphasize certain key words."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:142
+msgid "For italics:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:146
+msgid "/{foo}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:150
+msgid "produces: /{foo}/. Use them e.g. for the names of debian packages."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:152
+msgid "For monospace:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:156
+msgid "#{foo}#"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:160
+msgid ""
+"produces: #{foo}#. Use it e.g. for the names of commands. And also to "
+"highlight some key words or things like paths."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:162
+msgid "For code blocks:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:166
+#, no-wrap
+msgid " code{\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:169
+#, no-wrap
+msgid ""
+" $ foo\n"
+" # bar\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:171
+#, no-wrap
+msgid " }code\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:175
+msgid "produces:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:180
+#, no-wrap
+msgid ""
+" $ foo\n"
+" # bar\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:184
+msgid ""
+"Use #{code{}# to open and #{}code}# to close the tags. It is important to "
+"remember to leave a space at the beginning of each line of code."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:186
+msgid "2~ Guidelines for translators"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:188
+msgid ""
+"This section deals with some general considerations to be taken into account "
+"when translating the contents of live-manual."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:190
+msgid ""
+"As a general recommendation, translators should have read and understood the "
+"translation rules that apply to their specific languages. Usually, "
+"translation groups and mailing lists provide information on how to produce "
+"translated work that complies with Debian quality standards."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:192
+#, no-wrap
+msgid "*{Note:}* Translators should also read {Contributing to this document}#how-to-contribute. In particular the section {Translation}#translation\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:194
+msgid "3~ Translation hints"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:196
+msgid "_* /{Comments}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:198
+msgid ""
+"The role of the translator is to convey as faithfully as possible the "
+"meaning of words, sentences, paragraphs and texts as written by the original "
+"authors into their target language."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:200
+msgid ""
+"So they should refrain from adding personal comments or extra bits of "
+"information of their own. If they want to add a comment for other "
+"translators working on the same documents, they can leave it in the space "
+"reserved for that. That is, the header of the strings in the *{po}* files "
+"preceded by a number sign *{#}*. Most graphical translation programs can "
+"automatically handle those types of comments."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:202
+msgid "_* /{TN, Translator's Note}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:204
+msgid ""
+"It is perfectly acceptable however, to include a word or an expression in "
+"brackets in the translated text if, and only if, that makes the meaning of a "
+"difficult word or expression clearer to the reader. Inside the brackets the "
+"translator should make evident that the addition was theirs using the "
+"abbreviation \"TN\" or \"Translator's Note\"."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:206
+msgid "_* /{Impersonal sentences}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:208
+msgid ""
+"Documents written in English make an extensive use of the impersonal form "
+"\"you\". In some other languages that do not share this characteristic, this "
+"might give the false impression that the original texts are directly "
+"addressing the reader when they are actually not doing so. Translators must "
+"be aware of that fact and reflect it in their language as accurately as "
+"possible."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:210
+msgid "_* /{False friends}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:212
+msgid ""
+"The trap of \"false friends\" explained before especially applies to "
+"translators. Double check the meaning of suspicious false friends if in "
+"doubt."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:216
+msgid ""
+"Translators working initially with *{pot}* files and later on with *{po}* "
+"files will find many markup features in the strings. They can translate the "
+"text anyway, as long as it is translatable, but it is extremely important "
+"that they use exactly the same markup as the original English version."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:218
+msgid "_* /{Code blocks}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:220
+msgid ""
+"Some translators decide to include the code blocks in the translated files "
+"because it is easier for them to identify what has already been translated "
+"and what has not by looking at the percentages if they use a graphical "
+"translation program."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:222
+msgid ""
+"Include the code blocks if you want to score a 100% complete translation."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:224
+msgid ""
+"On the other hand some translators prefer to leave the code blocks "
+"\"untranslated\" (i.e. not including them). This makes the translation "
+"easier to maintain once finished because it does not require translators "
+"intervention if the code changes."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:226
+msgid ""
+"Leave the code blocks empty (they will be automatically added then) if you "
+"want to make your translation easier to maintain."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:228
+msgid "_* /{New lines}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:230
+msgid ""
+"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."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:232
+msgid ""
+"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."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:234
+msgid "_* /{Untranslatable strings}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:236
+msgid "Translators should never translate:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:238
+msgid "The code names of releases"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:240
+msgid "The names of programs"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:242
+msgid "The commands given as examples"
+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."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:246
+msgid "Links"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:247
+msgid "Paths"
+msgstr ""
diff --git a/manual/po/ro/user_customization-binary.ssi.po b/manual/po/ro/user_customization-binary.ssi.po
index 5719ce1..0f33aaa 100644
--- a/manual/po/ro/user_customization-binary.ssi.po
+++ b/manual/po/ro/user_customization-binary.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-15 20:48+0100\n"
+"POT-Creation-Date: 2012-02-25 21:42+0100\n"
"PO-Revision-Date: 2010-11-30 11:20+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,23 +19,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -85,23 +87,25 @@ 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/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/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/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/user_customization-installer.ssi:38
@@ -167,36 +171,70 @@ msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:8
msgid ""
-"live-build uses syslinux and some of its derivatives (depending on the image "
-"type) as bootloaders by default. You can easily modify their options using "
-"different methods, like {includes}#includes or {hooks}#hooks."
+"live-build uses /{syslinux}/ and some of its derivatives (depending on the "
+"image type) as bootloaders by default. You can easily customize them in a "
+"number of ways that range from providing a full theme to changing the boot "
+"timeout or simply adding a personalized splash image. Some of the following "
+"examples of customization make use of different methods, like {includes}"
+"#includes or {hooks}#hooks."
msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:10
msgid ""
-"For example, these derivatives are configured by default with a timeout of 0 "
-"(zero) which means that they will pause indefinitely at their splash screen "
-"until you press a key."
+"If you want to use a full theme you can specify the #{--syslinux-theme}# "
+"option (see man #{lb_config}#). live-build will then retrieve the theme from "
+"the mirror and install it."
msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:12
msgid ""
+"Imagine that you want to build a progress client but you prefer to include "
+"the server's theme because you want to have the help menu. Then you would "
+"launch #{lb config}# as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:16
+#, no-wrap
+msgid " $ lb config --mode progress --syslinux-theme progress-server\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:20
+msgid ""
+"You can also create your own theme or modify an already existing one and if "
+"you do not have a mirror, you can add the package to #{config/packages."
+"chroot}#. In this case it is not necessary to specify any option."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:22
+msgid ""
+"There is also the possibility of making smaller changes. For instance, "
+"syslinux derivatives are configured by default with a timeout of 0 (zero) "
+"which means that they will pause indefinitely at their splash screen until "
+"you press a key."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:24
+msgid ""
"To modify the boot timeout of a default #{iso-hybrid}# image you can edit a "
"default *{isolinux.cfg}* file specifying the timeout in units of seconds and "
"add it to #{config/includes.binary/isolinux/}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:26
msgid ""
"A modified *{isolinux.cfg}* to boot after five seconds would be similar to "
"this:"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:21
+#: en/user_customization-binary.ssi:33
#, no-wrap
msgid ""
" include menu.cfg\n"
@@ -206,7 +244,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:25
+#: en/user_customization-binary.ssi:37
msgid ""
"An alternative way of achieving the same goal could be writing a hook and "
"adding it to #{config/hooks/}# Remember to add the #{.binary}# suffix to run "
@@ -214,29 +252,31 @@ msgid ""
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 ""
#. type: Plain text
-#: en/user_customization-binary.ssi:31
+#: en/user_customization-binary.ssi:43
#, no-wrap
msgid " sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:35
-msgid "For more information please see man syslinux(1)."
+#: en/user_customization-binary.ssi:47
+msgid ""
+"Likewise, if you want to use a personalized splash.png image you can add a "
+"picture of 640x480 pixels to #{config/includes.binary/isolinux/}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:37
+#: en/user_customization-binary.ssi:49
msgid "2~ ISO metadata"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:39
+#: en/user_customization-binary.ssi:51
msgid ""
"When creating an ISO9660 binary image, you can use the following options to "
"add various textual metadata for your image. This can help you easily "
@@ -244,7 +284,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:41
+#: en/user_customization-binary.ssi:53
msgid ""
"_* #{LB_ISO_APPLICATION/--iso-application NAME}#: This should describe the "
"application that will be on the image. The maximum length for this field is "
@@ -252,7 +292,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:43
+#: en/user_customization-binary.ssi:55
msgid ""
"_* #{LB_ISO_PREPARER/--iso-preparer NAME}#: This should describe the "
"preparer of the image, usually with some contact details. The default for "
@@ -261,7 +301,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:45
+#: en/user_customization-binary.ssi:57
msgid ""
"_* #{LB_ISO_PUBLISHER/--iso-publisher NAME}#: This should describe the "
"publisher of the image, usually with some contact details. The maximum "
@@ -269,7 +309,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:46
+#: en/user_customization-binary.ssi:58
msgid ""
"_* #{LB_ISO_VOLUME/--iso-volume NAME}#: This should specify the volume ID of "
"the image. This is used as a user-visible label on some platforms such as "
diff --git a/manual/po/ro/user_customization-installer.ssi.po b/manual/po/ro/user_customization-installer.ssi.po
index fb410bf..e60444c 100644
--- a/manual/po/ro/user_customization-installer.ssi.po
+++ b/manual/po/ro/user_customization-installer.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 21:19-0400\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
"PO-Revision-Date: 2010-11-30 10:53+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,22 +19,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -78,28 +81,31 @@ msgstr ""
#: 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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -142,8 +148,8 @@ msgstr "code{"
#: 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"
@@ -187,7 +193,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-installer.ssi:14
#, no-wrap
-msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a seperate 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"
+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 ""
#. type: Plain text
@@ -259,7 +265,7 @@ msgstr ""
#: en/user_customization-installer.ssi:36
#, no-wrap
msgid ""
-" $ lb config --architecture i386 --linux-flavours 486 \\\n"
+" $ lb config --architectures i386 --linux-flavours 486 \\\n"
" --debian-installer live\n"
" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
msgstr ""
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index 841b5b1..c39b866 100644
--- a/manual/po/ro/user_customization-packages.ssi.po
+++ b/manual/po/ro/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-18 18:00-0400\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,23 +19,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -79,29 +81,31 @@ msgstr ""
#: 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/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/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/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/user_customization-installer.ssi:38
@@ -144,8 +148,8 @@ msgstr "code{"
#: 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"
@@ -199,7 +203,7 @@ msgid ""
"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, "
+"distribution. For example, to build against the *{unstable}* release, Sid, "
"specify:"
msgstr ""
@@ -253,13 +257,13 @@ msgid ""
"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."
+"{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 ""
#. type: Plain text
@@ -331,9 +335,9 @@ msgid ""
"backports, experimental or custom packages. To configure additional "
"repositories, create #{config/archives/your-repository.list.chroot}#, and/or "
"#{config/archives/your-repository.list.binary}# files. As with the #{--"
-"mirror-*}# options, these govern the repositories used in the *chroot* stage "
-"when building the image, and in the *binary* stage, i.e. for use when "
-"running the live system."
+"mirror-*}# options, these govern the repositories used in the *{chroot}* "
+"stage when building the image, and in the *{binary}* stage, i.e. for use "
+"when running the live system."
msgstr ""
#. type: Plain text
@@ -531,14 +535,14 @@ msgid ""
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
"Generally, this means any #{lb config}# option uppercased and with dashes "
"changed to underscores. But in practice, it is only the ones that influence "
-"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURE}"
+"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURES}"
"# or #{ARCHIVE_AREAS}#."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:138
msgid ""
-"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+"For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
"specified:"
msgstr ""
@@ -546,7 +550,7 @@ msgstr ""
#: en/user_customization-packages.ssi:144
#, no-wrap
msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
" ia32-libs\n"
" #endif\n"
msgstr ""
@@ -555,14 +559,15 @@ msgstr ""
#: en/user_customization-packages.ssi:148
msgid ""
"You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
+"# if either #{--architectures i386}# or #{--architectures amd64}# is "
+"specified:"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:154
#, no-wrap
msgid ""
-" #if ARCHITECTURE i386 amd64\n"
+" #if ARCHITECTURES i386 amd64\n"
" memtest86+\n"
" #endif\n"
msgstr ""
@@ -593,7 +598,7 @@ msgstr ""
#: en/user_customization-packages.ssi:174
#, no-wrap
msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
" #include <gnome-full>\n"
" #endif\n"
msgstr ""
@@ -992,7 +997,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:308
msgid ""
-"If there is not an #{lb config}# option to alter APT's behaviour in the way "
+"If there is not a #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
"options through to your configured APT tool. See the man pages for #{apt}# "
"and #{aptitude}# for details."
diff --git a/manual/po/ro/user_customization-runtime.ssi.po b/manual/po/ro/user_customization-runtime.ssi.po
index 81415fc..0c6e26f 100644
--- a/manual/po/ro/user_customization-runtime.ssi.po
+++ b/manual/po/ro/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 21:01-0400\n"
+"POT-Creation-Date: 2012-03-24 15:08+0100\n"
"PO-Revision-Date: 2010-11-30 11:40+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,22 +19,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -60,46 +63,50 @@ 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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -125,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"
@@ -216,7 +224,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:29
-msgid "$ lb config --bootappend-live \"username=live-user\""
+#, no-wrap
+msgid " $ lb config --bootappend-live \"username=live-user\"\n"
msgstr ""
#. type: Plain text
@@ -378,7 +387,7 @@ msgstr ""
#: en/user_customization-runtime.ssi:98
msgid ""
"The data stored on this ramdisk should be saved on a writable persistent "
-"medium like a Hard Disk, a USB key, a network share or even a session of a "
+"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}#."
@@ -386,130 +395,221 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:100
-msgid "3~ Full persistence"
+msgid ""
+"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:"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:102
+msgid "_* a partition, identified by its GPT name."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:104
+msgid "_* a filesystem, identified by its filesystem label."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:106
+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\"."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:108
+msgid ""
+"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:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:110
+msgid "_* #{full-ov}# for full persistent overlays."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:112
+msgid "_* #{custom-ov}# for custom overlays."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:114
+msgid "_* #{live-sn}# for full system snapshots."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:116
+msgid "_* #{home-sn}# for /home snapshots."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:118
+msgid "3~ Full persistent overlays"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:120
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 "
-"writable partition is used. In order to use this feature a partition with a "
-"clean writable supported filesystem on it labeled \"live-rw\" must be "
-"attached on the system at boot time and the system must be started with the "
-"boot parameter 'persistent'. This partition could be an ext2 partition on "
-"the hard disk or on a usb key created with, e.g.:"
+"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.:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:124
#, no-wrap
-msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
+msgid " # mkfs.ext2 -L full-ov /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:128
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:112
+#: en/user_customization-runtime.ssi:130
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:116
+#: en/user_customization-runtime.ssi:134
#, no-wrap
-msgid " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
+msgid " $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:120
+#: en/user_customization-runtime.ssi:138
msgid ""
-"But since live system users cannot always use a hard drive partition, and "
-"considering that most USB keys have poor write speeds, 'full' persistence "
-"could be also used with just image files, so you could create a file "
-"representing a partition and put this image file even on a NTFS partition of "
-"a foreign OS, with something like:"
+"Here's an example of how to create an ext2-based image file used for full "
+"persistence:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:125
+#: en/user_customization-runtime.ssi:143
#, no-wrap
msgid ""
-" $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
-" $ /sbin/mkfs.ext2 -F live-rw\n"
+" $ 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"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:129
+#: en/user_customization-runtime.ssi:147
msgid ""
-"Then copy the #{live-rw}# file to a writable partition and reboot with the "
-"boot parameter 'persistent'."
+"Then copy the #{full-ov}# file to the root of a writable partition and "
+"reboot."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:149
+msgid "3~ Custom overlays"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:131
-msgid "3~ Home automounting"
+#: 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."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:153
msgid ""
-"If during the boot a partition (filesystem) image file or a partition "
-"labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
-"as #{/home}#, thus permitting persistence of files that belong to e.g. the "
-"default user. It can be combined with full persistence."
+"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:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:135
+#: 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"
+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 ""
+
+#. 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 "
+"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 ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:168
msgid "3~ Snapshots"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:137
+#: 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 device to the system "
+"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 "
-"content of a snapshot could reside on a partition or an image file (like the "
-"above mentioned types) labeled #{live-sn}#, but it defaults to a simple cpio "
-"archive named #{live-sn.cpio.gz}#. As above, at boot time, the block devices "
-"connected to the system are traversed to see if a partition or a file named "
-"like that could be found. A power interruption during run time could lead to "
-"data loss, hence a tool invoked #{live-snapshot --refresh}# could be called "
-"to sync important changes. 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."
+"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:139
+#: en/user_customization-runtime.ssi:172
msgid ""
"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:141
-msgid ""
-"Snapshots cannot currently handle file deletion but full persistence and "
-"home automounting can."
+#: en/user_customization-runtime.ssi:174
+msgid "Snapshots cannot currently handle file deletion."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:176
msgid "3~ Persistent SubText"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:145
+#: en/user_customization-runtime.ssi:178
msgid ""
"If a user would need multiple persistent storage of the same type for "
-"different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
+"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 "
@@ -518,12 +618,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:147
+#: en/user_customization-runtime.ssi:180
msgid "3~ Partial remastering"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:148
+#: en/user_customization-runtime.ssi:181
msgid ""
"The run-time modification of the tmpfs could be collected using live-"
"snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index 392faf8..d463d5d 100644
--- a/manual/po/ro/user_examples.ssi.po
+++ b/manual/po/ro/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-18 18:00-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -24,25 +24,27 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: 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/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/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: 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/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
@@ -90,25 +92,27 @@ 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/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/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/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: 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/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
@@ -377,7 +381,7 @@ msgstr ""
#, no-wrap
msgid ""
" lb config noauto \\\n"
-" --architecture i386 \\\n"
+" --architectures i386 \\\n"
" --linux-flavours 686-pae \\\n"
" --package-lists lxde \\\n"
" \"${@}\"\n"
@@ -397,7 +401,7 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:113
msgid ""
-"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
+"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 "
diff --git a/manual/po/ro/user_installation.ssi.po b/manual/po/ro/user_installation.ssi.po
index d13b05d..7cbb419 100644
--- a/manual/po/ro/user_installation.ssi.po
+++ b/manual/po/ro/user_installation.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 17:40-0400\n"
+"POT-Creation-Date: 2012-03-31 16:32+0300\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,22 +19,26 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -57,49 +61,54 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 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: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: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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -121,29 +130,30 @@ msgstr "code{"
#: en/user_customization-packages.ssi:302
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 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-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: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"
@@ -353,7 +363,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:102
#, no-wrap
-msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the live-boot-doc and live-config-doc packages separately.\n"
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the /{live-boot-doc}/ and /{live-config-doc}/ packages separately.\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_managing_a_configuration.ssi.po b/manual/po/ro/user_managing_a_configuration.ssi.po
index f16d24f..d04a50b 100644
--- a/manual/po/ro/user_managing_a_configuration.ssi.po
+++ b/manual/po/ro/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-02 12:23-0200\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
"PO-Revision-Date: 2010-10-13 17:00+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,22 +19,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -43,33 +46,33 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
#: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:204
-#: 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:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi: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:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: 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
@@ -78,28 +81,31 @@ msgstr ""
#: 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/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/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/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/user_customization-installer.ssi:38
@@ -108,33 +114,33 @@ msgstr "code{"
#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:208
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: 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: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:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: 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
@@ -142,8 +148,8 @@ msgstr "code{"
#: 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"
@@ -208,7 +214,7 @@ msgid ""
"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 #{lb config}# and #{lb clean}#, these "
+"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 "
diff --git a/manual/po/ro/user_overview.ssi.po b/manual/po/ro/user_overview.ssi.po
index 4bd5b5d..7870778 100644
--- a/manual/po/ro/user_overview.ssi.po
+++ b/manual/po/ro/user_overview.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 08:16-0400\n"
+"POT-Creation-Date: 2012-03-19 18:09+0100\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,22 +19,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -57,11 +60,11 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.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: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
@@ -78,28 +81,31 @@ msgstr ""
#: 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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -121,12 +127,12 @@ msgstr "code{"
#: en/user_customization-packages.ssi:302
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: 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: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
@@ -142,8 +148,8 @@ msgstr "code{"
#: 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"
@@ -269,16 +275,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:40
+#: en/user_overview.ssi:41
#, no-wrap
msgid ""
" $ lb config\n"
+" [2012-03-19 15:17:14] lb_config\n"
" P: Considering defaults defined in /etc/live/build.conf\n"
-" P: Creating config tree\n"
+" P: Creating config tree for a debian system\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:44
+#: en/user_overview.ssi:45
msgid ""
"Using #{lb config}# without any arguments would be suitable for users who "
"need a very basic image, or who intend to later provide a more complete "
@@ -287,41 +294,41 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:46
+#: en/user_overview.ssi:47
msgid ""
"Normally, you will want to specify some options. For example, to include the "
"'gnome' package list in your configuration:"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:50
+#: en/user_overview.ssi:51
#, no-wrap
msgid " $ lb config -p gnome\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:54
+#: en/user_overview.ssi:55
msgid "It is possible to specify many options, such as:"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:58
+#: en/user_overview.ssi:59
#, no-wrap
-msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
+msgid " $ lb config --binary-images net --bootappend-live \"hostname=live-machine username=live-user\" ...\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:62
+#: en/user_overview.ssi:63
msgid "A full list of options is available in the #{lb_config}# man page."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:64
+#: en/user_overview.ssi:65
msgid "3~lb-build The #{lb build}# command"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:66
+#: en/user_overview.ssi:67
msgid ""
"The #{lb build}# command reads in your configuration from the #{config/}# "
"directory. It then runs the lower level commands needed to build your Live "
@@ -329,12 +336,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:68
+#: en/user_overview.ssi:69
msgid "3~lb-clean The #{lb clean}# command"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:70
+#: en/user_overview.ssi:71
msgid ""
"It is the job of the #{lb clean}# command to remove various parts of a build "
"so subsequent builds can start from a clean state. By default, #{chroot}#, #"
@@ -346,12 +353,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:72
+#: en/user_overview.ssi:73
msgid "2~live-boot The live-boot package"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:74
+#: en/user_overview.ssi:75
msgid ""
"live-boot is a collection of scripts providing hooks for the initramfs-"
"tools, used to generate an initramfs capable of booting live systems, such "
@@ -360,7 +367,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:76
+#: en/user_overview.ssi:77
msgid ""
"At boot time it will look for read-only media containing a #{/live/}# "
"directory where a root filesystem (often a compressed filesystem image like "
@@ -369,7 +376,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:78
+#: en/user_overview.ssi:79
msgid ""
"More information on initial ramfs in Debian can be found in the Debian Linux "
"Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
@@ -377,12 +384,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:80
+#: en/user_overview.ssi:81
msgid "2~live-config The live-config package"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:81
+#: en/user_overview.ssi:82
msgid ""
"live-config consists of the scripts that run at boot time after live-boot to "
"configure the live system automatically. It handles such tasks as setting "
diff --git a/manual/po4a.cfg b/manual/po4a.cfg
index b09d7e4..d033996 100644
--- a/manual/po4a.cfg
+++ b/manual/po4a.cfg
@@ -6,6 +6,7 @@
[type: text] en/project_bugs.ssi $lang:$lang/project_bugs.ssi
[type: text] en/project_coding-style.ssi $lang:$lang/project_coding-style.ssi
[type: text] en/project_procedures.ssi $lang:$lang/project_procedures.ssi
+[type: text] en/style_guide.ssi $lang:$lang/style_guide.ssi
[type: text] en/user_basics.ssi $lang:$lang/user_basics.ssi
[type: text] en/user_customization-binary.ssi $lang:$lang/user_customization-binary.ssi
[type: text] en/user_customization-contents.ssi $lang:$lang/user_customization-contents.ssi
diff --git a/manual/pot/about_manual.ssi.pot b/manual/pot/about_manual.ssi.pot
index 3168cab..e753900 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-02-05 17:13+0100\n"
+"POT-Creation-Date: 2012-03-07 08:59-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -29,8 +29,9 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:6
msgid ""
-"The main goal of this manual is to serve as a single access point to all "
-"documentation related to the Debian Live project. While it is primarily "
+"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, "
@@ -318,15 +319,16 @@ msgstr ""
#: 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/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/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/user_customization-installer.ssi:32
@@ -390,15 +392,16 @@ msgstr ""
#: 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/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/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/user_customization-installer.ssi:38
@@ -629,7 +632,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:203
-msgid "3~ Translation"
+msgid "3~translation Translation"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/about_project.ssi.pot b/manual/pot/about_project.ssi.pot
index 40b4ace..855c75f 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: 2011-08-29 08:54-0200\n"
+"POT-Creation-Date: 2012-02-19 22:16+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -234,18 +234,10 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_project.ssi:70
+#: 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."
msgstr ""
-
-#. type: Plain text
-#: en/about_project.ssi:71
-msgid ""
-"_* *{Wiki}*: The Debian Live wiki at http://wiki.debian.org/DebianLive is a "
-"place to gather information, discuss applied technologies, and document "
-"frameworks of Debian Live systems that go beyond the scope of this document."
-msgstr ""
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index 165f81a..f5377d5 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-02-06 18:57+0100\n"
+"POT-Creation-Date: 2012-04-03 00:19+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-02-06\n"
+" :published: 2012-04-03\n"
msgstr ""
#. type: Plain text
@@ -165,6 +165,16 @@ msgid ":B~ Examples"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:62
+#: en/live-manual.ssm:63
msgid "<< user_examples.ssi"
msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:65 en/style_guide.ssi:2
+msgid ":B~ Appendix"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:66
+msgid "<< style_guide.ssi"
+msgstr ""
diff --git a/manual/pot/project_coding-style.ssi.pot b/manual/pot/project_coding-style.ssi.pot
index 0fe490d..10f979b 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: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2012-03-31 16:32+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"
@@ -18,129 +18,141 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/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/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/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/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/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: 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 ""
@@ -366,7 +378,7 @@ msgstr ""
#. type: Plain text
#: en/project_coding-style.ssi:132
msgid ""
-"_* Use \"#{|}#\" (without the surround quotes) as a seperator in calls to "
+"_* Use \"#{|}#\" (without the surround quotes) as a separator in calls to "
"sed, e.g. \"#{sed -e 's|foo|bar|'}#\" (without \"\")."
msgstr ""
diff --git a/manual/pot/style_guide.ssi.pot b/manual/pot/style_guide.ssi.pot
new file mode 100644
index 0000000..5b3e060
--- /dev/null
+++ b/manual/pot/style_guide.ssi.pot
@@ -0,0 +1,894 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2012-03-31 19: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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#: en/live-manual.ssm:65 en/style_guide.ssi:2
+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/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
+#: 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: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: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/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
+#: 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: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
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
+msgid "}code"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:4
+msgid "1~style-guide Style guide"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:6
+msgid "2~ Guidelines for authors"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:8
+msgid ""
+"This section deals with some general considerations to be taken into account "
+"when writing technical documentation for live-manual. They are divided into "
+"linguistic features and recommended procedures."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:10
+#, no-wrap
+msgid "*{Note:}* Authors should first read {Contributing to this document}#how-to-contribute\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:12
+msgid "3~ Linguistic features"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:14
+msgid "_* /{Use plain English}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:16
+msgid ""
+"Keep in mind that a high percentage of your readers are not native speakers. "
+"So as a general rule try to use short, meaningful sentences, followed by a "
+"full stop."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:18
+msgid ""
+"This does not mean that you have to use a simplistic, naive style. It is a "
+"suggestion to try to avoid, as much as possible, complex subordinate "
+"sentences that make the text difficult to understand for non-native speakers."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:20
+msgid "_* /{Variety of English}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:22
+msgid ""
+"The most widely spread varieties of English are British and American so it "
+"is very likely that most authors will use either one or the other. In a "
+"collaborative environment, the ideal variety would be \"International English"
+"\" but it is very difficult, not to say impossible, to decide on which "
+"variety among all the existing ones, is the best to use."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:24
+msgid ""
+"We expect that different varieties may mix without creating "
+"misunderstandings but in general terms you should try to be coherent and "
+"before deciding on using British, American or any other English flavour at "
+"your discretion, please take a look at how other people write and try to "
+"imitate them."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:26
+msgid "_* /{Be balanced}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:28
+msgid ""
+"Do not be biased. Avoid including references to ideologies completely "
+"unrelated to live-manual. Technical writing should be as neutral as "
+"possible. It is in the very nature of scientific writing."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:30
+msgid "_* /{Be politically correct}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:32
+msgid ""
+"Try to avoid sexist language as much as possible. If you need to make "
+"references to the third person singular preferably use \"they\" rather than "
+"\"he\" or \"she\" or awkward inventions such as \"s/he\", \"s(he)\" and the "
+"like."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:34
+msgid "_* /{Be concise}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:36
+msgid ""
+"Go straight to the point and do not wander around aimlessly. Give as much "
+"information as necessary but do not give more information than necessary, "
+"this is to say, do not explain unnecessary details. Your readers are "
+"intelligent. Presume some previous knowledge on their part."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:38
+msgid "_* /{Minimize translation work}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:40
+msgid ""
+"Keep in mind that whatever you write will have to be translated into several "
+"other languages. This implies that a number of people will have to do an "
+"extra work if you add useless or redundant information."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:42
+msgid "_* /{Be coherent}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:44
+msgid ""
+"As suggested before, it is almost impossible to standardize a collaborative "
+"document into a perfectly unified whole. However, every effort on your side "
+"to write in a coherent way with the rest of the authors will be appreciated."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:46
+msgid "_* /{Be cohesive}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:48
+msgid ""
+"Use as many text-forming devices as necessary to make your text cohesive and "
+"unambiguous. (Text-forming devices are linguistic markers such as "
+"connectors)."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:50
+msgid "_* /{Be descriptive}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:52
+msgid ""
+"It is preferable to describe the point in one or several paragraphs than "
+"merely using a number of sentences in a typical \"changelog\" style. "
+"Describe it! Your readers will appreciate it."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:54
+msgid "_* /{Dictionary}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:56
+msgid ""
+"Look up the meaning of words in a dictionary or encyclopedia if you do not "
+"know how to express certain concepts in English. But keep in mind that a "
+"dictionary can either be your best friend or can turn into your worst enemy "
+"if you do not know how to use it correctly."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:58
+msgid ""
+"English has the largest vocabulary that exists (With over one million "
+"words). Many of these words are borrowings from other languages. When "
+"looking up the meaning of words in a bilingual dictionary the tendency of a "
+"non-native speaker is to choose the one that sounds more similar in their "
+"mother tongue. This often turns into an excessively formal discourse which "
+"does not sound quite natural in English."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:60
+msgid ""
+"As a general rule, if a concept can be expressed using different synonyms, "
+"it is a good advice to choose the first word proposed by the dictionary. If "
+"in doubt, choosing words of Germanic origin (Usually monosyllabic words) is "
+"often the right thing to do. Be warned that these two techniques might "
+"produce a rather informal discourse but at least your choice of words will "
+"be of wide use and generally accepted."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:62
+msgid ""
+"Using a dictionary of collocations is recommended. They are extremely "
+"helpful when it comes to know which words usually occur together."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:64
+msgid ""
+"Again it is a good practice to learn from the work of others. Using a search "
+"engine to check how other authors use certain expressions may help a lot."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:66
+msgid "_* /{False friends, idioms and other idiomatic expressions}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:68
+msgid ""
+"Watch out for false friends. No matter how proficient you are in a foreign "
+"language you cannot help falling from time to time in the trap of the so "
+"called \"false friends\", words that look similar in two languages but whose "
+"meanings or uses might be completely different."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:70
+msgid ""
+"Try to avoid idioms as much as possible. \"Idioms\" are expressions that may "
+"convey a completely different meaning from what their individual words seem "
+"to mean. Sometimes, idioms are difficult to understand even for native "
+"speakers!"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:72
+msgid "_* /{Avoid slang, abbreviations, contractions...}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:74
+msgid ""
+"Even though you are encouraged to use plain, everyday English, technical "
+"writing belongs to the formal register of the language."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:76
+msgid ""
+"Try to avoid slang, unusual abbreviations that are difficult to understand "
+"and above all contractions that try to imitate the spoken language. Not to "
+"mention typical irc and family friendly expressions."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:78
+msgid "3~ Procedures"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:80
+msgid "_* /{Test before write}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:82
+msgid ""
+"It is important that authors test their examples before adding them to live-"
+"manual to ensure that everything works as described. Testing on a clean "
+"chroot or VM can be a good starting point. Besides, it would be ideal if the "
+"tests were then carried out on different machines with different hardware to "
+"spot possible problems that may arise."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:84
+msgid "_* /{Examples}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:86
+msgid ""
+"When providing an example try to be as specific as you can. An example is, "
+"after all, just an example."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:88
+msgid ""
+"It is often better to use a line that only applies to an specific case than "
+"using abstractions that may confuse your readers. In this case you can "
+"provide a brief explanation of the effects of the proposed example."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:90
+msgid ""
+"There may be some exceptions when the example suggests using some "
+"potentially dangerous commands that, if misused, may cause data loss or "
+"other similar undesirable effects. In this case you should provide a "
+"thorough explanation of the possible side effects."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:92
+msgid "_* /{External links}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:94
+msgid ""
+"Links to external sites should only be used when the information on those "
+"sites is crucial when it comes to understanding a special point. Even so, "
+"try to use links to external sites as sparsely as possible. Internet links "
+"are likely to change from time to time resulting in broken links and leaving "
+"your arguments in an incomplete state."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:96
+msgid ""
+"Besides, people who read the manual offline will not have the chance to "
+"follow those links."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:98
+msgid ""
+"_* /{Avoid branding and things that violate the license under which the "
+"manual is published}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:100
+msgid ""
+"Try to avoid branding as much as possible. Keep in mind that other "
+"downstream projects might make use of the documentation you write. So you "
+"are complicating things for them if you add certain specific material."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:102
+msgid ""
+"live-manual is licensed under the GNU GPL. This has a number of implications "
+"that apply to the distribution of the material (of any kind, including "
+"copyrighted graphics or logos) that is published with it."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:104
+msgid "_* /{Write a first draft, revise, edit, improve, redo if necessary}/"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:106
+msgid ""
+"Brainstorm!. You need to organize your ideas first in a logical sequence of "
+"events."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:108
+msgid ""
+"Once you have somehow organized those ideas in your mind write a first draft."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:110
+msgid "Revise grammar, syntax and spelling."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:112
+msgid "Improve your statements and redo any part if necessary."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:114
+msgid "_* /{Chapters}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:116
+msgid ""
+"Use the conventional numbering system for chapters and subtitles. e.g. 1, "
+"1.1, 1.1.1, 1.1.2 ... 1.2, 1.2.1, 1.2.2 ... 2, 2.1 ... and so on. See markup "
+"below."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:118
+msgid ""
+"If you have to enumerate a series of steps or stages in your description, "
+"you can also use ordinal numbers: First, second, third ... or First, Then, "
+"After that, Finally ... Alternatively you can use bulleted items."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:120 en/style_guide.ssi:214
+msgid "_* /{Markup}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:122
+msgid ""
+"And last but not least, live-manual uses {SiSU}http://www.sisudoc.org to "
+"process the text files and produce a multiple format output. It is "
+"recommended to take a look at {SiSU's manual}http://www.sisudoc.org/sisu/"
+"sisu_manual/markup.html to get familiar with its markup, or else type:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:126
+#, no-wrap
+msgid " $ sisu --help markup\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:130
+msgid "Here are some markup examples that may prove useful:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:132
+msgid "For emphasis/bold text:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:136
+#, no-wrap
+msgid "*{foo}* or !{foo}!\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:140
+msgid "produces: *{foo}* or !{foo}!. Use it to emphasize certain key words."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:142
+msgid "For italics:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:146
+msgid "/{foo}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:150
+msgid "produces: /{foo}/. Use them e.g. for the names of debian packages."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:152
+msgid "For monospace:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:156
+msgid "#{foo}#"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:160
+msgid ""
+"produces: #{foo}#. Use it e.g. for the names of commands. And also to "
+"highlight some key words or things like paths."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:162
+msgid "For code blocks:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:166
+#, no-wrap
+msgid " code{\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:169
+#, no-wrap
+msgid ""
+" $ foo\n"
+" # bar\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:171
+#, no-wrap
+msgid " }code\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:175
+msgid "produces:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:180
+#, no-wrap
+msgid ""
+" $ foo\n"
+" # bar\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:184
+msgid ""
+"Use #{code{}# to open and #{}code}# to close the tags. It is important to "
+"remember to leave a space at the beginning of each line of code."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:186
+msgid "2~ Guidelines for translators"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:188
+msgid ""
+"This section deals with some general considerations to be taken into account "
+"when translating the contents of live-manual."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:190
+msgid ""
+"As a general recommendation, translators should have read and understood the "
+"translation rules that apply to their specific languages. Usually, "
+"translation groups and mailing lists provide information on how to produce "
+"translated work that complies with Debian quality standards."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:192
+#, no-wrap
+msgid "*{Note:}* Translators should also read {Contributing to this document}#how-to-contribute. In particular the section {Translation}#translation\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:194
+msgid "3~ Translation hints"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:196
+msgid "_* /{Comments}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:198
+msgid ""
+"The role of the translator is to convey as faithfully as possible the "
+"meaning of words, sentences, paragraphs and texts as written by the original "
+"authors into their target language."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:200
+msgid ""
+"So they should refrain from adding personal comments or extra bits of "
+"information of their own. If they want to add a comment for other "
+"translators working on the same documents, they can leave it in the space "
+"reserved for that. That is, the header of the strings in the *{po}* files "
+"preceded by a number sign *{#}*. Most graphical translation programs can "
+"automatically handle those types of comments."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:202
+msgid "_* /{TN, Translator's Note}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:204
+msgid ""
+"It is perfectly acceptable however, to include a word or an expression in "
+"brackets in the translated text if, and only if, that makes the meaning of a "
+"difficult word or expression clearer to the reader. Inside the brackets the "
+"translator should make evident that the addition was theirs using the "
+"abbreviation \"TN\" or \"Translator's Note\"."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:206
+msgid "_* /{Impersonal sentences}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:208
+msgid ""
+"Documents written in English make an extensive use of the impersonal form "
+"\"you\". In some other languages that do not share this characteristic, this "
+"might give the false impression that the original texts are directly "
+"addressing the reader when they are actually not doing so. Translators must "
+"be aware of that fact and reflect it in their language as accurately as "
+"possible."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:210
+msgid "_* /{False friends}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:212
+msgid ""
+"The trap of \"false friends\" explained before especially applies to "
+"translators. Double check the meaning of suspicious false friends if in "
+"doubt."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:216
+msgid ""
+"Translators working initially with *{pot}* files and later on with *{po}* "
+"files will find many markup features in the strings. They can translate the "
+"text anyway, as long as it is translatable, but it is extremely important "
+"that they use exactly the same markup as the original English version."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:218
+msgid "_* /{Code blocks}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:220
+msgid ""
+"Some translators decide to include the code blocks in the translated files "
+"because it is easier for them to identify what has already been translated "
+"and what has not by looking at the percentages if they use a graphical "
+"translation program."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:222
+msgid ""
+"Include the code blocks if you want to score a 100% complete translation."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:224
+msgid ""
+"On the other hand some translators prefer to leave the code blocks "
+"\"untranslated\" (i.e. not including them). This makes the translation "
+"easier to maintain once finished because it does not require translators "
+"intervention if the code changes."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:226
+msgid ""
+"Leave the code blocks empty (they will be automatically added then) if you "
+"want to make your translation easier to maintain."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:228
+msgid "_* /{New lines}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:230
+msgid ""
+"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."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:232
+msgid ""
+"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."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:234
+msgid "_* /{Untranslatable strings}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:236
+msgid "Translators should never translate:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:238
+msgid "The code names of releases"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:240
+msgid "The names of programs"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:242
+msgid "The commands given as examples"
+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."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:246
+msgid "Links"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:247
+msgid "Paths"
+msgstr ""
diff --git a/manual/pot/user_customization-binary.ssi.pot b/manual/pot/user_customization-binary.ssi.pot
index 93b4659..22d4ac2 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-01-15 20:48+0100\n"
+"POT-Creation-Date: 2012-02-25 21:42+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,23 +18,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -84,23 +86,25 @@ 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/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/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/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/user_customization-installer.ssi:38
@@ -166,36 +170,70 @@ msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:8
msgid ""
-"live-build uses syslinux and some of its derivatives (depending on the image "
-"type) as bootloaders by default. You can easily modify their options using "
-"different methods, like {includes}#includes or {hooks}#hooks."
+"live-build uses /{syslinux}/ and some of its derivatives (depending on the "
+"image type) as bootloaders by default. You can easily customize them in a "
+"number of ways that range from providing a full theme to changing the boot "
+"timeout or simply adding a personalized splash image. Some of the following "
+"examples of customization make use of different methods, like {includes}"
+"#includes or {hooks}#hooks."
msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:10
msgid ""
-"For example, these derivatives are configured by default with a timeout of 0 "
-"(zero) which means that they will pause indefinitely at their splash screen "
-"until you press a key."
+"If you want to use a full theme you can specify the #{--syslinux-theme}# "
+"option (see man #{lb_config}#). live-build will then retrieve the theme from "
+"the mirror and install it."
msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:12
msgid ""
+"Imagine that you want to build a progress client but you prefer to include "
+"the server's theme because you want to have the help menu. Then you would "
+"launch #{lb config}# as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:16
+#, no-wrap
+msgid " $ lb config --mode progress --syslinux-theme progress-server\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:20
+msgid ""
+"You can also create your own theme or modify an already existing one and if "
+"you do not have a mirror, you can add the package to #{config/packages."
+"chroot}#. In this case it is not necessary to specify any option."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:22
+msgid ""
+"There is also the possibility of making smaller changes. For instance, "
+"syslinux derivatives are configured by default with a timeout of 0 (zero) "
+"which means that they will pause indefinitely at their splash screen until "
+"you press a key."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:24
+msgid ""
"To modify the boot timeout of a default #{iso-hybrid}# image you can edit a "
"default *{isolinux.cfg}* file specifying the timeout in units of seconds and "
"add it to #{config/includes.binary/isolinux/}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:26
msgid ""
"A modified *{isolinux.cfg}* to boot after five seconds would be similar to "
"this:"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:21
+#: en/user_customization-binary.ssi:33
#, no-wrap
msgid ""
" include menu.cfg\n"
@@ -205,7 +243,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:25
+#: en/user_customization-binary.ssi:37
msgid ""
"An alternative way of achieving the same goal could be writing a hook and "
"adding it to #{config/hooks/}# Remember to add the #{.binary}# suffix to run "
@@ -213,29 +251,31 @@ msgid ""
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 ""
#. type: Plain text
-#: en/user_customization-binary.ssi:31
+#: en/user_customization-binary.ssi:43
#, no-wrap
msgid " sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:35
-msgid "For more information please see man syslinux(1)."
+#: en/user_customization-binary.ssi:47
+msgid ""
+"Likewise, if you want to use a personalized splash.png image you can add a "
+"picture of 640x480 pixels to #{config/includes.binary/isolinux/}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:37
+#: en/user_customization-binary.ssi:49
msgid "2~ ISO metadata"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:39
+#: en/user_customization-binary.ssi:51
msgid ""
"When creating an ISO9660 binary image, you can use the following options to "
"add various textual metadata for your image. This can help you easily "
@@ -243,7 +283,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:41
+#: en/user_customization-binary.ssi:53
msgid ""
"_* #{LB_ISO_APPLICATION/--iso-application NAME}#: This should describe the "
"application that will be on the image. The maximum length for this field is "
@@ -251,7 +291,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:43
+#: en/user_customization-binary.ssi:55
msgid ""
"_* #{LB_ISO_PREPARER/--iso-preparer NAME}#: This should describe the "
"preparer of the image, usually with some contact details. The default for "
@@ -260,7 +300,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:45
+#: en/user_customization-binary.ssi:57
msgid ""
"_* #{LB_ISO_PUBLISHER/--iso-publisher NAME}#: This should describe the "
"publisher of the image, usually with some contact details. The maximum "
@@ -268,7 +308,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:46
+#: en/user_customization-binary.ssi:58
msgid ""
"_* #{LB_ISO_VOLUME/--iso-volume NAME}#: This should specify the volume ID of "
"the image. This is used as a user-visible label on some platforms such as "
diff --git a/manual/pot/user_customization-installer.ssi.pot b/manual/pot/user_customization-installer.ssi.pot
index 019df52..07c2a1e 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: 2011-11-07 21:19-0400\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,22 +18,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -77,28 +80,31 @@ msgstr ""
#: 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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -141,8 +147,8 @@ msgstr ""
#: 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 ""
@@ -186,7 +192,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-installer.ssi:14
#, no-wrap
-msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a seperate 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"
+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 ""
#. type: Plain text
@@ -258,7 +264,7 @@ msgstr ""
#: en/user_customization-installer.ssi:36
#, no-wrap
msgid ""
-" $ lb config --architecture i386 --linux-flavours 486 \\\n"
+" $ lb config --architectures i386 --linux-flavours 486 \\\n"
" --debian-installer live\n"
" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
msgstr ""
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index 4c7f56a..036e06b 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-01-18 18:00-0400\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,23 +18,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -78,29 +80,31 @@ msgstr ""
#: 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/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/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/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/user_customization-installer.ssi:38
@@ -143,8 +147,8 @@ msgstr ""
#: 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 ""
@@ -198,7 +202,7 @@ msgid ""
"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, "
+"distribution. For example, to build against the *{unstable}* release, Sid, "
"specify:"
msgstr ""
@@ -252,13 +256,13 @@ msgid ""
"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."
+"{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 ""
#. type: Plain text
@@ -330,9 +334,9 @@ msgid ""
"backports, experimental or custom packages. To configure additional "
"repositories, create #{config/archives/your-repository.list.chroot}#, and/or "
"#{config/archives/your-repository.list.binary}# files. As with the #{--"
-"mirror-*}# options, these govern the repositories used in the *chroot* stage "
-"when building the image, and in the *binary* stage, i.e. for use when "
-"running the live system."
+"mirror-*}# options, these govern the repositories used in the *{chroot}* "
+"stage when building the image, and in the *{binary}* stage, i.e. for use "
+"when running the live system."
msgstr ""
#. type: Plain text
@@ -530,14 +534,14 @@ msgid ""
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
"Generally, this means any #{lb config}# option uppercased and with dashes "
"changed to underscores. But in practice, it is only the ones that influence "
-"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURE}"
+"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURES}"
"# or #{ARCHIVE_AREAS}#."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:138
msgid ""
-"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+"For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
"specified:"
msgstr ""
@@ -545,7 +549,7 @@ msgstr ""
#: en/user_customization-packages.ssi:144
#, no-wrap
msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
" ia32-libs\n"
" #endif\n"
msgstr ""
@@ -554,14 +558,15 @@ msgstr ""
#: en/user_customization-packages.ssi:148
msgid ""
"You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
+"# if either #{--architectures i386}# or #{--architectures amd64}# is "
+"specified:"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:154
#, no-wrap
msgid ""
-" #if ARCHITECTURE i386 amd64\n"
+" #if ARCHITECTURES i386 amd64\n"
" memtest86+\n"
" #endif\n"
msgstr ""
@@ -592,7 +597,7 @@ msgstr ""
#: en/user_customization-packages.ssi:174
#, no-wrap
msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
" #include <gnome-full>\n"
" #endif\n"
msgstr ""
@@ -991,7 +996,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:308
msgid ""
-"If there is not an #{lb config}# option to alter APT's behaviour in the way "
+"If there is not a #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
"options through to your configured APT tool. See the man pages for #{apt}# "
"and #{aptitude}# for details."
diff --git a/manual/pot/user_customization-runtime.ssi.pot b/manual/pot/user_customization-runtime.ssi.pot
index a7c3c3e..5a1dafe 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: 2011-11-07 21:01-0400\n"
+"POT-Creation-Date: 2012-03-24 15:08+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,22 +18,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -59,46 +62,50 @@ 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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -124,25 +131,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 ""
@@ -215,7 +223,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:29
-msgid "$ lb config --bootappend-live \"username=live-user\""
+#, no-wrap
+msgid " $ lb config --bootappend-live \"username=live-user\"\n"
msgstr ""
#. type: Plain text
@@ -377,7 +386,7 @@ msgstr ""
#: en/user_customization-runtime.ssi:98
msgid ""
"The data stored on this ramdisk should be saved on a writable persistent "
-"medium like a Hard Disk, a USB key, a network share or even a session of a "
+"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}#."
@@ -385,130 +394,221 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:100
-msgid "3~ Full persistence"
+msgid ""
+"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:"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:102
+msgid "_* a partition, identified by its GPT name."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:104
+msgid "_* a filesystem, identified by its filesystem label."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:106
+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\"."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:108
+msgid ""
+"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:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:110
+msgid "_* #{full-ov}# for full persistent overlays."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:112
+msgid "_* #{custom-ov}# for custom overlays."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:114
+msgid "_* #{live-sn}# for full system snapshots."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:116
+msgid "_* #{home-sn}# for /home snapshots."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:118
+msgid "3~ Full persistent overlays"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:120
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 "
-"writable partition is used. In order to use this feature a partition with a "
-"clean writable supported filesystem on it labeled \"live-rw\" must be "
-"attached on the system at boot time and the system must be started with the "
-"boot parameter 'persistent'. This partition could be an ext2 partition on "
-"the hard disk or on a usb key created with, e.g.:"
+"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.:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:124
#, no-wrap
-msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
+msgid " # mkfs.ext2 -L full-ov /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:128
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:112
+#: en/user_customization-runtime.ssi:130
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:116
+#: en/user_customization-runtime.ssi:134
#, no-wrap
-msgid " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
+msgid " $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:120
+#: en/user_customization-runtime.ssi:138
msgid ""
-"But since live system users cannot always use a hard drive partition, and "
-"considering that most USB keys have poor write speeds, 'full' persistence "
-"could be also used with just image files, so you could create a file "
-"representing a partition and put this image file even on a NTFS partition of "
-"a foreign OS, with something like:"
+"Here's an example of how to create an ext2-based image file used for full "
+"persistence:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:125
+#: en/user_customization-runtime.ssi:143
#, no-wrap
msgid ""
-" $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
-" $ /sbin/mkfs.ext2 -F live-rw\n"
+" $ 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"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:129
+#: en/user_customization-runtime.ssi:147
msgid ""
-"Then copy the #{live-rw}# file to a writable partition and reboot with the "
-"boot parameter 'persistent'."
+"Then copy the #{full-ov}# file to the root of a writable partition and "
+"reboot."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:149
+msgid "3~ Custom overlays"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:131
-msgid "3~ Home automounting"
+#: 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."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:153
msgid ""
-"If during the boot a partition (filesystem) image file or a partition "
-"labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
-"as #{/home}#, thus permitting persistence of files that belong to e.g. the "
-"default user. It can be combined with full persistence."
+"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:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:135
+#: 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"
+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 ""
+
+#. 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 "
+"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 ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:168
msgid "3~ Snapshots"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:137
+#: 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 device to the system "
+"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 "
-"content of a snapshot could reside on a partition or an image file (like the "
-"above mentioned types) labeled #{live-sn}#, but it defaults to a simple cpio "
-"archive named #{live-sn.cpio.gz}#. As above, at boot time, the block devices "
-"connected to the system are traversed to see if a partition or a file named "
-"like that could be found. A power interruption during run time could lead to "
-"data loss, hence a tool invoked #{live-snapshot --refresh}# could be called "
-"to sync important changes. 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."
+"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:139
+#: en/user_customization-runtime.ssi:172
msgid ""
"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:141
-msgid ""
-"Snapshots cannot currently handle file deletion but full persistence and "
-"home automounting can."
+#: en/user_customization-runtime.ssi:174
+msgid "Snapshots cannot currently handle file deletion."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:176
msgid "3~ Persistent SubText"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:145
+#: en/user_customization-runtime.ssi:178
msgid ""
"If a user would need multiple persistent storage of the same type for "
-"different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
+"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 "
@@ -517,12 +617,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:147
+#: en/user_customization-runtime.ssi:180
msgid "3~ Partial remastering"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:148
+#: en/user_customization-runtime.ssi:181
msgid ""
"The run-time modification of the tmpfs could be collected using live-"
"snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index b14bce3..57ea9e9 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-01-18 18:00-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -23,25 +23,27 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: 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/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/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: 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/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,25 +91,27 @@ 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/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/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/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: 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/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
@@ -376,7 +380,7 @@ msgstr ""
#, no-wrap
msgid ""
" lb config noauto \\\n"
-" --architecture i386 \\\n"
+" --architectures i386 \\\n"
" --linux-flavours 686-pae \\\n"
" --package-lists lxde \\\n"
" \"${@}\"\n"
@@ -396,7 +400,7 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:113
msgid ""
-"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
+"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 "
diff --git a/manual/pot/user_installation.ssi.pot b/manual/pot/user_installation.ssi.pot
index d4a9bee..243e075 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: 2011-11-07 17:40-0400\n"
+"POT-Creation-Date: 2012-03-31 16:32+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"
@@ -18,22 +18,26 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -56,49 +60,54 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 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: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: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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -120,29 +129,30 @@ msgstr ""
#: en/user_customization-packages.ssi:302
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 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-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: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 ""
@@ -352,7 +362,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:102
#, no-wrap
-msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the live-boot-doc and live-config-doc packages separately.\n"
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the /{live-boot-doc}/ and /{live-config-doc}/ packages separately.\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_managing_a_configuration.ssi.pot b/manual/pot/user_managing_a_configuration.ssi.pot
index 8436b29..7041a6b 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: 2011-11-02 12:23-0200\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,22 +18,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -42,33 +45,33 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
#: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:204
-#: 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:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi: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:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: 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
@@ -77,28 +80,31 @@ msgstr ""
#: 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/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/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/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/user_customization-installer.ssi:38
@@ -107,33 +113,33 @@ msgstr ""
#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:208
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: 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: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:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: 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
@@ -141,8 +147,8 @@ msgstr ""
#: 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 ""
@@ -207,7 +213,7 @@ msgid ""
"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 #{lb config}# and #{lb clean}#, these "
+"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 "
diff --git a/manual/pot/user_overview.ssi.pot b/manual/pot/user_overview.ssi.pot
index ba7d3c7..83720ad 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: 2011-11-07 08:16-0400\n"
+"POT-Creation-Date: 2012-03-19 18:09+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,22 +18,25 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: 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/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/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/user_customization-installer.ssi:32
@@ -56,11 +59,11 @@ msgstr ""
#: en/user_customization-packages.ssi:316
#: en/user_customization-packages.ssi:333
#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.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: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
@@ -77,28 +80,31 @@ msgstr ""
#: 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/project_bugs.ssi:64
+#: 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/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/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/user_customization-installer.ssi:38
@@ -120,12 +126,12 @@ msgstr ""
#: en/user_customization-packages.ssi:302
#: en/user_customization-packages.ssi:329
#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: 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: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
@@ -141,8 +147,8 @@ msgstr ""
#: 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 ""
@@ -268,16 +274,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:40
+#: en/user_overview.ssi:41
#, no-wrap
msgid ""
" $ lb config\n"
+" [2012-03-19 15:17:14] lb_config\n"
" P: Considering defaults defined in /etc/live/build.conf\n"
-" P: Creating config tree\n"
+" P: Creating config tree for a debian system\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:44
+#: en/user_overview.ssi:45
msgid ""
"Using #{lb config}# without any arguments would be suitable for users who "
"need a very basic image, or who intend to later provide a more complete "
@@ -286,41 +293,41 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:46
+#: en/user_overview.ssi:47
msgid ""
"Normally, you will want to specify some options. For example, to include the "
"'gnome' package list in your configuration:"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:50
+#: en/user_overview.ssi:51
#, no-wrap
msgid " $ lb config -p gnome\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:54
+#: en/user_overview.ssi:55
msgid "It is possible to specify many options, such as:"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:58
+#: en/user_overview.ssi:59
#, no-wrap
-msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
+msgid " $ lb config --binary-images net --bootappend-live \"hostname=live-machine username=live-user\" ...\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:62
+#: en/user_overview.ssi:63
msgid "A full list of options is available in the #{lb_config}# man page."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:64
+#: en/user_overview.ssi:65
msgid "3~lb-build The #{lb build}# command"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:66
+#: en/user_overview.ssi:67
msgid ""
"The #{lb build}# command reads in your configuration from the #{config/}# "
"directory. It then runs the lower level commands needed to build your Live "
@@ -328,12 +335,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:68
+#: en/user_overview.ssi:69
msgid "3~lb-clean The #{lb clean}# command"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:70
+#: en/user_overview.ssi:71
msgid ""
"It is the job of the #{lb clean}# command to remove various parts of a build "
"so subsequent builds can start from a clean state. By default, #{chroot}#, #"
@@ -345,12 +352,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:72
+#: en/user_overview.ssi:73
msgid "2~live-boot The live-boot package"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:74
+#: en/user_overview.ssi:75
msgid ""
"live-boot is a collection of scripts providing hooks for the initramfs-"
"tools, used to generate an initramfs capable of booting live systems, such "
@@ -359,7 +366,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:76
+#: en/user_overview.ssi:77
msgid ""
"At boot time it will look for read-only media containing a #{/live/}# "
"directory where a root filesystem (often a compressed filesystem image like "
@@ -368,7 +375,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:78
+#: en/user_overview.ssi:79
msgid ""
"More information on initial ramfs in Debian can be found in the Debian Linux "
"Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
@@ -376,12 +383,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:80
+#: en/user_overview.ssi:81
msgid "2~live-config The live-config package"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:81
+#: en/user_overview.ssi:82
msgid ""
"live-config consists of the scripts that run at boot time after live-boot to "
"configure the live system automatically. It handles such tasks as setting "
diff --git a/manual/pt_BR/about_manual.ssi b/manual/pt_BR/about_manual.ssi
index bff4e4c..4f22d00 100644
--- a/manual/pt_BR/about_manual.ssi
+++ b/manual/pt_BR/about_manual.ssi
@@ -2,8 +2,9 @@
1~about-manual Sobre esse manual
-The main goal of this manual is to serve as a single access point to all
-documentation related to the Debian Live project. While it is primarily
+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
@@ -283,7 +284,7 @@ code{
}code
-3~ Translation
+3~translation Translation
To submit a translation for a new language, follow these three steps:
diff --git a/manual/pt_BR/about_project.ssi b/manual/pt_BR/about_project.ssi
index 71c6174..d41ee63 100644
--- a/manual/pt_BR/about_project.ssi
+++ b/manual/pt_BR/about_project.ssi
@@ -101,7 +101,3 @@ _* *{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.
-
-_* *{Wiki}*: The Debian Live wiki at http://wiki.debian.org/DebianLive is a
-place to gather information, discuss applied technologies, and document
-frameworks of Debian Live systems that go beyond the scope of this document.
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index 485e4aa..43736ce 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -9,7 +9,7 @@
: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-02-06
+ :published: 2012-04-03
@publisher: Debian Live Project <debian-live at lists.debian.org>
@@ -60,3 +60,7 @@
:B~ Examples
<< user_examples.ssi
+
+:B~ Appendix
+
+<< style_guide.ssi
diff --git a/manual/pt_BR/project_coding-style.ssi b/manual/pt_BR/project_coding-style.ssi
index c4a9b86..7ec54b5 100644
--- a/manual/pt_BR/project_coding-style.ssi
+++ b/manual/pt_BR/project_coding-style.ssi
@@ -133,7 +133,7 @@ code{
2~ Miscellaneous
-_* Use "#{|}#" (without the surround quotes) as a seperator in calls to sed,
+_* Use "#{|}#" (without the surround quotes) as a separator in calls to sed,
e.g. "#{sed -e 's|foo|bar|'}#" (without "").
_* Don't use the #{test}# command for comparisons or tests, use "#{[}#"
diff --git a/manual/pt_BR/style_guide.ssi b/manual/pt_BR/style_guide.ssi
new file mode 100644
index 0000000..8b01cc3
--- /dev/null
+++ b/manual/pt_BR/style_guide.ssi
@@ -0,0 +1,371 @@
+:B~ Appendix
+
+1~style-guide Style guide
+
+2~ Guidelines for authors
+
+This section deals with some general considerations to be taken into account
+when writing technical documentation for live-manual. They are divided into
+linguistic features and recommended procedures.
+
+*{Note:}* Authors should first read {Contributing to this document}#how-to-contribute
+
+3~ Linguistic features
+
+_* /{Use plain English}/
+
+Keep in mind that a high percentage of your readers are not native
+speakers. So as a general rule try to use short, meaningful sentences,
+followed by a full stop.
+
+This does not mean that you have to use a simplistic, naive style. It is a
+suggestion to try to avoid, as much as possible, complex subordinate
+sentences that make the text difficult to understand for non-native
+speakers.
+
+_* /{Variety of English}/
+
+The most widely spread varieties of English are British and American so it
+is very likely that most authors will use either one or the other. In a
+collaborative environment, the ideal variety would be "International
+English" but it is very difficult, not to say impossible, to decide on which
+variety among all the existing ones, is the best to use.
+
+We expect that different varieties may mix without creating
+misunderstandings but in general terms you should try to be coherent and
+before deciding on using British, American or any other English flavour at
+your discretion, please take a look at how other people write and try to
+imitate them.
+
+_* /{Be balanced}/
+
+Do not be biased. Avoid including references to ideologies completely
+unrelated to live-manual. Technical writing should be as neutral as
+possible. It is in the very nature of scientific writing.
+
+_* /{Be politically correct}/
+
+Try to avoid sexist language as much as possible. If you need to make
+references to the third person singular preferably use "they" rather than
+"he" or "she" or awkward inventions such as "s/he", "s(he)" and the like.
+
+_* /{Be concise}/
+
+Go straight to the point and do not wander around aimlessly. Give as much
+information as necessary but do not give more information than necessary,
+this is to say, do not explain unnecessary details. Your readers are
+intelligent. Presume some previous knowledge on their part.
+
+_* /{Minimize translation work}/
+
+Keep in mind that whatever you write will have to be translated into several
+other languages. This implies that a number of people will have to do an
+extra work if you add useless or redundant information.
+
+_* /{Be coherent}/
+
+As suggested before, it is almost impossible to standardize a collaborative
+document into a perfectly unified whole. However, every effort on your side
+to write in a coherent way with the rest of the authors will be appreciated.
+
+_* /{Be cohesive}/
+
+Use as many text-forming devices as necessary to make your text cohesive and
+unambiguous. (Text-forming devices are linguistic markers such as
+connectors).
+
+_* /{Be descriptive}/
+
+It is preferable to describe the point in one or several paragraphs than
+merely using a number of sentences in a typical "changelog" style. Describe
+it! Your readers will appreciate it.
+
+_* /{Dictionary}/
+
+Look up the meaning of words in a dictionary or encyclopedia if you do not
+know how to express certain concepts in English. But keep in mind that a
+dictionary can either be your best friend or can turn into your worst enemy
+if you do not know how to use it correctly.
+
+English has the largest vocabulary that exists (With over one million
+words). Many of these words are borrowings from other languages. When
+looking up the meaning of words in a bilingual dictionary the tendency of a
+non-native speaker is to choose the one that sounds more similar in their
+mother tongue. This often turns into an excessively formal discourse which
+does not sound quite natural in English.
+
+As a general rule, if a concept can be expressed using different synonyms,
+it is a good advice to choose the first word proposed by the dictionary. If
+in doubt, choosing words of Germanic origin (Usually monosyllabic words) is
+often the right thing to do. Be warned that these two techniques might
+produce a rather informal discourse but at least your choice of words will
+be of wide use and generally accepted.
+
+Using a dictionary of collocations is recommended. They are extremely
+helpful when it comes to know which words usually occur together.
+
+Again it is a good practice to learn from the work of others. Using a search
+engine to check how other authors use certain expressions may help a lot.
+
+_* /{False friends, idioms and other idiomatic expressions}/
+
+Watch out for false friends. No matter how proficient you are in a foreign
+language you cannot help falling from time to time in the trap of the so
+called "false friends", words that look similar in two languages but whose
+meanings or uses might be completely different.
+
+Try to avoid idioms as much as possible. "Idioms" are expressions that may
+convey a completely different meaning from what their individual words seem
+to mean. Sometimes, idioms are difficult to understand even for native
+speakers!
+
+_* /{Avoid slang, abbreviations, contractions...}/
+
+Even though you are encouraged to use plain, everyday English, technical
+writing belongs to the formal register of the language.
+
+Try to avoid slang, unusual abbreviations that are difficult to understand
+and above all contractions that try to imitate the spoken language. Not to
+mention typical irc and family friendly expressions.
+
+3~ Procedures
+
+_* /{Test before write}/
+
+It is important that authors test their examples before adding them to
+live-manual to ensure that everything works as described. Testing on a clean
+chroot or VM can be a good starting point. Besides, it would be ideal if the
+tests were then carried out on different machines with different hardware to
+spot possible problems that may arise.
+
+_* /{Examples}/
+
+When providing an example try to be as specific as you can. An example is,
+after all, just an example.
+
+It is often better to use a line that only applies to an specific case than
+using abstractions that may confuse your readers. In this case you can
+provide a brief explanation of the effects of the proposed example.
+
+There may be some exceptions when the example suggests using some
+potentially dangerous commands that, if misused, may cause data loss or
+other similar undesirable effects. In this case you should provide a
+thorough explanation of the possible side effects.
+
+_* /{External links}/
+
+Links to external sites should only be used when the information on those
+sites is crucial when it comes to understanding a special point. Even so,
+try to use links to external sites as sparsely as possible. Internet links
+are likely to change from time to time resulting in broken links and leaving
+your arguments in an incomplete state.
+
+Besides, people who read the manual offline will not have the chance to
+follow those links.
+
+_* /{Avoid branding and things that violate the license under which the
+manual is published}/
+
+Try to avoid branding as much as possible. Keep in mind that other
+downstream projects might make use of the documentation you write. So you
+are complicating things for them if you add certain specific material.
+
+live-manual is licensed under the GNU GPL. This has a number of implications
+that apply to the distribution of the material (of any kind, including
+copyrighted graphics or logos) that is published with it.
+
+_* /{Write a first draft, revise, edit, improve, redo if necessary}/
+
+ - Brainstorm!. You need to organize your ideas first in a logical sequence
+ of events.
+
+ - Once you have somehow organized those ideas in your mind write a first
+ draft.
+
+ - Revise grammar, syntax and spelling.
+
+ - Improve your statements and redo any part if necessary.
+
+_* /{Chapters}/
+
+Use the conventional numbering system for chapters and subtitles. e.g. 1,
+1.1, 1.1.1, 1.1.2 ... 1.2, 1.2.1, 1.2.2 ... 2, 2.1 ... and so on. See markup
+below.
+
+If you have to enumerate a series of steps or stages in your description,
+you can also use ordinal numbers: First, second, third ... or First, Then,
+After that, Finally ... Alternatively you can use bulleted items.
+
+_* /{Markup}/
+
+And last but not least, live-manual uses {SiSU}http://www.sisudoc.org to
+process the text files and produce a multiple format output. It is
+recommended to take a look at {SiSU's
+manual}http://www.sisudoc.org/sisu/sisu_manual/markup.html to get familiar
+with its markup, or else type:
+
+code{
+
+ $ sisu --help markup
+
+}code
+
+Here are some markup examples that may prove useful:
+
+ - For emphasis/bold text:
+
+code{
+
+*{foo}* or !{foo}!
+
+}code
+
+produces: *{foo}* or !{foo}!. Use it to emphasize certain key words.
+
+ - For italics:
+
+code{
+
+/{foo}/
+
+}code
+
+produces: /{foo}/. Use them e.g. for the names of debian packages.
+
+ - For monospace:
+
+code{
+
+#{foo}#
+
+}code
+
+produces: #{foo}#. Use it e.g. for the names of commands. And also to
+highlight some key words or things like paths.
+
+ - For code blocks:
+
+code{
+
+ code{
+
+ $ foo
+ # bar
+
+ }code
+
+}code
+
+produces:
+
+code{
+
+ $ foo
+ # bar
+
+}code
+
+Use #{code{}# to open and #{}code}# to close the tags. It is important to
+remember to leave a space at the beginning of each line of code.
+
+2~ Guidelines for translators
+
+This section deals with some general considerations to be taken into account
+when translating the contents of live-manual.
+
+As a general recommendation, translators should have read and understood the
+translation rules that apply to their specific languages. Usually,
+translation groups and mailing lists provide information on how to produce
+translated work that complies with Debian quality standards.
+
+*{Note:}* Translators should also read {Contributing to this document}#how-to-contribute. In particular the section {Translation}#translation
+
+3~ Translation hints
+
+_* /{Comments}/
+
+The role of the translator is to convey as faithfully as possible the
+meaning of words, sentences, paragraphs and texts as written by the original
+authors into their target language.
+
+So they should refrain from adding personal comments or extra bits of
+information of their own. If they want to add a comment for other
+translators working on the same documents, they can leave it in the space
+reserved for that. That is, the header of the strings in the *{po}* files
+preceded by a number sign *{#}*. Most graphical translation programs can
+automatically handle those types of comments.
+
+_* /{TN, Translator's Note}/
+
+It is perfectly acceptable however, to include a word or an expression in
+brackets in the translated text if, and only if, that makes the meaning of a
+difficult word or expression clearer to the reader. Inside the brackets the
+translator should make evident that the addition was theirs using the
+abbreviation "TN" or "Translator's Note".
+
+_* /{Impersonal sentences}/
+
+Documents written in English make an extensive use of the impersonal form
+"you". In some other languages that do not share this characteristic, this
+might give the false impression that the original texts are directly
+addressing the reader when they are actually not doing so. Translators must
+be aware of that fact and reflect it in their language as accurately as
+possible.
+
+_* /{False friends}/
+
+The trap of "false friends" explained before especially applies to
+translators. Double check the meaning of suspicious false friends if in
+doubt.
+
+_* /{Markup}/
+
+Translators working initially with *{pot}* files and later on with *{po}*
+files will find many markup features in the strings. They can translate the
+text anyway, as long as it is translatable, but it is extremely important
+that they use exactly the same markup as the original English version.
+
+_* /{Code blocks}/
+
+Some translators decide to include the code blocks in the translated files
+because it is easier for them to identify what has already been translated
+and what has not by looking at the percentages if they use a graphical
+translation program.
+
+Include the code blocks if you want to score a 100% complete translation.
+
+On the other hand some translators prefer to leave the code blocks
+"untranslated" (i.e. not including them). This makes the translation easier
+to maintain once finished because it does not require translators
+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}/
+
+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.
+
+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.
+
+_* /{Untranslatable strings}/
+
+Translators should never translate:
+
+ - The code names of releases
+
+ - The names of programs
+
+ - 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.
+
+ - Links
+
+ - Paths
diff --git a/manual/pt_BR/user_customization-binary.ssi b/manual/pt_BR/user_customization-binary.ssi
index 1902f77..73cfb15 100644
--- a/manual/pt_BR/user_customization-binary.ssi
+++ b/manual/pt_BR/user_customization-binary.ssi
@@ -4,13 +4,36 @@ B~ Customizing the binary image
2~ Bootloader
-live-build uses syslinux and some of its derivatives (depending on the image
-type) as bootloaders by default. You can easily modify their options using
-different methods, like {includes}#includes or {hooks}#hooks.
+live-build uses /{syslinux}/ and some of its derivatives (depending on the
+image type) as bootloaders by default. You can easily customize them in a
+number of ways that range from providing a full theme to changing the boot
+timeout or simply adding a personalized splash image. Some of the following
+examples of customization make use of different methods, like
+{includes}#includes or {hooks}#hooks.
-For example, these derivatives are configured by default with a timeout of 0
-(zero) which means that they will pause indefinitely at their splash screen
-until you press a key.
+If you want to use a full theme you can specify the #{--syslinux-theme}#
+option (see man #{lb_config}#). live-build will then retrieve the theme from
+the mirror and install it.
+
+Imagine that you want to build a progress client but you prefer to include
+the server's theme because you want to have the help menu. Then you would
+launch #{lb config}# as follows:
+
+code{
+
+ $ lb config --mode progress --syslinux-theme progress-server
+
+}code
+
+You can also create your own theme or modify an already existing one and if
+you do not have a mirror, you can add the package to
+#{config/packages.chroot}#. In this case it is not necessary to specify any
+option.
+
+There is also the possibility of making smaller changes. For instance,
+syslinux derivatives are configured by default with a timeout of 0 (zero)
+which means that they will pause indefinitely at their splash screen until
+you press a key.
To modify the boot timeout of a default #{iso-hybrid}# image you can edit a
default *{isolinux.cfg}* file specifying the timeout in units of seconds and
@@ -40,7 +63,8 @@ code{
}code
-For more information please see man syslinux(1).
+Likewise, if you want to use a personalized splash.png image you can add a
+picture of 640x480 pixels to #{config/includes.binary/isolinux/}#
2~ ISO metadata
diff --git a/manual/pt_BR/user_customization-installer.ssi b/manual/pt_BR/user_customization-installer.ssi
index d8d0c17..a41a62d 100644
--- a/manual/pt_BR/user_customization-installer.ssi
+++ b/manual/pt_BR/user_customization-installer.ssi
@@ -15,7 +15,7 @@ seen abbreviated to "d-i".
The three main types of installer are:
-*{"Regular" Debian Installer}*: This is a normal Debian Live image with a seperate 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".
+*{"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
@@ -52,7 +52,7 @@ architecture. For example:
code{
- $ lb config --architecture i386 --linux-flavours 486 \
+ $ lb config --architectures i386 --linux-flavours 486 \
--debian-installer live
$ echo debian-installer-launcher >> config/package-lists/my.list.chroot
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index 01fd8c2..4542f38 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -29,7 +29,7 @@ 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,
+distribution. For example, to build against the *{unstable}* release, Sid,
specify:
code{
@@ -64,13 +64,13 @@ 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.
+{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
@@ -114,9 +114,9 @@ is available in your target distribution. These may be, for example, for
backports, experimental or custom packages. To configure additional
repositories, create #{config/archives/your-repository.list.chroot}#, and/or
#{config/archives/your-repository.list.binary}# files. As with the
-#{--mirror-*}# options, these govern the repositories used in the *chroot*
-stage when building the image, and in the *binary* stage, i.e. for use when
-running the live system.
+#{--mirror-*}# options, these govern the repositories used in the *{chroot}*
+stage when building the image, and in the *{binary}* stage, i.e. for use
+when running the live system.
For example, #{config/archives/live.list.chroot}# allows you to install
packages from the debian live snapshot repository at live system build time.
@@ -226,26 +226,26 @@ the #{LB_}# prefix) may be used in conditional statements in package
lists. Generally, this means any #{lb config}# option uppercased and with
dashes changed to underscores. But in practice, it is only the ones that
influence package selection that make sense, such as #{DISTRIBUTION}#,
-#{ARCHITECTURE}# or #{ARCHIVE_AREAS}#.
+#{ARCHITECTURES}# or #{ARCHIVE_AREAS}#.
-For example, to install #{ia32-libs}# if the #{--architecture amd64}# is
+For example, to install #{ia32-libs}# if the #{--architectures amd64}# is
specified:
code{
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
ia32-libs
#endif
}code
You may test for any one of a number of values, e.g. to install
-#{memtest86+}# if either #{--architecture i386}# or #{--architecture amd64}#
-is specified:
+#{memtest86+}# if either #{--architectures i386}# or #{--architectures
+amd64}# is specified:
code{
- #if ARCHITECTURE i386 amd64
+ #if ARCHITECTURES i386 amd64
memtest86+
#endif
@@ -267,7 +267,7 @@ A conditional may surround an #{#include}# directive:
code{
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
#include <gnome-full>
#endif
@@ -495,7 +495,7 @@ as explained in {APT pinning}#apt-pinning.
3~ Passing options to apt or aptitude
-If there is not an #{lb config}# option to alter APT's behaviour in the way
+If there is not a #{lb config}# option to alter APT's behaviour in the way
you need, use #{--apt-options}# or #{--aptitude-options}# to pass any
options through to your configured APT tool. See the man pages for #{apt}#
and #{aptitude}# for details.
diff --git a/manual/pt_BR/user_customization-runtime.ssi b/manual/pt_BR/user_customization-runtime.ssi
index 610fdb1..bd4c0fe 100644
--- a/manual/pt_BR/user_customization-runtime.ssi
+++ b/manual/pt_BR/user_customization-runtime.ssi
@@ -37,7 +37,7 @@ To change the default username you can simply specify it in your config:
code{
-$ lb config --bootappend-live "username=live-user"
+ $ lb config --bootappend-live "username=live-user"
}code
@@ -138,24 +138,48 @@ 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 a Hard Disk, a USB key, a network share or even a session of a
+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}#.
-3~ Full 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:
+
+_* 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".
+
+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:
+
+_* #{full-ov}# for full persistent overlays.
+
+_* #{custom-ov}# for custom overlays.
+
+_* #{live-sn}# for full system snapshots.
+
+_* #{home-sn}# for /home snapshots.
+
+3~ Full persistent 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
-writable partition is used. In order to use this feature a partition with a
-clean writable supported filesystem on it labeled "live-rw" must be attached
-on the system at boot time and the system must be started with the boot
-parameter 'persistent'. This partition could be an ext2 partition on the
+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.:
code{
- # mkfs.ext2 -L live-rw /dev/sdb1
+ # mkfs.ext2 -L full-ov /dev/sdb1
}code
@@ -166,59 +190,85 @@ label with one of the following:
code{
- # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems
+ $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems
}code
-But since live system users cannot always use a hard drive partition, and
-considering that most USB keys have poor write speeds, 'full' persistence
-could be also used with just image files, so you could create a file
-representing a partition and put this image file even on a NTFS partition of
-a foreign OS, with something like:
+Here's an example of how to create an ext2-based image file used for full
+persistence:
code{
- $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file
- $ /sbin/mkfs.ext2 -F live-rw
+ $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file
+ $ /sbin/mkfs.ext2 -F full-ov
}code
-Then copy the #{live-rw}# file to a writable partition and reboot with the
-boot parameter 'persistent'.
+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.
+
+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:
-3~ Home automounting
+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
+
+}code
-If during the boot a partition (filesystem) image file or a partition
-labeled #{home-rw}# is discovered, this filesystem will be directly mounted
-as #{/home}#, thus permitting persistence of files that belong to e.g. the
-default user. It can be combined with full persistence.
+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).
3~ Snapshots
Snapshots are collections of files and directories which are not mounted
-while running but which are copied from a persistent device to the system
+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
-content of a snapshot could reside on a partition or an image file (like the
-above mentioned types) labeled #{live-sn}#, but it defaults to a simple cpio
-archive named #{live-sn.cpio.gz}#. As above, at boot time, the block devices
-connected to the system are traversed to see if a partition or a file named
-like that could be found. A power interruption during run time could lead to
-data loss, hence a tool invoked #{live-snapshot --refresh}# could be called
-to sync important changes. 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.
+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.
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 but full persistence and
-home automounting can.
+Snapshots cannot currently handle file deletion.
3~ Persistent SubText
If a user would need multiple persistent storage of the same type for
-different locations or testing, such as #{live-rw-nonwork}# and
-#{live-rw-work}#, the boot parameter #{persistent-subtext}# used in
+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
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
index 56c8726..428c580 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/pt_BR/user_examples.ssi
@@ -131,7 +131,7 @@ code{
#!/bin/sh
lb config noauto \
- --architecture i386 \
+ --architectures i386 \
--linux-flavours 686-pae \
--package-lists lxde \
"${@}"
@@ -146,7 +146,7 @@ code{
}code
-First, #{--architecture i386}# ensures that on our #{amd64}# build system,
+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
diff --git a/manual/pt_BR/user_installation.ssi b/manual/pt_BR/user_installation.ssi
index bd8393d..1949e3d 100644
--- a/manual/pt_BR/user_installation.ssi
+++ b/manual/pt_BR/user_installation.ssi
@@ -105,7 +105,7 @@ are available on http://live.debian.net/debian/.
2~ live-boot and live-config
-*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the live-boot-doc and live-config-doc packages separately.
+*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the /{live-boot-doc}/ and /{live-config-doc}/ packages separately.
3~ From the Debian repository
diff --git a/manual/pt_BR/user_managing_a_configuration.ssi b/manual/pt_BR/user_managing_a_configuration.ssi
index d0706a8..7df1d34 100644
--- a/manual/pt_BR/user_managing_a_configuration.ssi
+++ b/manual/pt_BR/user_managing_a_configuration.ssi
@@ -31,7 +31,7 @@ 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 #{lb config}# and #{lb clean}#, these
+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
diff --git a/manual/pt_BR/user_overview.ssi b/manual/pt_BR/user_overview.ssi
index ad40e60..beda6d4 100644
--- a/manual/pt_BR/user_overview.ssi
+++ b/manual/pt_BR/user_overview.ssi
@@ -58,8 +58,9 @@ subdirectory which it populates with some default settings, and a skeleton
code{
$ lb config
+ [2012-03-19 15:17:14] lb_config
P: Considering defaults defined in /etc/live/build.conf
- P: Creating config tree
+ P: Creating config tree for a debian system
}code
@@ -81,7 +82,7 @@ It is possible to specify many options, such as:
code{
- $ lb config --binary-images net --hostname live-machine --username live-user ...
+ $ lb config --binary-images net --bootappend-live "hostname=live-machine username=live-user" ...
}code
diff --git a/manual/ro/about_manual.ssi b/manual/ro/about_manual.ssi
index a4bbbda..8be5f32 100644
--- a/manual/ro/about_manual.ssi
+++ b/manual/ro/about_manual.ssi
@@ -2,8 +2,9 @@
1~about-manual Despre acest manual
-The main goal of this manual is to serve as a single access point to all
-documentation related to the Debian Live project. While it is primarily
+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
@@ -278,7 +279,7 @@ code{
}code
-3~ Translation
+3~translation Translation
To submit a translation for a new language, follow these three steps:
diff --git a/manual/ro/about_project.ssi b/manual/ro/about_project.ssi
index 9af1b07..e0aa567 100644
--- a/manual/ro/about_project.ssi
+++ b/manual/ro/about_project.ssi
@@ -103,8 +103,3 @@ _* *{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.
-
-_* *{Wiki}*: Debian Live are un wiki la http://wiki.debian.org/DebianLive ,
-si este locul unde pot fi gasite diferite informatii, se discuta modul de
-aplicare de tehnologii, sau sunt documentate alte lucrari legate de debian
-live si care pot depasi cadrul acestui document.
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index 485e4aa..43736ce 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -9,7 +9,7 @@
: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-02-06
+ :published: 2012-04-03
@publisher: Debian Live Project <debian-live at lists.debian.org>
@@ -60,3 +60,7 @@
:B~ Examples
<< user_examples.ssi
+
+:B~ Appendix
+
+<< style_guide.ssi
diff --git a/manual/ro/project_coding-style.ssi b/manual/ro/project_coding-style.ssi
index c4a9b86..7ec54b5 100644
--- a/manual/ro/project_coding-style.ssi
+++ b/manual/ro/project_coding-style.ssi
@@ -133,7 +133,7 @@ code{
2~ Miscellaneous
-_* Use "#{|}#" (without the surround quotes) as a seperator in calls to sed,
+_* Use "#{|}#" (without the surround quotes) as a separator in calls to sed,
e.g. "#{sed -e 's|foo|bar|'}#" (without "").
_* Don't use the #{test}# command for comparisons or tests, use "#{[}#"
diff --git a/manual/ro/style_guide.ssi b/manual/ro/style_guide.ssi
new file mode 100644
index 0000000..8b01cc3
--- /dev/null
+++ b/manual/ro/style_guide.ssi
@@ -0,0 +1,371 @@
+:B~ Appendix
+
+1~style-guide Style guide
+
+2~ Guidelines for authors
+
+This section deals with some general considerations to be taken into account
+when writing technical documentation for live-manual. They are divided into
+linguistic features and recommended procedures.
+
+*{Note:}* Authors should first read {Contributing to this document}#how-to-contribute
+
+3~ Linguistic features
+
+_* /{Use plain English}/
+
+Keep in mind that a high percentage of your readers are not native
+speakers. So as a general rule try to use short, meaningful sentences,
+followed by a full stop.
+
+This does not mean that you have to use a simplistic, naive style. It is a
+suggestion to try to avoid, as much as possible, complex subordinate
+sentences that make the text difficult to understand for non-native
+speakers.
+
+_* /{Variety of English}/
+
+The most widely spread varieties of English are British and American so it
+is very likely that most authors will use either one or the other. In a
+collaborative environment, the ideal variety would be "International
+English" but it is very difficult, not to say impossible, to decide on which
+variety among all the existing ones, is the best to use.
+
+We expect that different varieties may mix without creating
+misunderstandings but in general terms you should try to be coherent and
+before deciding on using British, American or any other English flavour at
+your discretion, please take a look at how other people write and try to
+imitate them.
+
+_* /{Be balanced}/
+
+Do not be biased. Avoid including references to ideologies completely
+unrelated to live-manual. Technical writing should be as neutral as
+possible. It is in the very nature of scientific writing.
+
+_* /{Be politically correct}/
+
+Try to avoid sexist language as much as possible. If you need to make
+references to the third person singular preferably use "they" rather than
+"he" or "she" or awkward inventions such as "s/he", "s(he)" and the like.
+
+_* /{Be concise}/
+
+Go straight to the point and do not wander around aimlessly. Give as much
+information as necessary but do not give more information than necessary,
+this is to say, do not explain unnecessary details. Your readers are
+intelligent. Presume some previous knowledge on their part.
+
+_* /{Minimize translation work}/
+
+Keep in mind that whatever you write will have to be translated into several
+other languages. This implies that a number of people will have to do an
+extra work if you add useless or redundant information.
+
+_* /{Be coherent}/
+
+As suggested before, it is almost impossible to standardize a collaborative
+document into a perfectly unified whole. However, every effort on your side
+to write in a coherent way with the rest of the authors will be appreciated.
+
+_* /{Be cohesive}/
+
+Use as many text-forming devices as necessary to make your text cohesive and
+unambiguous. (Text-forming devices are linguistic markers such as
+connectors).
+
+_* /{Be descriptive}/
+
+It is preferable to describe the point in one or several paragraphs than
+merely using a number of sentences in a typical "changelog" style. Describe
+it! Your readers will appreciate it.
+
+_* /{Dictionary}/
+
+Look up the meaning of words in a dictionary or encyclopedia if you do not
+know how to express certain concepts in English. But keep in mind that a
+dictionary can either be your best friend or can turn into your worst enemy
+if you do not know how to use it correctly.
+
+English has the largest vocabulary that exists (With over one million
+words). Many of these words are borrowings from other languages. When
+looking up the meaning of words in a bilingual dictionary the tendency of a
+non-native speaker is to choose the one that sounds more similar in their
+mother tongue. This often turns into an excessively formal discourse which
+does not sound quite natural in English.
+
+As a general rule, if a concept can be expressed using different synonyms,
+it is a good advice to choose the first word proposed by the dictionary. If
+in doubt, choosing words of Germanic origin (Usually monosyllabic words) is
+often the right thing to do. Be warned that these two techniques might
+produce a rather informal discourse but at least your choice of words will
+be of wide use and generally accepted.
+
+Using a dictionary of collocations is recommended. They are extremely
+helpful when it comes to know which words usually occur together.
+
+Again it is a good practice to learn from the work of others. Using a search
+engine to check how other authors use certain expressions may help a lot.
+
+_* /{False friends, idioms and other idiomatic expressions}/
+
+Watch out for false friends. No matter how proficient you are in a foreign
+language you cannot help falling from time to time in the trap of the so
+called "false friends", words that look similar in two languages but whose
+meanings or uses might be completely different.
+
+Try to avoid idioms as much as possible. "Idioms" are expressions that may
+convey a completely different meaning from what their individual words seem
+to mean. Sometimes, idioms are difficult to understand even for native
+speakers!
+
+_* /{Avoid slang, abbreviations, contractions...}/
+
+Even though you are encouraged to use plain, everyday English, technical
+writing belongs to the formal register of the language.
+
+Try to avoid slang, unusual abbreviations that are difficult to understand
+and above all contractions that try to imitate the spoken language. Not to
+mention typical irc and family friendly expressions.
+
+3~ Procedures
+
+_* /{Test before write}/
+
+It is important that authors test their examples before adding them to
+live-manual to ensure that everything works as described. Testing on a clean
+chroot or VM can be a good starting point. Besides, it would be ideal if the
+tests were then carried out on different machines with different hardware to
+spot possible problems that may arise.
+
+_* /{Examples}/
+
+When providing an example try to be as specific as you can. An example is,
+after all, just an example.
+
+It is often better to use a line that only applies to an specific case than
+using abstractions that may confuse your readers. In this case you can
+provide a brief explanation of the effects of the proposed example.
+
+There may be some exceptions when the example suggests using some
+potentially dangerous commands that, if misused, may cause data loss or
+other similar undesirable effects. In this case you should provide a
+thorough explanation of the possible side effects.
+
+_* /{External links}/
+
+Links to external sites should only be used when the information on those
+sites is crucial when it comes to understanding a special point. Even so,
+try to use links to external sites as sparsely as possible. Internet links
+are likely to change from time to time resulting in broken links and leaving
+your arguments in an incomplete state.
+
+Besides, people who read the manual offline will not have the chance to
+follow those links.
+
+_* /{Avoid branding and things that violate the license under which the
+manual is published}/
+
+Try to avoid branding as much as possible. Keep in mind that other
+downstream projects might make use of the documentation you write. So you
+are complicating things for them if you add certain specific material.
+
+live-manual is licensed under the GNU GPL. This has a number of implications
+that apply to the distribution of the material (of any kind, including
+copyrighted graphics or logos) that is published with it.
+
+_* /{Write a first draft, revise, edit, improve, redo if necessary}/
+
+ - Brainstorm!. You need to organize your ideas first in a logical sequence
+ of events.
+
+ - Once you have somehow organized those ideas in your mind write a first
+ draft.
+
+ - Revise grammar, syntax and spelling.
+
+ - Improve your statements and redo any part if necessary.
+
+_* /{Chapters}/
+
+Use the conventional numbering system for chapters and subtitles. e.g. 1,
+1.1, 1.1.1, 1.1.2 ... 1.2, 1.2.1, 1.2.2 ... 2, 2.1 ... and so on. See markup
+below.
+
+If you have to enumerate a series of steps or stages in your description,
+you can also use ordinal numbers: First, second, third ... or First, Then,
+After that, Finally ... Alternatively you can use bulleted items.
+
+_* /{Markup}/
+
+And last but not least, live-manual uses {SiSU}http://www.sisudoc.org to
+process the text files and produce a multiple format output. It is
+recommended to take a look at {SiSU's
+manual}http://www.sisudoc.org/sisu/sisu_manual/markup.html to get familiar
+with its markup, or else type:
+
+code{
+
+ $ sisu --help markup
+
+}code
+
+Here are some markup examples that may prove useful:
+
+ - For emphasis/bold text:
+
+code{
+
+*{foo}* or !{foo}!
+
+}code
+
+produces: *{foo}* or !{foo}!. Use it to emphasize certain key words.
+
+ - For italics:
+
+code{
+
+/{foo}/
+
+}code
+
+produces: /{foo}/. Use them e.g. for the names of debian packages.
+
+ - For monospace:
+
+code{
+
+#{foo}#
+
+}code
+
+produces: #{foo}#. Use it e.g. for the names of commands. And also to
+highlight some key words or things like paths.
+
+ - For code blocks:
+
+code{
+
+ code{
+
+ $ foo
+ # bar
+
+ }code
+
+}code
+
+produces:
+
+code{
+
+ $ foo
+ # bar
+
+}code
+
+Use #{code{}# to open and #{}code}# to close the tags. It is important to
+remember to leave a space at the beginning of each line of code.
+
+2~ Guidelines for translators
+
+This section deals with some general considerations to be taken into account
+when translating the contents of live-manual.
+
+As a general recommendation, translators should have read and understood the
+translation rules that apply to their specific languages. Usually,
+translation groups and mailing lists provide information on how to produce
+translated work that complies with Debian quality standards.
+
+*{Note:}* Translators should also read {Contributing to this document}#how-to-contribute. In particular the section {Translation}#translation
+
+3~ Translation hints
+
+_* /{Comments}/
+
+The role of the translator is to convey as faithfully as possible the
+meaning of words, sentences, paragraphs and texts as written by the original
+authors into their target language.
+
+So they should refrain from adding personal comments or extra bits of
+information of their own. If they want to add a comment for other
+translators working on the same documents, they can leave it in the space
+reserved for that. That is, the header of the strings in the *{po}* files
+preceded by a number sign *{#}*. Most graphical translation programs can
+automatically handle those types of comments.
+
+_* /{TN, Translator's Note}/
+
+It is perfectly acceptable however, to include a word or an expression in
+brackets in the translated text if, and only if, that makes the meaning of a
+difficult word or expression clearer to the reader. Inside the brackets the
+translator should make evident that the addition was theirs using the
+abbreviation "TN" or "Translator's Note".
+
+_* /{Impersonal sentences}/
+
+Documents written in English make an extensive use of the impersonal form
+"you". In some other languages that do not share this characteristic, this
+might give the false impression that the original texts are directly
+addressing the reader when they are actually not doing so. Translators must
+be aware of that fact and reflect it in their language as accurately as
+possible.
+
+_* /{False friends}/
+
+The trap of "false friends" explained before especially applies to
+translators. Double check the meaning of suspicious false friends if in
+doubt.
+
+_* /{Markup}/
+
+Translators working initially with *{pot}* files and later on with *{po}*
+files will find many markup features in the strings. They can translate the
+text anyway, as long as it is translatable, but it is extremely important
+that they use exactly the same markup as the original English version.
+
+_* /{Code blocks}/
+
+Some translators decide to include the code blocks in the translated files
+because it is easier for them to identify what has already been translated
+and what has not by looking at the percentages if they use a graphical
+translation program.
+
+Include the code blocks if you want to score a 100% complete translation.
+
+On the other hand some translators prefer to leave the code blocks
+"untranslated" (i.e. not including them). This makes the translation easier
+to maintain once finished because it does not require translators
+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}/
+
+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.
+
+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.
+
+_* /{Untranslatable strings}/
+
+Translators should never translate:
+
+ - The code names of releases
+
+ - The names of programs
+
+ - 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.
+
+ - Links
+
+ - Paths
diff --git a/manual/ro/user_customization-binary.ssi b/manual/ro/user_customization-binary.ssi
index 1902f77..73cfb15 100644
--- a/manual/ro/user_customization-binary.ssi
+++ b/manual/ro/user_customization-binary.ssi
@@ -4,13 +4,36 @@ B~ Customizing the binary image
2~ Bootloader
-live-build uses syslinux and some of its derivatives (depending on the image
-type) as bootloaders by default. You can easily modify their options using
-different methods, like {includes}#includes or {hooks}#hooks.
+live-build uses /{syslinux}/ and some of its derivatives (depending on the
+image type) as bootloaders by default. You can easily customize them in a
+number of ways that range from providing a full theme to changing the boot
+timeout or simply adding a personalized splash image. Some of the following
+examples of customization make use of different methods, like
+{includes}#includes or {hooks}#hooks.
-For example, these derivatives are configured by default with a timeout of 0
-(zero) which means that they will pause indefinitely at their splash screen
-until you press a key.
+If you want to use a full theme you can specify the #{--syslinux-theme}#
+option (see man #{lb_config}#). live-build will then retrieve the theme from
+the mirror and install it.
+
+Imagine that you want to build a progress client but you prefer to include
+the server's theme because you want to have the help menu. Then you would
+launch #{lb config}# as follows:
+
+code{
+
+ $ lb config --mode progress --syslinux-theme progress-server
+
+}code
+
+You can also create your own theme or modify an already existing one and if
+you do not have a mirror, you can add the package to
+#{config/packages.chroot}#. In this case it is not necessary to specify any
+option.
+
+There is also the possibility of making smaller changes. For instance,
+syslinux derivatives are configured by default with a timeout of 0 (zero)
+which means that they will pause indefinitely at their splash screen until
+you press a key.
To modify the boot timeout of a default #{iso-hybrid}# image you can edit a
default *{isolinux.cfg}* file specifying the timeout in units of seconds and
@@ -40,7 +63,8 @@ code{
}code
-For more information please see man syslinux(1).
+Likewise, if you want to use a personalized splash.png image you can add a
+picture of 640x480 pixels to #{config/includes.binary/isolinux/}#
2~ ISO metadata
diff --git a/manual/ro/user_customization-installer.ssi b/manual/ro/user_customization-installer.ssi
index d8d0c17..a41a62d 100644
--- a/manual/ro/user_customization-installer.ssi
+++ b/manual/ro/user_customization-installer.ssi
@@ -15,7 +15,7 @@ seen abbreviated to "d-i".
The three main types of installer are:
-*{"Regular" Debian Installer}*: This is a normal Debian Live image with a seperate 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".
+*{"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
@@ -52,7 +52,7 @@ architecture. For example:
code{
- $ lb config --architecture i386 --linux-flavours 486 \
+ $ lb config --architectures i386 --linux-flavours 486 \
--debian-installer live
$ echo debian-installer-launcher >> config/package-lists/my.list.chroot
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index 01fd8c2..4542f38 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -29,7 +29,7 @@ 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,
+distribution. For example, to build against the *{unstable}* release, Sid,
specify:
code{
@@ -64,13 +64,13 @@ 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.
+{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
@@ -114,9 +114,9 @@ is available in your target distribution. These may be, for example, for
backports, experimental or custom packages. To configure additional
repositories, create #{config/archives/your-repository.list.chroot}#, and/or
#{config/archives/your-repository.list.binary}# files. As with the
-#{--mirror-*}# options, these govern the repositories used in the *chroot*
-stage when building the image, and in the *binary* stage, i.e. for use when
-running the live system.
+#{--mirror-*}# options, these govern the repositories used in the *{chroot}*
+stage when building the image, and in the *{binary}* stage, i.e. for use
+when running the live system.
For example, #{config/archives/live.list.chroot}# allows you to install
packages from the debian live snapshot repository at live system build time.
@@ -226,26 +226,26 @@ the #{LB_}# prefix) may be used in conditional statements in package
lists. Generally, this means any #{lb config}# option uppercased and with
dashes changed to underscores. But in practice, it is only the ones that
influence package selection that make sense, such as #{DISTRIBUTION}#,
-#{ARCHITECTURE}# or #{ARCHIVE_AREAS}#.
+#{ARCHITECTURES}# or #{ARCHIVE_AREAS}#.
-For example, to install #{ia32-libs}# if the #{--architecture amd64}# is
+For example, to install #{ia32-libs}# if the #{--architectures amd64}# is
specified:
code{
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
ia32-libs
#endif
}code
You may test for any one of a number of values, e.g. to install
-#{memtest86+}# if either #{--architecture i386}# or #{--architecture amd64}#
-is specified:
+#{memtest86+}# if either #{--architectures i386}# or #{--architectures
+amd64}# is specified:
code{
- #if ARCHITECTURE i386 amd64
+ #if ARCHITECTURES i386 amd64
memtest86+
#endif
@@ -267,7 +267,7 @@ A conditional may surround an #{#include}# directive:
code{
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
#include <gnome-full>
#endif
@@ -495,7 +495,7 @@ as explained in {APT pinning}#apt-pinning.
3~ Passing options to apt or aptitude
-If there is not an #{lb config}# option to alter APT's behaviour in the way
+If there is not a #{lb config}# option to alter APT's behaviour in the way
you need, use #{--apt-options}# or #{--aptitude-options}# to pass any
options through to your configured APT tool. See the man pages for #{apt}#
and #{aptitude}# for details.
diff --git a/manual/ro/user_customization-runtime.ssi b/manual/ro/user_customization-runtime.ssi
index 610fdb1..bd4c0fe 100644
--- a/manual/ro/user_customization-runtime.ssi
+++ b/manual/ro/user_customization-runtime.ssi
@@ -37,7 +37,7 @@ To change the default username you can simply specify it in your config:
code{
-$ lb config --bootappend-live "username=live-user"
+ $ lb config --bootappend-live "username=live-user"
}code
@@ -138,24 +138,48 @@ 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 a Hard Disk, a USB key, a network share or even a session of a
+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}#.
-3~ Full 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:
+
+_* 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".
+
+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:
+
+_* #{full-ov}# for full persistent overlays.
+
+_* #{custom-ov}# for custom overlays.
+
+_* #{live-sn}# for full system snapshots.
+
+_* #{home-sn}# for /home snapshots.
+
+3~ Full persistent 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
-writable partition is used. In order to use this feature a partition with a
-clean writable supported filesystem on it labeled "live-rw" must be attached
-on the system at boot time and the system must be started with the boot
-parameter 'persistent'. This partition could be an ext2 partition on the
+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.:
code{
- # mkfs.ext2 -L live-rw /dev/sdb1
+ # mkfs.ext2 -L full-ov /dev/sdb1
}code
@@ -166,59 +190,85 @@ label with one of the following:
code{
- # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems
+ $ tune2fs -L full-ov /dev/sdb1 # for ext2,3,4 filesystems
}code
-But since live system users cannot always use a hard drive partition, and
-considering that most USB keys have poor write speeds, 'full' persistence
-could be also used with just image files, so you could create a file
-representing a partition and put this image file even on a NTFS partition of
-a foreign OS, with something like:
+Here's an example of how to create an ext2-based image file used for full
+persistence:
code{
- $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file
- $ /sbin/mkfs.ext2 -F live-rw
+ $ dd if=/dev/null of=full-ov bs=1G seek=1 # for a 1GB sized image file
+ $ /sbin/mkfs.ext2 -F full-ov
}code
-Then copy the #{live-rw}# file to a writable partition and reboot with the
-boot parameter 'persistent'.
+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.
+
+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:
-3~ Home automounting
+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
+
+}code
-If during the boot a partition (filesystem) image file or a partition
-labeled #{home-rw}# is discovered, this filesystem will be directly mounted
-as #{/home}#, thus permitting persistence of files that belong to e.g. the
-default user. It can be combined with full persistence.
+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).
3~ Snapshots
Snapshots are collections of files and directories which are not mounted
-while running but which are copied from a persistent device to the system
+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
-content of a snapshot could reside on a partition or an image file (like the
-above mentioned types) labeled #{live-sn}#, but it defaults to a simple cpio
-archive named #{live-sn.cpio.gz}#. As above, at boot time, the block devices
-connected to the system are traversed to see if a partition or a file named
-like that could be found. A power interruption during run time could lead to
-data loss, hence a tool invoked #{live-snapshot --refresh}# could be called
-to sync important changes. 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.
+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.
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 but full persistence and
-home automounting can.
+Snapshots cannot currently handle file deletion.
3~ Persistent SubText
If a user would need multiple persistent storage of the same type for
-different locations or testing, such as #{live-rw-nonwork}# and
-#{live-rw-work}#, the boot parameter #{persistent-subtext}# used in
+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
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
index 56c8726..428c580 100644
--- a/manual/ro/user_examples.ssi
+++ b/manual/ro/user_examples.ssi
@@ -131,7 +131,7 @@ code{
#!/bin/sh
lb config noauto \
- --architecture i386 \
+ --architectures i386 \
--linux-flavours 686-pae \
--package-lists lxde \
"${@}"
@@ -146,7 +146,7 @@ code{
}code
-First, #{--architecture i386}# ensures that on our #{amd64}# build system,
+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
diff --git a/manual/ro/user_installation.ssi b/manual/ro/user_installation.ssi
index bd8393d..1949e3d 100644
--- a/manual/ro/user_installation.ssi
+++ b/manual/ro/user_installation.ssi
@@ -105,7 +105,7 @@ are available on http://live.debian.net/debian/.
2~ live-boot and live-config
-*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the live-boot-doc and live-config-doc packages separately.
+*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes. If you only want the documentation, you may now install the /{live-boot-doc}/ and /{live-config-doc}/ packages separately.
3~ From the Debian repository
diff --git a/manual/ro/user_managing_a_configuration.ssi b/manual/ro/user_managing_a_configuration.ssi
index d0706a8..7df1d34 100644
--- a/manual/ro/user_managing_a_configuration.ssi
+++ b/manual/ro/user_managing_a_configuration.ssi
@@ -31,7 +31,7 @@ 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 #{lb config}# and #{lb clean}#, these
+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
diff --git a/manual/ro/user_overview.ssi b/manual/ro/user_overview.ssi
index ad40e60..beda6d4 100644
--- a/manual/ro/user_overview.ssi
+++ b/manual/ro/user_overview.ssi
@@ -58,8 +58,9 @@ subdirectory which it populates with some default settings, and a skeleton
code{
$ lb config
+ [2012-03-19 15:17:14] lb_config
P: Considering defaults defined in /etc/live/build.conf
- P: Creating config tree
+ P: Creating config tree for a debian system
}code
@@ -81,7 +82,7 @@ It is possible to specify many options, such as:
code{
- $ lb config --binary-images net --hostname live-machine --username live-user ...
+ $ lb config --binary-images net --bootappend-live "hostname=live-machine username=live-user" ...
}code
--
live-manual
More information about the debian-live-changes
mailing list