[SCM] live-manual branch, upstream, updated. upstream/3.0_a9-1-gee238fb
Daniel Baumann
daniel at debian.org
Mon Feb 6 22:42:48 UTC 2012
The following commit has been merged in the upstream branch:
commit ee238fb1d15d368a121b60d959fbed85628934e5
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Feb 6 23:42:11 2012 +0100
Adding upstream version 3.0~a10.
diff --git a/Makefile b/Makefile
index e5c8756..28dcf0b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,8 @@ SHELL := sh -e
LANGUAGES = en $(shell cd manual/po && ls)
+FORMATS = epub html odf pdf txt
+
DEBUG = 0
all: build
@@ -19,7 +21,7 @@ tidy:
sed -i -e 's|[ \t]*$$||' $${FILE}; \
done
-build:
+build: clean
#FIXME: do a proper dependency-based build
#FORMATS = epub html odf pdf txt
#...
@@ -28,52 +30,42 @@ build:
#etc.
@# FIXME: sisu-concordance sisu-pg sisu-sqlite
+
+ cd $(CURDIR)/manual; \
+ sisu --configure
for LANGUAGE in $(LANGUAGES); \
do \
- cd $(CURDIR)/manual/$${LANGUAGE}; \
- sisu-epub -v live-manual.ssm; \
- sisu-html -v live-manual.ssm; \
- sisu-odf -v live-manual.ssm; \
- sisu-pdf -v live-manual.ssm; \
- sisu-txt -v live-manual.ssm; \
- done
-# for FILE in build/manual/live-manual/*.$${LANGUAGE}.html; \
-# do \
-# ../bin/fix-sisu-html.rb $${FILE}; \
-# ([ $(DEBUG) -gt 0 ] || rm -f $${FILE}~); \
-# done; \
-
-autobuild: clean build
- rm -rf build
- cp -a html build
- cp -a manual/en/_sisu build
-
+ for FORMAT in $(FORMATS); \
+ do \
+ cd $(CURDIR)/manual; \
+ sisu-$${FORMAT} -v $${LANGUAGE}/live-manual.ssm; \
+ if [ "$${FORMAT}" = "html" ] ; \
+ then \
+ for FILE in ../build/manual/html/*.$${LANGUAGE}.html ../build/manual/html/live-manual/*.$${LANGUAGE}.html; \
+ do \
+ bin/fix-sisu-html.rb $${FILE}; \
+ ([ $(DEBUG) -gt 0 ] || rm -f $${FILE}~); \
+ done; \
+ fi ; \
+ done; \
+ done; \
+
+
+autobuild: build
+
+ cd build/manual && rm -rf manifest toc.html; \
+
set +e; for LANGUAGE in $(LANGUAGES); \
do \
- FROMDIR=$(CURDIR)/manual/$${LANGUAGE}/build/manual; \
- TODIR=$(CURDIR)/build; \
- mkdir -p $${TODIR}; \
- cd $${TODIR}; \
- mkdir -p epub; \
- cp $${FROMDIR}/epub/live-manual.$${LANGUAGE}.epub epub; \
- mkdir -p html; \
- cp $${FROMDIR}/live-manual/*.$${LANGUAGE}.html html; \
- mv html/scroll.$${LANGUAGE}.html html/live-manual.$${LANGUAGE}.html; \
- rm -f html/toc.$${LANGUAGE}.html html/sisu_manifest.$${LANGUAGE}.html html/metadata.$${LANGUAGE}.html; \
- mkdir -p odf; \
- cp $${FROMDIR}/live-manual/opendocument.$${LANGUAGE}.odt odf/live-manual.$${LANGUAGE}.odt; \
- mkdir -p pdf; \
- cp $${FROMDIR}/live-manual/landscape.$${LANGUAGE}.a4.pdf pdf/live-manual.landscape-a4.$${LANGUAGE}.pdf; \
- cp $${FROMDIR}/live-manual/portrait.$${LANGUAGE}.a4.pdf pdf/live-manual.portrait-a4.$${LANGUAGE}.pdf; \
- cp $${FROMDIR}/live-manual/landscape.$${LANGUAGE}.letter.pdf pdf/live-manual.landscape-letter.$${LANGUAGE}.pdf; \
- cp $${FROMDIR}/live-manual/portrait.$${LANGUAGE}.letter.pdf pdf/live-manual.portrait-letter.$${LANGUAGE}.pdf; \
- mkdir -p txt; \
- cp $${FROMDIR}/live-manual/plain.$${LANGUAGE}.txt txt/live-manual.$${LANGUAGE}.txt; \
+ FROMDIR=$(CURDIR)/manual/$${LANGUAGE}; \
+ TODIR=$(CURDIR)/build/manual; \
+ cp $${FROMDIR}/index.html.in $${TODIR}; \
sed -e "s|@DATE_BUILD@|$(shell LC_ALL=C date -R)|" \
-e "s|@DATE_CHANGE@|$(shell LC_ALL=C git log | grep -m1 Date | awk -FDate: '{ print $2 }' | sed -e 's| ||g')|" \
- $${FROMDIR}/../../index.html.in > index.$${LANGUAGE}.html; \
+ $${TODIR}/index.html.in > $${TODIR}/index.$${LANGUAGE}.html; \
+ rm $${TODIR}/index.html.in; \
done
-
+
commit: tidy test
$(MAKE) -C manual rebuild
@@ -91,37 +83,20 @@ commit: tidy test
@echo " * git push"
install:
-
- for LANGUAGE in $(LANGUAGES); \
- do \
- FROMDIR=$(CURDIR)/manual/$${LANGUAGE}/build/manual; \
+ FROMDIR=$(CURDIR)/build/manual; \
TODIR=$(DESTDIR)/usr/share/doc/live-manual; \
- mkdir -p $${TODIR}; \
- cd $${TODIR}; \
- mkdir -p epub; \
- cp $${FROMDIR}/epub/live-manual.$${LANGUAGE}.epub epub; \
- mkdir -p html; \
- cp $${FROMDIR}/live-manual/*.$${LANGUAGE}.html html; \
- mv html/scroll.$${LANGUAGE}.html html/live-manual.$${LANGUAGE}.html; \
- rm -f html/toc.$${LANGUAGE}.html html/sisu_manifest.$${LANGUAGE}.html html/metadata.$${LANGUAGE}.html; \
- mkdir -p odf; \
- cp $${FROMDIR}/live-manual/opendocument.$${LANGUAGE}.odt odf/live-manual.$${LANGUAGE}.odt; \
- mkdir -p txt; \
- cp $${FROMDIR}/live-manual/plain.$${LANGUAGE}.txt txt/live-manual.$${LANGUAGE}.txt; \
- mkdir -p pdf; \
- cp $${FROMDIR}/live-manual/landscape.$${LANGUAGE}.a4.pdf pdf/live-manual.landscape-a4.$${LANGUAGE}.pdf; \
- cp $${FROMDIR}/live-manual/portrait.$${LANGUAGE}.a4.pdf pdf/live-manual.portrait-a4.$${LANGUAGE}.pdf; \
- cp $${FROMDIR}/live-manual/landscape.$${LANGUAGE}.letter.pdf pdf/live-manual.landscape-letter.$${LANGUAGE}.pdf; \
- cp $${FROMDIR}/live-manual/portrait.$${LANGUAGE}.letter.pdf pdf/live-manual.portrait-letter.$${LANGUAGE}.pdf; \
- done
+ cd $${FROMDIR} && rm -rf manifest index.html toc.html; \
+ mkdir -p $${TODIR}; \
+ cp -a $(CURDIR)/build/manual/* $(DESTDIR)/usr/share/doc/live-manual
+
- cp -a manual/en/_sisu $(DESTDIR)/usr/share/doc/live-manual
uninstall:
rm -rf $(DESTDIR)/usr/share/doc/live-manual
clean:
- rm -rf manual/*/build
+ rm -rf build
+ rm -f manual/en/*~
distclean: clean
rm -rf build
diff --git a/VERSION b/VERSION
index 3d80df2..bf14168 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a9
+3.0~a10
diff --git a/manual/Makefile b/manual/Makefile
index f2007e3..7992825 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -35,20 +35,16 @@ build: po4a.cfg
@if [ ! -x "$$(which po4a 2>/dev/null)" ]; \
then \
echo "E: po4a - command not found"; \
- echo "I: po4a can be optained from http://po4a.alioth.debian.org/"; \
+ echo "I: po4a can be obtained from http://po4a.alioth.debian.org/"; \
echo "I: On Debian based systems, po4a can be installed with 'apt-get install po4a'."; \
exit 1; \
fi
po4a --keep 0 --no-backups --package-name live-manual $(PO4A_FLAGS) po4a.cfg
- for LANGUAGE in $(LANGUAGES); \
- do \
- cp -a en/_sisu $${LANGUAGE}; \
- done
-
clean:
rm -f po/*/*.po~
+ rm -rf ../build
distclean: clean
rm -f po4a.cfg
diff --git a/manual/de/_sisu/.empty b/manual/_sisu/.empty
similarity index 100%
rename from manual/de/_sisu/.empty
rename to manual/_sisu/.empty
diff --git a/html/index.html b/manual/_sisu/home/index.html
similarity index 100%
rename from html/index.html
rename to manual/_sisu/home/index.html
diff --git a/manual/de/_sisu/image/.empty b/manual/_sisu/image/.empty
similarity index 100%
rename from manual/de/_sisu/image/.empty
rename to manual/_sisu/image/.empty
diff --git a/manual/de/_sisu/sisurc.yml b/manual/_sisu/sisurc.yml
similarity index 95%
rename from manual/de/_sisu/sisurc.yml
rename to manual/_sisu/sisurc.yml
index 788cd67..71e4020 100644
--- a/manual/de/_sisu/sisurc.yml
+++ b/manual/_sisu/sisurc.yml
@@ -15,7 +15,7 @@
# #all: 'image'
#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
webserv:
- path: 'build'
+ path: '../build'
url_root: 'http://live.debian.net/manual' #without dir stub
# images: '_sisu/image'
# man: 'man'
@@ -124,3 +124,7 @@ program_set:
# hyperestraier:
# flag: true
# action: http://search.sisudoc.org/cgi-bin/estseek.cgi?
+#% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2)
+#output_dir_structure_by: filename
+output_dir_structure_by: filetype
+#output_dir_structure_by: language
diff --git a/manual/de/_sisu/skin/doc/skin_debian-live.rb b/manual/_sisu/skin/doc/skin_debian-live.rb
similarity index 100%
rename from manual/de/_sisu/skin/doc/skin_debian-live.rb
rename to manual/_sisu/skin/doc/skin_debian-live.rb
diff --git a/manual/de/about_manual.ssi b/manual/de/about_manual.ssi
index c15a1a8..d01ce5b 100644
--- a/manual/de/about_manual.ssi
+++ b/manual/de/about_manual.ssi
@@ -24,19 +24,21 @@ command.
While we believe that everything in this manual is important to at least
some of our users, we realize it is a lot of material to cover and that you
may wish to experience early success using the software before delving into
-the details. Therefore, we have provided three tutorials in the
-{Examples}#examples section designed to teach you image building and
-customization basics. Read {Using the examples}#using-the-examples first,
-followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web
-browser utility}#tutorial-2 and finally {Tutorial 3: A personalized
-image}#tutorial-3. By the end of these tutorials, you will have a taste of
-what can be done with Debian Live. We encourage you to return to more
-in-depth study of the manual, perhaps next reading {The basics}#the-basics,
-skimming or skipping {Building a netboot image}#building-netboot-image, and
-finishing by reading the {Customization overview}#customization-overview and
-the chapters that follow it. By this point, we hope you are thoroughly
-excited by what can be done with Debian Live and motivated to read the rest
-of the manual, cover-to-cover.
+the details. Therefore, we suggest reading in the following order. First,
+read this chapter, {About this manual}#about-manual, from the beginning and
+ending with the {Terms}#terms section. Next, skip to the three tutorials at
+the front of the {Examples}#examples section designed to teach you image
+building and customization basics. Read {Using the
+examples}#using-the-examples first, followed by {Tutorial 1: A standard
+image}#tutorial-1, {Tutorial 2: A web browser utility}#tutorial-2 and
+finally {Tutorial 3: A personalized image}#tutorial-3. By the end of these
+tutorials, you will have a taste of what can be done with Debian Live. We
+encourage you to return to more in-depth study of the manual, perhaps next
+reading {The basics}#the-basics, skimming or skipping {Building a netboot
+image}#building-netboot-image, and finishing by reading the {Customization
+overview}#customization-overview and the chapters that follow it. By this
+point, we hope you are thoroughly excited by what can be done with Debian
+Live and motivated to read the rest of the manual, cover-to-cover.
2~terms Terms
@@ -180,7 +182,23 @@ code{
}code
-3~ Applying patches
+It is also possible to build by document type, e.g:
+
+code{
+
+ $ make build FORMATS=pdf
+
+}code
+
+Or combine both, e.g:
+
+code{
+
+ $ make build FORMATS=html LANGUAGES=it
+
+}code
+
+3~ Applying changes
Anyone can directly commit to the repository. However, we ask you to send
bigger changes to the mailing list to discuss them first. To push to the
@@ -234,10 +252,18 @@ code{
}code
-_* After sanitizing, commit the changes. Write commit messages that consist
-of full, useful sentences in English, starting with a capital letter and
-ending with a full stop. Usually, these will start with the form
-'Fixing/Adding/Removing/Correcting/Translating', e.g.
+_* Then
+
+code{
+
+ $ git add .
+
+}code
+
+_* After sanitizing and adding the files, commit the changes. Write commit
+messages that consist of full, useful sentences in English, starting with a
+capital letter and ending with a full stop. Usually, these will start with
+the form 'Fixing/Adding/Removing/Correcting/Translating', e.g.
code{
@@ -267,4 +293,8 @@ _* Once the new language is added, you can randomly start translating all po
files in #{manual/po/}#.
_* Don't forget you need #{make commit}# to ensure the translated manuals
-are updated from the po files, before #{git commit -a}# and #{git push}#.
+are updated from the po files and then you can review your changes launching
+#{make build}# before #{git add .}#, #{git commit -a -m "Translating..."}#
+and #{git push}#.
+
+*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.
diff --git a/manual/de/index.html.in b/manual/de/index.html.in
index acc1e36..cf5f168 100644
--- a/manual/de/index.html.in
+++ b/manual/de/index.html.in
@@ -9,9 +9,9 @@
<h2>Debian Live Handbuch</h2>
<p>
- <i>live-manual</i> is available in different file formats and it is
-translated into several languages. Keep in mind that some translations may
-be incomplete or may not be up to date.
+ <i>live-manual</i> ist in verschiedenen Dateiformaten und Übersetzungen in
+mehrere Sprachen verfügbar, jedoch können manche Übersetzungen teilweise
+unvollständig oder nicht immer aktuell sein.
</p>
<p>
@@ -20,21 +20,21 @@ be incomplete or may not be up to date.
unter <a
href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
(englischspraching) gemeldet werden. Informationen wie man <a
-href="html/about-manual.de.html#how-to-contribute">zum Handbuch
-beitragen</a> kann, können im Handbuch gefunden werden.
+href="html/live-manual.de.html#how-to-contribute">zum Handbuch beitragen</a>
+kann, können im Handbuch gefunden werden.
</p>
<h3>Verfügbare Formate</h3>
<ul>
<li><a href="epub/live-manual.de.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.de.html">mehrere Seiten</a>, <a
+ <li>HTML: <a href="html/live-manual/toc.de.html">mehrere Seiten</a>, <a
href="html/live-manual.de.html">einzelne Seite</a></li>
- <li><a href="odf/live-manual.de.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.de.pdf">A4 Hochformat</a>, <a
-href="pdf/live-manual.landscape-a4.de.pdf">A4 Querformat</a>, <a
-href="pdf/live-manual.portrait-letter.de.pdf">Letter Hochformat</a>, <a
-href="pdf/live-manual.landscape-letter.de.pdf">Letter Querformat</a></li>
+ <li><a href="odt/live-manual.de.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/portrait.de.a4.pdf">A4 Hochformat</a>, <a
+href="pdf/landscape.de.a4.pdf">A4 Querformat</a>, <a
+href="pdf/portrait.de.letter.pdf">Letter Hochformat</a>, <a
+href="pdf/landscape.de.letter.pdf">Letter Querformat</a></li>
<li><a href="txt/live-manual.de.txt">Text</a></li>
</ul>
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index 719b633..84d2856 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -5,11 +5,11 @@
@creator: Debian Live Projekt <debian-live at lists.debian.org>
@rights:
- :copyright: Copyright (C) 2006-2011 Debian Live Projekt
+ :copyright: Copyright (C) 2006-2012 Debian Live Projekt
: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: 2011-12-04
+ :published: 2012-02-06
@publisher: Debian Live Projekt <debian-live at lists.debian.org>
diff --git a/manual/de/user_basics.ssi b/manual/de/user_basics.ssi
index 4c42960..2eee04a 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -6,7 +6,7 @@ This chapter contains a brief overview of the build process and instructions
for using the three most commonly used image types. The most versatile image
type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB
portable storage device. In certain special cases, such as the use of
-persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter
+persistence, #{hdd}# may be more suitable for USB devices. The chapter
finishes with instructions for building and using a #{net}# type image,
which is a bit more involved due to the setup required on the server. This
is a slightly advanced topic for anyone who is not familiar already with
@@ -229,16 +229,16 @@ code{
}code
-2~building-usb-hdd Building a USB/HDD image
+2~building-hdd Building an HDD image
-Building a USB/HDD image is similar to ISO hybrid in all respects except you
-specify #{-b usb-hdd}# and the resulting filename is #{binary.img}# which
-cannot be burnt to optical media. It is suitable for booting from USB
-sticks, USB hard drives, and various other portable storage
-devices. Normally, an ISO hybrid image can be used for this purpose instead,
-but if you have a BIOS which does not handle hybrid images properly, or want
-to use the remaining space on the media for some purpose, such as a
-persistence partition, you need a USB/HDD image.
+Building an HDD image is similar to ISO hybrid in all respects except you
+specify #{-b hdd}# and the resulting filename is #{binary.img}# which cannot
+be burnt to optical media. It is suitable for booting from USB sticks, USB
+hard drives, and various other portable storage devices. Normally, an ISO
+hybrid image can be used for this purpose instead, but if you have a BIOS
+which does not handle hybrid images properly, or want to use the remaining
+space on the media for some purpose, such as a persistence partition, you
+need an HDD image.
Note: if you created an ISO hybrid image with the previous example, you will
need to clean up your working directory with the #{lb clean}# command (see
@@ -250,12 +250,12 @@ code{
}code
-Run the #{lb config}# command as before, except this time specifying the
-USB/HDD image type:
+Run the #{lb config}# command as before, except this time specifying the HDD
+image type:
code{
- $ lb config -b usb-hdd
+ $ lb config -b hdd
}code
@@ -270,15 +270,15 @@ code{
When the build finishes, a #{binary.img}# file should be present in the
current directory.
-2~using-usb-hdd-image Using a USB/HDD image
+2~using-hdd-image Using an HDD image
The generated binary image contains a VFAT partition and the syslinux
-bootloader, ready to be directly written on a USB stick. Since using a
-USB/HDD image is just like using an ISO hybrid image on USB, follow the
-instructions in {Using an ISO hybrid live image}#using-iso-hybrid, except
-use the filename #{binary.img}# instead of #{binary-hybrid.iso}#.
+bootloader, ready to be directly written on a USB stick. Since using an HDD
+image is just like using an ISO hybrid image on USB, follow the instructions
+in {Using an ISO hybrid live image}#using-iso-hybrid, except use the
+filename #{binary.img}# instead of #{binary-hybrid.iso}#.
-3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu
+3~testing-hdd-with-qemu Testing an HDD image with Qemu
First, install QEMU as described above in {Testing an ISO image with
QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on
@@ -345,12 +345,12 @@ code{
}code
-In contrast with the ISO and USB/HDD images, netbooting does not, itself,
-serve the filesystem image to the client, so the files must be served via
-NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the
-location and server, respectively, of the NFS server where the filesytem
-image will be located at boot time. Make sure these are set to suitable
-values for your network and server.
+In contrast with the ISO and HDD images, netbooting does not, itself, serve
+the filesystem image to the client, so the files must be served via NFS. The
+#{--net-root-path}# and #{--net-root-server}# options specify the location
+and server, respectively, of the NFS server where the filesytem image will
+be located at boot time. Make sure these are set to suitable values for your
+network and server.
Now build the image with the #{lb build}# command:
diff --git a/manual/de/user_customization-binary.ssi b/manual/de/user_customization-binary.ssi
index 6f843f8..1902f77 100644
--- a/manual/de/user_customization-binary.ssi
+++ b/manual/de/user_customization-binary.ssi
@@ -4,11 +4,43 @@ B~ Customizing the binary image
2~ Bootloader
-live-build uses syslinux as bootloader by default, which is by default
-configured to pause indefinitely at its splash screen. To adjust this, you
-can pass #{--syslinux-timeout TIMEOUT}# to #{lb config}#. The value is
-specified in units of seconds. A timeout of 0 (zero) disables the timeout
-completely. For more information please see syslinux(1).
+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.
+
+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.
+
+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/}#
+
+A modified *{isolinux.cfg}* to boot after five seconds would be similar to
+this:
+
+code{
+
+ include menu.cfg
+ default vesamenu.c32
+ prompt 0
+ timeout 5
+
+}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:
+
+code{
+
+ #!/bin/sh
+
+ sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg
+
+}code
+
+For more information please see man syslinux(1).
2~ ISO metadata
diff --git a/manual/de/user_customization-contents.ssi b/manual/de/user_customization-contents.ssi
index 5759093..4d67a3c 100644
--- a/manual/de/user_customization-contents.ssi
+++ b/manual/de/user_customization-contents.ssi
@@ -9,7 +9,7 @@ execute arbitrary commands at different stages of the build and at boot
time, and preseeding allows you to configure packages when they are
installed by supplying answers to debconf questions.
-2~ Includes
+2~includes Includes
While ideally a Debian live system would include files entirely provided by
unmodified Debian packages, it is sometimes convenient to provide or modify
@@ -105,7 +105,7 @@ Otherwise, the material will be installed by live-build in #{/includes/}# by
default on the media filesystem, or else you can specify an alternate path
with #{--includes}#.
-2~ Hooks
+2~hooks Hooks
Hooks allow commands to be performed in the chroot and binary stages of the
build in order to customize the image.
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index 75d3198..01fd8c2 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -62,40 +62,39 @@ also modifies live-build behaviour to suit the derivatives.
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 #{--parent-mirror-*}# options governs which
+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
-#{--parent-mirror-binary}# and #{--parent-mirror-binary-security}# values
-are used, superceding any mirrors used in an earlier stage.
+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
To set the distribution mirrors used at build time to point at a local
-mirror, it is sufficient to set #{--parent-mirror-bootstrap}#,
-#{--parent-mirror-chroot-security}# and #{--parent-mirror-chroot-backports}#
-as follows.
+mirror, it is sufficient to set #{--mirror-bootstrap}#,
+#{--mirror-chroot-security}# and #{--mirror-chroot-backports}# as follows.
code{
- $ lb config --parent-mirror-bootstrap http://localhost/debian/ \
- --parent-mirror-chroot-security http://localhost/debian-security/ \
- --parent-mirror-chroot-backports http://localhost/debian-backports/
+ $ lb config --mirror-bootstrap http://localhost/debian/ \
+ --mirror-chroot-security http://localhost/debian-security/ \
+ --mirror-chroot-backports http://localhost/debian-backports/
}code
-The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the
-#{--parent-mirror-bootstrap}# value.
+The chroot mirror, specified by #{--mirror-chroot}#, defaults to the
+#{--mirror-bootstrap}# value.
3~ Distribution mirrors used at run time
-The #{--parent-mirror-binary*}# options govern the distribution mirrors
-placed in the binary image. These may be used to install additional packages
-while running the live system. The defaults employ #{cdn.debian.net}#, a
-service that chooses a geographically close mirror based on the user's IP
+The #{--mirror-binary*}# options govern the distribution mirrors placed in
+the binary image. These may be used to install additional packages while
+running the live system. The defaults employ #{cdn.debian.net}#, a service
+that chooses a geographically close mirror based on the user's IP
number. This is a suitable choice when you cannot predict which mirror will
be best for all of your users. Or you may specify your own values as shown
in the example below. An image built from this configuration would only be
@@ -103,8 +102,8 @@ suitable for users on a network where "#{mirror}#" is reachable.
code{
- $ lb config --parent-mirror-binary http://mirror/debian/ \
- --parent-mirror-binary-security http://mirror/debian-security/
+ $ lb config --mirror-binary http://mirror/debian/ \
+ --mirror-binary-security http://mirror/debian-security/
}code
@@ -115,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
-#{--parent-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.
@@ -135,7 +134,7 @@ directory.
If such files exist, they will be picked up automatically.
You should also put the GPG key used to sign the repository into
-#{config/archives/your-repository.gpg.{binary,chroot}}# files.
+#{config/archives/your-repository.key.{binary,chroot}}# files.
*{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:
@@ -518,7 +517,7 @@ accomplish this:
code{
$ echo "deb http://mirror/debian sid main" > config/archives/sid.list.chroot
- $ cat >> config/chroot_apt/preferences <<END
+ $ cat >> config/chroot_apt/preferences << END
Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
Pin: release n=sid
Pin-Priority: 600
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
index 965f9ac..1faee91 100644
--- a/manual/de/user_examples.ssi
+++ b/manual/de/user_examples.ssi
@@ -19,15 +19,15 @@ if you use a local mirror. You may specify the options when you use #{lb
config}#, as described in {Distribution mirrors used at build
time}#distribution-mirrors-build-time, or for more convenience, set the
default for your build system in #{/etc/live/build.conf}#. Simply create
-this file and in it, set the corresponding #{LB_PARENT_MIRROR_*}# variables
-to your preferred mirror. All other mirrors used in the build will be
-defaulted from these values. For example:
+this file and in it, set the corresponding #{LB_MIRROR_*}# variables to your
+preferred mirror. All other mirrors used in the build will be defaulted from
+these values. For example:
code{
- LB_PARENT_MIRROR_BOOTSTRAP="http://mirror/debian"
- LB_PARENT_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
- LB_PARENT_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
+ LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
}code
@@ -255,7 +255,7 @@ to port #{5901}# on a server at #{192.168.1.2}#:
code{
$ mkdir -p config/includes.chroot/etc/skel
- $ cat > config/includes.chroot/etc/skel/.xsession <<END
+ $ cat > config/includes.chroot/etc/skel/.xsession << END
#!/bin/sh
/usr/bin/metacity &
diff --git a/manual/en/_sisu/.empty b/manual/en/_sisu/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/manual/en/_sisu/image/.empty b/manual/en/_sisu/image/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/manual/en/_sisu/sisurc.yml b/manual/en/_sisu/sisurc.yml
deleted file mode 100644
index 788cd67..0000000
--- a/manual/en/_sisu/sisurc.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-# Name: SiSU - Simple information Structuring Universe
-# Author: Ralph at Amissah.com
-# Description: Site wide envionment defaults set here
-# system environment info / resource configuration file, for sisu
-# License: GPL v3 or later
-# site environment configuration file
-# this file should be configured and live in
-# /etc/sisu #per environment settings, overridden by:
-# ~/.sisu #per user settings, overridden by:
-# ./_sisu #per local markup directory settings
-#% #image source directory, main path and subdirectories
-#image:
-# path: 'sisu_working'
-# public: '_sisu/image'
-# #all: 'image'
-#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
-webserv:
- path: 'build'
- url_root: 'http://live.debian.net/manual' #without dir stub
-# images: '_sisu/image'
-# man: 'man'
-# cgi: '/usr/lib/cgi-bin'
-# feed: 'feed'
-# sqlite: 'sisu/sqlite'
-# webrick_url: true
-#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
-#show_output_on: 'local:8111'
-#webserv_cgi:
-# host: localhost
-# base_path: ~
-# port: '8081'
-# user: ~
-show_output_on: 'filesystem_url'
-#texinfo display output
-#texinfo:
-# stub: 'texinfo'
-##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
-#processing:
-# path: '~'
-# dir: '.sisu_processing~'
-# metaverse: 'metaverse'
-# tune: 'tune'
-# latex: 'tex'
-# texinfo: 'texinfo'
-# concord_max: 400000
-#% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)
-flag:
- color: true # making colour default -c is toggle, and will now toggle colour off
- default: '-NhwepoabxXyYv' # -m run by default; includes verbose
- i: '-hwpoay' # -m run by default
- ii: '-NhwepoabxXy' # -m run by default
- iii: '-NhwepoabxXyY' # -m run by default
- iv: '-NhwepoabxXYDy --update' # -m run by default
- v: '-NhwepoabxXYDyv --update' # -m run by default; includes verbose
-#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
-default:
- papersize: 'A4,letter'
- #texpdf_font: 'Liberation Serif' # 'Liberation Sans' 'Liberation Serif'
- #text_wrap: 78
- #emphasis: 'bold' #make *{emphasis}* 'bold', 'italics' or 'underscore', default if not configured is 'bold'
- #digest: 'sha' #sha is sha256, default is md5
- #multilingual: false
- #language_file: 2
- #language: 'English'
-#% markup, make *{emphasis}* 'bold' or 'italics', default if not configured is 'bold'
-#% settings used by ssh scp
-#remote:
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-#% webrick information
-#webrick:
-# port: '8081'
-#% sql database info, postgresql and sqlite
-#db:
-# share_source: false # boolean, default is false
-# postgresql:
-# port: # '[port (default is 5432)]'
-# host: # '[if not localhost, provide host tcp/ip address or domain name]''
-# user: # '[(if different from user) provide username]'
-# password: # '[password if required]'
-# sqlite:
-# path: ~ # './sisu_sqlite.db'
-# port: "**"
-#% possible values ~, true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'.
-#will only ignore if value set to false, absence or nil will not remove program as should operate without rc file
-#ie in case of ~ will ignore and use hard coded defaults within program), true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'
-#on value true system defaults used, to change, e.g. editor specify
-permission_set:
- zap: false
- css_modify: false
-# remote_base_site: true
-program_set:
- rmagick: false
-# wc: true
-# editor: true
-# postgresql: true
-# sqlite: true
-# tidy: true
-# rexml: true
-# pdflatex: true
-#program_select:
-# editor: 'gvim -c :R -c :S'
-# pdf_viewer: 'evince'
-# web_browser: 'firefox' #'iceweasel' #'epiphany' #'galeon' #'konqueror' #'kazehakase'
-# console_www_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
-# epub_viewer: 'ebook-viewer' #'calibre' #'okular' #'fbreader'
-# odf_viewer: 'oowriter' #'abiword'
-# xml_viewer: 'xml-viewer'
-# man: 'nroff -man' #'groff -man -Tascii' # 'nroff -man'
-#promo: sisu_icon, sisu, sisu_search_libre, open_society, fsf, ruby
-#search:
-# sisu:
-# flag: true
-## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
-# action: http://search.sisudoc.org
-# db: sisu
-# title: sample search form
-# hyperestraier:
-# flag: true
-# action: http://search.sisudoc.org/cgi-bin/estseek.cgi?
diff --git a/manual/en/_sisu/skin/doc/skin_debian-live.rb b/manual/en/_sisu/skin/doc/skin_debian-live.rb
deleted file mode 100644
index 137636c..0000000
--- a/manual/en/_sisu/skin/doc/skin_debian-live.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-module SiSU_Viz
- require "#{SiSU_lib}/defaults" #<url:zxy_defaults.rb>
- class Skin
- #% path
- def path_root
- './sisu/' # the only parameter that cannot be changed here
- end
- def path_rel
- '../'
- end
- #% url
- def url_root_http
- 'http://live.debian.net/manual/'
- end
- def url_home
- 'http://live.debian.net/'
- end
- def url_site # used in pdf header
- 'http://live.debian.net'
- end
- def url_txt # text to go with url usually stripped url
- ''
- end
- def url_home_url
- '../index.html'
- end
- def url_footer_signature
- ''
- end
- #% color
- def color_band1
- '"#ffffff"'
- end
- def color_band2
- '"#ffffff"'
- end
- #% txt
- def txt_hp
- ' Debian'
- end
- def txt_home
- 'Debian'
- end
- def txt_signature
- ''
- end
- #% icon
- def icon_home_button
- 'debian_home.png'
- end
- def icon_home_banner
- home_button
- end
- #% banner
- def banner_home_button
- %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n}
- end
- def banner_home_and_index_buttons
- %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}</td><td width="60%"><center><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#ffffff"><font face="arial" size="2"><a href="toc" target="_top"> This text sub- <br /> Table of Contents </a></font>#{table_close}</center></center></td><td width="20%"> #{table_close}}
- end
- def banner_band
- %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}}
- end
- end
- class TeX
- def header_center
- "\\chead{\\href{#{@vz.url_site}/}{live.debian.net}}"
- end
- def home_url
- "\\href{#{@vz.url_site}/}{live.debian.net}"
- end
- def home
- "\\href{#{@vz.url_site}/}{Debian Live}"
- end
- def owner_chapter
- "Document owner details"
- end
- end
-end
diff --git a/manual/en/about_manual.ssi b/manual/en/about_manual.ssi
index c3bbe50..966b3f3 100644
--- a/manual/en/about_manual.ssi
+++ b/manual/en/about_manual.ssi
@@ -8,7 +8,7 @@ Some of the commands mentioned in the text must be executed with superuser privi
2~ For the impatient
-While we believe that everything in this manual is important to at least some of our users, we realize it is a lot of material to cover and that you may wish to experience early success using the software before delving into the details. Therefore, we have provided three tutorials in the {Examples}#examples section designed to teach you image building and customization basics. Read {Using the examples}#using-the-examples first, followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser utility}#tutorial-2 and finally {Tutorial 3: A personalized image}#tutorial-3. By the end of these tutorials, you will have a taste of what can be done with Debian Live. We encourage you to return to more in-depth study of the manual, perhaps next reading {The basics}#the-basics, skimming or skipping {Building a netboot image}#building-netboot-image, and finishing by reading the {Customization overview}#customization-overview and the chapters that follow it. By this poin
t, we hope you are thoroughly excited by what can be done with Debian Live and motivated to read the rest of the manual, cover-to-cover.
+While we believe that everything in this manual is important to at least some of our users, we realize it is a lot of material to cover and that you may wish to experience early success using the software before delving into the details. Therefore, we suggest reading in the following order. First, read this chapter, {About this manual}#about-manual, from the beginning and ending with the {Terms}#terms section. Next, skip to the three tutorials at the front of the {Examples}#examples section designed to teach you image building and customization basics. Read {Using the examples}#using-the-examples first, followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser utility}#tutorial-2 and finally {Tutorial 3: A personalized image}#tutorial-3. By the end of these tutorials, you will have a taste of what can be done with Debian Live. We encourage you to return to more in-depth study of the manual, perhaps next reading {The basics}#the-basics, skimming or ski
pping {Building a netboot image}#building-netboot-image, and finishing by reading the {Customization overview}#customization-overview and the chapters that follow it. By this point, we hope you are thoroughly excited by what can be done with Debian Live and motivated to read the rest of the manual, cover-to-cover.
2~terms Terms
@@ -110,7 +110,23 @@ code{
}code
-3~ Applying patches
+It is also possible to build by document type, e.g:
+
+code{
+
+ $ make build FORMATS=pdf
+
+}code
+
+Or combine both, e.g:
+
+code{
+
+ $ make build FORMATS=html LANGUAGES=it
+
+}code
+
+3~ Applying changes
Anyone can directly commit to the repository. However, we ask you to send bigger changes to the mailing list to discuss them first. To push to the repository, you must follow this procedure:
@@ -159,7 +175,15 @@ code{
}code
-_* After sanitizing, commit the changes. Write commit messages that consist of full, useful sentences in English, starting with a capital letter and ending with a full stop. Usually, these will start with the form 'Fixing/Adding/Removing/Correcting/Translating', e.g.
+_* Then
+
+code{
+
+ $ git add .
+
+}code
+
+_* After sanitizing and adding the files, commit the changes. Write commit messages that consist of full, useful sentences in English, starting with a capital letter and ending with a full stop. Usually, these will start with the form 'Fixing/Adding/Removing/Correcting/Translating', e.g.
code{
@@ -183,4 +207,6 @@ _* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html.in.p
_* Once the new language is added, you can randomly start translating all po files in #{manual/po/}#.
-_* Don't forget you need #{make commit}# to ensure the translated manuals are updated from the po files, before #{git commit -a}# and #{git push}#.
+_* Don't forget you need #{make commit}# to ensure the translated manuals are updated from the po files and then you can review your changes launching #{make build}# before #{git add .}#, #{git commit -a -m "Translating..."}# and #{git push}#.
+
+*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.
diff --git a/manual/en/index.html.in b/manual/en/index.html.in
index 2c630f3..212e00e 100644
--- a/manual/en/index.html.in
+++ b/manual/en/index.html.in
@@ -14,16 +14,16 @@
<p>
- Please report errors, omissions, patches and suggestions to our mailinglist at <a href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a> and read about <a href="html/about-manual.en.html#how-to-contribute">how to contribute</a> to the manual.
+ Please report errors, omissions, patches and suggestions to our mailinglist at <a href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a> and read about <a href="html/live-manual.en.html#how-to-contribute">how to contribute</a> to the manual.
</p>
<h3>Available Formats</h3>
<ul>
<li><a href="epub/live-manual.en.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.en.html">multi page</a>, <a href="html/live-manual.en.html">single page</a></li>
- <li><a href="odf/live-manual.en.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.en.pdf">A4 portrait</a>, <a href="pdf/live-manual.landscape-a4.en.pdf">A4 landscape</a>, <a href="pdf/live-manual.portrait-letter.en.pdf">letter portrait</a>, <a href="pdf/live-manual.landscape-letter.en.pdf">letter landscape</a></li>
+ <li>HTML: <a href="html/live-manual/toc.en.html">multi page</a>, <a href="html/live-manual.en.html">single page</a></li>
+ <li><a href="odt/live-manual.en.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/portrait.en.a4.pdf">A4 portrait</a>, <a href="pdf/landscape.en.a4.pdf">A4 landscape</a>, <a href="pdf/portrait.en.letter.pdf">letter portrait</a>, <a href="pdf/landscape.en.letter.pdf">letter landscape</a></li>
<li><a href="txt/live-manual.en.txt">Plain text</a></li>
</ul>
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 75eb990..485e4aa 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -5,11 +5,11 @@
@creator: Debian Live Project <debian-live at lists.debian.org>
@rights:
- :copyright: Copyright (C) 2006-2011 Debian Live Project
+ :copyright: Copyright (C) 2006-2012 Debian Live Project
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-12-04
+ :published: 2012-02-06
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/en/user_basics.ssi b/manual/en/user_basics.ssi
index ba065ea..e835b61 100644
--- a/manual/en/user_basics.ssi
+++ b/manual/en/user_basics.ssi
@@ -2,7 +2,7 @@
1~the-basics The basics
-This chapter contains a brief overview of the build process and instructions for using the three most commonly used image types. The most versatile image type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB portable storage device. In certain special cases, such as the use of persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter finishes with instructions for building and using a #{net}# type image, which is a bit more involved due to the setup required on the server. This is a slightly advanced topic for anyone who is not familiar already with netbooting, but is included here because once the setup is done, it is a very convenient way to test and deploy images for booting on the local network without the hassle of dealing with image media.
+This chapter contains a brief overview of the build process and instructions for using the three most commonly used image types. The most versatile image type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB portable storage device. In certain special cases, such as the use of persistence, #{hdd}# may be more suitable for USB devices. The chapter finishes with instructions for building and using a #{net}# type image, which is a bit more involved due to the setup required on the server. This is a slightly advanced topic for anyone who is not familiar already with netbooting, but is included here because once the setup is done, it is a very convenient way to test and deploy images for booting on the local network without the hassle of dealing with image media.
Throughout the chapter, we will often refer to the default filenames produced by live-build. If you are downloading a prebuilt image instead, the actual filenames may vary.
@@ -142,9 +142,9 @@ code{
}code
-2~building-usb-hdd Building a USB/HDD image
+2~building-hdd Building an HDD image
-Building a USB/HDD image is similar to ISO hybrid in all respects except you specify #{-b usb-hdd}# and the resulting filename is #{binary.img}# which cannot be burnt to optical media. It is suitable for booting from USB sticks, USB hard drives, and various other portable storage devices. Normally, an ISO hybrid image can be used for this purpose instead, but if you have a BIOS which does not handle hybrid images properly, or want to use the remaining space on the media for some purpose, such as a persistence partition, you need a USB/HDD image.
+Building an HDD image is similar to ISO hybrid in all respects except you specify #{-b hdd}# and the resulting filename is #{binary.img}# which cannot be burnt to optical media. It is suitable for booting from USB sticks, USB hard drives, and various other portable storage devices. Normally, an ISO hybrid image can be used for this purpose instead, but if you have a BIOS which does not handle hybrid images properly, or want to use the remaining space on the media for some purpose, such as a persistence partition, you need an HDD image.
Note: if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):
@@ -154,11 +154,11 @@ code{
}code
-Run the #{lb config}# command as before, except this time specifying the USB/HDD image type:
+Run the #{lb config}# command as before, except this time specifying the HDD image type:
code{
- $ lb config -b usb-hdd
+ $ lb config -b hdd
}code
@@ -172,11 +172,11 @@ code{
When the build finishes, a #{binary.img}# file should be present in the current directory.
-2~using-usb-hdd-image Using a USB/HDD image
+2~using-hdd-image Using an HDD image
-The generated binary image contains a VFAT partition and the syslinux bootloader, ready to be directly written on a USB stick. Since using a USB/HDD image is just like using an ISO hybrid image on USB, follow the instructions in {Using an ISO hybrid live image}#using-iso-hybrid, except use the filename #{binary.img}# instead of #{binary-hybrid.iso}#.
+The generated binary image contains a VFAT partition and the syslinux bootloader, ready to be directly written on a USB stick. Since using an HDD image is just like using an ISO hybrid image on USB, follow the instructions in {Using an ISO hybrid live image}#using-iso-hybrid, except use the filename #{binary.img}# instead of #{binary-hybrid.iso}#.
-3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu
+3~testing-hdd-with-qemu Testing an HDD image with Qemu
First, install QEMU as described above in {Testing an ISO image with QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which version your host system needs, specifying #{binary.img}# as the first hard drive.
@@ -228,7 +228,7 @@ code{
}code
-In contrast with the ISO and USB/HDD images, netbooting does not, itself, serve the filesystem image to the client, so the files must be served via NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the location and server, respectively, of the NFS server where the filesytem image will be located at boot time. Make sure these are set to suitable values for your network and server.
+In contrast with the ISO and HDD images, netbooting does not, itself, serve the filesystem image to the client, so the files must be served via NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the location and server, respectively, of the NFS server where the filesytem image will be located at boot time. Make sure these are set to suitable values for your network and server.
Now build the image with the #{lb build}# command:
diff --git a/manual/en/user_customization-binary.ssi b/manual/en/user_customization-binary.ssi
index 7a31382..88fc1f6 100644
--- a/manual/en/user_customization-binary.ssi
+++ b/manual/en/user_customization-binary.ssi
@@ -4,7 +4,34 @@ B~ Customizing the binary image
2~ Bootloader
-live-build uses syslinux as bootloader by default, which is by default configured to pause indefinitely at its splash screen. To adjust this, you can pass #{--syslinux-timeout TIMEOUT}# to #{lb config}#. The value is specified in units of seconds. A timeout of 0 (zero) disables the timeout completely. For more information please see syslinux(1).
+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.
+
+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.
+
+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/}#
+
+A modified *{isolinux.cfg}* to boot after five seconds would be similar to this:
+
+code{
+
+ include menu.cfg
+ default vesamenu.c32
+ prompt 0
+ timeout 5
+
+}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:
+
+code{
+
+ #!/bin/sh
+
+ sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg
+
+}code
+
+For more information please see man syslinux(1).
2~ ISO metadata
diff --git a/manual/en/user_customization-contents.ssi b/manual/en/user_customization-contents.ssi
index 0ff1407..4c00e5a 100644
--- a/manual/en/user_customization-contents.ssi
+++ b/manual/en/user_customization-contents.ssi
@@ -4,7 +4,7 @@
This chapter discusses fine-tuning customization of the live system contents beyond merely choosing which packages to include. Includes allow you to add or replace arbitrary files in your Debian Live image, hooks allow you to execute arbitrary commands at different stages of the build and at boot time, and preseeding allows you to configure packages when they are installed by supplying answers to debconf questions.
-2~ Includes
+2~includes Includes
While ideally a Debian live system would include files entirely provided by unmodified Debian packages, it is sometimes convenient to provide or modify some content by means of files. Using includes, it is possible to add (or replace) arbitrary files in your Debian Live image. live-build provides three mechanisms for using them:
@@ -70,7 +70,7 @@ code{
Otherwise, the material will be installed by live-build in #{/includes/}# by default on the media filesystem, or else you can specify an alternate path with #{--includes}#.
-2~ Hooks
+2~hooks Hooks
Hooks allow commands to be performed in the chroot and binary stages of the build in order to customize the image.
diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index 8772854..e7b277d 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -30,36 +30,36 @@ 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 #{--parent-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 #{--parent-mirror-binary}# and #{--parent-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
-To set the distribution mirrors used at build time to point at a local mirror, it is sufficient to set #{--parent-mirror-bootstrap}#, #{--parent-mirror-chroot-security}# and #{--parent-mirror-chroot-backports}# as follows.
+To set the distribution mirrors used at build time to point at a local mirror, it is sufficient to set #{--mirror-bootstrap}#, #{--mirror-chroot-security}# and #{--mirror-chroot-backports}# as follows.
code{
- $ lb config --parent-mirror-bootstrap http://localhost/debian/ \
- --parent-mirror-chroot-security http://localhost/debian-security/ \
- --parent-mirror-chroot-backports http://localhost/debian-backports/
+ $ lb config --mirror-bootstrap http://localhost/debian/ \
+ --mirror-chroot-security http://localhost/debian-security/ \
+ --mirror-chroot-backports http://localhost/debian-backports/
}code
-The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the #{--parent-mirror-bootstrap}# value.
+The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--mirror-bootstrap}# value.
3~ Distribution mirrors used at run time
-The #{--parent-mirror-binary*}# options govern the distribution mirrors placed in the binary image. These may be used to install additional packages while running the live system. The defaults employ #{cdn.debian.net}#, a service that chooses a geographically close mirror based on the user's IP number. This is a suitable choice when you cannot predict which mirror will be best for all of your users. Or you may specify your own values as shown in the example below. An image built from this configuration would only be suitable for users on a network where "#{mirror}#" is reachable.
+The #{--mirror-binary*}# options govern the distribution mirrors placed in the binary image. These may be used to install additional packages while running the live system. The defaults employ #{cdn.debian.net}#, a service that chooses a geographically close mirror based on the user's IP number. This is a suitable choice when you cannot predict which mirror will be best for all of your users. Or you may specify your own values as shown in the example below. An image built from this configuration would only be suitable for users on a network where "#{mirror}#" is reachable.
code{
- $ lb config --parent-mirror-binary http://mirror/debian/ \
- --parent-mirror-binary-security http://mirror/debian-security/
+ $ lb config --mirror-binary http://mirror/debian/ \
+ --mirror-binary-security http://mirror/debian-security/
}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 #{--parent-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.
@@ -73,7 +73,7 @@ If you add the same line to #{config/archives/live.list.binary}#, the repository
If such files exist, they will be picked up automatically.
-You should also put the GPG key used to sign the repository into #{config/archives/your-repository.gpg.{binary,chroot}}# files.
+You should also put the GPG key used to sign the repository into #{config/archives/your-repository.key.{binary,chroot}}# files.
*{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:
@@ -315,7 +315,7 @@ Let's say you are building a Wheezy live system but need all the live packages t
code{
$ echo "deb http://mirror/debian sid main" > config/archives/sid.list.chroot
- $ cat >> config/chroot_apt/preferences <<END
+ $ cat >> config/chroot_apt/preferences << END
Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
Pin: release n=sid
Pin-Priority: 600
diff --git a/manual/en/user_examples.ssi b/manual/en/user_examples.ssi
index d3ac9e4..834ef3f 100644
--- a/manual/en/user_examples.ssi
+++ b/manual/en/user_examples.ssi
@@ -8,13 +8,13 @@ This chapter covers example builds for specific use cases with Debian Live. If y
To use these examples you need a system to build them on that meets the requirements listed in {Requirements}#requirements and has live-build installed as described in {Installing live-build}#installing-live-build.
-Note that, for the sake of brevity, in these examples we do not specify a local mirror to use for the build. You can speed up downloads considerably if you use a local mirror. You may specify the options when you use #{lb config}#, as described in {Distribution mirrors used at build time}#distribution-mirrors-build-time, or for more convenience, set the default for your build system in #{/etc/live/build.conf}#. Simply create this file and in it, set the corresponding #{LB_PARENT_MIRROR_*}# variables to your preferred mirror. All other mirrors used in the build will be defaulted from these values. For example:
+Note that, for the sake of brevity, in these examples we do not specify a local mirror to use for the build. You can speed up downloads considerably if you use a local mirror. You may specify the options when you use #{lb config}#, as described in {Distribution mirrors used at build time}#distribution-mirrors-build-time, or for more convenience, set the default for your build system in #{/etc/live/build.conf}#. Simply create this file and in it, set the corresponding #{LB_MIRROR_*}# variables to your preferred mirror. All other mirrors used in the build will be defaulted from these values. For example:
code{
- LB_PARENT_MIRROR_BOOTSTRAP="http://mirror/debian"
- LB_PARENT_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
- LB_PARENT_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
+ LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
}code
@@ -192,7 +192,7 @@ Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for the
code{
$ mkdir -p config/includes.chroot/etc/skel
- $ cat > config/includes.chroot/etc/skel/.xsession <<END
+ $ cat > config/includes.chroot/etc/skel/.xsession << END
#!/bin/sh
/usr/bin/metacity &
diff --git a/manual/es/_sisu/.empty b/manual/es/_sisu/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/manual/es/_sisu/image/.empty b/manual/es/_sisu/image/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/manual/es/_sisu/sisurc.yml b/manual/es/_sisu/sisurc.yml
deleted file mode 100644
index 788cd67..0000000
--- a/manual/es/_sisu/sisurc.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-# Name: SiSU - Simple information Structuring Universe
-# Author: Ralph at Amissah.com
-# Description: Site wide envionment defaults set here
-# system environment info / resource configuration file, for sisu
-# License: GPL v3 or later
-# site environment configuration file
-# this file should be configured and live in
-# /etc/sisu #per environment settings, overridden by:
-# ~/.sisu #per user settings, overridden by:
-# ./_sisu #per local markup directory settings
-#% #image source directory, main path and subdirectories
-#image:
-# path: 'sisu_working'
-# public: '_sisu/image'
-# #all: 'image'
-#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
-webserv:
- path: 'build'
- url_root: 'http://live.debian.net/manual' #without dir stub
-# images: '_sisu/image'
-# man: 'man'
-# cgi: '/usr/lib/cgi-bin'
-# feed: 'feed'
-# sqlite: 'sisu/sqlite'
-# webrick_url: true
-#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
-#show_output_on: 'local:8111'
-#webserv_cgi:
-# host: localhost
-# base_path: ~
-# port: '8081'
-# user: ~
-show_output_on: 'filesystem_url'
-#texinfo display output
-#texinfo:
-# stub: 'texinfo'
-##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
-#processing:
-# path: '~'
-# dir: '.sisu_processing~'
-# metaverse: 'metaverse'
-# tune: 'tune'
-# latex: 'tex'
-# texinfo: 'texinfo'
-# concord_max: 400000
-#% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)
-flag:
- color: true # making colour default -c is toggle, and will now toggle colour off
- default: '-NhwepoabxXyYv' # -m run by default; includes verbose
- i: '-hwpoay' # -m run by default
- ii: '-NhwepoabxXy' # -m run by default
- iii: '-NhwepoabxXyY' # -m run by default
- iv: '-NhwepoabxXYDy --update' # -m run by default
- v: '-NhwepoabxXYDyv --update' # -m run by default; includes verbose
-#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
-default:
- papersize: 'A4,letter'
- #texpdf_font: 'Liberation Serif' # 'Liberation Sans' 'Liberation Serif'
- #text_wrap: 78
- #emphasis: 'bold' #make *{emphasis}* 'bold', 'italics' or 'underscore', default if not configured is 'bold'
- #digest: 'sha' #sha is sha256, default is md5
- #multilingual: false
- #language_file: 2
- #language: 'English'
-#% markup, make *{emphasis}* 'bold' or 'italics', default if not configured is 'bold'
-#% settings used by ssh scp
-#remote:
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-#% webrick information
-#webrick:
-# port: '8081'
-#% sql database info, postgresql and sqlite
-#db:
-# share_source: false # boolean, default is false
-# postgresql:
-# port: # '[port (default is 5432)]'
-# host: # '[if not localhost, provide host tcp/ip address or domain name]''
-# user: # '[(if different from user) provide username]'
-# password: # '[password if required]'
-# sqlite:
-# path: ~ # './sisu_sqlite.db'
-# port: "**"
-#% possible values ~, true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'.
-#will only ignore if value set to false, absence or nil will not remove program as should operate without rc file
-#ie in case of ~ will ignore and use hard coded defaults within program), true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'
-#on value true system defaults used, to change, e.g. editor specify
-permission_set:
- zap: false
- css_modify: false
-# remote_base_site: true
-program_set:
- rmagick: false
-# wc: true
-# editor: true
-# postgresql: true
-# sqlite: true
-# tidy: true
-# rexml: true
-# pdflatex: true
-#program_select:
-# editor: 'gvim -c :R -c :S'
-# pdf_viewer: 'evince'
-# web_browser: 'firefox' #'iceweasel' #'epiphany' #'galeon' #'konqueror' #'kazehakase'
-# console_www_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
-# epub_viewer: 'ebook-viewer' #'calibre' #'okular' #'fbreader'
-# odf_viewer: 'oowriter' #'abiword'
-# xml_viewer: 'xml-viewer'
-# man: 'nroff -man' #'groff -man -Tascii' # 'nroff -man'
-#promo: sisu_icon, sisu, sisu_search_libre, open_society, fsf, ruby
-#search:
-# sisu:
-# flag: true
-## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
-# action: http://search.sisudoc.org
-# db: sisu
-# title: sample search form
-# hyperestraier:
-# flag: true
-# action: http://search.sisudoc.org/cgi-bin/estseek.cgi?
diff --git a/manual/es/_sisu/skin/doc/skin_debian-live.rb b/manual/es/_sisu/skin/doc/skin_debian-live.rb
deleted file mode 100644
index 137636c..0000000
--- a/manual/es/_sisu/skin/doc/skin_debian-live.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-module SiSU_Viz
- require "#{SiSU_lib}/defaults" #<url:zxy_defaults.rb>
- class Skin
- #% path
- def path_root
- './sisu/' # the only parameter that cannot be changed here
- end
- def path_rel
- '../'
- end
- #% url
- def url_root_http
- 'http://live.debian.net/manual/'
- end
- def url_home
- 'http://live.debian.net/'
- end
- def url_site # used in pdf header
- 'http://live.debian.net'
- end
- def url_txt # text to go with url usually stripped url
- ''
- end
- def url_home_url
- '../index.html'
- end
- def url_footer_signature
- ''
- end
- #% color
- def color_band1
- '"#ffffff"'
- end
- def color_band2
- '"#ffffff"'
- end
- #% txt
- def txt_hp
- ' Debian'
- end
- def txt_home
- 'Debian'
- end
- def txt_signature
- ''
- end
- #% icon
- def icon_home_button
- 'debian_home.png'
- end
- def icon_home_banner
- home_button
- end
- #% banner
- def banner_home_button
- %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n}
- end
- def banner_home_and_index_buttons
- %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}</td><td width="60%"><center><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#ffffff"><font face="arial" size="2"><a href="toc" target="_top"> This text sub- <br /> Table of Contents </a></font>#{table_close}</center></center></td><td width="20%"> #{table_close}}
- end
- def banner_band
- %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}}
- end
- end
- class TeX
- def header_center
- "\\chead{\\href{#{@vz.url_site}/}{live.debian.net}}"
- end
- def home_url
- "\\href{#{@vz.url_site}/}{live.debian.net}"
- end
- def home
- "\\href{#{@vz.url_site}/}{Debian Live}"
- end
- def owner_chapter
- "Document owner details"
- end
- end
-end
diff --git a/manual/es/about_manual.ssi b/manual/es/about_manual.ssi
index 9e7d698..604b69f 100644
--- a/manual/es/about_manual.ssi
+++ b/manual/es/about_manual.ssi
@@ -27,12 +27,15 @@ la orden.
Aunque se cree que todo lo descrito en este manual es importante para la
mayoría de los usuarios, es cierto que hay mucho material a interiorizar y
que los usuarios desean experimentar con las herramientas de forma rápida y
-satisfactoria antes de entrar en detalles. Ésta es la razón por la que se
-presentan tres tutoriales en 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 {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
+satisfactoria antes de entrar en detalles. Por lo tanto, se sugiere leer
+siguiendo el siguiente orden. Primero leer el capítulo {Acerca de este
+manual}#about-manual, desde el principio y terminando en la sección
+{Términos}#terms. Después saltar hasta los tres tutoriales que están al
+principio de la sección {Ejemplos}#examples pensados para aprender a
+configurar y construir imágenes de sistemas en vivo de forma básica. Se
+deberá leer primero {Uso de 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,
@@ -202,7 +205,23 @@ $ make build LANGUAGES=en
}code
-3~ Aplicación de parches
+Es posible generar el documento por formato:
+
+code{
+
+ $ make build FORMATS=pdf
+
+}code
+
+O combinar ambos, por ejemplo:
+
+code{
+
+ $ make build FORMATS=html LANGUAGES=it
+
+}code
+
+3~ Aplicar cambios
Cualquiera puede hacer una entrega en el repositorio. Sin embargo, a la hora
de hacer grandes cambios, es conveniente enviarlos a la lista de correo para
@@ -263,10 +282,18 @@ code{
}code
-_* Una vez se ha saneado, 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 un punto final. Es
-habitual comenzar estas frases con la forma
+_* Entonces
+
+code{
+
+ $ git add .
+
+}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
+un punto final. Es habitual comenzar estas frases con la forma
'Fixing/Adding/Removing/Correcting/Translating', por ejemplo:
@@ -301,5 +328,9 @@ traducción de todos los ficheros .po exisitentes en #{manual/po/}# de manera
aleatoria.
_* No se debe olvidar la ejecución del comando #{make commit}# para asegurar
-que los manuales traducidos son actualizados desde los ficheros .po, antes
-de realizar la entrega mediante #{git commit -a}# y #{git push}#.
+que los manuales traducidos son actualizados desde los ficheros
+.po. Entonces se puede revisar los cambios ejecutando #{make build}# antes
+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.
diff --git a/manual/es/index.html.in b/manual/es/index.html.in
index ffc31ff..f256a51 100644
--- a/manual/es/index.html.in
+++ b/manual/es/index.html.in
@@ -17,7 +17,7 @@ traducciones pueden estar incompletas o sin actualizar.
<p>
Por favor, leer previamente <a
-href="html/about-manual.es.html#how-to-contribute">como contribuir</a> para
+href="html/live-manual.es.html#how-to-contribute">como contribuir</a> para
conocer como reportar errores, omisiones, parches y sugerencias a este
manual, utilizando la lista de correos <a
href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>.
@@ -27,14 +27,13 @@ href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>.
<ul>
<li><a href="epub/live-manual.es.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.es.html">una página por capítulo</a>, <a
+ <li>HTML: <a href="html/live-manual/toc.es.html">una página por capítulo</a>, <a
href="html/live-manual.es.html">todo el manual en una página</a></li>
- <li><a href="odf/live-manual.es.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.es.pdf">A4 vertical</a>, <a
-href="pdf/live-manual.landscape-a4.es.pdf">A4 apaisado</a>, <a
-href="pdf/live-manual.portrait-letter.es.pdf">Carta (letter) vertical</a>,
-<a href="pdf/live-manual.landscape-letter.es.pdf">Carta (letter)
-apaisado</a></li>
+ <li><a href="odt/live-manual.es.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/portrait.es.a4.pdf">A4 vertical</a>, <a
+href="pdf/landscape.es.a4.pdf">A4 apaisado</a>, <a
+href="pdf/portrait.es.letter.pdf">Carta (letter) vertical</a>, <a
+href="pdf/landscape.es.letter.pdf">Carta (letter) apaisado</a></li>
<li><a href="txt/live-manual.es.txt">Texto sin formato</a></li>
</ul>
diff --git a/manual/es/live-manual.ssm b/manual/es/live-manual.ssm
index a87d382..d2f142a 100644
--- a/manual/es/live-manual.ssm
+++ b/manual/es/live-manual.ssm
@@ -5,11 +5,11 @@
@creator: Debian Live Project <debian-live at lists.debian.org>
@rights:
- :copyright: Copyright (C) 2006-2011 Debian Live Project
- :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
+ :copyright: Copyright (C) 2006-2012 Debian Live Project
+ :license: Este programa es software libre: puede ser redistribuido y/o modificado bajo los términos de la GNU General Public License publicada por la Free Software Foundation, bien de la versión 3 de la Licencia, o (a su elección) cualquier versión posterior. <br><br> Este programa se distribuye con la esperanza de que sea útil, pero SIN NINGUNA GARANTÍA, incluso sin la garantía implícita de COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la GNU General Public License para más detalles. <br><br> Debería haber recibido una copia de la General Public License GNU junto con este programa. Si no, vea http://www.gnu.org/licenses/. <br><br> El texto completo de la GNU Licencia Pública General se pueden encontrar en /usr/share/common-licenses/GPL-3
@date:
- :published: 2011-12-04
+ :published: 2012-02-06
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/es/user_basics.ssi b/manual/es/user_basics.ssi
index 072ff4c..785fd62 100644
--- a/manual/es/user_basics.ssi
+++ b/manual/es/user_basics.ssi
@@ -7,15 +7,15 @@ 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 #{usb-hdd}#, pueden ser
-las más adecuadas para dispositivos USB. El capítulo termina con
-instrucciones para crear y usar una imagen de tipo #{red}#, 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 («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.
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
@@ -252,16 +252,17 @@ code{
}code
-2~building-usb-hdd Crear una imagen USB/HDD
+2~building-hdd Crear una imagen HDD
-La siguiente secuencia de comandos creará una imagen USB/HDD básica que
-contendrá sólo el sistema estándar de Debian sin X.org. Es adecuada para el
-arranque desde dispositivos USB, discos duros USB y otros dispositivos de
-almacenamiento portátil. Normalmente, se puede utilizar para este propósito
-una imagen ISO híbrida, pero es posible que la BIOS no maneje adecuadamente
-las imágenes híbridas. También es interesante una imagen USB/HDD si se desea
-utilizar el espacio restante en los medios de almacenamiento para una
-partición con persistencia.
+Crear una imagen HDD es similar a una de tipo ISO híbrida en todos los
+aspectos, con la diferencia de que hay que especificar #{-b hdd}# y de que
+el nombre de la imagen final es #{binary.img}# que se puede copiar en medios
+ópticos. Es adecuada para el arranque desde dispositivos USB, discos duros
+USB y otros sistemas de almacenamiento portátil. Normalmente, se puede
+utilizar para este propósito una imagen ISO híbrida, pero es posible que la
+BIOS no maneje adecuadamente las imágenes híbridas. También es interesante
+una imagen HDD si se desea utilizar el espacio restante en los medios de
+almacenamiento para una partición con persistencia.
Nota: si se ha creado una imagen ISO híbrida con el ejemplo anterior, se
tendrá que limpiar el directorio de trabajo con el comando #{lb clean}# (ver
@@ -274,11 +275,11 @@ code{
}code
Ejecutar el comando #{lb config}# como antes pero esta vez especificando el
-tipo de imagen USB/HDD:
+tipo de imagen HDD:
code{
- $ lb config -b usb-hdd
+ $ lb config -b hdd
}code
@@ -293,16 +294,16 @@ code{
Cuando termine el proceso de creación, debe haber un fichero llamado
#{binary.img}# en el directorio actual .
-2~using-usb-hdd-image Utilizar una imágen USB/HDD
+2~using-hdd-image Utilizar una imágen HDD
La imagen binaria generada contiene una partición VFAT y el gestor de
arranque syslinux, lista para ser copiada directamente en un dispositivo
-USB. Dado que utilizar una imagen USB/HDD es igual a usar una imagen ISO
-híbrida en un USB, seguir las instrucciones de {Usar una imagen ISO
+USB. Dado que utilizar una imagen HDD es igual a usar una imagen ISO híbrida
+en un USB, seguir las instrucciones de {Usar una imagen ISO
híbrida}#using-iso-hybrid con la diferencia de usar el nombre #{binary.img}#
en lugar de #{binary-hybrid.iso}#.
-3~testing-usb-hdd-with-qemu Probar una imágen USB/HDD con Qemu
+3~testing-hdd-with-qemu Probar una imágen HDD con Qemu
En primer lugar, instalar QEMU como se describe más arriba en {Probar una
imágen ISO con QEMU}#testing-iso-with-qemu A continuación, ejecutar #{kvm}#
@@ -369,8 +370,8 @@ code{
}code
-A diferencia de las imágenes ISO y USB/HDD, el sistema de arranque en red en
-sí mismo no envía la imagen del sistema de ficheros al cliente, por eso los
+A diferencia de las imágenes ISO y HDD, el sistema de arranque en red en sí
+mismo no envía la imagen del sistema de ficheros al cliente, por eso los
ficheros se deben enviar mediante NFS. Las opciones #{--net-root-path}# y
#{--net-root-server}# especifican la ubicación y el servidor,
respectivamente, del servidor NFS en el que se encuentra la imagen del
diff --git a/manual/es/user_customization-binary.ssi b/manual/es/user_customization-binary.ssi
index 1189837..38a3fce 100644
--- a/manual/es/user_customization-binary.ssi
+++ b/manual/es/user_customization-binary.ssi
@@ -4,12 +4,45 @@ B~ Personalización de la imagen binaria
2~ Gestor de arranque
-live-build utiliza syslinux como gestor de arranque por defecto, el cual
-está configurado de forma predeterminada para hacer una pausa indefinida en
-su pantalla de bienvenida. Para modificar esto, se puede pasar
-#{--syslinux-timeout TIMEOUT}# a #{lb config}#. El valor se especifica en
-segundos. Un tiempo de espera de 0 (cero) desactiva el tiempo de espera por
-completo. Para obtener más información, consultar syslinux (1).
+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.
+
+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.
+
+Para modificar el tiempo de espera de arranque de una imagen #{iso-hybrid}#
+se puede editar un fichero *{isolinux.cfg}* especificando el tiempo de
+espera en unidades de segundo y agregarlo a
+#{config/includes.binary/isolinux/}#
+
+Un fichero *{isolinux.cfg}* modificado para arrancar después de cinco
+segundos sería así:
+
+code{
+
+ include menu.cfg
+ default vesamenu.c32
+ prompt 0
+ timeout 5
+
+}code
+
+Una forma alternativa de lograr el mismo objetivo podría ser escribiendo un
+script gancho y agregarlo a #{config/hooks/}# Recordar añadir el sufijo
+.binary para que sea ejecutado en la etapa binary. Un ejemplo podría ser:
+
+code{
+
+ #!/bin/sh
+
+ sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg
+
+}code
+
+Para más información ver la página del manual de syslinux(1).
2~ Metadatos ISO
diff --git a/manual/es/user_customization-contents.ssi b/manual/es/user_customization-contents.ssi
index 5d75a2f..ef5cf6f 100644
--- a/manual/es/user_customization-contents.ssi
+++ b/manual/es/user_customization-contents.ssi
@@ -12,7 +12,7 @@ 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
+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
@@ -124,7 +124,7 @@ directorio #{/includes/}# del sistema de ficheros del medio de instalación
por defecto. En lugar de none, se puede especificar un directorio
alternativo mediante la misma opción #{--includes}#.
-2~ Scripts gancho (Hooks)
+2~hooks Scripts gancho (Hooks)
Los scripts gancho permiten ejecutar órdenes para personalizar la imagen en
las etapas chroot y binary.
diff --git a/manual/es/user_customization-packages.ssi b/manual/es/user_customization-packages.ssi
index d3947a4..e9f742c 100644
--- a/manual/es/user_customization-packages.ssi
+++ b/manual/es/user_customization-packages.ssi
@@ -72,42 +72,41 @@ modificará su comportamiento para adecuarlo al modo seleccionado.
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
-#{--parent-mirror-*}# gobierna qué réplica de repositorio Debian se utiliza
-en las diferentes etapas de creación. Si se recuerda de {Etapas de la
+#{--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 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
-#{--parent-mirror-*}#. Posteriormente, en la etapa *binary* se utilizarán
-las réplicas Debian indicadas en los valores de las opciones
-#{--parent-mirror-binary}# y #{--parent-mirror-binary-security}# en lugar de
-utilizar los indicados para las etapas anteriores.
+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.
3~distribution-mirrors-build-time Réplicas de Distribution utilizadas
durante la creación
Para indicar qué réplicas deben ser utilizadas en el momento de crear la
-imagen es suficiente con utilizar las opciones #{--parent-mirror-bootstrap}#
-, #{--parent-mirror-chroot-security}# y #{--parent-mirror-chroot-backports}#
-como se muestra a continuación.
+imagen es suficiente con utilizar las opciones #{--mirror-bootstrap}# ,
+#{--mirror-chroot-security}# y #{--mirror-chroot-backports}# como se muestra
+a continuación.
code{
- $ lb config --parent-mirror-bootstrap http://localhost/debian/ \
- --parent-mirror-chroot-security http://localhost/debian-security/ \
- --parent-mirror-chroot-backports http://localhost/debian-backports/
+ $ lb config --mirror-bootstrap http://localhost/debian/ \
+ --mirror-chroot-security http://localhost/debian-security/ \
+ --mirror-chroot-backports http://localhost/debian-backports/
}code
-El valor indicado en #{--parent-mirror-chroot}# es utilizado como valor por
-defecto para la opción #{--parent-mirror-bootstrap}# si esta no es indicada.
+El valor indicado en #{--mirror-chroot}# es utilizado como valor por defecto
+para la opción #{--mirror-bootstrap}# si esta no es indicada.
3~ Réplicas de distribución Debian utilizadas en la ejecución.
-Las opciones #{--parent-mirror-binary*}# gobiernan las réplicas configuradas
-en la imagen binaria que serán utilizadas para instalar paquetes adicionales
+Las opciones #{--mirror-binary*}# gobiernan las réplicas configuradas en la
+imagen binaria que serán utilizadas para instalar paquetes adicionales
mientras se ejecuta el sistema en vivo. Por defecto se utiliza
#{cdn.debian.net}#, que es un servicio que selecciona la réplica más cercana
basándose en el número de IP. Es una elección bastante acertada siempre que
@@ -119,8 +118,8 @@ configuración solamente sería accesible a los usuarios de una red donde
code{
- $ lb config --parent-mirror-binary http://mirror/debian/ \
- --parent-mirror-binary-security http://mirror/debian-security/
+ $ lb config --mirror-binary http://mirror/debian/ \
+ --mirror-binary-security http://mirror/debian-security/
}code
@@ -132,7 +131,7 @@ indicada, como pueden ser paquetes de backports, paquetes experimentales o
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 #{--parent-mirror-*}#, estos ficheros gobiernan los repositorios
+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.
@@ -153,7 +152,7 @@ sistema en vivo.
Estos ficheros serán seleccionados automáticamente si existen.
Se debería también incluir en el fichero
-#{config/archives/your-repository.gpg.{binary,chroot}}# la clave GPG a
+#{config/archives/your-repository.key.{binary,chroot}}# la clave GPG a
utilizar para firmar dicho repositorio.
*{Nota:}* Existen algunos repositorios de paquetes ya preconfigurados para facilitar la selección mediante la opción #{--archives}#. Por ejemplo, para utilizar las instantáneas del repositorio de Debian Live, sería suficiente con activarlo mediante:
@@ -570,7 +569,7 @@ se puede realizar de la siguiente forma:
code{
$ echo "deb http://mirror/debian sid main" > config/archives/sid.list.chroot
- $ cat >> config/chroot_apt/preferences <<END
+ $ cat >> config/chroot_apt/preferences << END
Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
Pin: release n=sid
Pin-Priority: 600
diff --git a/manual/es/user_examples.ssi b/manual/es/user_examples.ssi
index bda4ac7..2850ecc 100644
--- a/manual/es/user_examples.ssi
+++ b/manual/es/user_examples.ssi
@@ -23,15 +23,15 @@ describe en {Réplicas de Distribution utilizadas durante la
creación}#distribution-mirrors-build-time, o para más comodidad, establecer
el valor por defecto para la creación del sistema en
#{/etc/live/build.conf}#. Basta con crear este fichero y en el mismo,
-establecer las variables #{LB_PARENT_MIRROR_*}# correspondientes a la
-réplica preferida. Todas las demás réplicas usadas en el proceso de creación
-usarán estos valores por defecto. Por ejemplo:
+establecer las variables #{LB_MIRROR_*}# correspondientes a la réplica
+preferida. Todas las demás réplicas usadas en el proceso de creación usarán
+estos valores por defecto. Por ejemplo:
code{
- LB_PARENT_MIRROR_BOOTSTRAP="http://mirror/debian"
- LB_PARENT_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
- LB_PARENT_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
+ LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
}code
@@ -273,7 +273,7 @@ el xvncviewer, conectándo al puerto #{5901}# de un servidor en
code{
$ mkdir -p config/includes.chroot/etc/skel
- $ cat > config/includes.chroot/etc/skel/.xsession <<END
+ $ cat > config/includes.chroot/etc/skel/.xsession << END
#!/bin/sh
/usr/bin/metacity &
diff --git a/manual/fr/_sisu/.empty b/manual/fr/_sisu/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/manual/fr/_sisu/image/.empty b/manual/fr/_sisu/image/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/manual/fr/_sisu/sisurc.yml b/manual/fr/_sisu/sisurc.yml
deleted file mode 100644
index 788cd67..0000000
--- a/manual/fr/_sisu/sisurc.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-# Name: SiSU - Simple information Structuring Universe
-# Author: Ralph at Amissah.com
-# Description: Site wide envionment defaults set here
-# system environment info / resource configuration file, for sisu
-# License: GPL v3 or later
-# site environment configuration file
-# this file should be configured and live in
-# /etc/sisu #per environment settings, overridden by:
-# ~/.sisu #per user settings, overridden by:
-# ./_sisu #per local markup directory settings
-#% #image source directory, main path and subdirectories
-#image:
-# path: 'sisu_working'
-# public: '_sisu/image'
-# #all: 'image'
-#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
-webserv:
- path: 'build'
- url_root: 'http://live.debian.net/manual' #without dir stub
-# images: '_sisu/image'
-# man: 'man'
-# cgi: '/usr/lib/cgi-bin'
-# feed: 'feed'
-# sqlite: 'sisu/sqlite'
-# webrick_url: true
-#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
-#show_output_on: 'local:8111'
-#webserv_cgi:
-# host: localhost
-# base_path: ~
-# port: '8081'
-# user: ~
-show_output_on: 'filesystem_url'
-#texinfo display output
-#texinfo:
-# stub: 'texinfo'
-##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
-#processing:
-# path: '~'
-# dir: '.sisu_processing~'
-# metaverse: 'metaverse'
-# tune: 'tune'
-# latex: 'tex'
-# texinfo: 'texinfo'
-# concord_max: 400000
-#% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)
-flag:
- color: true # making colour default -c is toggle, and will now toggle colour off
- default: '-NhwepoabxXyYv' # -m run by default; includes verbose
- i: '-hwpoay' # -m run by default
- ii: '-NhwepoabxXy' # -m run by default
- iii: '-NhwepoabxXyY' # -m run by default
- iv: '-NhwepoabxXYDy --update' # -m run by default
- v: '-NhwepoabxXYDyv --update' # -m run by default; includes verbose
-#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
-default:
- papersize: 'A4,letter'
- #texpdf_font: 'Liberation Serif' # 'Liberation Sans' 'Liberation Serif'
- #text_wrap: 78
- #emphasis: 'bold' #make *{emphasis}* 'bold', 'italics' or 'underscore', default if not configured is 'bold'
- #digest: 'sha' #sha is sha256, default is md5
- #multilingual: false
- #language_file: 2
- #language: 'English'
-#% markup, make *{emphasis}* 'bold' or 'italics', default if not configured is 'bold'
-#% settings used by ssh scp
-#remote:
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-#% webrick information
-#webrick:
-# port: '8081'
-#% sql database info, postgresql and sqlite
-#db:
-# share_source: false # boolean, default is false
-# postgresql:
-# port: # '[port (default is 5432)]'
-# host: # '[if not localhost, provide host tcp/ip address or domain name]''
-# user: # '[(if different from user) provide username]'
-# password: # '[password if required]'
-# sqlite:
-# path: ~ # './sisu_sqlite.db'
-# port: "**"
-#% possible values ~, true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'.
-#will only ignore if value set to false, absence or nil will not remove program as should operate without rc file
-#ie in case of ~ will ignore and use hard coded defaults within program), true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'
-#on value true system defaults used, to change, e.g. editor specify
-permission_set:
- zap: false
- css_modify: false
-# remote_base_site: true
-program_set:
- rmagick: false
-# wc: true
-# editor: true
-# postgresql: true
-# sqlite: true
-# tidy: true
-# rexml: true
-# pdflatex: true
-#program_select:
-# editor: 'gvim -c :R -c :S'
-# pdf_viewer: 'evince'
-# web_browser: 'firefox' #'iceweasel' #'epiphany' #'galeon' #'konqueror' #'kazehakase'
-# console_www_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
-# epub_viewer: 'ebook-viewer' #'calibre' #'okular' #'fbreader'
-# odf_viewer: 'oowriter' #'abiword'
-# xml_viewer: 'xml-viewer'
-# man: 'nroff -man' #'groff -man -Tascii' # 'nroff -man'
-#promo: sisu_icon, sisu, sisu_search_libre, open_society, fsf, ruby
-#search:
-# sisu:
-# flag: true
-## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
-# action: http://search.sisudoc.org
-# db: sisu
-# title: sample search form
-# hyperestraier:
-# flag: true
-# action: http://search.sisudoc.org/cgi-bin/estseek.cgi?
diff --git a/manual/fr/_sisu/skin/doc/skin_debian-live.rb b/manual/fr/_sisu/skin/doc/skin_debian-live.rb
deleted file mode 100644
index 137636c..0000000
--- a/manual/fr/_sisu/skin/doc/skin_debian-live.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-module SiSU_Viz
- require "#{SiSU_lib}/defaults" #<url:zxy_defaults.rb>
- class Skin
- #% path
- def path_root
- './sisu/' # the only parameter that cannot be changed here
- end
- def path_rel
- '../'
- end
- #% url
- def url_root_http
- 'http://live.debian.net/manual/'
- end
- def url_home
- 'http://live.debian.net/'
- end
- def url_site # used in pdf header
- 'http://live.debian.net'
- end
- def url_txt # text to go with url usually stripped url
- ''
- end
- def url_home_url
- '../index.html'
- end
- def url_footer_signature
- ''
- end
- #% color
- def color_band1
- '"#ffffff"'
- end
- def color_band2
- '"#ffffff"'
- end
- #% txt
- def txt_hp
- ' Debian'
- end
- def txt_home
- 'Debian'
- end
- def txt_signature
- ''
- end
- #% icon
- def icon_home_button
- 'debian_home.png'
- end
- def icon_home_banner
- home_button
- end
- #% banner
- def banner_home_button
- %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n}
- end
- def banner_home_and_index_buttons
- %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}</td><td width="60%"><center><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#ffffff"><font face="arial" size="2"><a href="toc" target="_top"> This text sub- <br /> Table of Contents </a></font>#{table_close}</center></center></td><td width="20%"> #{table_close}}
- end
- def banner_band
- %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}}
- end
- end
- class TeX
- def header_center
- "\\chead{\\href{#{@vz.url_site}/}{live.debian.net}}"
- end
- def home_url
- "\\href{#{@vz.url_site}/}{live.debian.net}"
- end
- def home
- "\\href{#{@vz.url_site}/}{Debian Live}"
- end
- def owner_chapter
- "Document owner details"
- end
- end
-end
diff --git a/manual/fr/about_manual.ssi b/manual/fr/about_manual.ssi
index 2793b64..6afd52d 100644
--- a/manual/fr/about_manual.ssi
+++ b/manual/fr/about_manual.ssi
@@ -26,7 +26,10 @@ fait pas partie de la commande.
Même si nous croyons que tout dans ce manuel est important pour au moins
certains de nos utilisateurs, nous nous rendons compte qu'il y a beaucoup de
matière à couvrir et que vous pouvez vouloir expérimenter avant d'entrer
-dans les détails. Par conséquent, nous avons fourni trois tutoriels dans la
+dans les détails. Par conséquent, nous vous suggérons de lire dans l'ordre
+suivant. Tout d'abord, lisez ce chapitre {À propos de ce
+manuel}#about-manual dès le début et finissant avec la section
+{Terminologie}#terms. Ensuite, sautez aux trois tutoriels à l'avant de la
section {Exemples}#examples destinée à vous apprendre la construction de
l'image et les bases de la personnalisation. Lire en premier {En utilisant
les exemples}#using-the-examples, suivie par {Tutoriel 1: Une image
@@ -188,7 +191,23 @@ code{
}code
-3~ Appliquer des correctifs
+Il est également possible de construire par type de document, par exemple,
+
+code{
+
+ $ make build FORMATS=pdf
+
+}code
+
+Ou combiner les deux, par exemple:
+
+code{
+
+ $ make build FORMATS=html LANGUAGES=it
+
+}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
@@ -243,10 +262,19 @@ code{
}code
-_* Après nettoyage, soumettre les modifications. Veuillez écrire les
-commentaires de commit à l'aide de phrases complètes, en commençant par une
-majuscule et en terminant par un point, et en commençant par
-'Fixing/Adding/Removing/Correcting/Translating', par exemple
+_* Alors
+
+code{
+
+ $ git add .
+
+}code
+
+_* Après le nettoyage et d'ajouter les fichiers, soumettre les
+modifications. Veuillez écrire les commentaires de commit à l'aide de
+phrases complètes, en commençant par une majuscule et en terminant par un
+point, et en commençant par 'Fixing/Adding/Removing/Correcting/Translating',
+par exemple
code{
@@ -277,5 +305,8 @@ _* Une fois la nouvelle langue est ajoutée, vous pouvez commencer à traduire
de façon aléatoire tous les fichiers po dans #{manual/po/}#.
_* N'oubliez pas que vous devez faire un #{make commit}# pour assurer que la
-traduction des manuels sont mis à jour à partir des fichiers po, avant #{git
-commit -a}# et #{git push}#.
+traduction des manuels sont mis à jour à partir des fichiers po, alors vous
+pouvez réviser vos modifications avec #{make build}# avant #{git add .}#,
+#{git commit -a -m "Translating..."}# et #{git push}#.
+
+*{Remarque:}* S'il vous plaît soyez conscient que même si les deux #{make commit}# et #{make build}# suppriment votre répertoire de construction, si vous construisez le manuel pour examiner vos modifications comme il est recommandé, et vous voulez nettoyer votre arbre git avant de les envoyer, vous pouvez utiliser #{make clean}#. Cette dernière étape n'est pas obligatoire grâce au fichier .gitignore mais il est une bonne pratique pour éviter d'envoyer certains fichiers involontairement.
diff --git a/manual/fr/index.html.in b/manual/fr/index.html.in
index 2ecf6ad..2d600fa 100644
--- a/manual/fr/index.html.in
+++ b/manual/fr/index.html.in
@@ -19,7 +19,7 @@ est traduit en plusieurs langues. Rappelez que certaines traductions peuvent
Veuillez transmettre les erreurs, omissions, patches et suggestions sur
notre liste de discussion <a
href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
-et lire <a href="html/about-manual.fr.html#how-to-contribute">comment
+et lire <a href="html/live-manual.fr.html#how-to-contribute">comment
contribuer</a> au manuel.
</p>
@@ -27,13 +27,13 @@ contribuer</a> au manuel.
<ul>
<li><a href="epub/live-manual.fr.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.fr.html">multi pages</a>, <a
+ <li>HTML: <a href="html/live-manual/toc.fr.html">multi pages</a>, <a
href="html/live-manual.fr.html">page unique</a></li>
- <li><a href="odf/live-manual.fr.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.fr.pdf">A4 portrait</a>, <a
-href="pdf/live-manual.landscape-a4.fr.pdf">A4 paysage</a>, <a
-href="pdf/live-manual.portrait-letter.fr.pdf">US portrait</a>, <a
-href="pdf/live-manual.landscape-letter.fr.pdf">US paysage</a></li>
+ <li><a href="odt/live-manual.fr.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/portrait.fr.a4.pdf">A4 portrait</a>, <a
+href="pdf/landscape.fr.a4.pdf">A4 paysage</a>, <a
+href="pdf/portrait.fr.letter.pdf">US portrait</a>, <a
+href="pdf/landscape.fr.letter.pdf">US paysage</a></li>
<li><a href="txt/live-manual.fr.txt">Texte brut</a></li>
</ul>
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index 1b61293..776d785 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -5,11 +5,11 @@
@creator: Debian Live Project <debian-live at lists.debian.org>
@rights:
- :copyright: Copyright (C) 2006-2011 Debian Live Project
+ :copyright: Copyright (C) 2006-2012 Debian Live Project
:license: 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: 2011-12-04
+ :published: 2012-02-06
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/fr/user_basics.ssi b/manual/fr/user_basics.ssi
index d1d62e8..1397d66 100644
--- a/manual/fr/user_basics.ssi
+++ b/manual/fr/user_basics.ssi
@@ -7,7 +7,7 @@ instructions pour utiliser les trois types d'images les plus couramment
utilisées. Le type d'image le plus polyvalent, #{iso-hybrid}#, peut être
utilisé sur une machine virtuelle, supports optiques ou un périphérique USB
de stockage portable. Dans certains cas particuliers, tels que l'utilisation
-de la persistance, le type #{usb-hdd}# peut être plus approprié pour les
+de la persistance, le type #{hdd}# peut être plus approprié pour les
périphériques USB. Le chapitre se termine avec des instructions pour la
construction et l'utilisation d'une image #{net}# , qui est un peu plus
compliqué en raison de la configuration requise sur le serveur. C'est un
@@ -249,17 +249,17 @@ code{
}code
-2~building-usb-hdd Construction d'une image USB/HDD
+2~building-hdd Construction d'une image HDD
-La construction d'une image USB/HDD est similaire à une ISO hybride à tous
-les égards, sauf que vous spécifiez #{-b usb-hdd}# et le nom du fichier
-résultant est #{binary.img}# qui ne peut être brûlé sur des supports
-optiques. Il convient pour le démarrage à partir de clés USB, disques durs
-USB, et divers autres dispositifs de stockage portables. Normalement, une
-image ISO hybride peut être utilisé à cette fin au lieu, mais si vous avez
-un BIOS qui ne gère pas correctement des images hybrides, ou si vous voulez
-utiliser l'espace disponible sur le support à certaines fins, tel que la
-persistance d'une partition, vous devez utiliser une image USB/HDD.
+La construction d'une image HDD est similaire à une ISO hybride à tous les
+régards, sauf que vous spécifiez #{-b hdd}# et le nom du fichier résultant
+est #{binary.img}# qui ne peut être brûlé sur des supports optiques. Il
+convient pour le démarrage à partir de clés USB, disques durs USB, et divers
+autres dispositifs de stockage portables. Normalement, une image ISO hybride
+peut être utilisé à cette fin au lieu, mais si vous avez un BIOS qui ne gère
+pas correctement des images hybrides, ou si vous voulez utiliser l'espace
+disponible sur le support à certaines fins, tel que la persistance d'une
+partition, vous devez utiliser une image HDD.
Remarque: si vous avez créé une image ISO hybride avec l'exemple précédent,
vous devrez nettoyer votre répertoire de travail avec la commande #{lb
@@ -272,11 +272,11 @@ code{
}code
Exécutez la commande #{lb config}# comme avant, sauf que cette fois en
-spécifiant le type d'image USB/HDD:
+spécifiant le type d'image HDD:
code{
- $ lb config -b usb-hdd
+ $ lb config -b hdd
}code
@@ -291,16 +291,16 @@ code{
Quand la création de l'image est finie, un fichier #{binary.img}# doit être
présent dans le répertoire courant.
-2~using-usb-hdd-image Utiliser une image USB/HDD
+2~using-hdd-image Utiliser une image HDD
L'image binaire générée contient une partition VFAT et le chargeur de
démarrage syslinux, prêtes à être écrites directement sur une clé USB. Comme
-l'utilisation d'une image USB/HDD est juste comme l'utilisation d'une image
-ISO hybride sur USB, suivez les instructions {Utiliser une image live ISO
+l'utilisation d'une image HDD est juste comme l'utilisation d'une image ISO
+hybride sur USB, suivez les instructions {Utiliser une image live ISO
hybride}#using-iso-hybrid, à l'exception du nom de fichier #{binary.img}# en
lieu de #{binary-hybrid.iso}#.
-3~testing-usb-hdd-with-qemu Test d'une image USB/HDD avec Qemu
+3~testing-hdd-with-qemu Test d'une image HDD avec Qemu
D'abord, installer QEMU comme décrit ci-dessus dans {Test d'une image ISO
avec QEMU}#testing-iso-with-qemu. Ensuite, exécutez #{kvm}# ou #{qemu}#,
@@ -369,7 +369,7 @@ code{
}code
-Contrairement à les images ISO et USB/HDD netbooting ne serve pas l'image du
+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
diff --git a/manual/fr/user_customization-binary.ssi b/manual/fr/user_customization-binary.ssi
index a235165..119ef49 100644
--- a/manual/fr/user_customization-binary.ssi
+++ b/manual/fr/user_customization-binary.ssi
@@ -2,14 +2,46 @@ B~ Personnalisation de l'image binaire
1~customizing-binary Personnalisation de l'image binaire
-2~ Chargeur de démarrage
-
-live-build utilise syslinux comme chargeur de démarrage par défaut, qui est
-configuré par défaut pour pauser indéfiniment à son écran splash. Pour
-régler cela, vous pouvez passer #{--syslinux-timeout TIMEOUT}# à #{lb
-config}#. La valeur est spécifiée en unités de secondes. Une valeur 0 (zéro)
-désactive le délai complètement. Pour plus d'informations s'il vous plaît
-voir syslinux(1).
+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.
+
+Par exemple, ces dérivés 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.
+
+Pour modifier le délai de démarrage d'une image iso-hybrid, vous pouvez
+éditer un fichier *{isolinux.cfg}* précisant le timeout dans les unités de
+secondes et l'ajouter à #{config/includes.binary/isolinux/}#
+
+Un *{isolinux.cfg}* modifié pour démarrer après cinq secondes ressemblerait
+à ceci:
+
+code{
+
+ include menu.cfg
+ default vesamenu.c32
+ prompt 0
+ timeout 5
+
+}code
+
+Une autre façon d'atteindre le même objectif pourrait être écrire un hook et
+l'ajouter à #{config/hooks/}# N'oubliez pas d'ajouter le suffixe #{.binary}#
+pour l'exécuter dans l’étape binaire. Un exemple proposé:
+
+code{
+
+ #!/bin/sh
+
+ sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg
+
+}code
+
+Pour plus d'informations s'il vous plaît voir man syslinux(1).
2~ Métadonnées ISO
diff --git a/manual/fr/user_customization-contents.ssi b/manual/fr/user_customization-contents.ssi
index 90aec25..5e79a3c 100644
--- a/manual/fr/user_customization-contents.ssi
+++ b/manual/fr/user_customization-contents.ssi
@@ -10,7 +10,7 @@ différentes étapes de la construction et au démarrage, et la
préconfiguration (preseeding) vous permet de configurer les paquets quand
ils sont installés en fournissant des réponses aux questions debconf .
-2~ Includes
+2~includes Includes
Bien qu'idéalement un système Debian Live comprendrait les fichiers
entièrement fournis par les paquets Debian non modifiés, on convient parfois
@@ -113,7 +113,7 @@ 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
-2~ Hooks
+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.
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index 875dc24..5f68aec 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -69,53 +69,52 @@ 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
-#{--parent-mirror-*}# qui régit quel miroir de distribution est utilisée à
+#{--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 #{--parent-mirror-binary}# et
-#{--parent-mirror-binary-security}# sont utilisées, remplaçant tout miroir
-utilisé dans une étape antérieure.
+*binary* stade les valeurs #{--mirror-binary}# et
+#{--mirror-binary-security}# sont utilisées, remplaçant tout miroir utilisé
+dans une étape antérieure.
3~distribution-mirrors-build-time Miroirs de distribution utilisés au temps
de construction
Pour définir les miroirs de distribution utilisés au temps de construction
-pour pointer vers un miroir local, il suffit de fixer
-#{--parent-mirror-bootstrap}# , #{--parent-mirror-chroot-security}# et
-#{--parent-mirror-chroot-backports}# comme suit.
+pour pointer vers un miroir local, il suffit de fixer #{--mirror-bootstrap}#
+, #{--mirror-chroot-security}# et #{--mirror-chroot-backports}# comme suit.
code{
- $ lb config --parent-mirror-bootstrap http://localhost/debian/ \
- --parent-mirror-chroot-security http://localhost/debian-security/ \
- --parent-mirror-chroot-backports http://localhost/debian-backports/
+ $ lb config --mirror-bootstrap http://localhost/debian/ \
+ --mirror-chroot-security http://localhost/debian-security/ \
+ --mirror-chroot-backports http://localhost/debian-backports/
}code
-Le miroir chroot, spécifiée par #{--parent-mirror-chroot}#, par défaut,
-c'est la valeur #{--parent-mirror-bootstrap}#.
+Le miroir chroot, spécifiée par #{--mirror-chroot}#, par défaut, c'est la
+valeur #{--mirror-bootstrap}#.
3~ Miroirs de distribution utilisés au moment de l'exécution
-Les options #{--parent-mirror-binary*}# régissent les miroirs de
-distribution placés dans l'image binaire. Ils peuvent être utilisés pour
-installer des paquets supplémentaires lors de l'exécution du système
-live. Les valeurs par défaut emploient #{cdn.debian.net}#, un service qui
-choisit un miroir géographiquement proche basé sur le numéro IP de
-l'utilisateur. C'est un choix approprié lorsque vous ne pouvez pas prédire
-quel miroir sera mieux pour tous vos utilisateurs. Ou vous pouvez spécifier
-vos propres valeurs, comme indiqué dans l'exemple ci-dessous. Une image
-construite avec cette configuration seulement serait approprié pour les
-utilisateurs sur un réseau où "#{mirror}#" est accessible.
+Les options #{--mirror-binary*}# régissent les miroirs de distribution
+placés dans l'image binaire. Ils peuvent être utilisés pour installer des
+paquets supplémentaires lors de l'exécution du système live. Les valeurs par
+défaut emploient #{cdn.debian.net}#, un service qui choisit un miroir
+géographiquement proche basé sur le numéro IP de l'utilisateur. C'est un
+choix approprié lorsque vous ne pouvez pas prédire quel miroir sera mieux
+pour tous vos utilisateurs. Ou vous pouvez spécifier vos propres valeurs,
+comme indiqué dans l'exemple ci-dessous. Une image construite avec cette
+configuration seulement serait approprié pour les utilisateurs sur un réseau
+où "#{mirror}#" est accessible.
code{
- $ lb config --parent-mirror-binary http://mirror/debian/ \
- --parent-mirror-binary-security http://mirror/debian-security/
+ $ lb config --mirror-binary http://mirror/debian/ \
+ --mirror-binary-security http://mirror/debian-security/
}code
@@ -127,10 +126,9 @@ 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
-#{--parent-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 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.
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
@@ -149,7 +147,7 @@ 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.gpg.{binary,chroot}}#
+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:
@@ -558,7 +556,7 @@ distribution du système cible, Wheezy. Ce qui suit devrait accomplir ça:
code{
$ echo "deb http://mirror/debian sid main" > config/archives/sid.list.chroot
- $ cat >> config/chroot_apt/preferences <<END
+ $ cat >> config/chroot_apt/preferences << END
Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
Pin: release n=sid
Pin-Priority: 600
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index 60730c1..fb9dfd1 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -23,15 +23,15 @@ config}#, tel que décrit dans {Miroirs de distribution utilisés au temps de
construction}#distribution-mirrors-build-time, ou pour plus de commodité,
fixez par défaut votre système de construction dans
#{/etc/live/build.conf}#. Il suffit de créer ce fichier et de définir les
-variables #{LB_PARENT_MIRROR_*}# correspondantes à votre miroir
-préféré. Tous les autres miroirs utilisés dans la construction seront par
-défaut à partir de ces valeurs. Par exemple:
+variables #{LB_MIRROR_*}# correspondantes à votre miroir préféré. Tous les
+autres miroirs utilisés dans la construction seront par défaut à partir de
+ces valeurs. Par exemple:
code{
- LB_PARENT_MIRROR_BOOTSTRAP="http://mirror/debian"
- LB_PARENT_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
- LB_PARENT_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
+ LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
}code
@@ -273,7 +273,7 @@ reliant le port #{5901}# sur un serveur à #{192.168.1.2}#:
code{
$ mkdir -p config/includes.chroot/etc/skel
- $ cat > config/includes.chroot/etc/skel/.xsession <<END
+ $ cat > config/includes.chroot/etc/skel/.xsession << END
#!/bin/sh
/usr/bin/metacity &
diff --git a/manual/it/_sisu/.empty b/manual/it/_sisu/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/manual/it/_sisu/image/.empty b/manual/it/_sisu/image/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/manual/it/_sisu/sisurc.yml b/manual/it/_sisu/sisurc.yml
deleted file mode 100644
index 788cd67..0000000
--- a/manual/it/_sisu/sisurc.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-# Name: SiSU - Simple information Structuring Universe
-# Author: Ralph at Amissah.com
-# Description: Site wide envionment defaults set here
-# system environment info / resource configuration file, for sisu
-# License: GPL v3 or later
-# site environment configuration file
-# this file should be configured and live in
-# /etc/sisu #per environment settings, overridden by:
-# ~/.sisu #per user settings, overridden by:
-# ./_sisu #per local markup directory settings
-#% #image source directory, main path and subdirectories
-#image:
-# path: 'sisu_working'
-# public: '_sisu/image'
-# #all: 'image'
-#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
-webserv:
- path: 'build'
- url_root: 'http://live.debian.net/manual' #without dir stub
-# images: '_sisu/image'
-# man: 'man'
-# cgi: '/usr/lib/cgi-bin'
-# feed: 'feed'
-# sqlite: 'sisu/sqlite'
-# webrick_url: true
-#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
-#show_output_on: 'local:8111'
-#webserv_cgi:
-# host: localhost
-# base_path: ~
-# port: '8081'
-# user: ~
-show_output_on: 'filesystem_url'
-#texinfo display output
-#texinfo:
-# stub: 'texinfo'
-##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
-#processing:
-# path: '~'
-# dir: '.sisu_processing~'
-# metaverse: 'metaverse'
-# tune: 'tune'
-# latex: 'tex'
-# texinfo: 'texinfo'
-# concord_max: 400000
-#% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)
-flag:
- color: true # making colour default -c is toggle, and will now toggle colour off
- default: '-NhwepoabxXyYv' # -m run by default; includes verbose
- i: '-hwpoay' # -m run by default
- ii: '-NhwepoabxXy' # -m run by default
- iii: '-NhwepoabxXyY' # -m run by default
- iv: '-NhwepoabxXYDy --update' # -m run by default
- v: '-NhwepoabxXYDyv --update' # -m run by default; includes verbose
-#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
-default:
- papersize: 'A4,letter'
- #texpdf_font: 'Liberation Serif' # 'Liberation Sans' 'Liberation Serif'
- #text_wrap: 78
- #emphasis: 'bold' #make *{emphasis}* 'bold', 'italics' or 'underscore', default if not configured is 'bold'
- #digest: 'sha' #sha is sha256, default is md5
- #multilingual: false
- #language_file: 2
- #language: 'English'
-#% markup, make *{emphasis}* 'bold' or 'italics', default if not configured is 'bold'
-#% settings used by ssh scp
-#remote:
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-#% webrick information
-#webrick:
-# port: '8081'
-#% sql database info, postgresql and sqlite
-#db:
-# share_source: false # boolean, default is false
-# postgresql:
-# port: # '[port (default is 5432)]'
-# host: # '[if not localhost, provide host tcp/ip address or domain name]''
-# user: # '[(if different from user) provide username]'
-# password: # '[password if required]'
-# sqlite:
-# path: ~ # './sisu_sqlite.db'
-# port: "**"
-#% possible values ~, true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'.
-#will only ignore if value set to false, absence or nil will not remove program as should operate without rc file
-#ie in case of ~ will ignore and use hard coded defaults within program), true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'
-#on value true system defaults used, to change, e.g. editor specify
-permission_set:
- zap: false
- css_modify: false
-# remote_base_site: true
-program_set:
- rmagick: false
-# wc: true
-# editor: true
-# postgresql: true
-# sqlite: true
-# tidy: true
-# rexml: true
-# pdflatex: true
-#program_select:
-# editor: 'gvim -c :R -c :S'
-# pdf_viewer: 'evince'
-# web_browser: 'firefox' #'iceweasel' #'epiphany' #'galeon' #'konqueror' #'kazehakase'
-# console_www_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
-# epub_viewer: 'ebook-viewer' #'calibre' #'okular' #'fbreader'
-# odf_viewer: 'oowriter' #'abiword'
-# xml_viewer: 'xml-viewer'
-# man: 'nroff -man' #'groff -man -Tascii' # 'nroff -man'
-#promo: sisu_icon, sisu, sisu_search_libre, open_society, fsf, ruby
-#search:
-# sisu:
-# flag: true
-## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
-# action: http://search.sisudoc.org
-# db: sisu
-# title: sample search form
-# hyperestraier:
-# flag: true
-# action: http://search.sisudoc.org/cgi-bin/estseek.cgi?
diff --git a/manual/it/_sisu/skin/doc/skin_debian-live.rb b/manual/it/_sisu/skin/doc/skin_debian-live.rb
deleted file mode 100644
index 137636c..0000000
--- a/manual/it/_sisu/skin/doc/skin_debian-live.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-module SiSU_Viz
- require "#{SiSU_lib}/defaults" #<url:zxy_defaults.rb>
- class Skin
- #% path
- def path_root
- './sisu/' # the only parameter that cannot be changed here
- end
- def path_rel
- '../'
- end
- #% url
- def url_root_http
- 'http://live.debian.net/manual/'
- end
- def url_home
- 'http://live.debian.net/'
- end
- def url_site # used in pdf header
- 'http://live.debian.net'
- end
- def url_txt # text to go with url usually stripped url
- ''
- end
- def url_home_url
- '../index.html'
- end
- def url_footer_signature
- ''
- end
- #% color
- def color_band1
- '"#ffffff"'
- end
- def color_band2
- '"#ffffff"'
- end
- #% txt
- def txt_hp
- ' Debian'
- end
- def txt_home
- 'Debian'
- end
- def txt_signature
- ''
- end
- #% icon
- def icon_home_button
- 'debian_home.png'
- end
- def icon_home_banner
- home_button
- end
- #% banner
- def banner_home_button
- %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n}
- end
- def banner_home_and_index_buttons
- %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}</td><td width="60%"><center><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#ffffff"><font face="arial" size="2"><a href="toc" target="_top"> This text sub- <br /> Table of Contents </a></font>#{table_close}</center></center></td><td width="20%"> #{table_close}}
- end
- def banner_band
- %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}}
- end
- end
- class TeX
- def header_center
- "\\chead{\\href{#{@vz.url_site}/}{live.debian.net}}"
- end
- def home_url
- "\\href{#{@vz.url_site}/}{live.debian.net}"
- end
- def home
- "\\href{#{@vz.url_site}/}{Debian Live}"
- end
- def owner_chapter
- "Document owner details"
- end
- end
-end
diff --git a/manual/it/about_manual.ssi b/manual/it/about_manual.ssi
index d8eef6e..24321dc 100644
--- a/manual/it/about_manual.ssi
+++ b/manual/it/about_manual.ssi
@@ -25,11 +25,13 @@ di super-utente, i comandi sono preceduti rispettivamente da #{$}# o
Sebbene crediamo che ogni cosa in questo manuale sia importante almeno per
alcuni dei nostri utenti, ci rendiamo conto che c'è tanto materiale da
trattare e che si potrebbe voler provare il software prima di entrare nei
-dettagli. Pertanto, abbiamo messo a disposizione nella sezione
-{Esempi}#examples tre tutorial progettati per insegnarvi le basi della
-costruzione e della personalizzazione delle immagini. Si legga innanzitutto
-{Usare gli esempi}#using-the-examples, seguito da {Tutorial 1: un'immagine
-standard}#tutorial-1, {Tutorial 2: un programma di utilità web
+dettagli; pertanto suggeriamo di leggerlo nel seguente ordine. Per iniziare
+leggere questo capitolo, {A proposito di questo manuale}#about-manual, da
+cima a fondo insieme alla sezione {Glossario}#terms, quindi passare ai tre
+tutorial all'inizio della sezione {Esempi}#examples progettati per insegnare
+le basi della costruzione e della personalizzazione delle immagini. Si legga
+innanzitutto {Usare gli esempi}#using-the-examples, seguito da {Tutorial 1:
+un'immagine standard}#tutorial-1, {Tutorial 2: un programma di utilità web
browser}#tutorial-2 e, infine, {Tutorial 3: un'immagine
personalizzata}#tutorial-3. Alla fine di queste esercitazioni, si avrà un
assaggio di ciò che si può fare con Debian Live. Ti invitiamo ad uno studio
@@ -184,7 +186,23 @@ code{
}code
-3~ Applicare le patch
+È inoltre possibile compilare in base al tipo di documento, esempio:
+
+code{
+
+ $ make build FORMATS=pdf
+
+}code
+
+Or combine both, e.g:
+
+code{
+
+ $ make build FORMATS=html LANGUAGES=it
+
+}code
+
+3~ Applicare le modifiche
Chiunque può eseguire il commit direttamente sul repository; tuttavia
chiediamo di inviare le modifiche più corpose in mailing list, per poterne
@@ -240,11 +258,19 @@ code{
}code
-_* Dopo la pulizia è possibile eseguire il commit delle modifiche. Si
-scrivano messaggi costituiti da frasi in inglese esaurienti ed utili,
-inizianti con una lettera maiuscola e terminanti con un punto. Solitamente
-cominceranno con la forma "Fixing/Adding/Removing/Correcting/Translating",
-ad esempio.
+_* Then
+
+code{
+
+ $ git add .
+
+}code
+
+_* Dopo aver pulito e aggiunto i file è possibile eseguire il commit delle
+modifiche. Si scrivano messaggi costituiti da frasi in inglese esaurienti e
+utili, inizianti con una lettera maiuscola e terminanti con un
+punto. Solitamente cominceranno con la forma
+"Fixing/Adding/Removing/Correcting/Translating", ad esempio.
code{
@@ -274,6 +300,9 @@ _* Una volta che la nuova lingua è stata aggiunta, si può iniziare a
tradurre tutti i file po situati in #{manual/po/}#, nell'ordine che si
preferisce.
-_* Non si dimentichi che è necessario dare un #{make commit}# per
-assicurarsi che i manuali tradotti siano aggiornati partendo dai file po,
-prima di #{git commit -a}# e #{git push}#.
+_* Non dimenticare che è necessario usare #{make commit}# per assicurarsi
+che i manuali tradotti siano aggiornati partendo dai file po, quindi si
+possono verificare le modifiche con #{make build}# prima di #{git add .}#,
+#{git commit -a -m "Traduzione..."}# e #{git push}#.
+
+*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.
diff --git a/manual/it/index.html.in b/manual/it/index.html.in
index 19632e2..57e6c52 100644
--- a/manual/it/index.html.in
+++ b/manual/it/index.html.in
@@ -9,9 +9,9 @@
<h2>Manuale Debian Live</h2>
<p>
- <i>live-manual</i> is available in different file formats and it is
-translated into several languages. Keep in mind that some translations may
-be incomplete or may not be up to date.
+ <i>live-manual</i> è disponibile in diversi formati e tradotto in varie
+lingue. Ricordarsi che alcune traduzioni possono essere incomplete o non
+aggiornate.
</p>
<p>
@@ -19,7 +19,7 @@ be incomplete or may not be up to date.
Si prega di segnalare errori, omissioni, patch e suggerimenti sulla nostra
mailing list <a
href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
-e leggere <a href="html/about-manual.it.html#how-to-contribute">come
+e leggere <a href="html/live-manual.it.html#how-to-contribute">come
contribuire</a> al manuale.
</p>
@@ -27,13 +27,13 @@ contribuire</a> al manuale.
<ul>
<li><a href="epub/live-manual.it.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.it.html">multi-pagina</a>, <a
+ <li>HTML: <a href="html/live-manual/toc.it.html">multi-pagina</a>, <a
href="html/live-manual.it.html">pagina unica</a></li>
- <li><a href="odf/live-manual.it.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.it.pdf">A4 verticale</a>, <a
-href="pdf/live-manual.landscape-a4.it.pdf">A4 orizzontale</a>, <a
-href="pdf/live-manual.portrait-letter.it.pdf">lettera verticale</a>, <a
-href="pdf/live-manual.landscape-letter.it.pdf">lettera orizzontale</a></li>
+ <li><a href="odt/live-manual.it.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/portrait.it.a4.pdf">A4 verticale</a>, <a
+href="pdf/landscape.it.a4.pdf">A4 orizzontale</a>, <a
+href="pdf/portrait.it.letter.pdf">lettera verticale</a>, <a
+href="pdf/landscape.it.letter.pdf">lettera orizzontale</a></li>
<li><a href="txt/live-manual.it.txt">Testo semplice</a></li>
</ul>
diff --git a/manual/it/live-manual.ssm b/manual/it/live-manual.ssm
index 3e72090..b4bce8a 100644
--- a/manual/it/live-manual.ssm
+++ b/manual/it/live-manual.ssm
@@ -5,11 +5,11 @@
@creator: Debian Live Project <debian-live at lists.debian.org>
@rights:
- :copyright: Copyright (C) 2006-2011 Debian Live Project
+ :copyright: Copyright (C) 2006-2012 Debian Live Project
:license: Questo programma è software libero: è possibile ridistribuirlo e modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, sia la versione 3 della licenza o (a scelta) una versione successiva.<br><br>Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori dettagli.<br><br>Si dovrebbe aver ricevuto una copia della GNU General Public License con questo programma. In caso contrario, vedere http://www.gnu.org/licenses/. <br><br>Il testo completo della GNU General Public License può essere trovato nel file /usr/share/common-licenses/GPL-3.
@date:
- :published: 2011-12-04
+ :published: 2012-02-06
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/it/user_basics.ssi b/manual/it/user_basics.ssi
index 8652ce2..adce3c5 100644
--- a/manual/it/user_basics.ssi
+++ b/manual/it/user_basics.ssi
@@ -7,14 +7,14 @@ le istruzioni per utilizzare i tre tipi di immagine più comunemente
utilizzati. La tipologia di immagine più versatile, #{iso-hybrid}#, può
essere usata su una macchina virtuale, supporto ottico o dispositivo di
archiviazione portatile USB. In alcuni casi particolari, come l'utilizzo
-della persistenza, la #{usb-hdd}# potrebbe essere più adatta per i
-dispositivi USB. Il capitolo termina con le istruzioni per costruire e usare
-un'immagine di tipo #{net}#, che è un poco più complessa a causa del setup
-richiesto sul server. Si tratta di un argomento leggermente avanzato per chi
-non ha familiarità con l'avvio da rete, ma è incluso qui perché, una volta
-che il setup è stato fatto, è un modo molto comodo per collaudare e
-distribuire immagini facendo il boot nella rete locale senza la seccatura di
-doversi occupare dei mezzi di divulgazione dell'immagine.
+della persistenza, la #{hdd}# potrebbe essere più adatta per i dispositivi
+USB. Il capitolo termina con le istruzioni per costruire e usare un'immagine
+di tipo #{net}#, che è un poco più complessa a causa del setup richiesto sul
+server. Si tratta di un argomento leggermente avanzato per chi non ha
+familiarità con l'avvio da rete, ma è incluso qui perché, una volta che il
+setup è stato fatto, è un modo molto comodo per collaudare e distribuire
+immagini facendo il boot nella rete locale senza la seccatura di doversi
+occupare dei mezzi di divulgazione dell'immagine.
Throughout the chapter, we will often refer to the default filenames
produced by live-build. If you are downloading a prebuilt image instead, the
@@ -242,17 +242,17 @@ code{
}code
-2~building-usb-hdd Creare un'immagine USB/HDD
+2~building-hdd Creare un'immagine HDD
-La creazione di un'immagine USB/HDD è simile alla ISO ibrida sotto tutti gli
-aspetti ad eccezione della necessità di specificare l'opzione #{-b usb-hdd}#
-e che il nome del file risultante è #{binary.img}# e non può essere
+La creazione di un'immagine HDD è simile alla ISO ibrida sotto tutti gli
+aspetti ad eccezione della necessità di specificare l'opzione #{-b hdd}# e
+che il nome del file risultante è #{binary.img}# e non può essere
masterizzato. È adatta per avviarsi da chiavette USB, dischi rigidi USB, e
da svariati altri dispositivi di archiviazione portatili. In genere per
questo scopo può essere usata un'immagine ISO ibrida, ma se si ha un BIOS
che non supporta le immagini ibride, o si vuole usare lo spazio rimanente
sul supporto per altri scopi, come una partizione persistente, allora
-occorre un'immagine USB/HDD.
+occorre un'immagine HDD.
Nota: se si è creata un'immagine ISO ibrida con gli esempi precedenti,
occorre pulire la directory di lavoro con il comando #{lb clean}# (vedere
@@ -265,11 +265,11 @@ code{
}code
Eseguire il comando #{lb config}# come prima, questa volta specificando però
-il tipo di immagine USB/HDD:
+il tipo di immagine HDD:
code{
- $ lb config -b usb-hdd
+ $ lb config -b hdd
}code
@@ -284,16 +284,16 @@ code{
Quando la costruzione è terminata dovrebbe essere presente un file
#{binary.img}# nella directory corrente.
-2~using-usb-hdd-image Utilizzare un'immagine USB/HDD
+2~using-hdd-image Utilizzare un'immagine HDD
L'immagine binaria generata contiene una partizione VFAT e il bootloader
syslinux, pronti per essere scritti direttamente su una penna USB. Dal
-momento che utilizzare un'immagine USB/HDD è come utilizzare un'immagine ISO
+momento che utilizzare un'immagine HDD è come utilizzare un'immagine ISO
ibrida via USB, seguire le istruzioni contenute in {Utilizzare un'immagine
live ISO ibrida}#using-iso-hybrid tenendo però conto che il nome del file
sarà #{binary.img}# invece di #{binary-hybrid.iso}#.
-3~testing-usb-hdd-with-qemu Provare un'immagine USB/HDD con Qemu
+3~testing-hdd-with-qemu Provare un'immagine HDD con Qemu
Installare QEMU come descritto in {Provare un'immagine ISO con
QEMU}#testing-iso-with-qemu; quindi eseguire #{kvm}# o #{qemu}#, a seconda
@@ -360,7 +360,7 @@ code{
}code
-Diversamente dalle immagini ISO e USB/HDD, il boot via rete non fornisce
+Diversamente dalle immagini ISO e HDD, il boot via rete non fornisce
un'immagine del filesytem al client, perciò i file devono essere forniti via
NFS. Le opzioni net-root-path e net-root-server specificano,
rispettivamente, il percorso e il server del server NFS dove l'immagine del
diff --git a/manual/it/user_customization-binary.ssi b/manual/it/user_customization-binary.ssi
index ed0aa19..c5c7260 100644
--- a/manual/it/user_customization-binary.ssi
+++ b/manual/it/user_customization-binary.ssi
@@ -4,12 +4,43 @@ B~ Personalizzare l'immagine binaria
2~ Bootloader
-live-build usa syslinux come bootloader predefinito, il quale è configurato
-per restare in pausa continua sulla schermata d'avvio. Per cambiare questo
-comportamento, si passi #{--syslinux-timeout TIMEOUT}# a #{lb
-config}#. Questo valore è espresso in secondi, 0 (zero) disabilita
-completamente il tempo di attesa. Per maggiori informazioni vedere
-syslinux(1).
+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.
+
+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.
+
+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/}#
+
+A modified *{isolinux.cfg}* to boot after five seconds would be similar to
+this:
+
+code{
+
+ include menu.cfg
+ default vesamenu.c32
+ prompt 0
+ timeout 5
+
+}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:
+
+code{
+
+ #!/bin/sh
+
+ sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg
+
+}code
+
+For more information please see man syslinux(1).
2~ Metadati ISO
diff --git a/manual/it/user_customization-contents.ssi b/manual/it/user_customization-contents.ssi
index c1e77d2..9e29dd7 100644
--- a/manual/it/user_customization-contents.ssi
+++ b/manual/it/user_customization-contents.ssi
@@ -9,7 +9,7 @@ hook permettono di eseguire comandi in fasi differenti della creazione e
all'avvio, e la preconfigurazione permette di configurare i pacchetti quando
vengono installati fornendo risposte alle domande di debconf.
-2~ Include
+2~includes Include
Anche se idealmente un sistema live Debian dovrebbe includere file forniti
interamente dal pacchetti Debian non modificati, a volte è conveniente
@@ -43,10 +43,10 @@ possono essere semplicemente aggiunti o sostituiti nell'immagine senza
elaborazione; si veda {Live/chroot hook locali}#live-chroot-local-hooks se è
necessaria l'elaborazione.
-To include files, simply add them to your #{config/includes.chroot}#
-directory. This directory corresponds to the root directory (#{/}#) of the
-live system. For example, to add a file #{/var/www/index.html}# in the live
-system, use:
+Per includere i file si aggiungano semplicemente alla directory
+#{config/includes.chroot}#. Questa corrisponde alla directory root (#{/}#)
+del sistema live. Per esempio, per aggiungere un file
+#{/var/www/index.html}# nel sistema live, si usi:
code{
@@ -75,13 +75,13 @@ pacchetti in modo che tali file vengano in seguito sovrascitti.
3~binary-local-includes Include locali binari
-To include material such as documentation or videos on the media filesystem
-so that it is accessible immediately upon insertion of the media without
-booting the Live system, you can use binary local includes. This works in a
-similar fashion to chroot local includes. For example, suppose the files
-#{~/video_demo.*}# are demo videos of the live system described by and
-linked to by an HTML index page. Simply copy the material to
-#{config/includes.binary/}# as follows:
+Si possono utilizzare include locali binari per inserire sul filesystem del
+supporto materiale come documentazione o video affinché sia immediatamente
+accessibile dopo l'inserimento dello stesso senza avviare il sistema
+live. Ciò funziona in modo simile agli include locali del chroot; supponendo
+che i file #{~/video_demo.*}# siano video dimostrativi del sistema descritti
+da e collegati a una pagina HTML indice, basta copiare il materiale in
+#{config/includes.binary/}# come segue:
code{
@@ -107,51 +107,51 @@ In caso contrario il materiale verrà installato da live-build nella
directory #{/includes/}# del filesystem in modo predefinito, oppure è
possibile specificare un percorso alternativo con #{--includes}#.
-2~ Hook
+2~hooks Hook
Gli hook permettono di eseguire comandi nel chroot e nelle fasi binarie
della creazione al fine di personalizzare l'immagine.
3~live-chroot-local-hooks Live/chroot hook locali
-To run commands in the chroot stage, create a hook script with a #{.chroot}#
-suffix containing the commands in the #{config/hooks/}# directory. The hook
-will run in the chroot after the rest of your chroot configuration has been
-applied, so remember to ensure your configuration includes all packages and
-files your hook needs in order to run. See the example chroot hook scripts
-for various common chroot customization tasks provided in
-#{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
-use them in your own configuration.
+Per eseguire comandi nella fase chroot, creare uno script hook con suffisso
+#{.chroot}# contenente i comandi nella directory #{config/hooks/}#. L'hook
+verrà eseguito nel chroot dopo che verrà applicata il resto della
+configurazione del chroot, ricordare quindi di garantire che la propria
+configurazione includa tutti i pacchetti e i file che l'hook necessita per
+funzionare. Vedere gli script d'esempio degli hook di chroot per i vari
+compiti di personalizzazione del chroot contenuti in
+#{/usr/share/live/build/examples/hooks}# da copiare o collegare nella
+propria configurazione.
3~boot-time-hooks Hook in fase di avvio
-To execute commands at boot time, you can supply live-config hooks as
-explained in the "Customization" section of its man page. Examine
-live-config's own hooks provided in #{/lib/live/config/}#, noting the
-sequence numbers. Then provide your own hook prefixed with an appropriate
-sequence number, either as a chroot local include in
-#{config/includes.chroot/lib/live/config/}#, or as a custom package as
-discussed in {Installing modified or third-party
-packages}#installing-modified-or-third-party-packages.
+Per eseguire comandi all'avvio, è possibile fornire degli hook a live-config
+come spiegato nella sezione "Customization" del suo manuale. Controllare gli
+hook di live-config in #{/lib/live/config/}# e notare i numeri sequenziali;
+fornire quindi i propri hook con una sequenza numerica appropriata, sia come
+include locali del chroot in #{config/includes.chroot/lib/live/config/}#,
+sia come pacchetto personalizzato come discusso in{Installare pacchetti
+modificati o di terze parti}#installing-modified-or-third-party-packages.
3~ Hook binari locali
-To run commands in the binary stage, create a hook script with a #{.binary}#
-suffix containing the commands in the #{config/hooks/}# directory. The hook
-will run after all other binary commands are run, but before
-binary_checksums, the very last binary command. The commands in your hook do
-not run in the chroot, so take care to not modify any files outside of the
-build tree, or you may damage your build system! See the example binary hook
-scripts for various common binary customization tasks provided in
-#{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
-use them in your own configuration.
+Per eseguire comandi nella fase binaria, creare uno script hook con suffisso
+#{.binary}# che contenga i comandi nella directory #{config/hooks/}#. L'hook
+verrà eseguito dopo tutti gli altri comandi binari, ma prima di
+binary_checksums, l'ultimo comando. I comandi nel proprio hook non vengono
+eseguiti nel chroot, perciò si faccia attenzione a non modificare nessun
+file al di fuori dell'albero di compilazione o si danneggerà il sistema!
+Vedere gli script d'esempio per gli hook binari per i vari compiti di
+personalizzazione dei binari in #{/usr/share/live/build/examples/hooks}# da
+copiare o collegare nella propria configurazione.
2~ Preconfigurare le domande di Debconf
-Files in the #{config/preseed/}# directory suffixed with #{.preseed}#
-followed by the stage (#{.chroot}# or #{.binary}#) are considered to be
-debconf preseed files and are installed by live-build using
-#{debconf-set-selections}# during the corresponding stage.
+I file nella directory #{config/preseed/}# con suffisso #{.preseed}# seguiti
+dalla fase (#{.chroot}# o #{.binary}#) sono considerati file di
+preconfigurazione di debconf e sono installati da live-build usando
+#{debconf-set-selections}# durante la fase corrispondente.
Per ulteriori informazioni su debconf, vedere debconf(7) nel pacchetto
#{debconf}#.
diff --git a/manual/it/user_customization-installer.ssi b/manual/it/user_customization-installer.ssi
index 22a1076..f9294a4 100644
--- a/manual/it/user_customization-installer.ssi
+++ b/manual/it/user_customization-installer.ssi
@@ -1,52 +1,51 @@
-:B~ Personalizzare il Debian Installer
+:B~ Personalizzare l'Installatore Debian
-1~customizing-installer Personalizzare il Debian Installer
+1~customizing-installer Personalizzare l'Installatore Debian
-Le immagini del sistema Debian Live possono essere integrate nel Debian
-Installer. Ci sono differenti tipi d'installazione che variano in cosa viene
-incluso e come agisce l'installatore.
+Le immagini del sistema Debian Live possono essere integrate
+nell'Installatore Debian. Ci sono differenti tipi d'installazione che
+variano in cosa viene incluso e come agisce l'installatore.
In questa sezione si presti attenzione all'uso delle lettere maiuscole
-quando si fa riferimento al "Debian Installer" - quando usato ci si
-riferisce all'installatore ufficiale Debian, niente altro. Spesso è
+quando si fa riferimento all'"Installatore Debian", quando usato ci si
+riferisce esclusivamente all'installatore ufficiale Debian. Spesso è
abbreviato come "d-i".
-2~ Tipologie del Debian Installer
+2~ Tipologie dell'Installatore Debian
I tre principali tipi dell'installer sono:
-*{Debian Installer "normale"}*: questa è un'immagine Debian Live con un kernel e un initrd separati i quali (quando viene selezionato da un appropriato bootloader) lancia un'istanza standard del Debian Installer, così come quando si scarica un'immagine di Debian e la si avvia. Le immagini che contengono un sistema live e un installatore indipendenti sono spesso definite "immagini combinate".
+*{Installatore Debian "normale"}*: un'immagine Debian Live con un kernel e un initrd separati i quali (quando viene selezionato dal bootloader appropriato) lancia un'istanza standard dell'Installatore Debian, come quando si scarica un'immagine di Debian per CD e la si avvia. Le immagini che contengono un sistema live e un'installatore indipendenti sono spesso definite "immagini combinate".
-In queste immagini, Debian è installata prendendo e installando pacchetti
-.deb usando {debootstrap}# o #{cdebootstrap}# da supporti locali o dalla
-rete, risultante in un sistema Debian standard che viene installato sul
-disco rigido.
+In queste immagini, Debian è installata prendendo e installando i pacchetti
+.deb usando {debootstrap}# o #{cdebootstrap}#, da supporti locali o dalla
+rete, risultante in un sistema Debian standard installato sul disco rigido.
L'intero processo può essere preimpostato e personalizzato in diversi modi;
per ulteriori informazioni si vedano le corrispondenti pagine del manuale
-del Debian Installer. Una volta che si ha un file preimpostato che funzioni,
-live-build può inserirlo automaticamente nell'immagine e abilitarlo.
+dell'Installatore Debian. Una volta che si ha un file preimpostato
+funzionante, live-build può inserirlo automaticamente nell'immagine e
+abilitarlo.
-*{Debian Installer "live"}*: Questa è un'immagine Debian Live con un kernel ed un initrd separato (quando selezionato dall'appropriato bootloader) lanciata in un'instanza del Debian Installer.
+*{Installatore Debian "live"}*: un'immagine Debian Live con un kernel e un initrd separato che (quando selezionato dall'appropriato bootloader) avvia un'instanza dell'Installatore Debian.
-L'installazione procederà nello stesso modo di un'installazione "Regolare"
-come descritto sopra, ma allo stadio attuale dell'installazione del
-pacchetto, invece di usare #{debootstrap}# per prelevare e installare i
-pacchetti, l'immagine del filesystem live viene copiata sulla
-destinazione. Questo si ottiene con uno speciale udeb chiamato
-live-installer.
+L'installazione procederà nello stesso modo di un'installazione "Normale"
+come descritto sopra, ma nella fase dell'installazione del pacchetto, invece
+di usare #{debootstrap}# per prelevare e installare i pacchetti, l'immagine
+del filesystem live viene copiata sulla destinazione. Questo si ottiene con
+uno speciale udeb chiamato live-installer.
-Dopo questa fase, il Debian Installer continua normalmente, installando e
+Dopo questa fase, l'Installatore Debian continua normalmente, installando e
configurando elementi come bootloader e utenti locali, ecc.
-Si noti: per supportare entrambi le voci dell'installer live o normale nel
-bootloader sullo stesso media, si deve disabilitare il live-installer dalla
-preconfigurazione #{live-installer/enable=false}#.
+Nota: per supportare nel bootloader sia la voce normale che quella live
+dell'installatore sullo stesso supporto si deve disabilitare live-installer
+preconfigurando #{live-installer/enable=false}#.
-*{Debian Installer "Desktop"}*: indipendentemente dal tipo del Debian Installer incluso, #{d-i}# può essere lanciato cliccando un'icona sul desktop, Questo è molto semplice in alcune situazioni. Per poterne usufruire deve essere incluso il pacchetto debian-installer-launcher.
+*{Installatore Debian "Desktop"}*: indipendentemente dal tipo di Installatore Debian incluso, #{d-i}# può essere lanciato cliccando un'icona sul desktop, in alcune situazioni più semplice per l'utente. Per poterne usufruire deve essere incluso il pacchetto debian-installer-launcher.
-Si noti che live-build non include il Debian Installer nell'immagine in modo
-predefinito, bisogna che sia espressamente abilitato con #{lb
+Si noti che live-build non include l'Installatore Debian nell'immagine in
+modo predefinito, necessita di essere espressamente abilitato con #{lb
config}#.Inoltre, affinché l'installatore "Desktop" funzioni, il kernel del
sistema live deve corrispondere a quello usato dal #{d-i}# per
l'architettura specificata. Per esempio:
@@ -61,7 +60,7 @@ code{
2~ Personalizzare il Debian Installer con la preconfigurazione
-Come descritto nell'appendice B del manuale del Debian Installer
+Come descritto nell'appendice B del manuale dell'Installatore Debian
all'indirizzo http://www.debian.org/releases/stable/i386/apb.html, "La
preconfigurazione fornisce un modo per impostare le risposte alle domande
poste durante il processo d'installazione senza la necessità di inserirle
@@ -79,12 +78,12 @@ code{
}code
-2~ Personalizzare il contenuto del Debian Installer
+2~ Personalizzare il contenuto dell'Installatore Debian
-For experimental or debugging purposes, you might want to include locally
-built #{d-i}# component udeb packages. Place these in
-#{config/packages.binary/}# to include them in the image. Additional or
-replacement files and directories may be included in the installer initrd as
-well, in a similar fashion to {Live/chroot local
-includes}#live-chroot-local-includes, by placing the material in
+Si può voler includere pacchetti udeb compilati localmente come componenti
+del #{d-i}# per scopi di sperimentazione o debug; per includerli
+nell'immagine inserirli in #{config/packages.binary/}#. I file e le
+directory aggiuntivi o di rimpiazzo si possono includere nell'initrd
+dell'installatore in maniera simile agli {Include locali del
+Live/chroot}#live-chroot-local-includes, inserendo il materiale in
#{config/binary_debian-installer-includes/}#.
diff --git a/manual/it/user_customization-packages.ssi b/manual/it/user_customization-packages.ssi
index dc567a5..665e559 100644
--- a/manual/it/user_customization-packages.ssi
+++ b/manual/it/user_customization-packages.ssi
@@ -65,68 +65,72 @@ comportamento di live-build per adattarlo alle derivate.
3~ Mirror delle distribuzioni
-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 #{--parent-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
-#{--parent-mirror-binary}# and #{--parent-mirror-binary-security}# values
-are used, superceding any mirrors used in an earlier stage.
+L'archivio Debian è replicato attraverso una vasta rete di mirror in tutto
+il mondo cosicché chiunque in ogni nazione può selezionare il mirror più
+vicino per la migliore velocità di scaricamento. Ciascuna delle opzioni
+#{--mirror-*}# determina quale mirror della distribuzione è usato nei vari
+stadi della compilazione. Ricordando dalle {Fasi della
+creazione}#stages-of-the-build che la fase di *avvio* è quando il chroot è
+inizialmente popolato da debootstrap con un sistema minimale e quella di
+*chroot* è quando viene creato il chroot usato per costruire il file system
+del sistema live. Perciò per queste fasi vengono usati i corrispondenti
+cambi di mirror, e in 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
-To set the distribution mirrors used at build time to point at a local
-mirror, it is sufficient to set #{--parent-mirror-bootstrap}#,
-#{--parent-mirror-chroot-security}# and #{--parent-mirror-chroot-backports}#
-as follows.
+Per impostare i mirror delle distribuzioni usati in fase di compilazione ad
+uno locale, è sufficiente impostare #{--mirror-bootstrap}#,
+#{--mirror-chroot-security}# e #{--mirror-chroot-backports}# come segue.
code{
- $ lb config --parent-mirror-bootstrap http://localhost/debian/ \
- --parent-mirror-chroot-security http://localhost/debian-security/ \
- --parent-mirror-chroot-backports http://localhost/debian-backports/
+ $ lb config --mirror-bootstrap http://localhost/debian/ \
+ --mirror-chroot-security http://localhost/debian-security/ \
+ --mirror-chroot-backports http://localhost/debian-backports/
}code
-The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the
-#{--parent-mirror-bootstrap}# value.
+Il mirror chroot, specificato da #{--mirror-chroot}#, è impostato al valore
+di #{--mirror-bootstrap}#.
3~ Mirror delle distribuzioni usate durante l'esecuzione
-The #{--parent-mirror-binary*}# options govern the distribution mirrors
-placed in the binary image. These may be used to install additional packages
-while running the live system. The defaults employ #{cdn.debian.net}#, a
-service that chooses a geographically close mirror based on the user's IP
-number. This is a suitable choice when you cannot predict which mirror will
-be best for all of your users. Or you may specify your own values as shown
-in the example below. An image built from this configuration would only be
-suitable for users on a network where "#{mirror}#" is reachable.
+Le opzioni #{--mirror-binary*}# determinano i mirror delle distribuzioni
+inseriti nell'immagine binaria. Questi possono essere usati per installare
+pacchetti aggiuntivi mentre il sistema live è in funzione. Le impostazioni
+predefinite impiegano #{cdn.debian.net}#, un servizio che sceglie un mirror
+geograficamente vicino basandosi sul numero IP dell'utente. Questo è una
+scelta conveniente quando non si può pronosticare quale sarà il mirror
+migliore per tutti gli utenti. Oppure si può specificare il proprio valore
+come mostrato nell'esempio qui sotto. Un'immagine compilata con questa
+configurazione sarebbe adatta solamente ad utenti di una rete dove sia
+raggiungibile il "#{mirror}#".
code{
- $ lb config --parent-mirror-binary http://mirror/debian/ \
- --parent-mirror-binary-security http://mirror/debian-security/
+ $ lb config --mirror-binary http://mirror/debian/ \
+ --mirror-binary-security http://mirror/debian-security/
}code
3~additional-repositories Repository addizionali
-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
-#{--parent-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.
+Si possono aggiungere altri repository, ampliando così la scelta dei
+pacchetti al di là di quelli disponibili nella distribuzione di
+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.
-For example, #{config/archives/live.list.chroot}# allows you to install
-packages from the debian live snapshot repository at live system build time.
+Per esempio, #{config/archives/live.list.chroot}# permette di installare
+pacchetti dal repository snapshot di debian live al momento della creazione
+del sistema live.
code{
@@ -134,16 +138,16 @@ code{
}code
-If you add the same line to #{config/archives/live.list.binary}#, the
-repository will be added to your live system's #{/etc/apt/sources.list.d/}#
-directory.
+Se si aggiunge la stessa riga in #{config/archives/live.list.binary}#, il
+repository verrà aggiunto alla directory #{/etc/apt/sources.list.d/}# del
+sistema live.
Se il file esiste, saranno prelevati automaticamente.
-You should also put the GPG key used to sign the repository into
-#{config/archives/your-repository.gpg.{binary,chroot}}# files.
+Bisogna inoltre inserire la chiave GPG usata per firmare il repository nei
+file #{config/archives/vostro-repository.key.{binary,chroot}}#.
-*{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:
+*{Nota:}* alcuni repository di pacchetti preconfigurati sono disponibili per una facile selezione attraverso l'opzione #{--archives}#, per abilitare gli snapshot live è sufficiente un semplice comando:
code{
@@ -153,12 +157,12 @@ code{
2~choosing-packages-to-install Scegliere i pacchetti da installare
-There are a number of ways to choose which packages live-build will install
-in your image, covering a variety of different needs. You can simply name
-individual packages to install in a package list. You can also choose
-predefined lists of packages, or use APT tasks. And finally, you may place
-package files in your #{config/}# tree, which is well suited to testing of
-new or experimental packages before they are available from a repository.
+Ci sono diversi modi per scegliere quali pacchetti live-build installerà
+nell'immagine, coprendo una gamma di esigenze diverse. Si possono richiamare
+i singoli pacchetti da un elenco o scegliere elenchi predefiniti di
+pacchetti oppure utilizzare i task di APT. E infine inserire i file dei
+pacchetti nell'albero #{config/}#, che ben si adatta a provare pacchetti
+nuovi o sperimentali prima che siano disponibili in un repository.
3~package-lists Elenchi di pacchetti
@@ -171,12 +175,11 @@ principali ambienti desktop e alcuni elenchi per uso speciale, così come
elenchi standard sui quali vi si basano altri. È inoltre possibile fornire i
propri elenchi o usare una combinazione di entrambi.
-*{Note:}* The behaviour of live-build when specifying a package that does not exist is determined by your choice of APT utility. See {Choosing apt or aptitude}#choosing-apt-or-aptitude for more details.
-
+*{Nota:}* quando si specifica un pacchetto che non esiste, il comportamento di live-build è determinato dalla scelta delle utilità di APT. Per ulteriori dettagli si veda {Scegliere apt o aptitude}#choosing-apt-or-aptitude.
3~ Elenchi predefiniti di pacchetti
-The simplest way to use lists is to specify one or more predefined lists
-with the #{--package-lists}# option. For example:
+Il modo più semplice per usare gli elenchi è di specificarne uno o più con
+l'opzione #{--package-lists}#. Per esempio:
code{
@@ -184,19 +187,19 @@ code{
}code
-The default location for the list files on your system is
-#{/usr/share/live/build/package-lists/}#. To determine the packages in a
-given list, read the corresponding file, paying attention to included files
-and conditionals as described in the following sections.
+Il percorso predefinito per i file elenco sul sistema è
+#{/usr/share/live/build/package-lists/}#. Per determinare i pacchetti in un
+dato elenco, si legga il file corrispondente, prestando attenzione ai file
+inclusi e condizionali come descritto nella sezioni seguenti.
3~ Elenchi locali dei pacchetti
-You may supplement the predefined lists using local package lists stored in
-#{config/package-lists/}#.
+Gli elenchi predefiniti si possono integrare usando quelli locali dei
+pacchetti in #{config/package-lists/}#.
-Package lists that exist in this directory need to have a #{.list}# suffix
-in order to be processed, and then an additional stage suffix, #{.chroot}#
-or #{.binary}# to indicate which stage the list is for.
+Per essere processate, gli elenchi dei pacchetti che si trovano in questa
+directory devono avere un suffisso #{.list}# e un suffisso #{.chroot}# o
+#{.binary}# aggiuntivo per indicare per quale fase sia l'elenco.
*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.
@@ -211,13 +214,14 @@ list, simply use the #{.list}# suffix by itself.
3~ Estendere un'elenco di pacchetti usando gli include
-The package lists that are included with live-build make extensive use of
-includes. Refer to these in the #{/usr/share/live/build/package-lists/}#
-directory, as they serve as good examples of how to write your own lists.
+Gli elenchi di pacchetti inclusi in live-build fanno un notevole uso di
+include. Far riferimento a questi nella directory
+#{/usr/share/live/build/package-lists/}#, in quanto portano ottimi esempi su
+come scriverne di propri.
-For example, to make a list that includes the predefined #{gnome}# list plus
-iceweasel, create #{config/package-lists/my.list.chroot}# with the following
-contents:
+Per esempio, per creare un elenco che includa quello predefinito di
+#{gnome}#più iceweasel, creare #{config/package-lists/mio.elenco.chroot}#
+con i seguenti contenuti:
code{
@@ -285,13 +289,13 @@ Le condizioni nidificate non sono supportate.
3~ Task
-The Debian Installer offers the user choices of a number of preselected
-lists of packages, each one focused on a particular kind of system, or task
-a system may be used for, such as "Graphical desktop environment", "Mail
-server" or "Laptop". These lists are called "tasks" and are supported by APT
-through the "Task:" field. You can specify one or more tasks in live-build
-by putting them in a list in #{config/task-lists/}#, as in the example
-below.
+L'installatore Debian offre all'utente la scelta di vari elenchi di
+pacchetti pre-selezionati, ognuno dei quali focalizzato su un particolare
+tipo di sistema, o il tipo di attività per cui utilizzarlo, come "Graphical
+desktop environment", "Mail server" o "Laptop". Questi elenchi sono chiamati
+"task" e sono gestiti da APT attraverso il campo"Task:". In live-build si
+possono specificare uno o più task inserendoli in una lista in
+#{config/task-lists/}#, come nell'esempio seguente.
code{
@@ -307,15 +311,16 @@ con #{tasksel --task-packages}#.
3~desktop-and-language-tasks Task per desktop e lingua
-Desktop and language tasks are special cases that need some extra planning
-and configuration. Live images are different from Debian Installer images in
-this respect. In the Debian Installer, if the medium was prepared for a
-particular desktop environment flavour, the corresponding task will be
-automatically installed. Thus, there are internal #{gnome-desktop}#,
-#{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}# tasks, none of which
-are offered in #{tasksel}#'s menu. Likewise, there are no menu entries for
-tasks for languages, but the user's language choice during the install
-influences the selection of corresponding language tasks.
+I task per i desktop e la lingua sono un caso particolare che necessita di
+ulteriori pianificazioni e configurazioni e in questo senso le immagini live
+sono diverse da quelle dell'Installatore Debian. Nell'Installatore Debian,
+se il supporto è stato preparato per un particolare ambiente desktop, il
+corrispondente task verrà automaticamente installato. Perciò ci sono task
+#{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# e #{xfce-desktop}#
+interni, nessuno dei quali è offerto nel menu di #{tasksel}#. Allo stesso
+modo, non c'è nessuna voce nel menu per i task delle lingue, ma la scelta
+della lingua dell'utente durante l'installazione influenza la selezione dei
+corrispondenti task della lingua.
When developing a desktop live image, the image typically boots directly to
a working desktop, the choices of both desktop and default language having
@@ -324,11 +329,11 @@ Installer. That's not to say that a live image couldn't be built to support
multiple desktops or multiple languages and offer the user a choice, but
that is not live-build's default behaviour.
-Because there is no provision made automatically for language tasks, which
-include such things as language-specific fonts and input-method packages, if
-you want them, you need to specify them in your configuration. For example,
-a GNOME desktop image containing support for Japanese might include these
-tasks:
+Poiché automaticamente non viene fatta alcuna preparazione sui task della
+lingua, i quali includono cose come caratteri specifici per la lingua e
+pacchetti per i metodi di input, se li si vogliono, vanno specificati nella
+configurazione. Per esempio, un'immagine del desktop GNOME contenente il
+supporto per il giapponese può includere questi task:
code{
@@ -375,36 +380,37 @@ _* #{packages.chroot}#
_* Utilizzare repository APT personalizzati
-Using #{packages.chroot}# is simpler to achieve and useful for "one-off"
-customizations but has a number of drawbacks, whilst using a custom APT
-repository is more time-consuming to set up.
+Usando #{packages.chroot}# è più semplice da ottenere e utile per una
+personalizzazione "una tantum" ma ha una serie di svantaggi, mentre un
+repository APT personalizzato è più laborioso da configurare.
-3~ Using #{packages.chroot}# to install custom packages
+3~ Utilizzare #{packages.chroot}# per installare pacchetti personalizzati
-To install a custom package, simply copy it to the
-#{config/packages.chroot/}# directory. Packages that are inside this
-directory will be automatically installed into the live system during build
-- you do not need to specify them elsewhere.
+Per installare un pacchetto personalizzato copiarlo nella directory
+#{config/packages.chroot/}#; i pacchetti al suo interno verranno installati
+automaticamente durante la creazione del sistema live, non è necessario
+specificarli altrove.
I pacchetti *{devono}* essere nominati nel modo prescritto, un metodo
semplice per farlo è usare #{dpkg-name}#.
-Using #{packages.chroot}# for installation of custom packages has
-disadvantages:
+L'utilizzo di #{packages.chroot}# per l'installazione di pacchetti
+personalizzati presenta degli svantaggi:
_* non è possibile usare secure APT
-_* You must install all appropriate packages in the
-#{config/packages.chroot/}# directory.
+_* è necessario installare i pacchetti adeguati nella directory
+#{config/packages.chroot/}#.
_* non si presta a salvare le configurazioni di Debian Live nel controllo di
versione.
3~ Utilizzare un repository APT per installare pacchetti personalizzati
-Unlike using #{packages.chroot}#, when using a custom APT repository you
-must ensure that you specify the packages elsewhere. See {Choosing packages
-to install}#choosing-packages-to-install for details.
+A differenza di #{packages.chroot}#, quando si usa un repository APT
+personalizzato è necessario assicurarsi di specificare altrove i
+pacchetti. Per i dettagli si veda {Scegliere i pacchetti da
+installare}#choosing-packages-to-install.
Sebbene creare un repository APT possa sembrare uno sforzo inutile,
l'infrastruttura può facilmente essere riutilizzata in un secondo momento
@@ -426,12 +432,12 @@ veda {APT pinning}#apt-pinning per maggiori informazioni.
2~ Configurare APT in fase di costruzione
-You can configure APT through a number of options applied only at build
-time. (APT configuration used in the running live system may be configured
-in the normal way for live system contents, that is, by including the
-appropriate configurations through #{config/includes.chroot/}#.) For a
-complete list, look for options starting with #{apt}# in the #{lb_config}#
-man page.
+APT è configurabile tramite una serie di opzioni applicate solo in fase di
+costruzione (la configurazione di APT utilizzata nel sistema live in
+esecuzione può essere configurata nel solito modo, ovvero includendo le
+impostazioni appropriate attraverso #{config/includes.chroot/}#). Per un
+elenco completo, cercare nel manuale di #{lb_config}# le opzioni che
+iniziano con #{apt}#.
3~choosing-apt-or-aptitude Scegliere apt o aptitude
@@ -509,9 +515,9 @@ di #{apt}# e #{aptitude}# per i dettagli.
3~apt-pinning APT pinning
-For background, please first read the #{apt_preferences(5)}# man page. APT
-pinning can be configured either for build time, or else for run time. For
-the former, create #{config/chroot_apt/preferences}#. For the latter, create
+Si prega di leggere prima il manuale di #{apt_preferences(5)}#. Il pinning
+può essere configurato sia in fase di costruzione sia di esecuzione; per la
+prima creare #{config/chroot_apt/preferences}# mentre per l'ultima creare
#{config/includes.chroot/etc/apt/preferences}#.
Nell'ipotesi di creare un sistema live Wheezy e avendo la necessità di
@@ -524,7 +530,7 @@ servirà allo scopo:
code{
$ echo "deb http://mirror/debian sid main" > config/archives/sid.list.chroot
- $ cat >> config/chroot_apt/preferences <<END
+ $ cat >> config/chroot_apt/preferences << END
Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
Pin: release n=sid
Pin-Priority: 600
@@ -544,14 +550,14 @@ $ lb config --distribution wheezy
}code
-Negative pin priorities will prevent a package from being installed, as in
-the case where you do not want a package that is recommended by another
-package. Suppose you are building an LXDE image using #{--package-lists
-lxde}# option, but don't want the user prompted to store wifi passwords in
-the keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in
-turn recommends #{gnome-keyring}#. So you want to omit the recommended
-#{gnome-keyring}# package. This can be done by adding the following stanza
-to #{config/chroot_apt/preferences}#:
+Un valore negativo della priorità evita che un pacchetto venga installato,
+come nel caso in cui non se ne voglia uno raccomandato da un altro. Si
+suppone di costruire un'immagine di LXDE utilizzando l'opzione
+#{--package-lists lxde}# ma non si desidera che all'utente venga richiesto
+di salvare la password del wifi nel portachiavi. L'elenco include #{gdm}#
+che dipende da #{gksu}# che a sua volta raccomanda #{gnome-keyring}#, in
+questo caso si vorrà omettere il pacchetto #{gnome-keyring}# aggiungendo a
+#{config/chroot_apt/preferences}# la seguente definizione:
code{
diff --git a/manual/it/user_customization-runtime.ssi b/manual/it/user_customization-runtime.ssi
index 8ba36b2..fc0cea0 100644
--- a/manual/it/user_customization-runtime.ssi
+++ b/manual/it/user_customization-runtime.ssi
@@ -17,10 +17,10 @@ creazione, come discusso in {Live/chroot include
locali}#live-chroot-local-includes, ma anche ogni gruppo e permesso
associato all'utente live.
-You can specify additional groups that the live user will belong to by
-preseeding the #{passwd/user-default-groups}# debconf value. For example, to
-add the live user to the #{fuse}# group, add the following preseed under
-#{config/preseed/}# for the chroot stage:
+È possibile specificare gruppi aggiuntivi ai quali l'utente live apparterrà
+preconfigurando il valore #{passwd/user-default-groups}# di debconf. Ad
+esempio, per aggiungere l'utente al gruppo #{fuse}#, inserire la seguente
+preconfigurazione in #{config/preseed/}# per la fase chroot:
code{
diff --git a/manual/it/user_examples.ssi b/manual/it/user_examples.ssi
index 8832e9b..4c632d8 100644
--- a/manual/it/user_examples.ssi
+++ b/manual/it/user_examples.ssi
@@ -14,21 +14,22 @@ Per usare questi esempi è necessario un sistema per costruirveli sopra che
soddisfi i requisiti elencati in {Requisiti}#requirements e avere live-build
installato come descritto in {Installare live-build}#installing-live-build.
-Note that, for the sake of brevity, in these examples we do not specify a
-local mirror to use for the build. You can speed up downloads considerably
-if you use a local mirror. You may specify the options when you use #{lb
-config}#, as described in {Distribution mirrors used at build
-time}#distribution-mirrors-build-time, or for more convenience, set the
-default for your build system in #{/etc/live/build.conf}#. Simply create
-this file and in it, set the corresponding #{LB_PARENT_MIRROR_*}# variables
-to your preferred mirror. All other mirrors used in the build will be
-defaulted from these values. For example:
+Si noti che, per brevità, in questi esempi non specifichiamo un mirror
+locale da usare per la costruzione. Usando un mirror locale, si possono
+accelerare considerevolmente i download. Si possono specificare le opzioni
+quando si usa #{lb config}#, come descritto in {Mirror delle distribuzioni
+usati in fase di compilazione}#distribution-mirrors-build-time o, più
+convenientemente, impostare il predefinito per il proprio sistema in
+#{/etc/live/build.conf}#. Si crei semplicemente questo file e si impostino
+in esso le corrispondenti variabili #{LB_MIRROR_*}# per il mirror
+desiderato. Tutti gli altri mirror utilizzati nella costruzione avranno
+questi valori, ad esempio:
code{
- LB_PARENT_MIRROR_BOOTSTRAP="http://mirror/debian"
- LB_PARENT_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
- LB_PARENT_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
+ LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
}code
@@ -87,13 +88,13 @@ code{
}code
-Our choice of LXDE for this example reflects our desire to provide a minimal
-desktop environment, since the focus of the image is the single use we have
-in mind, the web browser. We could go even further and provide a default
-configuration for the web browser in
-#{config/includes.chroot/etc/iceweasel/profile/}#, or additional support
-packages for viewing various kinds of web content, but we leave this as an
-exercise for the reader.
+La scelta di LXDE per questo esempio riflette il desiderio di fornire un
+ambiente desktop minimale, dato che il punto focale dell'immagine è il
+singolo uso che abbiamo in mente, il browser web. Potremmo anche spingerci
+oltre e fornire una configurazione predefinita per il browser web in
+#{config/includes.chroot/etc/iceweasel/profile/}#, o pacchetti addizionali
+di supporto per la fruizione di vari tipi di contenuti web, ma lasciamo
+questo come esercizio per il lettore.
Si generi l'immagine, ancora come super-utente, conservando un log come in
{Tutorial 1}#tutorial-1:
@@ -143,7 +144,7 @@ code{
}code
-Now populate your local package list:
+Popolare ora l'elenco locale dei pacchetti:
code{
@@ -151,12 +152,13 @@ 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}#.
+Per prima cosa, #{--architecture i386}# assicura che sul nostro sistema
+#{amd64}# costruiamo una versione a 32-bit utilizzabile sulla maggior parte
+delle macchine. In secondo luogo, usiamo #{--linux-flavours 686-pae}# dato
+che non prevediamo di usare questa immagine su sistemi troppo vecchi. Terzo,
+abbiamo scelto la lista di pacchetti #{lxde}# per avere un desktop
+minimale. Infine, abbiamo aggiunto due pacchetti preferiti per cominciare:
+#{iceweasel}# e #{xchat}#.
Costruire quindi l'immagine:
@@ -244,9 +246,10 @@ utenti Debian Live.
*{Caso d'uso:}* creazione di un'immagine con live-build per avviare direttamente un server VNC.
-Make a build directory and create a skeletal configuration in it built
-around the standard-x11 list, including #{gdm3}#, #{metacity}# and
-#{xvnc4viewer}#, disabling recommends to make a minimal system:
+Creare una directory con al suo interno una configurazione scheletrica
+costruita sulla base dell'elenco di standard-x11, tra cui #{gdm3}#,
+#{metacity}# e #{xvnc4viewer}#, disabilitando i raccomandati per ottenere un
+sistema minimale:
code{
@@ -266,7 +269,7 @@ xvncviewer, connesso alla porta #{5901}# su un server all'indirizzo
code{
$ mkdir -p config/includes.chroot/etc/skel
- $ cat > config/includes.chroot/etc/skel/.xsession <<END
+ $ cat > config/includes.chroot/etc/skel/.xsession << END
#!/bin/sh
/usr/bin/metacity &
@@ -320,19 +323,19 @@ All'autore del sistema al momento di scrivere, la seguente configurazione ha
prodotto una immagine di 78Mbyte. Comparabile favorevolmente con i 166Mbyte
prodotta dalla configurazione predefinita nel {Tutorial 1}#tutorial-1.
-The biggest space-saver here, compared to building a standard image on an
-#{i386}# architecture system, is to select only the #{486}# kernel flavour
-instead of the default #{-k "486 686-pae"}#. Leaving off APT's indices with
-#{--apt-indices false}# also saves a fair amount of space, the tradeoff
-being that you need to #{apt-get update}# before using apt in the live
-system. Choosing the #{minimal}# package list leaves out the large
-#{locales}# package and associated utilities. Dropping recommended packages
-with #{--apt-recommends false}# saves some additional space, at the expense
-of omitting some packages you might otherwise expect to be there, such as
-#{firmware-linux-free}# which may be needed to support certain hardware. The
-remaining options shave off additional small amounts of space. It's up to
-you to decide if the functionality that is sacrificed with each optimization
-is worth the loss in functionality.
+Ciò che salva più spazio, comparato alla costruzione di un'immagine standard
+su un sistema con architettura #{i386}#, è la selezione del solo kernel
+#{486}# invece che quello predefinito #{-k "486 686-pae"}#. Lasciando fuori
+anche gli indici di APT con #{--apt-indices false}# si può salvare una certa
+quantità di spazio, il compromesso è usare #{apt-get update}# prima di usare
+apt nel sistema live. Scegliendo la lista #{minima}# dei pacchetti si
+esclude il grosso pacchetto #{locales}# e le utilità associate. Saltare i
+pacchetti raccomandati con #{--apt-recommends false}# salva altro spazio, a
+scapito di alcuni pacchetti che ci si aspetta di trovare, come
+#{firmware-linux-free}# che potrebbe servire a supportare un certo
+hardware. Le restanti opzioni limano altre piccole quantità di spazio. Sta a
+voi decidere se le funzionalità sacrificate con ciascuna ottimizzazione
+valgono la pena.
2~ Un desktop KDE localizzato e l'installer
@@ -343,11 +346,11 @@ nostro desktop preferito, in questo caso KDE, contenente tutti gli stessi
pacchetti che verrebbero installati dall'installatore Debian standard per
KDE.
-Our initial problem is the discovery of the names of the appropriate
-language tasks. Currently, live-build cannot help with this. While we might
-get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#,
-which can be used to dig it out of the task descriptions in tasksel-data, so
-to prepare, make sure you have both of those things:
+Il problema iniziale è di scoprire i nomi dei task della lingua appropriati,
+attualmente, live-build non aiuta in questo. Si può essere fortunati o
+arrivarci con vari tentativi, ma c'è uno strumento #{grep-dctrl}# il quale
+può essere utilizzato per scavare nelle descrizioni in tasksel-data, perciò
+assicursi di avere entrambi questi pacchetti:
code{
diff --git a/manual/it/user_managing_a_configuration.ssi b/manual/it/user_managing_a_configuration.ssi
index 1a31b47..bb14c0c 100644
--- a/manual/it/user_managing_a_configuration.ssi
+++ b/manual/it/user_managing_a_configuration.ssi
@@ -4,47 +4,48 @@
Questo capitolo spiega come gestire una configurazione per una live sin
dalla creazione iniziale, attraverso le successive revisioni e rilasci sia
-del software live-build che della stessa immagine live.
+del software live-build che della stessa immagine.
2~ Utilizzare auto per gestire i cambiamenti di configurazione
-Le configurazioni live raramente sono perfette da riuscire al primo
-colpo. Servono una serie di revisioni prima di essere soddisfatti. Comunque,
-possono verificarsi delle incoerenze tra una revisione ed un'altra se non si
-presta attenzione. Il problema principale è, una volta che ad una variabile
-è assegnato un valore predefinito, tale valore non sarà ricalcolato da altre
-variabili che possono cambiare in altre revisioni.
-
-Per esempio, durante la messa a punto della prima distribuzione, molte
-variabili 'dependent' sono date dalle caratteristiche della
-distribuzione. Quindi, se in seguito si decide di cambiare distribuzione,
-quelle variabili dipendenti continueranno a mantenere i vecchi valori i
-quali non sono più appropriati
-
-Un secondo relativo problema è che se si lancia #{lb config}# e si è
-aggiornato live-build ad una nuova versione il quale ha cambiato il nome di
-una o più variabili, si può scoprire ciò solamente con una revisione manuale
-delle variabili nei file #{config/*}#, bisogna che vengano risistemate, di
-nuovo, le appropriate opzioni.
-
-Tutto ciò potrebbe essere un fastidio terribile se non fosse per lo script
-auto/*, una semplice alternativa ai comandi #{lb config}#, #{lb build}# e
-#{lb clean}# che sono disegnati per aiutare nella gestione della
-configurazione. Basta creare un semplice script auto/config che contenga il
-comando #{lb config}# con le opzioni desiderate, e un auot/clean che rimuova
-i file contenenti i valori variabili di configurazione, cosi ogni volta
-saranno eseguiti #{lb config}# #{lb clean}#. Questo farà si che la
-configurazione sia sempre coerente da una revisione all'altra o dal rilascio
-delle varie versioni del live-build.
-
-2~ Esempi di auto script
-
-Usare esempi di auto script come il seguente come punto di partenza per una
-nuova configurazione di live-build. Prendere nota che quando si chiama il
-comando #{lb}# che l'auto script wraps, si deve specificare il parametro
-#{noauto}# per essere sicuri che l'auto script chiamato di nuovo
-ricorsivamente. Non dimenticare, inoltre, di rendere lo script eseguibile
-(es. #{chmod 755 auto/*}#).
+Le configurazioni live raramente sono perfette da riuscire al primo colpo,
+servono una serie di revisioni prima di essere soddisfatti. Tuttavia, se non
+si presta attenzione, possono verificarsi delle incoerenze tra una revisione
+e l'altra se non si presta attenzione. Il problema principale è che una
+volta assegnato un valore predefinito ad una variabile, tale valore non sarà
+ricalcolato da altre variabili che possono cambiare in altre revisioni.
+
+Per esempio, durante la prima configurazione della distribuzione, a molte
+variabili 'dipendenti' vengono dati valori predefiniti che si adattino.Per
+cui se in seguito si decide di cambiare distribuzione, quelle variabili
+continueranno a mantenere vecchi valori non più appropriati.
+
+Un secondo problema correlato è l'eseguire #{lb config}# e aggiornare alla
+nuova versione di live-build il quale ha cambiato il nome di una delle
+variabili, lo si può scoprire solamente con una revisione manuale delle
+variabili nei file #{config/*}#, che sarà necessario utilizzare per
+impostare nuovamente le opzioni appropriate.
+
+Tutto ciò potrebbe essere un fastidio terribile se non fosse per gli script
+auto/*, semplici wrapper ai comandi #{lb config}#, #{lb build}# e #{lb
+clean}#, designati per aiutare nella gestione della propria
+configurazione. Basta creare uno script auto/config che contenga il comando
+#{lb config}# con le opzioni desiderate e un auto/clean che rimuove i file
+contenenti valori delle variabili di configurazione, così ogni volta che si
+usano #{lb config}# e #{lb clean}# questi file saranno eseguiti. Ciò fà sì
+che la configurazione sia coerente da una revisione all'altra e tra i
+rilasci delle varie versioni di live-build (sebbene si dovrà comunque fare
+attenzione aggiornando live-build, leggendo la documentazione e facendo le
+modifiche necessarie).
+
+2~ Esempi di script automatici
+
+Usare esempi di script automatici come il seguente come punto di partenza
+per una nuova configurazione di live-build. Si noti che quando si invoca il
+comando #{lb}# incluso nello script, si deve specificare il parametro
+#{noauto}# per essere certi che lo script stesso non venga richiamato
+ricorsivamente. Non dimenticare, inoltre, di accertarsi che gli script siano
+eseguibili (es. #{chmod 755 auto/*}#).
#{auto/config}#
@@ -78,8 +79,8 @@ code{
}code
-Facciamo un esempio di auto script per live-build basato sull'esempio
-precedente. Si possono copiare come punto di partenza.
+Facciamo un esempio di script automatico per live-build basato sugli esempi
+precedenti; si possono copiare come punto di partenza.
code{
@@ -87,8 +88,8 @@ code{
}code
-Edit #{auto/config}#, changing or adding any options as you see fit. In the
-example above, #{--package-lists standard}# is set to the default
-value. Change this to an appropriate value for your image (or delete it if
-you want to use the default) and add any additional options in continuation
-lines that follow.
+Modificare #{auto/config}# aggiungendo o togliendo le opzioni come meglio
+credi. Nel precedente esempio, #{--package-lists standard}# è impostato al
+valore predefinito; cambiarlo in un valore appropriato per l'immagine (o
+cancellarlo se si desidera utilizzare un valore predefinito) e aggiungere
+eventuali opzioni ulteriori in continuazione delle righe che seguono.
diff --git a/manual/it/user_overview.ssi b/manual/it/user_overview.ssi
index 9404a20..72b6e21 100644
--- a/manual/it/user_overview.ssi
+++ b/manual/it/user_overview.ssi
@@ -54,9 +54,9 @@ singola directory chiamata #{config/}#. Dal momento che crearla a mano
sarebbe dispendioso in termini di tempo e soggetto a errori, si può usare il
comando #{lb config}# per creare la directory scheletro di configurazione.
-Issuing #{lb config}# without any arguments creates a #{config/}#
-subdirectory which it populates with some default settings, and a skeleton
-#{auto/}# subdirectory tree.
+L'esecuzione di #{lb config}# senza argomenti crea una sottodirectory
+#{config/}# popolata con alcune impostazioni predefinite e uno scheletro di
+sottodirectory in #{auto/}#.
code{
@@ -66,10 +66,10 @@ code{
}code
-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
-configuration via #{auto/config}# (see {Managing a
-configuration}#managing-a-configuration for details).
+L'uso di #{lb config}# senza argomenti è adatto ad utenti che necessitano di
+un'immagine di base o che intendono fornire in seguito una configurazione
+più completa tramite #{auto/config}# (per i dettagli vedere {Gestire una
+configurazione}#managing-a-configuration).
Normalmente si vorranno specificare delle opzioni, ad esempio per includere
nella propria configurazione l'elenco del pacchetto "gnome":
@@ -92,9 +92,9 @@ Una lista completa delle opzioni è disponibile nel manuale di #{lb_config}#.
3~lb-build Il comando #{lb build}#
-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.
+Il comando #{lb build}# legge la configurazione dalla directory #{config/}#
+ed esegue a un livello inferiore i comandi necessari a costruire il sistema
+live.
3~lb-clean Il comando #{lb clean}#
@@ -114,10 +114,10 @@ utilizzato per generare un initramfs in grado di avviare sistemi live, come
quelli creati da live-build. Questo include le ISO di Debian Live, archivi
per l'avvio da rete e immagini per penne USB.
-At boot time it will look for read-only media containing a #{/live/}#
-directory where a root filesystem (often a compressed filesystem image like
-squashfs) is stored. If found, it will create a writable environment, using
-aufs, for Debian like systems to boot from.
+All'avvio cercherà supporti in sola lettura che contengano una directory
+#{/live/}# dove sia presente un filesystem root (spesso un'immagine
+compressa come squashfs). Se trovata, creerà un ambiente scrivibile usando
+aufs, per avviarsi da sistemi simili a Debian.
Si possono trovare maggiori informazioni sui ramfs iniziali nel capitolo su
initramfs del Debian Linux Kernel Handbook all'indirizzo
diff --git a/manual/po/de/about_manual.ssi.po b/manual/po/de/about_manual.ssi.po
index 6936b3f..11139d2 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: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2012-02-05 17:13+0100\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -61,19 +61,21 @@ msgid ""
"While we believe that everything in this manual is important to at least "
"some of our users, we realize it is a lot of material to cover and that you "
"may wish to experience early success using the software before delving into "
-"the details. Therefore, we have provided three tutorials in the {Examples}"
-"#examples section designed to teach you image building and customization "
-"basics. Read {Using the examples}#using-the-examples first, followed by "
-"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
-"utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
-"#tutorial-3. By the end of these tutorials, you will have a taste of what "
-"can be done with Debian Live. We encourage you to return to more in-depth "
-"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
-"or skipping {Building a netboot image}#building-netboot-image, and finishing "
-"by reading the {Customization overview}#customization-overview and the "
-"chapters that follow it. By this point, we hope you are thoroughly excited "
-"by what can be done with Debian Live and motivated to read the rest of the "
-"manual, cover-to-cover."
+"the details. Therefore, we suggest reading in the following order. First, "
+"read this chapter, {About this manual}#about-manual, from the beginning and "
+"ending with the {Terms}#terms section. Next, skip to the three tutorials at "
+"the front of the {Examples}#examples section designed to teach you image "
+"building and customization basics. Read {Using the examples}#using-the-"
+"examples first, followed by {Tutorial 1: A standard image}#tutorial-1, "
+"{Tutorial 2: A web browser utility}#tutorial-2 and finally {Tutorial 3: A "
+"personalized image}#tutorial-3. By the end of these tutorials, you will have "
+"a taste of what can be done with Debian Live. We encourage you to return to "
+"more in-depth study of the manual, perhaps next reading {The basics}#the-"
+"basics, skimming or skipping {Building a netboot image}#building-netboot-"
+"image, and finishing by reading the {Customization overview}#customization-"
+"overview and the chapters that follow it. By this point, we hope you are "
+"thoroughly excited by what can be done with Debian Live and motivated to "
+"read the rest of the manual, cover-to-cover."
msgstr ""
#. type: Plain text
@@ -307,9 +309,10 @@ 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
@@ -323,40 +326,42 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-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_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_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: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
@@ -365,7 +370,7 @@ 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:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -376,9 +381,10 @@ 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
@@ -392,40 +398,42 @@ msgstr ""
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-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_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_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: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
@@ -433,8 +441,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:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
@@ -481,11 +489,33 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:114
-msgid "3~ Applying patches"
+msgid "It is also possible to build by document type, e.g:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:116
+#: en/about_manual.ssi:118
+#, no-wrap
+msgid " $ make build FORMATS=pdf\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:122
+msgid "Or combine both, e.g:"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:126
+#, no-wrap
+msgid " $ make build FORMATS=html LANGUAGES=it\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:130
+msgid "3~ Applying changes"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:132
msgid ""
"Anyone can directly commit to the repository. However, we ask you to send "
"bigger changes to the mailing list to discuss them first. To push to the "
@@ -493,12 +523,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:134
msgid "_* Fetch the public commit key:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:127
+#: en/about_manual.ssi:143
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
@@ -510,12 +540,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:131
+#: en/about_manual.ssi:147
msgid "_* Add the following section to your openssh-client config:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:140
+#: en/about_manual.ssi:156
#, no-wrap
msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
@@ -527,12 +557,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:144
+#: en/about_manual.ssi:160
msgid "_* Check out a clone of the manual through ssh:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:149
+#: en/about_manual.ssi:165
#, no-wrap
msgid ""
" $ git clone git at live.debian.net:/live-manual.git\n"
@@ -540,14 +570,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:153
+#: en/about_manual.ssi:169
msgid ""
"_* Note that you should commit any changes on the debian-next branch, not on "
"the debian branch."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:155
+#: en/about_manual.ssi:171
msgid ""
"_* After editing the files in #{manual/en/}#, please call the 'commit' "
"target in the top level directory to sanitize the files and update the "
@@ -555,49 +585,60 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:159
+#: en/about_manual.ssi:175
#, no-wrap
msgid " $ make commit\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:163
+#: en/about_manual.ssi:179
+msgid "_* Then"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:183
+#, no-wrap
+msgid " $ git add .\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:187
msgid ""
-"_* After sanitizing, commit the changes. Write commit messages that consist "
-"of full, useful sentences in English, starting with a capital letter and "
-"ending with a full stop. Usually, these will start with the form 'Fixing/"
-"Adding/Removing/Correcting/Translating', e.g."
+"_* After sanitizing and adding the files, commit the changes. Write commit "
+"messages that consist of full, useful sentences in English, starting with a "
+"capital letter and ending with a full stop. Usually, these will start with "
+"the form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:167
+#: en/about_manual.ssi:191
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:171
+#: en/about_manual.ssi:195
msgid "_* Push the commit to the server:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:175
+#: en/about_manual.ssi:199
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:179
+#: en/about_manual.ssi:203
msgid "3~ Translation"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:181
+#: en/about_manual.ssi:205
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:183
+#: en/about_manual.ssi:207
msgid ""
"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
"in.pot files to your language with your favourite editor (such as poedit). "
@@ -607,15 +648,23 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:185
+#: en/about_manual.ssi:209
msgid ""
"_* Once the new language is added, you can randomly start translating all po "
"files in #{manual/po/}#."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:186
+#: en/about_manual.ssi:211
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
-"are updated from the po files, before #{git commit -a}# and #{git push}#."
+"are updated from the po files and then you can review your changes launching "
+"#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
+"and #{git push}#."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi: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 ""
diff --git a/manual/po/de/index.html.in.po b/manual/po/de/index.html.in.po
index aa9d073..a3f1f93 100644
--- a/manual/po/de/index.html.in.po
+++ b/manual/po/de/index.html.in.po
@@ -1,14 +1,15 @@
# German translations for live-manual package
# 2010-2011 Daniel Baumann <daniel at debian.org>
# This file is distributed under the same license as the live-config package.
+# Carlos Zuferri «chals» <chals at altorricon.com>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual 3.0~a3-1\n"
-"POT-Creation-Date: 2011-12-03 18:55+0100\n"
-"PO-Revision-Date: 2011-04-23 14:15+0300\n"
-"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
-"Language-Team: none\n"
+"POT-Creation-Date: 2012-01-07 16:03+0100\n"
+"PO-Revision-Date: 2011-12-26 19:06+0100\n"
+"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
+"Language-Team: <debian-live at lists.debian.org>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -32,19 +33,22 @@ msgid ""
"translated into several languages. Keep in mind that some translations may "
"be incomplete or may not be up to date."
msgstr ""
+"<i>live-manual</i> ist in verschiedenen Dateiformaten und Übersetzungen in "
+"mehrere Sprachen verfügbar, jedoch können manche Übersetzungen teilweise "
+"unvollständig oder nicht immer aktuell sein."
#. type: Content of: <html><body><p>
#: en/index.html.in:17
msgid ""
"Please report errors, omissions, patches and suggestions to our mailinglist "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/about-manual.en.html#how-to-contribute"
+"org</a> and read about <a href=\"html/live-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
msgstr ""
"Fehler, Vergessenes, Patches und Vorschläge können an unsere Mailing Liste "
"unter <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists."
"debian.org</a> (englischspraching) gemeldet werden. Informationen wie man <a "
-"href=\"html/about-manual.de.html#how-to-contribute\">zum Handbuch beitragen</"
+"href=\"html/live-manual.de.html#how-to-contribute\">zum Handbuch beitragen</"
"a> kann, können im Handbuch gefunden werden."
#. type: Content of: <html><body><h3>
@@ -60,29 +64,29 @@ msgstr "<a href=\"epub/live-manual.de.epub\">EPUB</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:24
msgid ""
-"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
-"manual.en.html\">single page</a>"
+"HTML: <a href=\"html/live-manual/toc.en.html\">multi page</a>, <a href="
+"\"html/live-manual.en.html\">single page</a>"
msgstr ""
-"HTML: <a href=\"html/index.de.html\">mehrere Seiten</a>, <a href=\"html/live-"
-"manual.de.html\">einzelne Seite</a>"
+"HTML: <a href=\"html/live-manual/toc.de.html\">mehrere Seiten</a>, <a href="
+"\"html/live-manual.de.html\">einzelne Seite</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:25
-msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
-msgstr "<a href=\"odf/live-manual.de.odt\">ODF</a>"
+msgid "<a href=\"odt/live-manual.en.odt\">ODF</a>"
+msgstr "<a href=\"odt/live-manual.de.odt\">ODF</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:26
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
-"manual.landscape-letter.en.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/portrait.en.a4.pdf\">A4 portrait</a>, <a href=\"pdf/"
+"landscape.en.a4.pdf\">A4 landscape</a>, <a href=\"pdf/portrait.en.letter.pdf"
+"\">letter portrait</a>, <a href=\"pdf/landscape.en.letter.pdf\">letter "
+"landscape</a>"
msgstr ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.de.pdf\">A4 Hochformat</a>, <a "
-"href=\"pdf/live-manual.landscape-a4.de.pdf\">A4 Querformat</a>, <a href="
-"\"pdf/live-manual.portrait-letter.de.pdf\">Letter Hochformat</a>, <a href="
-"\"pdf/live-manual.landscape-letter.de.pdf\">Letter Querformat</a>"
+"PDF: <a href=\"pdf/portrait.de.a4.pdf\">A4 Hochformat</a>, <a href=\"pdf/"
+"landscape.de.a4.pdf\">A4 Querformat</a>, <a href=\"pdf/portrait.de.letter.pdf"
+"\">Letter Hochformat</a>, <a href=\"pdf/landscape.de.letter.pdf\">Letter "
+"Querformat</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:27
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index add5468..8c56e88 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: 2011-12-04 10:22+0100\n"
+"POT-Creation-Date: 2012-02-06 18:57+0100\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -36,11 +36,11 @@ msgstr "@creator: Debian Live Projekt <debian-live at lists.debian.org>"
#, no-wrap
msgid ""
"@rights:\n"
-" :copyright: Copyright (C) 2006-2011 Debian Live Project\n"
+" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
" :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.\n"
msgstr ""
"@rights:\n"
-" :copyright: Copyright (C) 2006-2011 Debian Live Projekt\n"
+" :copyright: Copyright (C) 2006-2012 Debian Live Projekt\n"
" :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.\n"
#. type: Plain text
@@ -48,7 +48,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-12-04\n"
+" :published: 2012-02-06\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/de/user_basics.ssi.po
index b9830a3..2f218d4 100644
--- a/manual/po/de/user_basics.ssi.po
+++ b/manual/po/de/user_basics.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-01-12 08:28-0400\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -20,7 +20,7 @@ msgstr ""
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -42,33 +42,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,7 +77,7 @@ 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:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -85,7 +85,7 @@ msgstr ""
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -107,33 +107,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 +141,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:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
@@ -163,7 +163,7 @@ msgid ""
"for using the three most commonly used image types. The most versatile image "
"type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB "
"portable storage device. In certain special cases, such as the use of "
-"persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter "
+"persistence, #{hdd}# may be more suitable for USB devices. The chapter "
"finishes with instructions for building and using a #{net}# type image, "
"which is a bit more involved due to the setup required on the server. This "
"is a slightly advanced topic for anyone who is not familiar already with "
@@ -552,20 +552,20 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:146
-msgid "2~building-usb-hdd Building a USB/HDD image"
+msgid "2~building-hdd Building an HDD image"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:148
msgid ""
-"Building a USB/HDD image is similar to ISO hybrid in all respects except you "
-"specify #{-b usb-hdd}# and the resulting filename is #{binary.img}# which "
-"cannot be burnt to optical media. It is suitable for booting from USB "
-"sticks, USB hard drives, and various other portable storage devices. "
-"Normally, an ISO hybrid image can be used for this purpose instead, but if "
-"you have a BIOS which does not handle hybrid images properly, or want to use "
-"the remaining space on the media for some purpose, such as a persistence "
-"partition, you need a USB/HDD image."
+"Building an HDD image is similar to ISO hybrid in all respects except you "
+"specify #{-b hdd}# and the resulting filename is #{binary.img}# which cannot "
+"be burnt to optical media. It is suitable for booting from USB sticks, USB "
+"hard drives, and various other portable storage devices. Normally, an ISO "
+"hybrid image can be used for this purpose instead, but if you have a BIOS "
+"which does not handle hybrid images properly, or want to use the remaining "
+"space on the media for some purpose, such as a persistence partition, you "
+"need an HDD image."
msgstr ""
#. type: Plain text
@@ -585,14 +585,14 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:158
msgid ""
-"Run the #{lb config}# command as before, except this time specifying the USB/"
-"HDD image type:"
+"Run the #{lb config}# command as before, except this time specifying the HDD "
+"image type:"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:162
#, no-wrap
-msgid " $ lb config -b usb-hdd\n"
+msgid " $ lb config -b hdd\n"
msgstr ""
#. type: Plain text
@@ -609,22 +609,22 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:176
-msgid "2~using-usb-hdd-image Using a USB/HDD image"
+msgid "2~using-hdd-image Using an HDD image"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:178
msgid ""
"The generated binary image contains a VFAT partition and the syslinux "
-"bootloader, ready to be directly written on a USB stick. Since using a USB/"
-"HDD image is just like using an ISO hybrid image on USB, follow the "
-"instructions in {Using an ISO hybrid live image}#using-iso-hybrid, except "
-"use the filename #{binary.img}# instead of #{binary-hybrid.iso}#."
+"bootloader, ready to be directly written on a USB stick. Since using an HDD "
+"image is just like using an ISO hybrid image on USB, follow the instructions "
+"in {Using an ISO hybrid live image}#using-iso-hybrid, except use the "
+"filename #{binary.img}# instead of #{binary-hybrid.iso}#."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:180
-msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
+msgid "3~testing-hdd-with-qemu Testing an HDD image with Qemu"
msgstr ""
#. type: Plain text
@@ -727,12 +727,12 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:232
msgid ""
-"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
-"serve the filesystem image to the client, so the files must be served via "
-"NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the "
-"location and server, respectively, of the NFS server where the filesytem "
-"image will be located at boot time. Make sure these are set to suitable "
-"values for your network and server."
+"In contrast with the ISO and HDD images, netbooting does not, itself, serve "
+"the filesystem image to the client, so the files must be served via NFS. The "
+"#{--net-root-path}# and #{--net-root-server}# options specify the location "
+"and server, respectively, of the NFS server where the filesytem image will "
+"be located at boot time. Make sure these are set to suitable values for your "
+"network and server."
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_customization-binary.ssi.po b/manual/po/de/user_customization-binary.ssi.po
index ce18f65..af88b7e 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: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2012-01-15 20:48+0100\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,6 +17,138 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/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
+#: 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: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_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
+msgid "code{"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/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
+#: 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: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_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
+msgid "}code"
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-binary.ssi:2
msgid "B~ Customizing the binary image"
msgstr ""
@@ -34,28 +166,84 @@ msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:8
msgid ""
-"live-build uses syslinux as bootloader by default, which is by default "
-"configured to pause indefinitely at its splash screen. To adjust this, you "
-"can pass #{--syslinux-timeout TIMEOUT}# to #{lb config}#. The value is "
-"specified in units of seconds. A timeout of 0 (zero) disables the timeout "
-"completely. For more information please see syslinux(1)."
+"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."
msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:10
-msgid "2~ ISO metadata"
+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."
msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:12
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
+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
+#, no-wrap
+msgid ""
+" include menu.cfg\n"
+" default vesamenu.c32\n"
+" prompt 0\n"
+" timeout 5\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:25
+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 "
+"in the binary stage. A proposed example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#, no-wrap
+msgid " #!/bin/sh\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:31
+#, 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 ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:37
+msgid "2~ ISO metadata"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:39
+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 "
"identify the version or configuration of an image without booting it."
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:41
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 "
@@ -63,7 +251,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:43
msgid ""
"_* #{LB_ISO_PREPARER/--iso-preparer NAME}#: This should describe the "
"preparer of the image, usually with some contact details. The default for "
@@ -72,7 +260,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:45
msgid ""
"_* #{LB_ISO_PUBLISHER/--iso-publisher NAME}#: This should describe the "
"publisher of the image, usually with some contact details. The maximum "
@@ -80,7 +268,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:19
+#: en/user_customization-binary.ssi:46
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-contents.ssi.po b/manual/po/de/user_customization-contents.ssi.po
index 205e71a..8c405f5 100644
--- a/manual/po/de/user_customization-contents.ssi.po
+++ b/manual/po/de/user_customization-contents.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-01-15 16:28+0100\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -20,7 +20,7 @@ msgstr ""
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -34,6 +34,7 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -85,7 +86,7 @@ msgstr ""
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -99,6 +100,7 @@ msgstr ""
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -169,7 +171,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:8
-msgid "2~ Includes"
+msgid "2~includes Includes"
msgstr ""
#. type: Plain text
@@ -329,7 +331,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:74
-msgid "2~ Hooks"
+msgid "2~hooks Hooks"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index 7a7669d..cac34dd 100644
--- a/manual/po/de/user_customization-packages.ssi.po
+++ b/manual/po/de/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-07 21:01-0400\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -20,7 +20,7 @@ msgstr ""
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -34,6 +34,7 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -85,7 +86,7 @@ msgstr ""
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -99,6 +100,7 @@ msgstr ""
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -248,15 +250,15 @@ msgstr ""
msgid ""
"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 #{--parent-mirror-*}# options governs which "
+"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 #{--parent-mirror-binary}"
-"# and #{--parent-mirror-binary-security}# values are used, superceding any "
-"mirrors used in an earlier stage."
+"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
@@ -269,24 +271,24 @@ msgstr ""
#: en/user_customization-packages.ssi:38
msgid ""
"To set the distribution mirrors used at build time to point at a local "
-"mirror, it is sufficient to set #{--parent-mirror-bootstrap}#, #{--parent-"
-"mirror-chroot-security}# and #{--parent-mirror-chroot-backports}# as follows."
+"mirror, it is sufficient to set #{--mirror-bootstrap}#, #{--mirror-chroot-"
+"security}# and #{--mirror-chroot-backports}# as follows."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:44
#, no-wrap
msgid ""
-" $ lb config --parent-mirror-bootstrap http://localhost/debian/ \\\n"
-" --parent-mirror-chroot-security http://localhost/debian-security/ \\\n"
-"\t --parent-mirror-chroot-backports http://localhost/debian-backports/\n"
+" $ 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"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:48
msgid ""
-"The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the #"
-"{--parent-mirror-bootstrap}# value."
+"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+"mirror-bootstrap}# value."
msgstr ""
#. type: Plain text
@@ -297,22 +299,22 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:52
msgid ""
-"The #{--parent-mirror-binary*}# options govern the distribution mirrors "
-"placed in the binary image. These may be used to install additional packages "
-"while running the live system. The defaults employ #{cdn.debian.net}#, a "
-"service that chooses a geographically close mirror based on the user's IP "
-"number. This is a suitable choice when you cannot predict which mirror will "
-"be best for all of your users. Or you may specify your own values as shown "
-"in the example below. An image built from this configuration would only be "
-"suitable for users on a network where \"#{mirror}#\" is reachable."
+"The #{--mirror-binary*}# options govern the distribution mirrors placed in "
+"the binary image. These may be used to install additional packages while "
+"running the live system. The defaults employ #{cdn.debian.net}#, a service "
+"that chooses a geographically close mirror based on the user's IP number. "
+"This is a suitable choice when you cannot predict which mirror will be best "
+"for all of your users. Or you may specify your own values as shown in the "
+"example below. An image built from this configuration would only be suitable "
+"for users on a network where \"#{mirror}#\" is reachable."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:57
#, no-wrap
msgid ""
-" $ lb config --parent-mirror-binary http://mirror/debian/ \\\n"
-" --parent-mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --mirror-binary http://mirror/debian/ \\\n"
+" --mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
#. type: Plain text
@@ -328,9 +330,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 #{--"
-"parent-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
@@ -363,7 +365,7 @@ msgstr ""
#: en/user_customization-packages.ssi:77
msgid ""
"You should also put the GPG key used to sign the repository into #{config/"
-"archives/your-repository.gpg.{binary,chroot}}# files."
+"archives/your-repository.key.{binary,chroot}}# files."
msgstr ""
#. type: Plain text
@@ -1025,7 +1027,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
-" $ cat >> config/chroot_apt/preferences <<END\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"
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index a412f7d..b2a9535 100644
--- a/manual/po/de/user_examples.ssi.po
+++ b/manual/po/de/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-13 17:12+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -25,7 +25,7 @@ msgstr ":B~ Beispiele"
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -39,6 +39,7 @@ msgstr ":B~ Beispiele"
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/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
@@ -90,7 +91,7 @@ msgstr ""
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -104,6 +105,7 @@ msgstr ""
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -159,6 +161,12 @@ msgid " # lb build\n"
msgstr ""
#. type: Plain text
+#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#, no-wrap
+msgid " #!/bin/sh\n"
+msgstr ""
+
+#. type: Plain text
#: en/user_examples.ssi:4
msgid "1~examples Examples"
msgstr ""
@@ -194,18 +202,18 @@ msgid ""
"config}#, as described in {Distribution mirrors used at build time}"
"#distribution-mirrors-build-time, or for more convenience, set the default "
"for your build system in #{/etc/live/build.conf}#. Simply create this file "
-"and in it, set the corresponding #{LB_PARENT_MIRROR_*}# variables to your "
-"preferred mirror. All other mirrors used in the build will be defaulted from "
-"these values. For example:"
+"and in it, set the corresponding #{LB_MIRROR_*}# variables to your preferred "
+"mirror. All other mirrors used in the build will be defaulted from these "
+"values. For example:"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:18
#, no-wrap
msgid ""
-" LB_PARENT_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
-" LB_PARENT_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
-" LB_PARENT_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
+" 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"
msgstr ""
#. type: Plain text
@@ -364,12 +372,6 @@ msgid "Edit #{auto/config}# to read as follows:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:95
-#, no-wrap
-msgid " #!/bin/sh\n"
-msgstr ""
-
-#. type: Plain text
#: en/user_examples.ssi:101
#, no-wrap
msgid ""
@@ -556,7 +558,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
-" $ cat > config/includes.chroot/etc/skel/.xsession <<END\n"
+" $ cat > config/includes.chroot/etc/skel/.xsession << END\n"
" #!/bin/sh\n"
msgstr ""
diff --git a/manual/po/es/about_manual.ssi.po b/manual/po/es/about_manual.ssi.po
index c8982d9..87a723a 100644
--- a/manual/po/es/about_manual.ssi.po
+++ b/manual/po/es/about_manual.ssi.po
@@ -4,22 +4,22 @@
# Automatically generated, 2011.
# Translated and revised by:
# José Luis Zabalza <jlz.3008 at gmail.com> and
-# Carlos Zuferri «chals» <chals at altorricon.com>
+# Carlos Zuferri «chals» <chals at altorricon.com>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 17:03+0100\n"
-"PO-Revision-Date: 2011-04-09 15:32+0100\n"
+"POT-Creation-Date: 2012-02-05 17:13+0100\n"
+"PO-Revision-Date: 2012-02-05 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."
-"debian.org>\n"
+"Language-Team: <debian-live at lists.debian.org>\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/about_manual.ssi:2
@@ -88,29 +88,34 @@ msgid ""
"While we believe that everything in this manual is important to at least "
"some of our users, we realize it is a lot of material to cover and that you "
"may wish to experience early success using the software before delving into "
-"the details. Therefore, we have provided three tutorials in the {Examples}"
-"#examples section designed to teach you image building and customization "
-"basics. Read {Using the examples}#using-the-examples first, followed by "
-"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
-"utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
-"#tutorial-3. By the end of these tutorials, you will have a taste of what "
-"can be done with Debian Live. We encourage you to return to more in-depth "
-"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
-"or skipping {Building a netboot image}#building-netboot-image, and finishing "
-"by reading the {Customization overview}#customization-overview and the "
-"chapters that follow it. By this point, we hope you are thoroughly excited "
-"by what can be done with Debian Live and motivated to read the rest of the "
-"manual, cover-to-cover."
+"the details. Therefore, we suggest reading in the following order. First, "
+"read this chapter, {About this manual}#about-manual, from the beginning and "
+"ending with the {Terms}#terms section. Next, skip to the three tutorials at "
+"the front of the {Examples}#examples section designed to teach you image "
+"building and customization basics. Read {Using the examples}#using-the-"
+"examples first, followed by {Tutorial 1: A standard image}#tutorial-1, "
+"{Tutorial 2: A web browser utility}#tutorial-2 and finally {Tutorial 3: A "
+"personalized image}#tutorial-3. By the end of these tutorials, you will have "
+"a taste of what can be done with Debian Live. We encourage you to return to "
+"more in-depth study of the manual, perhaps next reading {The basics}#the-"
+"basics, skimming or skipping {Building a netboot image}#building-netboot-"
+"image, and finishing by reading the {Customization overview}#customization-"
+"overview and the chapters that follow it. By this point, we hope you are "
+"thoroughly excited by what can be done with Debian Live and motivated to "
+"read the rest of the manual, cover-to-cover."
msgstr ""
"Aunque se cree que todo lo descrito en este manual es importante para la "
"mayoría de los usuarios, es cierto que hay mucho material a interiorizar y "
"que los usuarios desean experimentar con las herramientas de forma rápida y "
-"satisfactoria antes de entrar en detalles. Ésta es la razón por la que se "
-"presentan tres tutoriales en 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 {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 "
+"satisfactoria antes de entrar en detalles. Por lo tanto, se sugiere leer "
+"siguiendo el siguiente orden. Primero leer el capítulo {Acerca de este "
+"manual}#about-manual, desde el principio y terminando en la sección "
+"{Términos}#terms. Después saltar hasta los tres tutoriales que están al "
+"principio de la sección {Ejemplos}#examples pensados para aprender a "
+"configurar y construir imágenes de sistemas en vivo de forma básica. Se "
+"deberá leer primero {Uso de 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, "
@@ -429,56 +434,59 @@ 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: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-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: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_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_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: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
@@ -487,7 +495,7 @@ 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:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -498,56 +506,59 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi: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: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-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: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_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_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: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
@@ -555,8 +566,8 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: 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:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -613,11 +624,33 @@ msgstr "$ make build LANGUAGES=en\n"
#. type: Plain text
#: en/about_manual.ssi:114
-msgid "3~ Applying patches"
-msgstr "3~ Aplicación de parches"
+msgid "It is also possible to build by document type, e.g:"
+msgstr "Es posible generar el documento por formato:"
#. type: Plain text
-#: en/about_manual.ssi:116
+#: en/about_manual.ssi:118
+#, no-wrap
+msgid " $ make build FORMATS=pdf\n"
+msgstr " $ make build FORMATS=pdf\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:122
+msgid "Or combine both, e.g:"
+msgstr "O combinar ambos, por ejemplo:"
+
+#. type: Plain text
+#: en/about_manual.ssi:126
+#, no-wrap
+msgid " $ make build FORMATS=html LANGUAGES=it\n"
+msgstr " $ make build FORMATS=html LANGUAGES=it\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:130
+msgid "3~ Applying changes"
+msgstr "3~ Aplicar cambios"
+
+#. type: Plain text
+#: en/about_manual.ssi:132
msgid ""
"Anyone can directly commit to the repository. However, we ask you to send "
"bigger changes to the mailing list to discuss them first. To push to the "
@@ -629,12 +662,12 @@ msgstr ""
"el siguiente procedimiento:\n"
#. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:134
msgid "_* Fetch the public commit key:"
msgstr "_* Obtener la clave pública de entrega:\n"
#. type: Plain text
-#: en/about_manual.ssi:127
+#: en/about_manual.ssi:143
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
@@ -652,14 +685,14 @@ msgstr ""
" $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*\n"
#. type: Plain text
-#: en/about_manual.ssi:131
+#: en/about_manual.ssi:147
msgid "_* Add the following section to your openssh-client config:"
msgstr ""
"_* Añadir la siguiente sección en el fichero de configuración de openssh-"
"client:\n"
#. type: Plain text
-#: en/about_manual.ssi:140
+#: en/about_manual.ssi:156
#, no-wrap
msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
@@ -677,12 +710,12 @@ msgstr ""
" EOF\n"
#. type: Plain text
-#: en/about_manual.ssi:144
+#: en/about_manual.ssi:160
msgid "_* Check out a clone of the manual through ssh:"
msgstr "_* Obtener un clon del manual mediante git utilizando ssh:\n"
#. type: Plain text
-#: en/about_manual.ssi:149
+#: en/about_manual.ssi:165
#, no-wrap
msgid ""
" $ git clone git at live.debian.net:/live-manual.git\n"
@@ -692,7 +725,7 @@ msgstr ""
" $ cd live-manual && git checkout debian-next\n"
#. type: Plain text
-#: en/about_manual.ssi:153
+#: en/about_manual.ssi:169
msgid ""
"_* Note that you should commit any changes on the debian-next branch, not on "
"the debian branch."
@@ -701,7 +734,7 @@ msgstr ""
"Debian."
#. type: Plain text
-#: en/about_manual.ssi:155
+#: en/about_manual.ssi:171
msgid ""
"_* After editing the files in #{manual/en/}#, please call the 'commit' "
"target in the top level directory to sanitize the files and update the "
@@ -712,58 +745,69 @@ msgstr ""
"actualizar los ficheros de traducciones:\n"
#. type: Plain text
-#: en/about_manual.ssi:159
+#: en/about_manual.ssi:175
#, no-wrap
msgid " $ make commit\n"
msgstr " $ make commit\n"
#. type: Plain text
-#: en/about_manual.ssi:163
+#: en/about_manual.ssi:179
+msgid "_* Then"
+msgstr "_* Entonces"
+
+#. type: Plain text
+#: en/about_manual.ssi:183
+#, no-wrap
+msgid " $ git add .\n"
+msgstr " $ git add .\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:187
msgid ""
-"_* After sanitizing, commit the changes. Write commit messages that consist "
-"of full, useful sentences in English, starting with a capital letter and "
-"ending with a full stop. Usually, these will start with the form 'Fixing/"
-"Adding/Removing/Correcting/Translating', e.g."
+"_* After sanitizing and adding the files, commit the changes. Write commit "
+"messages that consist of full, useful sentences in English, starting with a "
+"capital letter and ending with a full stop. Usually, these will start with "
+"the form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
msgstr ""
-"_* Una vez se ha saneado, 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 un punto final. Es "
-"habitual comenzar estas frases con la forma 'Fixing/Adding/Removing/"
-"Correcting/Translating', por ejemplo:\n"
+"_* 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 "
+"un punto final. Es habitual comenzar estas frases con la forma 'Fixing/"
+"Adding/Removing/Correcting/Translating', por ejemplo:\n"
#. type: Plain text
-#: en/about_manual.ssi:167
+#: 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"
#. type: Plain text
-#: en/about_manual.ssi:171
+#: en/about_manual.ssi:195
msgid "_* Push the commit to the server:"
msgstr ""
"_* Para finalizar se realizará la entrega al servidor utilizando el "
"siguiente comando:"
#. type: Plain text
-#: en/about_manual.ssi:175
+#: en/about_manual.ssi:199
#, no-wrap
msgid " $ git push\n"
msgstr " $ git push\n"
#. type: Plain text
-#: en/about_manual.ssi:179
+#: en/about_manual.ssi:203
msgid "3~ Translation"
msgstr "3~ Traducciones"
#. type: Plain text
-#: en/about_manual.ssi:181
+#: en/about_manual.ssi:205
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
"Para enviar una traducción para un nuevo idioma, se deben seguir los "
"siguientes pasos:"
#. type: Plain text
-#: en/about_manual.ssi:183
+#: en/about_manual.ssi:207
msgid ""
"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
"in.pot files to your language with your favourite editor (such as poedit). "
@@ -778,7 +822,7 @@ msgstr ""
"autobuild."
#. type: Plain text
-#: en/about_manual.ssi:185
+#: en/about_manual.ssi:209
msgid ""
"_* Once the new language is added, you can randomly start translating all po "
"files in #{manual/po/}#."
@@ -788,11 +832,21 @@ msgstr ""
"aleatoria."
#. type: Plain text
-#: en/about_manual.ssi:186
+#: en/about_manual.ssi:211
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
-"are updated from the po files, before #{git commit -a}# and #{git push}#."
+"are updated from the po files and then you can review your changes launching "
+"#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
+"and #{git push}#."
msgstr ""
"_* No se debe olvidar la ejecución del comando #{make commit}# para asegurar "
-"que los manuales traducidos son actualizados desde los ficheros .po, antes "
-"de realizar la entrega mediante #{git commit -a}# y #{git push}#."
+"que los manuales traducidos son actualizados desde los ficheros .po. "
+"Entonces se puede revisar los cambios ejecutando #{make build}# antes de "
+"realizar la entrega mediante #{git add .}#, #{git commit -a -m "
+"\"Translating...\"}# y #{git push}#."
+
+#. type: Plain text
+#: 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"
diff --git a/manual/po/es/index.html.in.po b/manual/po/es/index.html.in.po
index 92bae4a..19b6773 100644
--- a/manual/po/es/index.html.in.po
+++ b/manual/po/es/index.html.in.po
@@ -4,22 +4,22 @@
# Automatically generated, 2011.
# Translated and revised by:
# José Luis Zabalza <jlz.3008 at gmail.com> and
-# Carlos Zuferri «chals» <chals at altorricon.com>
+# Carlos Zuferri «chals» <chals at altorricon.com>, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-03 18:55+0100\n"
-"PO-Revision-Date: 2011-12-03 19:03+0100\n"
+"POT-Creation-Date: 2012-01-07 16:03+0100\n"
+"PO-Revision-Date: 2011-12-26 19:07+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
-"Language-Team: Debian live Spanish translation team <debian-live at lists."
-"debian.org>\n"
+"Language-Team: <debian-live at lists.debian.org>\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: Content of: <html><head><title>
#: en/index.html.in:4
@@ -47,10 +47,10 @@ msgstr ""
msgid ""
"Please report errors, omissions, patches and suggestions to our mailinglist "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/about-manual.en.html#how-to-contribute"
+"org</a> and read about <a href=\"html/live-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
msgstr ""
-"Por favor, leer previamente <a href=\"html/about-manual.es.html#how-to-"
+"Por favor, leer previamente <a href=\"html/live-manual.es.html#how-to-"
"contribute\">como contribuir</a> para conocer como reportar errores, "
"omisiones, parches y sugerencias a este manual, utilizando la lista de "
"correos <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists."
@@ -69,29 +69,29 @@ msgstr "<a href=\"epub/live-manual.es.epub\">EPUB</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:24
msgid ""
-"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
-"manual.en.html\">single page</a>"
+"HTML: <a href=\"html/live-manual/toc.en.html\">multi page</a>, <a href="
+"\"html/live-manual.en.html\">single page</a>"
msgstr ""
-"HTML: <a href=\"html/index.es.html\">una página por capítulo</a>, <a href="
-"\"html/live-manual.es.html\">todo el manual en una página</a>"
+"HTML: <a href=\"html/live-manual/toc.es.html\">una página por capítulo</a>, "
+"<a href=\"html/live-manual.es.html\">todo el manual en una página</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:25
-msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
-msgstr "<a href=\"odf/live-manual.es.odt\">ODF</a>"
+msgid "<a href=\"odt/live-manual.en.odt\">ODF</a>"
+msgstr "<a href=\"odt/live-manual.es.odt\">ODF</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:26
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
-"manual.landscape-letter.en.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/portrait.en.a4.pdf\">A4 portrait</a>, <a href=\"pdf/"
+"landscape.en.a4.pdf\">A4 landscape</a>, <a href=\"pdf/portrait.en.letter.pdf"
+"\">letter portrait</a>, <a href=\"pdf/landscape.en.letter.pdf\">letter "
+"landscape</a>"
msgstr ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.es.pdf\">A4 vertical</a>, <a href="
-"\"pdf/live-manual.landscape-a4.es.pdf\">A4 apaisado</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.es.pdf\">Carta (letter) vertical</a>, <a href=\"pdf/"
-"live-manual.landscape-letter.es.pdf\">Carta (letter) apaisado</a>"
+"PDF: <a href=\"pdf/portrait.es.a4.pdf\">A4 vertical</a>, <a href=\"pdf/"
+"landscape.es.a4.pdf\">A4 apaisado</a>, <a href=\"pdf/portrait.es.letter.pdf"
+"\">Carta (letter) vertical</a>, <a href=\"pdf/landscape.es.letter.pdf"
+"\">Carta (letter) apaisado</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:27
diff --git a/manual/po/es/live-manual.ssm.po b/manual/po/es/live-manual.ssm.po
index 4b9d721..f788ace 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: 2011-12-04 10:22+0100\n"
+"POT-Creation-Date: 2012-02-06 18:57+0100\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"
@@ -41,19 +41,19 @@ msgstr "@creator: Debian Live Project <debian-live at lists.debian.org>"
#, no-wrap
msgid ""
"@rights:\n"
-" :copyright: Copyright (C) 2006-2011 Debian Live Project\n"
+" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
" :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.\n"
msgstr ""
"@rights:\n"
-" :copyright: Copyright (C) 2006-2011 Debian Live Project\n"
-" :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\n"
+" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
+" :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\n"
#. type: Plain text
#: en/live-manual.ssm:13
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-12-04\n"
+" :published: 2012-02-06\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/es/user_basics.ssi.po b/manual/po/es/user_basics.ssi.po
index cbe6b4f..30b5675 100644
--- a/manual/po/es/user_basics.ssi.po
+++ b/manual/po/es/user_basics.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-02 20:28+0100\n"
+"POT-Creation-Date: 2012-01-12 08:28-0400\n"
+"PO-Revision-Date: 2012-01-14 18:42+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."
@@ -25,7 +25,7 @@ msgstr ""
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -47,33 +47,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,7 +82,7 @@ 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:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -90,7 +90,7 @@ msgstr "code{"
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -112,33 +112,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 +146,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:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -168,7 +168,7 @@ msgid ""
"for using the three most commonly used image types. The most versatile image "
"type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB "
"portable storage device. In certain special cases, such as the use of "
-"persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter "
+"persistence, #{hdd}# may be more suitable for USB devices. The chapter "
"finishes with instructions for building and using a #{net}# type image, "
"which is a bit more involved due to the setup required on the server. This "
"is a slightly advanced topic for anyone who is not familiar already with "
@@ -181,15 +181,15 @@ 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 #{usb-hdd}#, pueden ser "
-"las más adecuadas para dispositivos USB. El capítulo termina con "
-"instrucciones para crear y usar una imagen de tipo #{red}#, 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 («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."
#. type: Plain text
#: en/user_basics.ssi:8
@@ -701,29 +701,30 @@ msgstr " $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot\
#. type: Plain text
#: en/user_basics.ssi:146
-msgid "2~building-usb-hdd Building a USB/HDD image"
-msgstr "2~building-usb-hdd Crear una imagen USB/HDD"
+msgid "2~building-hdd Building an HDD image"
+msgstr "2~building-hdd Crear una imagen HDD"
#. type: Plain text
#: en/user_basics.ssi:148
msgid ""
-"Building a USB/HDD image is similar to ISO hybrid in all respects except you "
-"specify #{-b usb-hdd}# and the resulting filename is #{binary.img}# which "
-"cannot be burnt to optical media. It is suitable for booting from USB "
-"sticks, USB hard drives, and various other portable storage devices. "
-"Normally, an ISO hybrid image can be used for this purpose instead, but if "
-"you have a BIOS which does not handle hybrid images properly, or want to use "
-"the remaining space on the media for some purpose, such as a persistence "
-"partition, you need a USB/HDD image."
-msgstr ""
-"La siguiente secuencia de comandos creará una imagen USB/HDD básica que "
-"contendrá sólo el sistema estándar de Debian sin X.org. Es adecuada para el "
-"arranque desde dispositivos USB, discos duros USB y otros dispositivos de "
-"almacenamiento portátil. Normalmente, se puede utilizar para este propósito "
-"una imagen ISO híbrida, pero es posible que la BIOS no maneje adecuadamente "
-"las imágenes híbridas. También es interesante una imagen USB/HDD si se desea "
-"utilizar el espacio restante en los medios de almacenamiento para una "
-"partición con persistencia."
+"Building an HDD image is similar to ISO hybrid in all respects except you "
+"specify #{-b hdd}# and the resulting filename is #{binary.img}# which cannot "
+"be burnt to optical media. It is suitable for booting from USB sticks, USB "
+"hard drives, and various other portable storage devices. Normally, an ISO "
+"hybrid image can be used for this purpose instead, but if you have a BIOS "
+"which does not handle hybrid images properly, or want to use the remaining "
+"space on the media for some purpose, such as a persistence partition, you "
+"need an HDD image."
+msgstr ""
+"Crear una imagen HDD es similar a una de tipo ISO híbrida en todos los "
+"aspectos, con la diferencia de que hay que especificar #{-b hdd}# y de que "
+"el nombre de la imagen final es #{binary.img}# que se puede copiar en medios "
+"ópticos. Es adecuada para el arranque desde dispositivos USB, discos duros "
+"USB y otros sistemas de almacenamiento portátil. Normalmente, se puede "
+"utilizar para este propósito una imagen ISO híbrida, pero es posible que la "
+"BIOS no maneje adecuadamente las imágenes híbridas. También es interesante "
+"una imagen HDD si se desea utilizar el espacio restante en los medios de "
+"almacenamiento para una partición con persistencia."
#. type: Plain text
#: en/user_basics.ssi:150
@@ -745,17 +746,17 @@ msgstr " # lb clean --binary\n"
#. type: Plain text
#: en/user_basics.ssi:158
msgid ""
-"Run the #{lb config}# command as before, except this time specifying the USB/"
-"HDD image type:"
+"Run the #{lb config}# command as before, except this time specifying the HDD "
+"image type:"
msgstr ""
"Ejecutar el comando #{lb config}# como antes pero esta vez especificando el "
-"tipo de imagen USB/HDD:"
+"tipo de imagen HDD:"
#. type: Plain text
#: en/user_basics.ssi:162
#, no-wrap
-msgid " $ lb config -b usb-hdd\n"
-msgstr " $ lb config -b usb-hdd\n"
+msgid " $ lb config -b hdd\n"
+msgstr " $ lb config -b hdd\n"
#. type: Plain text
#: en/user_basics.ssi:166 en/user_basics.ssi:234
@@ -773,29 +774,29 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:176
-msgid "2~using-usb-hdd-image Using a USB/HDD image"
-msgstr "2~using-usb-hdd-image Utilizar una imágen USB/HDD"
+msgid "2~using-hdd-image Using an HDD image"
+msgstr "2~using-hdd-image Utilizar una imágen HDD"
#. type: Plain text
#: en/user_basics.ssi:178
msgid ""
"The generated binary image contains a VFAT partition and the syslinux "
-"bootloader, ready to be directly written on a USB stick. Since using a USB/"
-"HDD image is just like using an ISO hybrid image on USB, follow the "
-"instructions in {Using an ISO hybrid live image}#using-iso-hybrid, except "
-"use the filename #{binary.img}# instead of #{binary-hybrid.iso}#."
+"bootloader, ready to be directly written on a USB stick. Since using an HDD "
+"image is just like using an ISO hybrid image on USB, follow the instructions "
+"in {Using an ISO hybrid live image}#using-iso-hybrid, except use the "
+"filename #{binary.img}# instead of #{binary-hybrid.iso}#."
msgstr ""
"La imagen binaria generada contiene una partición VFAT y el gestor de "
"arranque syslinux, lista para ser copiada directamente en un dispositivo "
-"USB. Dado que utilizar una imagen USB/HDD es igual a usar una imagen ISO "
-"híbrida en un USB, seguir las instrucciones de {Usar una imagen ISO híbrida}"
-"#using-iso-hybrid con la diferencia de usar el nombre #{binary.img}# en "
-"lugar de #{binary-hybrid.iso}#."
+"USB. Dado que utilizar una imagen HDD es igual a usar una imagen ISO híbrida "
+"en un USB, seguir las instrucciones de {Usar una imagen ISO híbrida}#using-"
+"iso-hybrid con la diferencia de usar el nombre #{binary.img}# en lugar de #"
+"{binary-hybrid.iso}#."
#. type: Plain text
#: en/user_basics.ssi:180
-msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
-msgstr "3~testing-usb-hdd-with-qemu Probar una imágen USB/HDD con Qemu"
+msgid "3~testing-hdd-with-qemu Testing an HDD image with Qemu"
+msgstr "3~testing-hdd-with-qemu Probar una imágen HDD con Qemu"
#. type: Plain text
#: en/user_basics.ssi:182
@@ -919,15 +920,15 @@ msgstr " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-serv
#. type: Plain text
#: en/user_basics.ssi:232
msgid ""
-"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
-"serve the filesystem image to the client, so the files must be served via "
-"NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the "
-"location and server, respectively, of the NFS server where the filesytem "
-"image will be located at boot time. Make sure these are set to suitable "
-"values for your network and server."
+"In contrast with the ISO and HDD images, netbooting does not, itself, serve "
+"the filesystem image to the client, so the files must be served via NFS. The "
+"#{--net-root-path}# and #{--net-root-server}# options specify the location "
+"and server, respectively, of the NFS server where the filesytem image will "
+"be located at boot time. Make sure these are set to suitable values for your "
+"network and server."
msgstr ""
-"A diferencia de las imágenes ISO y USB/HDD, el sistema de arranque en red en "
-"sí mismo no envía la imagen del sistema de ficheros al cliente, por eso los "
+"A diferencia de las imágenes ISO y HDD, el sistema de arranque en red en sí "
+"mismo no envía la imagen del sistema de ficheros al cliente, por eso los "
"ficheros se deben enviar mediante NFS. Las opciones #{--net-root-path}# y #"
"{--net-root-server}# especifican la ubicación y el servidor, "
"respectivamente, del servidor NFS en el que se encuentra la imagen del "
diff --git a/manual/po/es/user_customization-binary.ssi.po b/manual/po/es/user_customization-binary.ssi.po
index 472f4f3..431767d 100644
--- a/manual/po/es/user_customization-binary.ssi.po
+++ b/manual/po/es/user_customization-binary.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: 2011-01-20 16:58-0400\n"
-"PO-Revision-Date: 2011-03-18 14:21+0100\n"
+"POT-Creation-Date: 2012-01-15 20:48+0100\n"
+"PO-Revision-Date: 2012-02-05 16:00+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
"Language-Team: Debian live Spanish translation team <debian-live at lists."
@@ -22,6 +22,138 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/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
+#: 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: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_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
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/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
+#: 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: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_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
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
#: en/user_customization-binary.ssi:2
msgid "B~ Customizing the binary image"
msgstr "B~ Personalización de la imagen binaria"
@@ -39,26 +171,92 @@ msgstr "2~ Gestor de arranque"
#. type: Plain text
#: en/user_customization-binary.ssi:8
msgid ""
-"live-build uses syslinux as bootloader by default, which is by default "
-"configured to pause indefinitely at its splash screen. To adjust this, you "
-"can pass #{--syslinux-timeout TIMEOUT}# to #{lb config}#. The value is "
-"specified in units of seconds. A timeout of 0 (zero) disables the timeout "
-"completely. For more information please see syslinux(1)."
+"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."
msgstr ""
-"live-build utiliza syslinux como gestor de arranque por defecto, el cual "
-"está configurado de forma predeterminada para hacer una pausa indefinida en "
-"su pantalla de bienvenida. Para modificar esto, se puede pasar #{--syslinux-"
-"timeout TIMEOUT}# a #{lb config}#. El valor se especifica en segundos. Un "
-"tiempo de espera de 0 (cero) desactiva el tiempo de espera por completo. "
-"Para obtener más información, consultar syslinux (1)."
+"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."
#. 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."
+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."
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:12
+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 ""
+"Para modificar el tiempo de espera de arranque de una imagen #{iso-hybrid}# "
+"se puede editar un fichero *{isolinux.cfg}* especificando el tiempo de "
+"espera en unidades de segundo y agregarlo a #{config/includes.binary/"
+"isolinux/}#"
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:14
+msgid ""
+"A modified *{isolinux.cfg}* to boot after five seconds would be similar to "
+"this:"
+msgstr ""
+"Un fichero *{isolinux.cfg}* modificado para arrancar después de cinco "
+"segundos sería así:"
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:21
+#, no-wrap
+msgid ""
+" include menu.cfg\n"
+" default vesamenu.c32\n"
+" prompt 0\n"
+" timeout 5\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:25
+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 "
+"in the binary stage. A proposed example:"
+msgstr ""
+"Una forma alternativa de lograr el mismo objetivo podría ser escribiendo un "
+"script gancho y agregarlo a #{config/hooks/}# Recordar añadir el sufijo ."
+"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
+#, no-wrap
+msgid " #!/bin/sh\n"
+msgstr " #!/bin/sh\n"
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:31
+#, 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"
+
+#. 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)."
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:37
msgid "2~ ISO metadata"
msgstr "2~ Metadatos ISO"
#. type: Plain text
-#: en/user_customization-binary.ssi:12
+#: en/user_customization-binary.ssi:39
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 "
@@ -70,7 +268,7 @@ msgstr ""
"sin arrancarla."
#. type: Plain text
-#: en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:41
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 "
@@ -81,7 +279,7 @@ msgstr ""
"de 128 caracteres."
#. type: Plain text
-#: en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:43
msgid ""
"_* #{LB_ISO_PREPARER/--iso-preparer NAME}#: This should describe the "
"preparer of the image, usually with some contact details. The default for "
@@ -95,7 +293,7 @@ msgstr ""
"longitud máxima para este campo es de 128 caracteres."
#. type: Plain text
-#: en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:45
msgid ""
"_* #{LB_ISO_PUBLISHER/--iso-publisher NAME}#: This should describe the "
"publisher of the image, usually with some contact details. The maximum "
@@ -106,7 +304,7 @@ msgstr ""
"longitud máxima para este campo es de 128 caracteres."
#. type: Plain text
-#: en/user_customization-binary.ssi:19
+#: en/user_customization-binary.ssi:46
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 2232dad..5c5dde5 100644
--- a/manual/po/es/user_customization-contents.ssi.po
+++ b/manual/po/es/user_customization-contents.ssi.po
@@ -6,8 +6,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:17+0100\n"
+"POT-Creation-Date: 2012-01-15 16:28+0100\n"
+"PO-Revision-Date: 2012-01-15 16:53+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"
@@ -21,7 +21,7 @@ msgstr ""
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -35,6 +35,7 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -86,7 +87,7 @@ msgstr "code{"
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -100,6 +101,7 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -179,8 +181,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:8
-msgid "2~ Includes"
-msgstr "2~ Includes"
+msgid "2~includes Includes"
+msgstr "2~includes Includes"
#. type: Plain text
#: en/user_customization-contents.ssi:10
@@ -407,8 +409,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:74
-msgid "2~ Hooks"
-msgstr "2~ Scripts gancho (Hooks)"
+msgid "2~hooks Hooks"
+msgstr "2~hooks Scripts gancho (Hooks)"
#. type: Plain text
#: en/user_customization-contents.ssi:76
diff --git a/manual/po/es/user_customization-packages.ssi.po b/manual/po/es/user_customization-packages.ssi.po
index 135b908..f8b8356 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: 2011-11-07 21:01-0400\n"
-"PO-Revision-Date: 2011-11-08 14:26+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\n"
+"PO-Revision-Date: 2012-01-18 23: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"
@@ -27,7 +27,7 @@ msgstr ""
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -41,6 +41,7 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -92,7 +93,7 @@ msgstr "code{"
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -106,6 +107,7 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -299,31 +301,30 @@ msgstr "3~ Réplicas de Distribución Debian"
msgid ""
"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 #{--parent-mirror-*}# options governs which "
+"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 #{--parent-mirror-binary}"
-"# and #{--parent-mirror-binary-security}# values are used, superceding any "
-"mirrors used in an earlier stage."
+"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 #{--"
-"parent-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}"
+"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 "
"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 #{--parent-mirror-*}#. "
-"Posteriormente, en la etapa *binary* se utilizarán las réplicas Debian "
-"indicadas en los valores de las opciones #{--parent-mirror-binary}# y #{--"
-"parent-mirror-binary-security}# en lugar de utilizar los indicados para las "
-"etapas anteriores."
+"etapas le corresponde su propia opción #{--mirror-*}#. Posteriormente, en la "
+"etapa *binary* se utilizarán las réplicas Debian indicadas en los valores de "
+"las opciones #{--mirror-binary}# y #{--mirror-binary-security}# en lugar de "
+"utilizar los indicados para las etapas anteriores."
#. type: Plain text
#: en/user_customization-packages.ssi:36
@@ -337,34 +338,34 @@ msgstr ""
#: en/user_customization-packages.ssi:38
msgid ""
"To set the distribution mirrors used at build time to point at a local "
-"mirror, it is sufficient to set #{--parent-mirror-bootstrap}#, #{--parent-"
-"mirror-chroot-security}# and #{--parent-mirror-chroot-backports}# as follows."
+"mirror, it is sufficient to set #{--mirror-bootstrap}#, #{--mirror-chroot-"
+"security}# and #{--mirror-chroot-backports}# as follows."
msgstr ""
"Para indicar qué réplicas deben ser utilizadas en el momento de crear la "
-"imagen es suficiente con utilizar las opciones #{--parent-mirror-bootstrap}"
-"# , #{--parent-mirror-chroot-security}# y #{--parent-mirror-chroot-backports}"
-"# como se muestra a continuación."
+"imagen es suficiente con utilizar las opciones #{--mirror-bootstrap}# , #{--"
+"mirror-chroot-security}# y #{--mirror-chroot-backports}# como se muestra a "
+"continuación."
#. type: Plain text
#: en/user_customization-packages.ssi:44
#, no-wrap
msgid ""
-" $ lb config --parent-mirror-bootstrap http://localhost/debian/ \\\n"
-" --parent-mirror-chroot-security http://localhost/debian-security/ \\\n"
-"\t --parent-mirror-chroot-backports http://localhost/debian-backports/\n"
+" $ 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"
msgstr ""
-" $ lb config --parent-mirror-bootstrap http://localhost/debian/ \\\n"
-" --parent-mirror-chroot-security http://localhost/debian-security/ \\\n"
-"\t --parent-mirror-chroot-backports http://localhost/debian-backports/\n"
+" $ 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
msgid ""
-"The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the #"
-"{--parent-mirror-bootstrap}# value."
+"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+"mirror-bootstrap}# value."
msgstr ""
-"El valor indicado en #{--parent-mirror-chroot}# es utilizado como valor por "
-"defecto para la opción #{--parent-mirror-bootstrap}# si esta no es indicada."
+"El valor indicado en #{--mirror-chroot}# es utilizado como valor por defecto "
+"para la opción #{--mirror-bootstrap}# si esta no es indicada."
#. type: Plain text
#: en/user_customization-packages.ssi:50
@@ -374,17 +375,17 @@ msgstr "3~ Réplicas de distribución Debian utilizadas en la ejecución."
#. type: Plain text
#: en/user_customization-packages.ssi:52
msgid ""
-"The #{--parent-mirror-binary*}# options govern the distribution mirrors "
-"placed in the binary image. These may be used to install additional packages "
-"while running the live system. The defaults employ #{cdn.debian.net}#, a "
-"service that chooses a geographically close mirror based on the user's IP "
-"number. This is a suitable choice when you cannot predict which mirror will "
-"be best for all of your users. Or you may specify your own values as shown "
-"in the example below. An image built from this configuration would only be "
-"suitable for users on a network where \"#{mirror}#\" is reachable."
-msgstr ""
-"Las opciones #{--parent-mirror-binary*}# gobiernan las réplicas configuradas "
-"en la imagen binaria que serán utilizadas para instalar paquetes adicionales "
+"The #{--mirror-binary*}# options govern the distribution mirrors placed in "
+"the binary image. These may be used to install additional packages while "
+"running the live system. The defaults employ #{cdn.debian.net}#, a service "
+"that chooses a geographically close mirror based on the user's IP number. "
+"This is a suitable choice when you cannot predict which mirror will be best "
+"for all of your users. Or you may specify your own values as shown in the "
+"example below. An image built from this configuration would only be suitable "
+"for users on a network where \"#{mirror}#\" is reachable."
+msgstr ""
+"Las opciones #{--mirror-binary*}# gobiernan las réplicas configuradas en la "
+"imagen binaria que serán utilizadas para instalar paquetes adicionales "
"mientras se ejecuta el sistema en vivo. Por defecto se utiliza #{cdn.debian."
"net}#, que es un servicio que selecciona la réplica más cercana basándose en "
"el número de IP. Es una elección bastante acertada siempre que no se pueda "
@@ -397,11 +398,11 @@ msgstr ""
#: en/user_customization-packages.ssi:57
#, no-wrap
msgid ""
-" $ lb config --parent-mirror-binary http://mirror/debian/ \\\n"
-" --parent-mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --mirror-binary http://mirror/debian/ \\\n"
+" --mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
-" $ lb config --parent-mirror-binary http://mirror/debian/ \\\n"
-" --parent-mirror-binary-security http://mirror/debian-security/\n"
+" $ 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
@@ -416,9 +417,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 #{--"
-"parent-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 "
@@ -426,9 +427,9 @@ msgstr ""
"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 #{--"
-"parent-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."
+"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."
#. type: Plain text
#: en/user_customization-packages.ssi:65
@@ -466,10 +467,10 @@ msgstr "Estos ficheros serán seleccionados automáticamente si existen."
#: en/user_customization-packages.ssi:77
msgid ""
"You should also put the GPG key used to sign the repository into #{config/"
-"archives/your-repository.gpg.{binary,chroot}}# files."
+"archives/your-repository.key.{binary,chroot}}# files."
msgstr ""
"Se debería también incluir en el fichero #{config/archives/your-repository."
-"gpg.{binary,chroot}}# la clave GPG a utilizar para firmar dicho repositorio."
+"key.{binary,chroot}}# la clave GPG a utilizar para firmar dicho repositorio."
#. type: Plain text
#: en/user_customization-packages.ssi:79
@@ -1370,13 +1371,13 @@ msgstr ""
#, no-wrap
msgid ""
" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
-" $ cat >> config/chroot_apt/preferences <<END\n"
+" $ cat >> config/chroot_apt/preferences << END\n"
" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
-" $ cat >> config/chroot_apt/preferences <<END\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"
diff --git a/manual/po/es/user_examples.ssi.po b/manual/po/es/user_examples.ssi.po
index 4645a16..17e80d3 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: 2011-11-13 17:12+0100\n"
-"PO-Revision-Date: 2011-11-13 17:27+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\n"
+"PO-Revision-Date: 2012-01-18 23: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."
@@ -30,7 +30,7 @@ msgstr ":B~ Ejemplos"
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -44,6 +44,7 @@ msgstr ":B~ Ejemplos"
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/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
@@ -95,7 +96,7 @@ msgstr "code{"
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -109,6 +110,7 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -164,6 +166,12 @@ msgid " # lb build\n"
msgstr " # lb build\n"
#. type: Plain text
+#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#, no-wrap
+msgid " #!/bin/sh\n"
+msgstr " #!/bin/sh\n"
+
+#. type: Plain text
#: en/user_examples.ssi:4
msgid "1~examples Examples"
msgstr "1~examples Ejemplos"
@@ -208,9 +216,9 @@ msgid ""
"config}#, as described in {Distribution mirrors used at build time}"
"#distribution-mirrors-build-time, or for more convenience, set the default "
"for your build system in #{/etc/live/build.conf}#. Simply create this file "
-"and in it, set the corresponding #{LB_PARENT_MIRROR_*}# variables to your "
-"preferred mirror. All other mirrors used in the build will be defaulted from "
-"these values. For example:"
+"and in it, set the corresponding #{LB_MIRROR_*}# variables to your preferred "
+"mirror. All other mirrors used in the build will be defaulted from these "
+"values. For example:"
msgstr ""
"Hay que tener en cuenta que, para abreviar, en estos ejemplos no se "
"especifica una réplica local para la creación de la imagen. Es posible "
@@ -219,22 +227,21 @@ msgstr ""
"describe en {Réplicas de Distribution utilizadas durante la creación}"
"#distribution-mirrors-build-time, o para más comodidad, establecer el valor "
"por defecto para la creación del sistema en #{/etc/live/build.conf}#. Basta "
-"con crear este fichero y en el mismo, establecer las variables #"
-"{LB_PARENT_MIRROR_*}# correspondientes a la réplica preferida. Todas las "
-"demás réplicas usadas en el proceso de creación usarán estos valores por "
-"defecto. Por ejemplo:"
+"con crear este fichero y en el mismo, establecer las variables #{LB_MIRROR_*}"
+"# correspondientes a la réplica preferida. Todas las demás réplicas usadas "
+"en el proceso de creación usarán estos valores por defecto. Por ejemplo:"
#. type: Plain text
#: en/user_examples.ssi:18
#, no-wrap
msgid ""
-" LB_PARENT_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
-" LB_PARENT_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
-" LB_PARENT_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
+" 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"
msgstr ""
-" LB_PARENT_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
-" LB_PARENT_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
-" LB_PARENT_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
+" 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
@@ -438,12 +445,6 @@ msgid "Edit #{auto/config}# to read as follows:"
msgstr "Editar #{auto/config}# del siguiente modo:"
#. type: Plain text
-#: en/user_examples.ssi:95
-#, no-wrap
-msgid " #!/bin/sh\n"
-msgstr " #!/bin/sh\n"
-
-#. type: Plain text
#: en/user_examples.ssi:101
#, no-wrap
msgid ""
@@ -688,11 +689,11 @@ msgstr ""
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
-" $ cat > config/includes.chroot/etc/skel/.xsession <<END\n"
+" $ 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"
+" $ cat > config/includes.chroot/etc/skel/.xsession << END\n"
" #!/bin/sh\n"
#. type: Plain text
diff --git a/manual/po/fr/about_manual.ssi.po b/manual/po/fr/about_manual.ssi.po
index f28736f..3186556 100644
--- a/manual/po/fr/about_manual.ssi.po
+++ b/manual/po/fr/about_manual.ssi.po
@@ -2,13 +2,13 @@
# 2010 Christophe Siraut <chris at tobald.eu.org>
# This file is distributed under the same license as the live-manual package.
# Creak <romain.failliot at foolstep.com>, 2010, 2011.
-# 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-10-22 18:44+0200\n"
+"POT-Creation-Date: 2012-02-05 17:13+0100\n"
+"PO-Revision-Date: 2012-02-05 17:57+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: fr\n"
@@ -79,37 +79,42 @@ msgid ""
"While we believe that everything in this manual is important to at least "
"some of our users, we realize it is a lot of material to cover and that you "
"may wish to experience early success using the software before delving into "
-"the details. Therefore, we have provided three tutorials in the {Examples}"
-"#examples section designed to teach you image building and customization "
-"basics. Read {Using the examples}#using-the-examples first, followed by "
-"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
-"utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
-"#tutorial-3. By the end of these tutorials, you will have a taste of what "
-"can be done with Debian Live. We encourage you to return to more in-depth "
-"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
-"or skipping {Building a netboot image}#building-netboot-image, and finishing "
-"by reading the {Customization overview}#customization-overview and the "
-"chapters that follow it. By this point, we hope you are thoroughly excited "
-"by what can be done with Debian Live and motivated to read the rest of the "
-"manual, cover-to-cover."
+"the details. Therefore, we suggest reading in the following order. First, "
+"read this chapter, {About this manual}#about-manual, from the beginning and "
+"ending with the {Terms}#terms section. Next, skip to the three tutorials at "
+"the front of the {Examples}#examples section designed to teach you image "
+"building and customization basics. Read {Using the examples}#using-the-"
+"examples first, followed by {Tutorial 1: A standard image}#tutorial-1, "
+"{Tutorial 2: A web browser utility}#tutorial-2 and finally {Tutorial 3: A "
+"personalized image}#tutorial-3. By the end of these tutorials, you will have "
+"a taste of what can be done with Debian Live. We encourage you to return to "
+"more in-depth study of the manual, perhaps next reading {The basics}#the-"
+"basics, skimming or skipping {Building a netboot image}#building-netboot-"
+"image, and finishing by reading the {Customization overview}#customization-"
+"overview and the chapters that follow it. By this point, we hope you are "
+"thoroughly excited by what can be done with Debian Live and motivated to "
+"read the rest of the manual, cover-to-cover."
msgstr ""
"Même si nous croyons que tout dans ce manuel est important pour au moins "
"certains de nos utilisateurs, nous nous rendons compte qu'il y a beaucoup de "
"matière à couvrir et que vous pouvez vouloir expérimenter avant d'entrer "
-"dans les détails. Par conséquent, nous avons fourni trois tutoriels dans la "
-"section {Exemples}#examples destinée à vous apprendre la construction de "
-"l'image et les bases de la personnalisation. Lire en premier {En utilisant "
-"les exemples}#using-the-examples, suivie par {Tutoriel 1: Une image standard}"
-"#tutorial-1, {Tutoriel 2: Un logiciel de navigateur Web}#tutorial-2 et "
-"finalement {Tutoriel 3: Une image personnalisée}#tutorial-3. À la fin de ces "
-"tutoriels, vous aurez un avant-goût de ce qui peut être fait avec Debian "
-"Live. Nous vous encourageons à revenir à l'étude plus approfondie du "
-"manuel, la prochaine lecture peut-être {Les bases}#the-basics, passer pour "
-"{Construire une image netboot}#building-netboot-image, et finissant par la "
-"lecture de la{Vue d'ensemble de la personnalisation}#customization-overview "
-"et les autres sections suivantes. En ce point, nous espérons que vous êtes "
-"complètement excités par ce que on peut faire avec Debian Live et motivés "
-"pour lire le reste du manuel, du début à la fin."
+"dans les détails. Par conséquent, nous vous suggérons de lire dans l'ordre "
+"suivant. Tout d'abord, lisez ce chapitre {À propos de ce manuel}#about-"
+"manual dès le début et finissant avec la section {Terminologie}#terms. "
+"Ensuite, sautez aux trois tutoriels à l'avant de la section {Exemples}"
+"#examples destinée à vous apprendre la construction de l'image et les bases "
+"de la personnalisation. Lire en premier {En utilisant les exemples}#using-"
+"the-examples, suivie par {Tutoriel 1: Une image standard}#tutorial-1, "
+"{Tutoriel 2: Un logiciel de navigateur Web}#tutorial-2 et finalement "
+"{Tutoriel 3: Une image personnalisée}#tutorial-3. À la fin de ces tutoriels, "
+"vous aurez un avant-goût de ce qui peut être fait avec Debian Live. Nous "
+"vous encourageons à revenir à l'étude plus approfondie du manuel, la "
+"prochaine lecture peut-être {Les bases}#the-basics, passer pour {Construire "
+"une image netboot}#building-netboot-image, et finissant par la lecture de la"
+"{Vue d'ensemble de la personnalisation}#customization-overview et les autres "
+"sections suivantes. En ce point, nous espérons que vous êtes complètement "
+"excités par ce que on peut faire avec Debian Live et motivés pour lire le "
+"reste du manuel, du début à la fin."
#. type: Plain text
#: en/about_manual.ssi:14
@@ -403,9 +408,10 @@ 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
@@ -419,40 +425,42 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-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_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_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: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
@@ -461,7 +469,7 @@ 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:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -472,9 +480,10 @@ 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
@@ -488,40 +497,42 @@ msgstr ""
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-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_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_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: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
@@ -529,8 +540,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:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -585,11 +596,34 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:114
-msgid "3~ Applying patches"
-msgstr "3~ Appliquer des correctifs"
+msgid "It is also possible to build by document type, e.g:"
+msgstr ""
+"Il est également possible de construire par type de document, par exemple,"
+
+#. type: Plain text
+#: en/about_manual.ssi:118
+#, no-wrap
+msgid " $ make build FORMATS=pdf\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:122
+msgid "Or combine both, e.g:"
+msgstr "Ou combiner les deux, par exemple:"
#. type: Plain text
-#: en/about_manual.ssi:116
+#: en/about_manual.ssi:126
+#, no-wrap
+msgid " $ make build FORMATS=html LANGUAGES=it\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:130
+msgid "3~ Applying changes"
+msgstr "3~ Appliquer des modifications"
+
+#. type: Plain text
+#: en/about_manual.ssi:132
msgid ""
"Anyone can directly commit to the repository. However, we ask you to send "
"bigger changes to the mailing list to discuss them first. To push to the "
@@ -601,12 +635,12 @@ msgstr ""
"les étapes suivantes sont nécessaires."
#. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:134
msgid "_* Fetch the public commit key:"
msgstr "_* Téléchargez la clé publique:"
#. type: Plain text
-#: en/about_manual.ssi:127
+#: en/about_manual.ssi:143
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
@@ -618,12 +652,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:131
+#: en/about_manual.ssi:147
msgid "_* Add the following section to your openssh-client config:"
msgstr "_* Ajoutez la section suivante à votre configuration openssh-client:"
#. type: Plain text
-#: en/about_manual.ssi:140
+#: en/about_manual.ssi:156
#, no-wrap
msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
@@ -635,12 +669,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:144
+#: en/about_manual.ssi:160
msgid "_* Check out a clone of the manual through ssh:"
msgstr "_* Clonez le manuel via ssh:"
#. type: Plain text
-#: en/about_manual.ssi:149
+#: en/about_manual.ssi:165
#, no-wrap
msgid ""
" $ git clone git at live.debian.net:/live-manual.git\n"
@@ -648,7 +682,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:153
+#: en/about_manual.ssi:169
msgid ""
"_* Note that you should commit any changes on the debian-next branch, not on "
"the debian branch."
@@ -657,7 +691,7 @@ msgstr ""
"pas sur la branche debian."
#. type: Plain text
-#: en/about_manual.ssi:155
+#: en/about_manual.ssi:171
msgid ""
"_* After editing the files in #{manual/en/}#, please call the 'commit' "
"target in the top level directory to sanitize the files and update the "
@@ -668,55 +702,67 @@ msgstr ""
"mettre à jour les fichiers de traduction:"
#. type: Plain text
-#: en/about_manual.ssi:159
+#: en/about_manual.ssi:175
#, no-wrap
msgid " $ make commit\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:163
+#: en/about_manual.ssi:179
+msgid "_* Then"
+msgstr "_* Alors"
+
+#. type: Plain text
+#: en/about_manual.ssi:183
+#, no-wrap
+msgid " $ git add .\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:187
msgid ""
-"_* After sanitizing, commit the changes. Write commit messages that consist "
-"of full, useful sentences in English, starting with a capital letter and "
-"ending with a full stop. Usually, these will start with the form 'Fixing/"
-"Adding/Removing/Correcting/Translating', e.g."
+"_* After sanitizing and adding the files, commit the changes. Write commit "
+"messages that consist of full, useful sentences in English, starting with a "
+"capital letter and ending with a full stop. Usually, these will start with "
+"the form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
msgstr ""
-"_* Après nettoyage, soumettre les modifications. Veuillez écrire les "
-"commentaires de commit à l'aide de phrases complètes, en commençant par une "
-"majuscule et en terminant par un point, et en commençant par 'Fixing/Adding/"
-"Removing/Correcting/Translating', par exemple"
+"_* Après le nettoyage et d'ajouter les fichiers, soumettre les "
+"modifications. Veuillez écrire les commentaires de commit à l'aide de "
+"phrases complètes, en commençant par une majuscule et en terminant par un "
+"point, et en commençant par 'Fixing/Adding/Removing/Correcting/Translating', "
+"par exemple"
#. type: Plain text
-#: en/about_manual.ssi:167
+#: en/about_manual.ssi:191
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:171
+#: en/about_manual.ssi:195
msgid "_* Push the commit to the server:"
msgstr "_* Envoyez votre commit au serveur:"
#. type: Plain text
-#: en/about_manual.ssi:175
+#: en/about_manual.ssi:199
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:179
+#: en/about_manual.ssi:203
msgid "3~ Translation"
msgstr "3~ Traduction"
#. type: Plain text
-#: en/about_manual.ssi:181
+#: en/about_manual.ssi:205
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
"Pour soumettre une traduction pour une nouvelle langue, suivez ces trois "
"étapes:"
#. type: Plain text
-#: en/about_manual.ssi:183
+#: en/about_manual.ssi:207
msgid ""
"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
"in.pot files to your language with your favourite editor (such as poedit). "
@@ -731,7 +777,7 @@ msgstr ""
"manuel (avec les fichiers po) et l'activer dans l'autobuild."
#. type: Plain text
-#: en/about_manual.ssi:185
+#: en/about_manual.ssi:209
msgid ""
"_* Once the new language is added, you can randomly start translating all po "
"files in #{manual/po/}#."
@@ -740,11 +786,20 @@ msgstr ""
"de façon aléatoire tous les fichiers po dans #{manual/po/}#."
#. type: Plain text
-#: en/about_manual.ssi:186
+#: en/about_manual.ssi:211
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
-"are updated from the po files, before #{git commit -a}# and #{git push}#."
+"are updated from the po files and then you can review your changes launching "
+"#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
+"and #{git push}#."
msgstr ""
"_* N'oubliez pas que vous devez faire un #{make commit}# pour assurer que la "
-"traduction des manuels sont mis à jour à partir des fichiers po, avant #{git "
-"commit -a}# et #{git push}#."
+"traduction des manuels sont mis à jour à partir des fichiers po, alors vous "
+"pouvez réviser vos modifications avec #{make build}# avant #{git add .}#, #"
+"{git commit -a -m \"Translating...\"}# et #{git push}#."
+
+#. type: Plain text
+#: en/about_manual.ssi: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 "*{Remarque:}* S'il vous plaît soyez conscient que même si les deux #{make commit}# et #{make build}# suppriment votre répertoire de construction, si vous construisez le manuel pour examiner vos modifications comme il est recommandé, et vous voulez nettoyer votre arbre git avant de les envoyer, vous pouvez utiliser #{make clean}#. Cette dernière étape n'est pas obligatoire grâce au fichier .gitignore mais il est une bonne pratique pour éviter d'envoyer certains fichiers involontairement.\n"
diff --git a/manual/po/fr/index.html.in.po b/manual/po/fr/index.html.in.po
index 1402d72..dbe12e1 100644
--- a/manual/po/fr/index.html.in.po
+++ b/manual/po/fr/index.html.in.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-12-03 18:55+0100\n"
-"PO-Revision-Date: 2011-12-03 19:04+0100\n"
+"POT-Creation-Date: 2012-01-07 16:03+0100\n"
+"PO-Revision-Date: 2011-12-26 19:07+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: fr\n"
@@ -43,12 +43,12 @@ msgstr ""
msgid ""
"Please report errors, omissions, patches and suggestions to our mailinglist "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/about-manual.en.html#how-to-contribute"
+"org</a> and read about <a href=\"html/live-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
msgstr ""
"Veuillez transmettre les erreurs, omissions, patches et suggestions sur "
"notre liste de discussion <a href=\"mailto:debian-live at lists.debian.org"
-"\">debian-live at lists.debian.org</a> et lire <a href=\"html/about-manual.fr."
+"\">debian-live at lists.debian.org</a> et lire <a href=\"html/live-manual.fr."
"html#how-to-contribute\">comment contribuer</a> au manuel."
#. type: Content of: <html><body><h3>
@@ -64,29 +64,28 @@ msgstr "<a href=\"epub/live-manual.fr.epub\">EPUB</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:24
msgid ""
-"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
-"manual.en.html\">single page</a>"
+"HTML: <a href=\"html/live-manual/toc.en.html\">multi page</a>, <a href="
+"\"html/live-manual.en.html\">single page</a>"
msgstr ""
-"HTML: <a href=\"html/index.fr.html\">multi pages</a>, <a href=\"html/live-"
-"manual.fr.html\">page unique</a>"
+"HTML: <a href=\"html/live-manual/toc.fr.html\">multi pages</a>, <a href="
+"\"html/live-manual.fr.html\">page unique</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:25
-msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
-msgstr "<a href=\"odf/live-manual.fr.odt\">ODF</a>"
+msgid "<a href=\"odt/live-manual.en.odt\">ODF</a>"
+msgstr "<a href=\"odt/live-manual.fr.odt\">ODF</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:26
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
-"manual.landscape-letter.en.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/portrait.en.a4.pdf\">A4 portrait</a>, <a href=\"pdf/"
+"landscape.en.a4.pdf\">A4 landscape</a>, <a href=\"pdf/portrait.en.letter.pdf"
+"\">letter portrait</a>, <a href=\"pdf/landscape.en.letter.pdf\">letter "
+"landscape</a>"
msgstr ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.fr.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.fr.pdf\">A4 paysage</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.fr.pdf\">US portrait</a>, <a href=\"pdf/live-manual."
-"landscape-letter.fr.pdf\">US paysage</a>"
+"PDF: <a href=\"pdf/portrait.fr.a4.pdf\">A4 portrait</a>, <a href=\"pdf/"
+"landscape.fr.a4.pdf\">A4 paysage</a>, <a href=\"pdf/portrait.fr.letter.pdf"
+"\">US portrait</a>, <a href=\"pdf/landscape.fr.letter.pdf\">US paysage</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:27
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index 0ab6ea6..93e3054 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: 2011-12-04 10:22+0100\n"
+"POT-Creation-Date: 2012-02-06 18:57+0100\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"
@@ -37,11 +37,11 @@ msgstr ""
#, no-wrap
msgid ""
"@rights:\n"
-" :copyright: Copyright (C) 2006-2011 Debian Live Project\n"
+" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
" :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.\n"
msgstr ""
"@rights:\n"
-" :copyright: Copyright (C) 2006-2011 Debian Live Project\n"
+" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
" :license: 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\n"
#. type: Plain text
@@ -49,7 +49,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-12-04\n"
+" :published: 2012-02-06\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/user_basics.ssi.po b/manual/po/fr/user_basics.ssi.po
index 8fa18db..18b050f 100644
--- a/manual/po/fr/user_basics.ssi.po
+++ b/manual/po/fr/user_basics.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-01-12 08:28-0400\n"
"PO-Revision-Date: 2011-06-26 20:10+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -43,33 +43,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,7 +78,7 @@ 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:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -86,7 +86,7 @@ msgstr "code{"
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -108,33 +108,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 +142,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:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -164,7 +164,7 @@ msgid ""
"for using the three most commonly used image types. The most versatile image "
"type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB "
"portable storage device. In certain special cases, such as the use of "
-"persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter "
+"persistence, #{hdd}# may be more suitable for USB devices. The chapter "
"finishes with instructions for building and using a #{net}# type image, "
"which is a bit more involved due to the setup required on the server. This "
"is a slightly advanced topic for anyone who is not familiar already with "
@@ -177,7 +177,7 @@ msgstr ""
"utilisées. Le type d'image le plus polyvalent, #{iso-hybrid}#, peut être "
"utilisé sur une machine virtuelle, supports optiques ou un périphérique USB "
"de stockage portable. Dans certains cas particuliers, tels que l'utilisation "
-"de la persistance, le type #{usb-hdd}# peut être plus approprié pour les "
+"de la persistance, le type #{hdd}# peut être plus approprié pour les "
"périphériques USB. Le chapitre se termine avec des instructions pour la "
"construction et l'utilisation d'une image #{net}# , qui est un peu plus "
"compliqué en raison de la configuration requise sur le serveur. C'est un "
@@ -693,30 +693,30 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:146
-msgid "2~building-usb-hdd Building a USB/HDD image"
-msgstr "2~building-usb-hdd Construction d'une image USB/HDD"
+msgid "2~building-hdd Building an HDD image"
+msgstr "2~building-hdd Construction d'une image HDD"
#. type: Plain text
#: en/user_basics.ssi:148
msgid ""
-"Building a USB/HDD image is similar to ISO hybrid in all respects except you "
-"specify #{-b usb-hdd}# and the resulting filename is #{binary.img}# which "
-"cannot be burnt to optical media. It is suitable for booting from USB "
-"sticks, USB hard drives, and various other portable storage devices. "
-"Normally, an ISO hybrid image can be used for this purpose instead, but if "
-"you have a BIOS which does not handle hybrid images properly, or want to use "
-"the remaining space on the media for some purpose, such as a persistence "
-"partition, you need a USB/HDD image."
-msgstr ""
-"La construction d'une image USB/HDD est similaire à une ISO hybride à tous "
-"les égards, sauf que vous spécifiez #{-b usb-hdd}# et le nom du fichier "
-"résultant est #{binary.img}# qui ne peut être brûlé sur des supports "
-"optiques. Il convient pour le démarrage à partir de clés USB, disques durs "
-"USB, et divers autres dispositifs de stockage portables. Normalement, une "
-"image ISO hybride peut être utilisé à cette fin au lieu, mais si vous avez "
-"un BIOS qui ne gère pas correctement des images hybrides, ou si vous voulez "
-"utiliser l'espace disponible sur le support à certaines fins, tel que la "
-"persistance d'une partition, vous devez utiliser une image USB/HDD. "
+"Building an HDD image is similar to ISO hybrid in all respects except you "
+"specify #{-b hdd}# and the resulting filename is #{binary.img}# which cannot "
+"be burnt to optical media. It is suitable for booting from USB sticks, USB "
+"hard drives, and various other portable storage devices. Normally, an ISO "
+"hybrid image can be used for this purpose instead, but if you have a BIOS "
+"which does not handle hybrid images properly, or want to use the remaining "
+"space on the media for some purpose, such as a persistence partition, you "
+"need an HDD image."
+msgstr ""
+"La construction d'une image HDD est similaire à une ISO hybride à tous les "
+"régards, sauf que vous spécifiez #{-b hdd}# et le nom du fichier résultant "
+"est #{binary.img}# qui ne peut être brûlé sur des supports optiques. Il "
+"convient pour le démarrage à partir de clés USB, disques durs USB, et divers "
+"autres dispositifs de stockage portables. Normalement, une image ISO hybride "
+"peut être utilisé à cette fin au lieu, mais si vous avez un BIOS qui ne gère "
+"pas correctement des images hybrides, ou si vous voulez utiliser l'espace "
+"disponible sur le support à certaines fins, tel que la persistance d'une "
+"partition, vous devez utiliser une image HDD. "
#. type: Plain text
#: en/user_basics.ssi:150
@@ -738,16 +738,16 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:158
msgid ""
-"Run the #{lb config}# command as before, except this time specifying the USB/"
-"HDD image type:"
+"Run the #{lb config}# command as before, except this time specifying the HDD "
+"image type:"
msgstr ""
"Exécutez la commande #{lb config}# comme avant, sauf que cette fois en "
-"spécifiant le type d'image USB/HDD:"
+"spécifiant le type d'image HDD:"
#. type: Plain text
#: en/user_basics.ssi:162
#, no-wrap
-msgid " $ lb config -b usb-hdd\n"
+msgid " $ lb config -b hdd\n"
msgstr ""
#. type: Plain text
@@ -766,29 +766,29 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:176
-msgid "2~using-usb-hdd-image Using a USB/HDD image"
-msgstr "2~using-usb-hdd-image Utiliser une image USB/HDD"
+msgid "2~using-hdd-image Using an HDD image"
+msgstr "2~using-hdd-image Utiliser une image HDD"
#. type: Plain text
#: en/user_basics.ssi:178
msgid ""
"The generated binary image contains a VFAT partition and the syslinux "
-"bootloader, ready to be directly written on a USB stick. Since using a USB/"
-"HDD image is just like using an ISO hybrid image on USB, follow the "
-"instructions in {Using an ISO hybrid live image}#using-iso-hybrid, except "
-"use the filename #{binary.img}# instead of #{binary-hybrid.iso}#."
+"bootloader, ready to be directly written on a USB stick. Since using an HDD "
+"image is just like using an ISO hybrid image on USB, follow the instructions "
+"in {Using an ISO hybrid live image}#using-iso-hybrid, except use the "
+"filename #{binary.img}# instead of #{binary-hybrid.iso}#."
msgstr ""
"L'image binaire générée contient une partition VFAT et le chargeur de "
"démarrage syslinux, prêtes à être écrites directement sur une clé USB. Comme "
-"l'utilisation d'une image USB/HDD est juste comme l'utilisation d'une image "
-"ISO hybride sur USB, suivez les instructions {Utiliser une image live ISO "
+"l'utilisation d'une image HDD est juste comme l'utilisation d'une image ISO "
+"hybride sur USB, suivez les instructions {Utiliser une image live ISO "
"hybride}#using-iso-hybrid, à l'exception du nom de fichier #{binary.img}# en "
"lieu de #{binary-hybrid.iso}#."
#. type: Plain text
#: en/user_basics.ssi:180
-msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
-msgstr "3~testing-usb-hdd-with-qemu Test d'une image USB/HDD avec Qemu"
+msgid "3~testing-hdd-with-qemu Testing an HDD image with Qemu"
+msgstr "3~testing-hdd-with-qemu Test d'une image HDD avec Qemu"
#. type: Plain text
#: en/user_basics.ssi:182
@@ -914,14 +914,14 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:232
msgid ""
-"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
-"serve the filesystem image to the client, so the files must be served via "
-"NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the "
-"location and server, respectively, of the NFS server where the filesytem "
-"image will be located at boot time. Make sure these are set to suitable "
-"values for your network and server."
+"In contrast with the ISO and HDD images, netbooting does not, itself, serve "
+"the filesystem image to the client, so the files must be served via NFS. The "
+"#{--net-root-path}# and #{--net-root-server}# options specify the location "
+"and server, respectively, of the NFS server where the filesytem image will "
+"be located at boot time. Make sure these are set to suitable values for your "
+"network and server."
msgstr ""
-"Contrairement à les images ISO et USB/HDD netbooting ne serve pas l'image du "
+"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 "
diff --git a/manual/po/fr/user_customization-binary.ssi.po b/manual/po/fr/user_customization-binary.ssi.po
index 29620f7..440331d 100644
--- a/manual/po/fr/user_customization-binary.ssi.po
+++ b/manual/po/fr/user_customization-binary.ssi.po
@@ -2,20 +2,152 @@
# 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-08-14 19:07+0200\n"
+"POT-Creation-Date: 2012-01-15 20:48+0100\n"
+"PO-Revision-Date: 2012-01-15 18:09+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/about_manual.ssi:181 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/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
+#: 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: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_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
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/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
+#: 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: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_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
+msgid "}code"
+msgstr "}code"
#. type: Plain text
#: en/user_customization-binary.ssi:2
@@ -30,31 +162,96 @@ msgstr "1~customizing-binary Personnalisation de l'image binaire"
#. type: Plain text
#: en/user_customization-binary.ssi:6
msgid "2~ Bootloader"
-msgstr "2~ Chargeur de démarrage"
+msgstr "2~ Chargeur d'amorçage"
#. type: Plain text
#: en/user_customization-binary.ssi:8
msgid ""
-"live-build uses syslinux as bootloader by default, which is by default "
-"configured to pause indefinitely at its splash screen. To adjust this, you "
-"can pass #{--syslinux-timeout TIMEOUT}# to #{lb config}#. The value is "
-"specified in units of seconds. A timeout of 0 (zero) disables the timeout "
-"completely. For more information please see syslinux(1)."
+"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."
msgstr ""
-"live-build utilise syslinux comme chargeur de démarrage par défaut, qui est "
-"configuré par défaut pour pauser indéfiniment à son écran splash. Pour "
-"régler cela, vous pouvez passer #{--syslinux-timeout TIMEOUT}# à #{lb config}"
-"#. La valeur est spécifiée en unités de secondes. Une valeur 0 (zéro) "
-"désactive le délai complètement. Pour plus d'informations s'il vous plaît "
-"voir syslinux(1)."
+"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."
#. 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."
+msgstr ""
+"Par exemple, ces dérivés 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
+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 ""
+"Pour modifier le délai de démarrage d'une image iso-hybrid, vous pouvez "
+"éditer un fichier *{isolinux.cfg}* précisant le timeout dans les unités de "
+"secondes et l'ajouter à #{config/includes.binary/isolinux/}#"
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:14
+msgid ""
+"A modified *{isolinux.cfg}* to boot after five seconds would be similar to "
+"this:"
+msgstr ""
+"Un *{isolinux.cfg}* modifié pour démarrer après cinq secondes ressemblerait "
+"à ceci:"
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:21
+#, no-wrap
+msgid ""
+" include menu.cfg\n"
+" default vesamenu.c32\n"
+" prompt 0\n"
+" timeout 5\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:25
+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 "
+"in the binary stage. A proposed example:"
+msgstr ""
+"Une autre façon d'atteindre le même objectif pourrait être écrire un hook et "
+"l'ajouter à #{config/hooks/}# N'oubliez pas d'ajouter le suffixe #{.binary}# "
+"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
+#, no-wrap
+msgid " #!/bin/sh\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:31
+#, 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)."
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:37
msgid "2~ ISO metadata"
msgstr "2~ Métadonnées ISO"
#. type: Plain text
-#: en/user_customization-binary.ssi:12
+#: en/user_customization-binary.ssi:39
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 "
@@ -66,7 +263,7 @@ msgstr ""
"d'une image sans la démarrer."
#. type: Plain text
-#: en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:41
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 "
@@ -77,7 +274,7 @@ msgstr ""
"128 caractères."
#. type: Plain text
-#: en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:43
msgid ""
"_* #{LB_ISO_PREPARER/--iso-preparer NAME}#: This should describe the "
"preparer of the image, usually with some contact details. The default for "
@@ -91,7 +288,7 @@ msgstr ""
"est de 128 caractères."
#. type: Plain text
-#: en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:45
msgid ""
"_* #{LB_ISO_PUBLISHER/--iso-publisher NAME}#: This should describe the "
"publisher of the image, usually with some contact details. The maximum "
@@ -102,7 +299,7 @@ msgstr ""
"de ce champ est de 128 caractères."
#. type: Plain text
-#: en/user_customization-binary.ssi:19
+#: en/user_customization-binary.ssi:46
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 8ad75c3..01b5c10 100644
--- a/manual/po/fr/user_customization-contents.ssi.po
+++ b/manual/po/fr/user_customization-contents.ssi.po
@@ -2,26 +2,26 @@
# 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:51+0100\n"
+"POT-Creation-Date: 2012-01-15 16:28+0100\n"
+"PO-Revision-Date: 2012-01-15 17:57+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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -35,6 +35,7 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -86,7 +87,7 @@ msgstr "code{"
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -100,6 +101,7 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -177,8 +179,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:8
-msgid "2~ Includes"
-msgstr "2~ Includes"
+msgid "2~includes Includes"
+msgstr "2~includes Includes"
#. type: Plain text
#: en/user_customization-contents.ssi:10
@@ -385,8 +387,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:74
-msgid "2~ Hooks"
-msgstr "2~ Hooks"
+msgid "2~hooks Hooks"
+msgstr "2~hooks Hooks"
#. type: Plain text
#: en/user_customization-contents.ssi:76
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index e40957c..25d0720 100644
--- a/manual/po/fr/user_customization-packages.ssi.po
+++ b/manual/po/fr/user_customization-packages.ssi.po
@@ -2,26 +2,26 @@
# 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:44+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\n"
+"PO-Revision-Date: 2012-01-18 23:41+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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -35,6 +35,7 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -86,7 +87,7 @@ msgstr "code{"
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -100,6 +101,7 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -290,29 +292,28 @@ msgstr "3~ Miroirs de distribution"
msgid ""
"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 #{--parent-mirror-*}# options governs which "
+"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 #{--parent-mirror-binary}"
-"# and #{--parent-mirror-binary-security}# values are used, superceding any "
-"mirrors used in an earlier stage."
+"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 #{--parent-"
-"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 #{--parent-mirror-binary}# et #{--parent-mirror-"
-"binary-security}# sont utilisées, remplaçant tout miroir utilisé dans une "
-"étape antérieure. "
+"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. "
#. type: Plain text
#: en/user_customization-packages.ssi:36
@@ -326,31 +327,30 @@ msgstr ""
#: en/user_customization-packages.ssi:38
msgid ""
"To set the distribution mirrors used at build time to point at a local "
-"mirror, it is sufficient to set #{--parent-mirror-bootstrap}#, #{--parent-"
-"mirror-chroot-security}# and #{--parent-mirror-chroot-backports}# as follows."
+"mirror, it is sufficient to set #{--mirror-bootstrap}#, #{--mirror-chroot-"
+"security}# and #{--mirror-chroot-backports}# as follows."
msgstr ""
"Pour définir les miroirs de distribution utilisés au temps de construction "
-"pour pointer vers un miroir local, il suffit de fixer #{--parent-mirror-"
-"bootstrap}# , #{--parent-mirror-chroot-security}# et #{--parent-mirror-"
-"chroot-backports}# comme suit."
+"pour pointer vers un miroir local, il suffit de fixer #{--mirror-bootstrap}"
+"# , #{--mirror-chroot-security}# et #{--mirror-chroot-backports}# comme suit."
#. type: Plain text
#: en/user_customization-packages.ssi:44
#, no-wrap
msgid ""
-" $ lb config --parent-mirror-bootstrap http://localhost/debian/ \\\n"
-" --parent-mirror-chroot-security http://localhost/debian-security/ \\\n"
-"\t --parent-mirror-chroot-backports http://localhost/debian-backports/\n"
+" $ 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"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:48
msgid ""
-"The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the #"
-"{--parent-mirror-bootstrap}# value."
+"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+"mirror-bootstrap}# value."
msgstr ""
-"Le miroir chroot, spécifiée par #{--parent-mirror-chroot}#, par défaut, "
-"c'est la valeur #{--parent-mirror-bootstrap}#."
+"Le miroir chroot, spécifiée par #{--mirror-chroot}#, par défaut, c'est la "
+"valeur #{--mirror-bootstrap}#."
#. type: Plain text
#: en/user_customization-packages.ssi:50
@@ -360,32 +360,32 @@ msgstr "3~ Miroirs de distribution utilisés au moment de l'exécution"
#. type: Plain text
#: en/user_customization-packages.ssi:52
msgid ""
-"The #{--parent-mirror-binary*}# options govern the distribution mirrors "
-"placed in the binary image. These may be used to install additional packages "
-"while running the live system. The defaults employ #{cdn.debian.net}#, a "
-"service that chooses a geographically close mirror based on the user's IP "
-"number. This is a suitable choice when you cannot predict which mirror will "
-"be best for all of your users. Or you may specify your own values as shown "
-"in the example below. An image built from this configuration would only be "
-"suitable for users on a network where \"#{mirror}#\" is reachable."
-msgstr ""
-"Les options #{--parent-mirror-binary*}# régissent les miroirs de "
-"distribution placés dans l'image binaire. Ils peuvent être utilisés pour "
-"installer des paquets supplémentaires lors de l'exécution du système live. "
-"Les valeurs par défaut emploient #{cdn.debian.net}#, un service qui choisit "
-"un miroir géographiquement proche basé sur le numéro IP de l'utilisateur. "
-"C'est un choix approprié lorsque vous ne pouvez pas prédire quel miroir sera "
-"mieux pour tous vos utilisateurs. Ou vous pouvez spécifier vos propres "
-"valeurs, comme indiqué dans l'exemple ci-dessous. Une image construite avec "
-"cette configuration seulement serait approprié pour les utilisateurs sur un "
-"réseau où \"#{mirror}#\" est accessible."
+"The #{--mirror-binary*}# options govern the distribution mirrors placed in "
+"the binary image. These may be used to install additional packages while "
+"running the live system. The defaults employ #{cdn.debian.net}#, a service "
+"that chooses a geographically close mirror based on the user's IP number. "
+"This is a suitable choice when you cannot predict which mirror will be best "
+"for all of your users. Or you may specify your own values as shown in the "
+"example below. An image built from this configuration would only be suitable "
+"for users on a network where \"#{mirror}#\" is reachable."
+msgstr ""
+"Les options #{--mirror-binary*}# régissent les miroirs de distribution "
+"placés dans l'image binaire. Ils peuvent être utilisés pour installer des "
+"paquets supplémentaires lors de l'exécution du système live. Les valeurs par "
+"défaut emploient #{cdn.debian.net}#, un service qui choisit un miroir "
+"géographiquement proche basé sur le numéro IP de l'utilisateur. C'est un "
+"choix approprié lorsque vous ne pouvez pas prédire quel miroir sera mieux "
+"pour tous vos utilisateurs. Ou vous pouvez spécifier vos propres valeurs, "
+"comme indiqué dans l'exemple ci-dessous. Une image construite avec cette "
+"configuration seulement serait approprié pour les utilisateurs sur un réseau "
+"où \"#{mirror}#\" est accessible."
#. type: Plain text
#: en/user_customization-packages.ssi:57
#, no-wrap
msgid ""
-" $ lb config --parent-mirror-binary http://mirror/debian/ \\\n"
-" --parent-mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --mirror-binary http://mirror/debian/ \\\n"
+" --mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
#. type: Plain text
@@ -401,17 +401,17 @@ 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 #{--"
-"parent-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-"
"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 #{--parent-mirror-*}#, "
-"elles gouvernent les référentiels utilisés dans l'étape *chroot* lors de la "
+"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."
@@ -451,10 +451,10 @@ msgstr "Si ces fichiers existent, ils seront sélectionnés automatiquement."
#: en/user_customization-packages.ssi:77
msgid ""
"You should also put the GPG key used to sign the repository into #{config/"
-"archives/your-repository.gpg.{binary,chroot}}# files."
+"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.gpg.{binary,chroot}}#"
+"dans fichiers #{config/archives/your-repository.key.{binary,chroot}}#"
#. type: Plain text
#: en/user_customization-packages.ssi:79
@@ -1325,7 +1325,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
-" $ cat >> config/chroot_apt/preferences <<END\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"
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index 4f34494..1264370 100644
--- a/manual/po/fr/user_examples.ssi.po
+++ b/manual/po/fr/user_examples.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-11-13 17:12+0100\n"
-"PO-Revision-Date: 2011-11-13 17:42+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\n"
+"PO-Revision-Date: 2012-01-18 23:35+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/live-manual.ssm:61 en/user_examples.ssi:2
@@ -26,7 +26,7 @@ msgstr ":B~ Exemples"
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -40,6 +40,7 @@ msgstr ":B~ Exemples"
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/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
@@ -91,7 +92,7 @@ msgstr "code{"
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -105,6 +106,7 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -160,6 +162,12 @@ msgid " # lb build\n"
msgstr ""
#. type: Plain text
+#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#, no-wrap
+msgid " #!/bin/sh\n"
+msgstr ""
+
+#. type: Plain text
#: en/user_examples.ssi:4
msgid "1~examples Examples"
msgstr "1~examples Exemples"
@@ -204,9 +212,9 @@ msgid ""
"config}#, as described in {Distribution mirrors used at build time}"
"#distribution-mirrors-build-time, or for more convenience, set the default "
"for your build system in #{/etc/live/build.conf}#. Simply create this file "
-"and in it, set the corresponding #{LB_PARENT_MIRROR_*}# variables to your "
-"preferred mirror. All other mirrors used in the build will be defaulted from "
-"these values. For example:"
+"and in it, set the corresponding #{LB_MIRROR_*}# variables to your preferred "
+"mirror. All other mirrors used in the build will be defaulted from these "
+"values. For example:"
msgstr ""
"Notez que, pour des raisons de concision, dans ces exemples, nous ne "
"spécifions pas un miroir local à utiliser pour la construction. Vous pouvez "
@@ -215,18 +223,17 @@ msgstr ""
"#, tel que décrit dans {Miroirs de distribution utilisés au temps de "
"construction}#distribution-mirrors-build-time, ou pour plus de commodité, "
"fixez par défaut votre système de construction dans #{/etc/live/build.conf}"
-"#. Il suffit de créer ce fichier et de définir les variables #"
-"{LB_PARENT_MIRROR_*}# correspondantes à votre miroir préféré. Tous les "
-"autres miroirs utilisés dans la construction seront par défaut à partir de "
-"ces valeurs. Par exemple:"
+"#. Il suffit de créer ce fichier et de définir les variables #{LB_MIRROR_*}# "
+"correspondantes à votre miroir préféré. Tous les autres miroirs utilisés "
+"dans la construction seront par défaut à partir de ces valeurs. Par exemple:"
#. type: Plain text
#: en/user_examples.ssi:18
#, no-wrap
msgid ""
-" LB_PARENT_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
-" LB_PARENT_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
-" LB_PARENT_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
+" 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"
msgstr ""
#. type: Plain text
@@ -423,12 +430,6 @@ msgid "Edit #{auto/config}# to read as follows:"
msgstr "Éditer #{auto/config}# pour lire comme suit: "
#. type: Plain text
-#: en/user_examples.ssi:95
-#, no-wrap
-msgid " #!/bin/sh\n"
-msgstr ""
-
-#. type: Plain text
#: en/user_examples.ssi:101
#, no-wrap
msgid ""
@@ -658,7 +659,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
-" $ cat > config/includes.chroot/etc/skel/.xsession <<END\n"
+" $ cat > config/includes.chroot/etc/skel/.xsession << END\n"
" #!/bin/sh\n"
msgstr ""
diff --git a/manual/po/it/about_manual.ssi.po b/manual/po/it/about_manual.ssi.po
index 69e1944..ec4968a 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: 2011-03-11 17:03+0100\n"
-"PO-Revision-Date: 2011-03-11 10:30+0100\n"
+"POT-Creation-Date: 2012-02-05 17:13+0100\n"
+"PO-Revision-Date: 2012-02-06 18:49+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
"Language: it\n"
@@ -78,37 +78,41 @@ msgid ""
"While we believe that everything in this manual is important to at least "
"some of our users, we realize it is a lot of material to cover and that you "
"may wish to experience early success using the software before delving into "
-"the details. Therefore, we have provided three tutorials in the {Examples}"
-"#examples section designed to teach you image building and customization "
-"basics. Read {Using the examples}#using-the-examples first, followed by "
-"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
-"utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
-"#tutorial-3. By the end of these tutorials, you will have a taste of what "
-"can be done with Debian Live. We encourage you to return to more in-depth "
-"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
-"or skipping {Building a netboot image}#building-netboot-image, and finishing "
-"by reading the {Customization overview}#customization-overview and the "
-"chapters that follow it. By this point, we hope you are thoroughly excited "
-"by what can be done with Debian Live and motivated to read the rest of the "
-"manual, cover-to-cover."
+"the details. Therefore, we suggest reading in the following order. First, "
+"read this chapter, {About this manual}#about-manual, from the beginning and "
+"ending with the {Terms}#terms section. Next, skip to the three tutorials at "
+"the front of the {Examples}#examples section designed to teach you image "
+"building and customization basics. Read {Using the examples}#using-the-"
+"examples first, followed by {Tutorial 1: A standard image}#tutorial-1, "
+"{Tutorial 2: A web browser utility}#tutorial-2 and finally {Tutorial 3: A "
+"personalized image}#tutorial-3. By the end of these tutorials, you will have "
+"a taste of what can be done with Debian Live. We encourage you to return to "
+"more in-depth study of the manual, perhaps next reading {The basics}#the-"
+"basics, skimming or skipping {Building a netboot image}#building-netboot-"
+"image, and finishing by reading the {Customization overview}#customization-"
+"overview and the chapters that follow it. By this point, we hope you are "
+"thoroughly excited by what can be done with Debian Live and motivated to "
+"read the rest of the manual, cover-to-cover."
msgstr ""
"Sebbene crediamo che ogni cosa in questo manuale sia importante almeno per "
"alcuni dei nostri utenti, ci rendiamo conto che c'è tanto materiale da "
"trattare e che si potrebbe voler provare il software prima di entrare nei "
-"dettagli. Pertanto, abbiamo messo a disposizione nella sezione {Esempi}"
-"#examples tre tutorial progettati per insegnarvi le basi della costruzione e "
-"della personalizzazione delle immagini. Si legga innanzitutto {Usare gli "
-"esempi}#using-the-examples, seguito da {Tutorial 1: un'immagine standard}"
-"#tutorial-1, {Tutorial 2: un programma di utilità web browser}#tutorial-2 e, "
-"infine, {Tutorial 3: un'immagine personalizzata}#tutorial-3. Alla fine di "
-"queste esercitazioni, si avrà un assaggio di ciò che si può fare con Debian "
-"Live. Ti invitiamo ad uno studio più approfondito del manuale, magari "
-"leggendo in seguito le {Nozioni di base}#the-basics, sfogliando o saltando "
-"{Creare un'immagine netboot}#building-netboot-image, e finendo con la "
-"lettura di {Panoramica sulla personalizzazione}#customization-overview e dei "
-"capitoli che lo seguono. A questo punto, ci auguriamo che tu sia davvero "
-"eccitato da ciò che si può fare con Debian Live e motivato a leggere il "
-"resto del manuale, da cima a fondo."
+"dettagli; pertanto suggeriamo di leggerlo nel seguente ordine. Per iniziare "
+"leggere questo capitolo, {A proposito di questo manuale}#about-manual, da "
+"cima a fondo insieme alla sezione {Glossario}#terms, quindi passare ai tre "
+"tutorial all'inizio della sezione {Esempi}#examples progettati per insegnare "
+"le basi della costruzione e della personalizzazione delle immagini. Si legga "
+"innanzitutto {Usare gli esempi}#using-the-examples, seguito da {Tutorial 1: "
+"un'immagine standard}#tutorial-1, {Tutorial 2: un programma di utilità web "
+"browser}#tutorial-2 e, infine, {Tutorial 3: un'immagine personalizzata}"
+"#tutorial-3. Alla fine di queste esercitazioni, si avrà un assaggio di ciò "
+"che si può fare con Debian Live. Ti invitiamo ad uno studio più approfondito "
+"del manuale, magari leggendo in seguito le {Nozioni di base}#the-basics, "
+"sfogliando o saltando {Creare un'immagine netboot}#building-netboot-image, e "
+"finendo con la lettura di {Panoramica sulla personalizzazione}#customization-"
+"overview e dei capitoli che lo seguono. A questo punto, ci auguriamo che tu "
+"sia davvero eccitato da ciò che si può fare con Debian Live e motivato a "
+"leggere il resto del manuale, da cima a fondo."
#. type: Plain text
#: en/about_manual.ssi:14
@@ -395,56 +399,59 @@ 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: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-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: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_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_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: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
@@ -453,7 +460,7 @@ 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:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -464,56 +471,59 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi: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: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-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: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_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_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: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
@@ -521,8 +531,8 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: 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:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -577,11 +587,33 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:114
-msgid "3~ Applying patches"
-msgstr "3~ Applicare le patch"
+msgid "It is also possible to build by document type, e.g:"
+msgstr "È inoltre possibile compilare in base al tipo di documento, esempio:"
#. type: Plain text
-#: en/about_manual.ssi:116
+#: en/about_manual.ssi:118
+#, no-wrap
+msgid " $ make build FORMATS=pdf\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:122
+msgid "Or combine both, e.g:"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:126
+#, no-wrap
+msgid " $ make build FORMATS=html LANGUAGES=it\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:130
+msgid "3~ Applying changes"
+msgstr "3~ Applicare le modifiche"
+
+#. type: Plain text
+#: en/about_manual.ssi:132
msgid ""
"Anyone can directly commit to the repository. However, we ask you to send "
"bigger changes to the mailing list to discuss them first. To push to the "
@@ -593,12 +625,12 @@ msgstr ""
"questa procedura:"
#. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:134
msgid "_* Fetch the public commit key:"
msgstr "_* Prelevare la chiave pubblica:"
#. type: Plain text
-#: en/about_manual.ssi:127
+#: en/about_manual.ssi:143
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
@@ -610,14 +642,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:131
+#: en/about_manual.ssi:147
msgid "_* Add the following section to your openssh-client config:"
msgstr ""
"_* Aggiungere la seguente sezione alla propria configurazione di openssh-"
"client:"
#. type: Plain text
-#: en/about_manual.ssi:140
+#: en/about_manual.ssi:156
#, no-wrap
msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
@@ -629,12 +661,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:144
+#: en/about_manual.ssi:160
msgid "_* Check out a clone of the manual through ssh:"
msgstr "_* Scaricare tramite ssh un clone del manuale:"
#. type: Plain text
-#: en/about_manual.ssi:149
+#: en/about_manual.ssi:165
#, no-wrap
msgid ""
" $ git clone git at live.debian.net:/live-manual.git\n"
@@ -644,7 +676,7 @@ msgstr ""
" $ cd live-manual && git checkout debian-next\n"
#. type: Plain text
-#: en/about_manual.ssi:153
+#: en/about_manual.ssi:169
msgid ""
"_* Note that you should commit any changes on the debian-next branch, not on "
"the debian branch."
@@ -653,7 +685,7 @@ msgstr ""
"su quello debian."
#. type: Plain text
-#: en/about_manual.ssi:155
+#: en/about_manual.ssi:171
msgid ""
"_* After editing the files in #{manual/en/}#, please call the 'commit' "
"target in the top level directory to sanitize the files and update the "
@@ -664,55 +696,66 @@ msgstr ""
"traduzione:"
#. type: Plain text
-#: en/about_manual.ssi:159
+#: en/about_manual.ssi:175
#, no-wrap
msgid " $ make commit\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:163
+#: en/about_manual.ssi:179
+msgid "_* Then"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:183
+#, no-wrap
+msgid " $ git add .\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:187
msgid ""
-"_* After sanitizing, commit the changes. Write commit messages that consist "
-"of full, useful sentences in English, starting with a capital letter and "
-"ending with a full stop. Usually, these will start with the form 'Fixing/"
-"Adding/Removing/Correcting/Translating', e.g."
+"_* After sanitizing and adding the files, commit the changes. Write commit "
+"messages that consist of full, useful sentences in English, starting with a "
+"capital letter and ending with a full stop. Usually, these will start with "
+"the form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
msgstr ""
-"_* Dopo la pulizia è possibile eseguire il commit delle modifiche. Si "
-"scrivano messaggi costituiti da frasi in inglese esaurienti ed utili, "
-"inizianti con una lettera maiuscola e terminanti con un punto. Solitamente "
-"cominceranno con la forma \"Fixing/Adding/Removing/Correcting/Translating\", "
-"ad esempio."
+"_* Dopo aver pulito e aggiunto i file è possibile eseguire il commit delle "
+"modifiche. Si scrivano messaggi costituiti da frasi in inglese esaurienti e "
+"utili, inizianti con una lettera maiuscola e terminanti con un punto. "
+"Solitamente cominceranno con la forma \"Fixing/Adding/Removing/Correcting/"
+"Translating\", ad esempio."
#. type: Plain text
-#: en/about_manual.ssi:167
+#: en/about_manual.ssi:191
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:171
+#: en/about_manual.ssi:195
msgid "_* Push the commit to the server:"
msgstr "_* Inviare il commit al server:"
#. type: Plain text
-#: en/about_manual.ssi:175
+#: en/about_manual.ssi:199
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:179
+#: en/about_manual.ssi:203
msgid "3~ Translation"
msgstr "3~ Traduzione"
#. type: Plain text
-#: en/about_manual.ssi:181
+#: en/about_manual.ssi:205
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
"Per inviare una traduzione per una nuova lingua, seguire questi tre passi:"
#. type: Plain text
-#: en/about_manual.ssi:183
+#: en/about_manual.ssi:207
msgid ""
"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
"in.pot files to your language with your favourite editor (such as poedit). "
@@ -727,7 +770,7 @@ msgstr ""
"la attiveremo per la procedura di compilazione automatica."
#. type: Plain text
-#: en/about_manual.ssi:185
+#: en/about_manual.ssi:209
msgid ""
"_* Once the new language is added, you can randomly start translating all po "
"files in #{manual/po/}#."
@@ -737,11 +780,20 @@ msgstr ""
"preferisce."
#. type: Plain text
-#: en/about_manual.ssi:186
+#: en/about_manual.ssi:211
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
-"are updated from the po files, before #{git commit -a}# and #{git push}#."
+"are updated from the po files and then you can review your changes launching "
+"#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
+"and #{git push}#."
+msgstr ""
+"_* Non dimenticare che è necessario usare #{make commit}# per assicurarsi "
+"che i manuali tradotti siano aggiornati partendo dai file po, quindi si "
+"possono verificare le modifiche con #{make build}# prima di #{git add .}#, #"
+"{git commit -a -m \"Traduzione...\"}# e #{git push}#."
+
+#. type: Plain text
+#: en/about_manual.ssi: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 ""
-"_* Non si dimentichi che è necessario dare un #{make commit}# per "
-"assicurarsi che i manuali tradotti siano aggiornati partendo dai file po, "
-"prima di #{git commit -a}# e #{git push}#."
diff --git a/manual/po/it/about_project.ssi.po b/manual/po/it/about_project.ssi.po
index 9e1b691..c8955ff 100644
--- a/manual/po/it/about_project.ssi.po
+++ b/manual/po/it/about_project.ssi.po
@@ -2,6 +2,7 @@
# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
+# skizzhg <skizzhg at gmx.com>, 2010.
#
msgid ""
msgstr ""
diff --git a/manual/po/it/index.html.in.po b/manual/po/it/index.html.in.po
index 0b9875d..3c1be44 100644
--- a/manual/po/it/index.html.in.po
+++ b/manual/po/it/index.html.in.po
@@ -4,12 +4,13 @@
# Automatically generated, 2010.
# Carlo Stemberger <carlo.stemberger at gmail.com>, 2010.
# Carlos Zuferri «chals» <chals at altorricon.com>, 2011.
+# skizzhg <skizzhg at gmx.com>, 2011
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-12-03 18:55+0100\n"
-"PO-Revision-Date: 2011-11-25 22:22+0100\n"
+"POT-Creation-Date: 2012-01-07 16:03+0100\n"
+"PO-Revision-Date: 2011-12-26 19:08+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: it\n"
@@ -35,18 +36,21 @@ msgid ""
"translated into several languages. Keep in mind that some translations may "
"be incomplete or may not be up to date."
msgstr ""
+"<i>live-manual</i> è disponibile in diversi formati e tradotto in varie "
+"lingue. Ricordarsi che alcune traduzioni possono essere incomplete o non "
+"aggiornate."
#. type: Content of: <html><body><p>
#: en/index.html.in:17
msgid ""
"Please report errors, omissions, patches and suggestions to our mailinglist "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/about-manual.en.html#how-to-contribute"
+"org</a> and read about <a href=\"html/live-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
msgstr ""
"Si prega di segnalare errori, omissioni, patch e suggerimenti sulla nostra "
"mailing list <a href=\"mailto:debian-live at lists.debian.org\">debian-"
-"live at lists.debian.org</a> e leggere <a href=\"html/about-manual.it.html#how-"
+"live at lists.debian.org</a> e leggere <a href=\"html/live-manual.it.html#how-"
"to-contribute\">come contribuire</a> al manuale."
#. type: Content of: <html><body><h3>
@@ -62,29 +66,29 @@ msgstr "<a href=\"epub/live-manual.it.epub\">EPUB</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:24
msgid ""
-"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
-"manual.en.html\">single page</a>"
+"HTML: <a href=\"html/live-manual/toc.en.html\">multi page</a>, <a href="
+"\"html/live-manual.en.html\">single page</a>"
msgstr ""
-"HTML: <a href=\"html/index.it.html\">multi-pagina</a>, <a href=\"html/live-"
-"manual.it.html\">pagina unica</a>"
+"HTML: <a href=\"html/live-manual/toc.it.html\">multi-pagina</a>, <a href="
+"\"html/live-manual.it.html\">pagina unica</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:25
-msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
-msgstr "<a href=\"odf/live-manual.it.odt\">ODF</a>"
+msgid "<a href=\"odt/live-manual.en.odt\">ODF</a>"
+msgstr "<a href=\"odt/live-manual.it.odt\">ODF</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:26
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
-"manual.landscape-letter.en.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/portrait.en.a4.pdf\">A4 portrait</a>, <a href=\"pdf/"
+"landscape.en.a4.pdf\">A4 landscape</a>, <a href=\"pdf/portrait.en.letter.pdf"
+"\">letter portrait</a>, <a href=\"pdf/landscape.en.letter.pdf\">letter "
+"landscape</a>"
msgstr ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.it.pdf\">A4 verticale</a>, <a "
-"href=\"pdf/live-manual.landscape-a4.it.pdf\">A4 orizzontale</a>, <a href="
-"\"pdf/live-manual.portrait-letter.it.pdf\">lettera verticale</a>, <a href="
-"\"pdf/live-manual.landscape-letter.it.pdf\">lettera orizzontale</a>"
+"PDF: <a href=\"pdf/portrait.it.a4.pdf\">A4 verticale</a>, <a href=\"pdf/"
+"landscape.it.a4.pdf\">A4 orizzontale</a>, <a href=\"pdf/portrait.it.letter."
+"pdf\">lettera verticale</a>, <a href=\"pdf/landscape.it.letter.pdf\">lettera "
+"orizzontale</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:27
diff --git a/manual/po/it/live-manual.ssm.po b/manual/po/it/live-manual.ssm.po
index 5e1c823..d3d6240 100644
--- a/manual/po/it/live-manual.ssm.po
+++ b/manual/po/it/live-manual.ssm.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-12-04 10:22+0100\n"
+"POT-Creation-Date: 2012-02-06 18:57+0100\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"
@@ -37,11 +37,11 @@ msgstr ""
#, no-wrap
msgid ""
"@rights:\n"
-" :copyright: Copyright (C) 2006-2011 Debian Live Project\n"
+" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
" :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.\n"
msgstr ""
"@rights:\n"
-" :copyright: Copyright (C) 2006-2011 Debian Live Project\n"
+" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
" :license: Questo programma è software libero: è possibile ridistribuirlo e modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, sia la versione 3 della licenza o (a scelta) una versione successiva.<br><br>Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori dettagli.<br><br>Si dovrebbe aver ricevuto una copia della GNU General Public License con questo programma. In caso contrario, vedere http://www.gnu.org/licenses/. <br><br>Il testo completo della GNU General Public License può essere trovato nel file /usr/share/common-licenses/GPL-3.\n"
#. type: Plain text
@@ -49,7 +49,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-12-04\n"
+" :published: 2012-02-06\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/it/project_bugs.ssi.po b/manual/po/it/project_bugs.ssi.po
index a8c2eef..b36b8de 100644
--- a/manual/po/it/project_bugs.ssi.po
+++ b/manual/po/it/project_bugs.ssi.po
@@ -2,7 +2,7 @@
# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
-# skizzhg <skizzhg at gmx.com>
+# skizzhg <skizzhg at gmx.com>, 2010.
#
msgid ""
msgstr ""
diff --git a/manual/po/it/project_procedures.ssi.po b/manual/po/it/project_procedures.ssi.po
index 744f5b8..09306de 100644
--- a/manual/po/it/project_procedures.ssi.po
+++ b/manual/po/it/project_procedures.ssi.po
@@ -2,7 +2,7 @@
# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
-# skizzhg <skizzhg at gmx.com>
+# skizzhg <skizzhg at gmx.com>, 2010.
# lillo sciascia <lillosciascia at gmail.com>, 2010.
#
msgid ""
diff --git a/manual/po/it/user_basics.ssi.po b/manual/po/it/user_basics.ssi.po
index ffbd9bd..290ac03 100644
--- a/manual/po/it/user_basics.ssi.po
+++ b/manual/po/it/user_basics.ssi.po
@@ -8,8 +8,8 @@
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-04-16 03:29+0200\n"
+"POT-Creation-Date: 2012-01-12 08:28-0400\n"
+"PO-Revision-Date: 2012-02-06 18:33+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
"Language: it\n"
@@ -22,7 +22,7 @@ msgstr ""
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -44,33 +44,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
@@ -79,7 +79,7 @@ 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:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -87,7 +87,7 @@ msgstr "code{"
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -109,33 +109,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
@@ -143,8 +143,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:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -165,7 +165,7 @@ msgid ""
"for using the three most commonly used image types. The most versatile image "
"type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB "
"portable storage device. In certain special cases, such as the use of "
-"persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter "
+"persistence, #{hdd}# may be more suitable for USB devices. The chapter "
"finishes with instructions for building and using a #{net}# type image, "
"which is a bit more involved due to the setup required on the server. This "
"is a slightly advanced topic for anyone who is not familiar already with "
@@ -178,14 +178,14 @@ msgstr ""
"utilizzati. La tipologia di immagine più versatile, #{iso-hybrid}#, può "
"essere usata su una macchina virtuale, supporto ottico o dispositivo di "
"archiviazione portatile USB. In alcuni casi particolari, come l'utilizzo "
-"della persistenza, la #{usb-hdd}# potrebbe essere più adatta per i "
-"dispositivi USB. Il capitolo termina con le istruzioni per costruire e usare "
-"un'immagine di tipo #{net}#, che è un poco più complessa a causa del setup "
-"richiesto sul server. Si tratta di un argomento leggermente avanzato per chi "
-"non ha familiarità con l'avvio da rete, ma è incluso qui perché, una volta "
-"che il setup è stato fatto, è un modo molto comodo per collaudare e "
-"distribuire immagini facendo il boot nella rete locale senza la seccatura di "
-"doversi occupare dei mezzi di divulgazione dell'immagine."
+"della persistenza, la #{hdd}# potrebbe essere più adatta per i dispositivi "
+"USB. Il capitolo termina con le istruzioni per costruire e usare un'immagine "
+"di tipo #{net}#, che è un poco più complessa a causa del setup richiesto sul "
+"server. Si tratta di un argomento leggermente avanzato per chi non ha "
+"familiarità con l'avvio da rete, ma è incluso qui perché, una volta che il "
+"setup è stato fatto, è un modo molto comodo per collaudare e distribuire "
+"immagini facendo il boot nella rete locale senza la seccatura di doversi "
+"occupare dei mezzi di divulgazione dell'immagine."
#. type: Plain text
#: en/user_basics.ssi:8
@@ -681,30 +681,30 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:146
-msgid "2~building-usb-hdd Building a USB/HDD image"
-msgstr "2~building-usb-hdd Creare un'immagine USB/HDD"
+msgid "2~building-hdd Building an HDD image"
+msgstr "2~building-hdd Creare un'immagine HDD"
#. type: Plain text
#: en/user_basics.ssi:148
msgid ""
-"Building a USB/HDD image is similar to ISO hybrid in all respects except you "
-"specify #{-b usb-hdd}# and the resulting filename is #{binary.img}# which "
-"cannot be burnt to optical media. It is suitable for booting from USB "
-"sticks, USB hard drives, and various other portable storage devices. "
-"Normally, an ISO hybrid image can be used for this purpose instead, but if "
-"you have a BIOS which does not handle hybrid images properly, or want to use "
-"the remaining space on the media for some purpose, such as a persistence "
-"partition, you need a USB/HDD image."
-msgstr ""
-"La creazione di un'immagine USB/HDD è simile alla ISO ibrida sotto tutti gli "
-"aspetti ad eccezione della necessità di specificare l'opzione #{-b usb-hdd}# "
-"e che il nome del file risultante è #{binary.img}# e non può essere "
+"Building an HDD image is similar to ISO hybrid in all respects except you "
+"specify #{-b hdd}# and the resulting filename is #{binary.img}# which cannot "
+"be burnt to optical media. It is suitable for booting from USB sticks, USB "
+"hard drives, and various other portable storage devices. Normally, an ISO "
+"hybrid image can be used for this purpose instead, but if you have a BIOS "
+"which does not handle hybrid images properly, or want to use the remaining "
+"space on the media for some purpose, such as a persistence partition, you "
+"need an HDD image."
+msgstr ""
+"La creazione di un'immagine HDD è simile alla ISO ibrida sotto tutti gli "
+"aspetti ad eccezione della necessità di specificare l'opzione #{-b hdd}# e "
+"che il nome del file risultante è #{binary.img}# e non può essere "
"masterizzato. È adatta per avviarsi da chiavette USB, dischi rigidi USB, e "
"da svariati altri dispositivi di archiviazione portatili. In genere per "
"questo scopo può essere usata un'immagine ISO ibrida, ma se si ha un BIOS "
"che non supporta le immagini ibride, o si vuole usare lo spazio rimanente "
"sul supporto per altri scopi, come una partizione persistente, allora "
-"occorre un'immagine USB/HDD."
+"occorre un'immagine HDD."
#. type: Plain text
#: en/user_basics.ssi:150
@@ -726,16 +726,16 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:158
msgid ""
-"Run the #{lb config}# command as before, except this time specifying the USB/"
-"HDD image type:"
+"Run the #{lb config}# command as before, except this time specifying the HDD "
+"image type:"
msgstr ""
"Eseguire il comando #{lb config}# come prima, questa volta specificando però "
-"il tipo di immagine USB/HDD:"
+"il tipo di immagine HDD:"
#. type: Plain text
#: en/user_basics.ssi:162
#, no-wrap
-msgid " $ lb config -b usb-hdd\n"
+msgid " $ lb config -b hdd\n"
msgstr ""
#. type: Plain text
@@ -754,29 +754,29 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:176
-msgid "2~using-usb-hdd-image Using a USB/HDD image"
-msgstr "2~using-usb-hdd-image Utilizzare un'immagine USB/HDD"
+msgid "2~using-hdd-image Using an HDD image"
+msgstr "2~using-hdd-image Utilizzare un'immagine HDD"
#. type: Plain text
#: en/user_basics.ssi:178
msgid ""
"The generated binary image contains a VFAT partition and the syslinux "
-"bootloader, ready to be directly written on a USB stick. Since using a USB/"
-"HDD image is just like using an ISO hybrid image on USB, follow the "
-"instructions in {Using an ISO hybrid live image}#using-iso-hybrid, except "
-"use the filename #{binary.img}# instead of #{binary-hybrid.iso}#."
+"bootloader, ready to be directly written on a USB stick. Since using an HDD "
+"image is just like using an ISO hybrid image on USB, follow the instructions "
+"in {Using an ISO hybrid live image}#using-iso-hybrid, except use the "
+"filename #{binary.img}# instead of #{binary-hybrid.iso}#."
msgstr ""
"L'immagine binaria generata contiene una partizione VFAT e il bootloader "
"syslinux, pronti per essere scritti direttamente su una penna USB. Dal "
-"momento che utilizzare un'immagine USB/HDD è come utilizzare un'immagine ISO "
+"momento che utilizzare un'immagine HDD è come utilizzare un'immagine ISO "
"ibrida via USB, seguire le istruzioni contenute in {Utilizzare un'immagine "
"live ISO ibrida}#using-iso-hybrid tenendo però conto che il nome del file "
"sarà #{binary.img}# invece di #{binary-hybrid.iso}#."
#. type: Plain text
#: en/user_basics.ssi:180
-msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
-msgstr "3~testing-usb-hdd-with-qemu Provare un'immagine USB/HDD con Qemu"
+msgid "3~testing-hdd-with-qemu Testing an HDD image with Qemu"
+msgstr "3~testing-hdd-with-qemu Provare un'immagine HDD con Qemu"
#. type: Plain text
#: en/user_basics.ssi:182
@@ -900,14 +900,14 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:232
msgid ""
-"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
-"serve the filesystem image to the client, so the files must be served via "
-"NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the "
-"location and server, respectively, of the NFS server where the filesytem "
-"image will be located at boot time. Make sure these are set to suitable "
-"values for your network and server."
+"In contrast with the ISO and HDD images, netbooting does not, itself, serve "
+"the filesystem image to the client, so the files must be served via NFS. The "
+"#{--net-root-path}# and #{--net-root-server}# options specify the location "
+"and server, respectively, of the NFS server where the filesytem image will "
+"be located at boot time. Make sure these are set to suitable values for your "
+"network and server."
msgstr ""
-"Diversamente dalle immagini ISO e USB/HDD, il boot via rete non fornisce "
+"Diversamente dalle immagini ISO e HDD, il boot via rete non fornisce "
"un'immagine del filesytem al client, perciò i file devono essere forniti via "
"NFS. Le opzioni net-root-path e net-root-server specificano, "
"rispettivamente, il percorso e il server del server NFS dove l'immagine del "
diff --git a/manual/po/it/user_customization-binary.ssi.po b/manual/po/it/user_customization-binary.ssi.po
index 21e3ceb..f6f7fad 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: 2011-01-20 16:58-0400\n"
+"POT-Creation-Date: 2012-01-15 20:48+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"
@@ -18,6 +18,138 @@ msgstr ""
"Plural-Forms: nplurals=2: plural=(n !=1)\n"
#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/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
+#: 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: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_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
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/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
+#: 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: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_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
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
#: en/user_customization-binary.ssi:2
msgid "B~ Customizing the binary image"
msgstr "B~ Personalizzare l'immagine binaria"
@@ -35,26 +167,77 @@ msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:8
msgid ""
-"live-build uses syslinux as bootloader by default, which is by default "
-"configured to pause indefinitely at its splash screen. To adjust this, you "
-"can pass #{--syslinux-timeout TIMEOUT}# to #{lb config}#. The value is "
-"specified in units of seconds. A timeout of 0 (zero) disables the timeout "
-"completely. For more information please see syslinux(1)."
+"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."
msgstr ""
-"live-build usa syslinux come bootloader predefinito, il quale è configurato "
-"per restare in pausa continua sulla schermata d'avvio. Per cambiare questo "
-"comportamento, si passi #{--syslinux-timeout TIMEOUT}# a #{lb config}#. "
-"Questo valore è espresso in secondi, 0 (zero) disabilita completamente il "
-"tempo di attesa. Per maggiori informazioni vedere syslinux(1)."
#. 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."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:12
+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
+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
+#, no-wrap
+msgid ""
+" include menu.cfg\n"
+" default vesamenu.c32\n"
+" prompt 0\n"
+" timeout 5\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:25
+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 "
+"in the binary stage. A proposed example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#, no-wrap
+msgid " #!/bin/sh\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:31
+#, 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 ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:37
msgid "2~ ISO metadata"
msgstr "2~ Metadati ISO"
# da rivedere l'ultimo periodo
#. type: Plain text
-#: en/user_customization-binary.ssi:12
+#: en/user_customization-binary.ssi:39
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 "
@@ -66,7 +249,7 @@ msgstr ""
"avviarla."
#. type: Plain text
-#: en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:41
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 "
@@ -77,7 +260,7 @@ msgstr ""
"caratteri."
#. type: Plain text
-#: en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:43
msgid ""
"_* #{LB_ISO_PREPARER/--iso-preparer NAME}#: This should describe the "
"preparer of the image, usually with some contact details. The default for "
@@ -91,7 +274,7 @@ msgstr ""
"per questo campo è di 128 caratteri."
#. type: Plain text
-#: en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:45
msgid ""
"_* #{LB_ISO_PUBLISHER/--iso-publisher NAME}#: This should describe the "
"publisher of the image, usually with some contact details. The maximum "
@@ -102,7 +285,7 @@ msgstr ""
"lunghezza massima lunghezza per questo campo è di 128 caratteri."
#. type: Plain text
-#: en/user_customization-binary.ssi:19
+#: en/user_customization-binary.ssi:46
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-contents.ssi.po b/manual/po/it/user_customization-contents.ssi.po
index 3684803..0042e90 100644
--- a/manual/po/it/user_customization-contents.ssi.po
+++ b/manual/po/it/user_customization-contents.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-09-10 23:07+0200\n"
+"POT-Creation-Date: 2012-01-15 16:28+0100\n"
+"PO-Revision-Date: 2012-02-06 18:47+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
"Language: it\n"
@@ -21,7 +21,7 @@ msgstr ""
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -35,6 +35,7 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -86,7 +87,7 @@ msgstr "code{"
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -100,6 +101,7 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -176,8 +178,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:8
-msgid "2~ Includes"
-msgstr "2~ Include"
+msgid "2~includes Includes"
+msgstr "2~includes Include"
#. type: Plain text
#: en/user_customization-contents.ssi:10
@@ -263,12 +265,6 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:24
-#, fuzzy
-#| msgid ""
-#| "To include files, simply add them to your #{config/chroot_local-includes}"
-#| "# directory. This directory corresponds to the root directory (#{/}#) of "
-#| "the live system. For example, to add a file #{/var/www/index.html}# in "
-#| "the live system, use:"
msgid ""
"To include files, simply add them to your #{config/includes.chroot}# "
"directory. This directory corresponds to the root directory (#{/}#) of the "
@@ -276,7 +272,7 @@ msgid ""
"system, use:"
msgstr ""
"Per includere i file si aggiungano semplicemente alla directory #{config/"
-"chroot_local-includes}#. Questa corrisponde alla directory root (#{/}#) del "
+"includes.chroot}#. Questa corrisponde alla directory root (#{/}#) del "
"sistema live. Per esempio, per aggiungere un file #{/var/www/index.html}# "
"nel sistema live, si usi:"
@@ -323,15 +319,6 @@ msgstr "3~binary-local-includes Include locali binari"
#. type: Plain text
#: en/user_customization-contents.ssi:52
-#, fuzzy
-#| msgid ""
-#| "To include material such as documentation or videos on the media "
-#| "filesystem so that it is accessible immediately upon insertion of the "
-#| "media without booting the Live system, you can use binary local includes. "
-#| "This works in a similar fashion to chroot local includes. For example, "
-#| "suppose the files #{~/video_demo.*}# are demo videos of the live system "
-#| "described by and linked to by an HTML index page. Simply copy the "
-#| "material to #{config/binary_local-includes/}# as follows:"
msgid ""
"To include material such as documentation or videos on the media filesystem "
"so that it is accessible immediately upon insertion of the media without "
@@ -347,7 +334,7 @@ msgstr ""
"Ciò funziona in modo simile agli include locali del chroot; supponendo che i "
"file #{~/video_demo.*}# siano video dimostrativi del sistema descritti da e "
"collegati a una pagina HTML indice, basta copiare il materiale in #{config/"
-"binary_local-includes/}# come segue:"
+"includes.binary/}# come segue:"
#. type: Plain text
#: en/user_customization-contents.ssi:56
@@ -394,8 +381,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:74
-msgid "2~ Hooks"
-msgstr "2~ Hook"
+msgid "2~hooks Hooks"
+msgstr "2~hooks Hook"
#. type: Plain text
#: en/user_customization-contents.ssi:76
@@ -413,16 +400,6 @@ msgstr "3~live-chroot-local-hooks Live/chroot hook locali"
#. type: Plain text
#: en/user_customization-contents.ssi:80
-#, fuzzy
-#| msgid ""
-#| "To run commands in the chroot stage, create a hook script containing the "
-#| "commands in the #{config/chroot_local-hooks}# directory. The hook will "
-#| "run in the chroot after the rest of your chroot configuration has been "
-#| "applied, so remember to ensure your configuration includes all packages "
-#| "and files your hook needs in order to run. See the example chroot hook "
-#| "scripts for various common chroot customization tasks provided in #{/usr/"
-#| "share/live/build/examples/hooks}# which you can copy or symlink to use "
-#| "them in your own configuration."
msgid ""
"To run commands in the chroot stage, create a hook script with a #{.chroot}# "
"suffix containing the commands in the #{config/hooks/}# directory. The hook "
@@ -433,14 +410,14 @@ msgid ""
"build/examples/hooks}# which you can copy or symlink to use them in your own "
"configuration."
msgstr ""
-"Per eseguire comandi nella fase chroot, creare uno script hook contenente i "
-"comandi nella directory #{config/chroot_local-hooks}#. L'hook verrà eseguito "
-"nel chroot dopo che verrà applicata il resto della configurazione del "
-"chroot, ricordare quindi di garantire che la propria configurazione includa "
-"tutti i pacchetti e i file che l'hook necessita per funzionare. Vedere gli "
-"script d'esempio degli hook di chroot per i vari compiti di "
-"personalizzazione del chroot contenuti in #{/usr/share/live/build/examples/"
-"hooks}# da copiare o collegare nella propria configurazione."
+"Per eseguire comandi nella fase chroot, creare uno script hook con suffisso #"
+"{.chroot}# contenente i comandi nella directory #{config/hooks/}#. L'hook "
+"verrà eseguito nel chroot dopo che verrà applicata il resto della "
+"configurazione del chroot, ricordare quindi di garantire che la propria "
+"configurazione includa tutti i pacchetti e i file che l'hook necessita per "
+"funzionare. Vedere gli script d'esempio degli hook di chroot per i vari "
+"compiti di personalizzazione del chroot contenuti in #{/usr/share/live/build/"
+"examples/hooks}# da copiare o collegare nella propria configurazione."
#. type: Plain text
#: en/user_customization-contents.ssi:82
@@ -449,16 +426,6 @@ msgstr "3~boot-time-hooks Hook in fase di avvio"
#. type: Plain text
#: en/user_customization-contents.ssi:84
-#, fuzzy
-#| msgid ""
-#| "To execute commands at boot time, you can supply live-config hooks as "
-#| "explained in the \"Customization\" section of its man page. Examine live-"
-#| "config's own hooks provided in #{/lib/live/config/}#, noting the sequence "
-#| "numbers. Then provide your own hook prefixed with an appropriate sequence "
-#| "number, either as a chroot local include in #{config/chroot_local-"
-#| "includes/lib/live/config/}#, or as a custom package as discussed in "
-#| "{Installing modified or third-party packages}#installing-modified-or-"
-#| "third-party-packages."
msgid ""
"To execute commands at boot time, you can supply live-config hooks as "
"explained in the \"Customization\" section of its man page. Examine live-"
@@ -472,9 +439,9 @@ msgstr ""
"come spiegato nella sezione \"Customization\" del suo manuale. Controllare "
"gli hook di live-config in #{/lib/live/config/}# e notare i numeri "
"sequenziali; fornire quindi i propri hook con una sequenza numerica "
-"appropriata, sia come include locali del chroot in #{config/chroot_local-"
-"includes/lib/live/config/}#, sia come pacchetto personalizzato come discusso "
-"in {Installare pacchetti modificati o di terze parti}#installing-modified-or-"
+"appropriata, sia come include locali del chroot in #{config/includes.chroot/"
+"lib/live/config/}#, sia come pacchetto personalizzato come discusso in"
+"{Installare pacchetti modificati o di terze parti}#installing-modified-or-"
"third-party-packages."
#. type: Plain text
@@ -484,17 +451,6 @@ msgstr "3~ Hook binari locali"
#. type: Plain text
#: en/user_customization-contents.ssi:88
-#, fuzzy
-#| msgid ""
-#| "To run commands in the binary stage, create a hook script containing the "
-#| "commands in the #{config/binary_local-hooks}#. The hook will run after "
-#| "all other binary commands are run, but before binary_checksums, the very "
-#| "last binary commands The commands in your hook do not run in the chroot, "
-#| "so take care to not modify any files outside of the build tree, or you "
-#| "may damage your build system! See the example binary hook scripts for "
-#| "various common binary customization tasks provided in #{/usr/share/live/"
-#| "build/examples/hooks}# which you can copy or symlink to use them in your "
-#| "own configuration."
msgid ""
"To run commands in the binary stage, create a hook script with a #{.binary}# "
"suffix containing the commands in the #{config/hooks/}# directory. The hook "
@@ -506,15 +462,15 @@ msgid ""
"share/live/build/examples/hooks}# which you can copy or symlink to use them "
"in your own configuration."
msgstr ""
-"Per eseguire comandi nella fase binaria, creare uno script hook che contenga "
-"i comandi in #{config/binary_local-hooks}#. L'hook verrà eseguito dopo tutti "
-"gli altri comandi binari, ma prima del binary_checksums, l'ultimo definitivo "
-"comando. I comandi nel proprio hook non vengono eseguiti nel chroot, perciò "
-"si faccia attenzione a non modificare nessun file al di fuori dell'albero di "
-"costruzione o si danneggerà il sistema! Vedere gli script d'esempio per gli "
-"hook binari per i vari compiti di personalizzazione dei binari in #{/usr/"
-"share/live/build/examples/hooks}# da copiare o collegare nella propria "
-"configurazione."
+"Per eseguire comandi nella fase binaria, creare uno script hook con suffisso "
+"#{.binary}# che contenga i comandi nella directory #{config/hooks/}#. L'hook "
+"verrà eseguito dopo tutti gli altri comandi binari, ma prima di "
+"binary_checksums, l'ultimo comando. I comandi nel proprio hook non vengono "
+"eseguiti nel chroot, perciò si faccia attenzione a non modificare nessun "
+"file al di fuori dell'albero di compilazione o si danneggerà il sistema! "
+"Vedere gli script d'esempio per gli hook binari per i vari compiti di "
+"personalizzazione dei binari in #{/usr/share/live/build/examples/hooks}# da "
+"copiare o collegare nella propria configurazione."
#. type: Plain text
#: en/user_customization-contents.ssi:90
@@ -523,20 +479,16 @@ msgstr "2~ Preconfigurare le domande di Debconf"
#. type: Plain text
#: en/user_customization-contents.ssi:92
-#, fuzzy
-#| msgid ""
-#| "Files in the #{config/chroot_local-preseed}# directory are considered to "
-#| "be debconf preseed files and are installed by live-build using #{debconf-"
-#| "set-selections}#."
msgid ""
"Files in the #{config/preseed/}# directory suffixed with #{.preseed}# "
"followed by the stage (#{.chroot}# or #{.binary}#) are considered to be "
"debconf preseed files and are installed by live-build using #{debconf-set-"
"selections}# during the corresponding stage."
msgstr ""
-"I file nella directory #{config/chroot_local-preseed}# sono considerati file "
-"di preconfigurazione di debconf e sono installati da live-build usando #"
-"{debconf-set-selections}#."
+"I file nella directory #{config/preseed/}# con suffisso #{.preseed}# seguiti "
+"dalla fase (#{.chroot}# o #{.binary}#) sono considerati file di "
+"preconfigurazione di debconf e sono installati da live-build usando #"
+"{debconf-set-selections}# durante la fase corrispondente."
#. type: Plain text
#: en/user_customization-contents.ssi:93
diff --git a/manual/po/it/user_customization-installer.ssi.po b/manual/po/it/user_customization-installer.ssi.po
index 6822433..fddc1be 100644
--- a/manual/po/it/user_customization-installer.ssi.po
+++ b/manual/po/it/user_customization-installer.ssi.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
"POT-Creation-Date: 2011-11-07 21:19-0400\n"
-"PO-Revision-Date: 2010-12-16 18:31+0100\n"
-"Last-Translator: lillo sciascia <lillosciascia at gmail.com>\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"
"Language: it\n"
"MIME-Version: 1.0\n"
@@ -150,12 +150,12 @@ msgstr "}code"
#. type: Plain text
#: en/user_customization-installer.ssi:2
msgid ":B~ Customizing Debian Installer"
-msgstr ":B~ Personalizzare il Debian Installer"
+msgstr ":B~ Personalizzare l'Installatore Debian"
#. type: Plain text
#: en/user_customization-installer.ssi:4
msgid "1~customizing-installer Customizing Debian Installer"
-msgstr "1~customizing-installer Personalizzare il Debian Installer"
+msgstr "1~customizing-installer Personalizzare l'Installatore Debian"
#. type: Plain text
#: en/user_customization-installer.ssi:6
@@ -164,9 +164,9 @@ msgid ""
"a number of different types of installation, varying in what is included and "
"how the installer operates."
msgstr ""
-"Le immagini del sistema Debian Live possono essere integrate nel Debian "
-"Installer. Ci sono differenti tipi d'installazione che variano in cosa viene "
-"incluso e come agisce l'installatore."
+"Le immagini del sistema Debian Live possono essere integrate "
+"nell'Installatore Debian. Ci sono differenti tipi d'installazione che "
+"variano in cosa viene incluso e come agisce l'installatore."
#. type: Plain text
#: en/user_customization-installer.ssi:8
@@ -177,14 +177,14 @@ msgid ""
"else. It is often seen abbreviated to \"d-i\"."
msgstr ""
"In questa sezione si presti attenzione all'uso delle lettere maiuscole "
-"quando si fa riferimento al \"Debian Installer\" - quando usato ci si "
-"riferisce all'installatore ufficiale Debian, niente altro. Spesso è "
+"quando si fa riferimento all'\"Installatore Debian\", quando usato ci si "
+"riferisce esclusivamente all'installatore ufficiale Debian. Spesso è "
"abbreviato come \"d-i\"."
#. type: Plain text
#: en/user_customization-installer.ssi:10
msgid "2~ Types of Debian Installer"
-msgstr "2~ Tipologie del Debian Installer"
+msgstr "2~ Tipologie dell'Installatore Debian"
#. type: Plain text
#: en/user_customization-installer.ssi:12
@@ -195,7 +195,7 @@ msgstr "I tre principali tipi dell'installer sono:"
#: 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 "*{Debian Installer \"normale\"}*: questa è un'immagine Debian Live con un kernel e un initrd separati i quali (quando viene selezionato da un appropriato bootloader) lancia un'istanza standard del Debian Installer, così come quando si scarica un'immagine di Debian e la si avvia. Le immagini che contengono un sistema live e un installatore indipendenti sono spesso definite \"immagini combinate\".\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
#: en/user_customization-installer.ssi:16
@@ -205,10 +205,9 @@ msgid ""
"network-based network, resulting in a standard Debian system being installed "
"to the hard disk."
msgstr ""
-"In queste immagini, Debian è installata prendendo e installando pacchetti ."
-"deb usando {debootstrap}# o #{cdebootstrap}# da supporti locali o dalla "
-"rete, risultante in un sistema Debian standard che viene installato sul "
-"disco rigido."
+"In queste immagini, Debian è installata prendendo e installando i pacchetti ."
+"deb usando {debootstrap}# o #{cdebootstrap}#, da supporti locali o dalla "
+"rete, risultante in un sistema Debian standard installato sul disco rigido."
#. type: Plain text
#: en/user_customization-installer.ssi:18
@@ -220,14 +219,15 @@ msgid ""
msgstr ""
"L'intero processo può essere preimpostato e personalizzato in diversi modi; "
"per ulteriori informazioni si vedano le corrispondenti pagine del manuale "
-"del Debian Installer. Una volta che si ha un file preimpostato che funzioni, "
-"live-build può inserirlo automaticamente nell'immagine e abilitarlo."
+"dell'Installatore Debian. Una volta che si ha un file preimpostato "
+"funzionante, live-build può inserirlo automaticamente nell'immagine e "
+"abilitarlo."
#. type: Plain text
#: 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 "*{Debian Installer \"live\"}*: Questa è un'immagine Debian Live con un kernel ed un initrd separato (quando selezionato dall'appropriato bootloader) lanciata in un'instanza del Debian Installer.\n"
+msgstr "*{Installatore Debian \"live\"}*: un'immagine Debian Live con un kernel e un initrd separato che (quando selezionato dall'appropriato bootloader) avvia un'instanza dell'Installatore Debian.\n"
#. type: Plain text
#: en/user_customization-installer.ssi:22
@@ -238,11 +238,11 @@ msgid ""
"filesystem image is copied to the target. This is achieved with a special "
"udeb called live-installer."
msgstr ""
-"L'installazione procederà nello stesso modo di un'installazione \"Regolare\" "
-"come descritto sopra, ma allo stadio attuale dell'installazione del "
-"pacchetto, invece di usare #{debootstrap}# per prelevare e installare i "
-"pacchetti, l'immagine del filesystem live viene copiata sulla destinazione. "
-"Questo si ottiene con uno speciale udeb chiamato live-installer."
+"L'installazione procederà nello stesso modo di un'installazione \"Normale\" "
+"come descritto sopra, ma nella fase dell'installazione del pacchetto, invece "
+"di usare #{debootstrap}# per prelevare e installare i pacchetti, l'immagine "
+"del filesystem live viene copiata sulla destinazione. Questo si ottiene con "
+"uno speciale udeb chiamato live-installer."
#. type: Plain text
#: en/user_customization-installer.ssi:24
@@ -250,7 +250,7 @@ msgid ""
"After this stage, the Debian Installer continues as normal, installing and "
"configuring items such as bootloaders and local users, etc."
msgstr ""
-"Dopo questa fase, il Debian Installer continua normalmente, installando e "
+"Dopo questa fase, l'Installatore Debian continua normalmente, installando e "
"configurando elementi come bootloader e utenti locali, ecc."
#. type: Plain text
@@ -260,15 +260,15 @@ msgid ""
"the same live media, you must disable live-installer by preseeding #{live-"
"installer/enable=false}#."
msgstr ""
-"Si noti: per supportare entrambi le voci dell'installer live o normale nel "
-"bootloader sullo stesso media, si deve disabilitare il live-installer dalla "
-"preconfigurazione #{live-installer/enable=false}#."
+"Nota: per supportare nel bootloader sia la voce normale che quella live "
+"dell'installatore sullo stesso supporto si deve disabilitare live-installer "
+"preconfigurando #{live-installer/enable=false}#."
#. 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 "*{Debian Installer \"Desktop\"}*: indipendentemente dal tipo del Debian Installer incluso, #{d-i}# può essere lanciato cliccando un'icona sul desktop, Questo è molto semplice in alcune situazioni. Per poterne usufruire deve essere incluso il pacchetto debian-installer-launcher.\n"
+msgstr "*{Installatore Debian \"Desktop\"}*: indipendentemente dal tipo di Installatore Debian incluso, #{d-i}# può essere lanciato cliccando un'icona sul desktop, in alcune situazioni più semplice per l'utente. Per poterne usufruire deve essere incluso il pacchetto debian-installer-launcher.\n"
#. type: Plain text
#: en/user_customization-installer.ssi:30
@@ -279,11 +279,11 @@ msgid ""
"live system must match the kernel #{d-i}# uses for the specified "
"architecture. For example:"
msgstr ""
-"Si noti che live-build non include il Debian Installer nell'immagine in modo "
-"predefinito, bisogna che sia espressamente abilitato con #{lb config}#."
-"Inoltre, affinché l'installatore \"Desktop\" funzioni, il kernel del sistema "
-"live deve corrispondere a quello usato dal #{d-i}# per l'architettura "
-"specificata. Per esempio:"
+"Si noti che live-build non include l'Installatore Debian nell'immagine in "
+"modo predefinito, necessita di essere espressamente abilitato con #{lb "
+"config}#.Inoltre, affinché l'installatore \"Desktop\" funzioni, il kernel "
+"del sistema live deve corrispondere a quello usato dal #{d-i}# per "
+"l'architettura specificata. Per esempio:"
#. type: Plain text
#: en/user_customization-installer.ssi:36
@@ -312,7 +312,7 @@ msgid ""
"configuration in a #{preseed.cfg}# file included in #{config/binary_debian-"
"installer/}#. For example, to preseed setting the locale to #{en_US}#:"
msgstr ""
-"Come descritto nell'appendice B del manuale del Debian Installer "
+"Come descritto nell'appendice B del manuale dell'Installatore Debian "
"all'indirizzo http://www.debian.org/releases/stable/i386/apb.html, \"La "
"preconfigurazione fornisce un modo per impostare le risposte alle domande "
"poste durante il processo d'installazione senza la necessità di inserirle "
@@ -334,19 +334,10 @@ msgstr ""
#. type: Plain text
#: en/user_customization-installer.ssi:51
msgid "2~ Customizing Debian Installer content"
-msgstr "2~ Personalizzare il contenuto del Debian Installer"
+msgstr "2~ Personalizzare il contenuto dell'Installatore Debian"
#. type: Plain text
#: en/user_customization-installer.ssi:52
-#, fuzzy
-#| msgid ""
-#| "For experimental or debugging purposes, you might want to include locally "
-#| "built #{d-i}# component udeb packages. Place these in #{config/"
-#| "binary_local-udebs/}# to include them in the image. Additional or "
-#| "replacement files and directories may be included in the installer initrd "
-#| "as well, in a similar fashion to {Live/chroot local includes}#live-chroot-"
-#| "local-includes, by placing the material in #{config/binary_debian-"
-#| "installer-includes/}#."
msgid ""
"For experimental or debugging purposes, you might want to include locally "
"built #{d-i}# component udeb packages. Place these in #{config/packages."
@@ -357,7 +348,7 @@ msgid ""
msgstr ""
"Si può voler includere pacchetti udeb compilati localmente come componenti "
"del #{d-i}# per scopi di sperimentazione o debug; per includerli "
-"nell'immagine inserirli in #{config/binary_local-udebs/}#. I file e le "
+"nell'immagine inserirli in #{config/packages.binary/}#. I file e le "
"directory aggiuntivi o di rimpiazzo si possono includere nell'initrd "
"dell'installatore in maniera simile agli {Include locali del Live/chroot}"
"#live-chroot-local-includes, inserendo il materiale in #{config/"
diff --git a/manual/po/it/user_customization-overview.ssi.po b/manual/po/it/user_customization-overview.ssi.po
index 9874a98..486f96d 100644
--- a/manual/po/it/user_customization-overview.ssi.po
+++ b/manual/po/it/user_customization-overview.ssi.po
@@ -2,7 +2,7 @@
# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
-# skizzhg <skizzhg at gmx.com>
+# skizzhg <skizzhg at gmx.com>, 2010.
#
msgid ""
msgstr ""
diff --git a/manual/po/it/user_customization-packages.ssi.po b/manual/po/it/user_customization-packages.ssi.po
index c7a42a7..d308afd 100644
--- a/manual/po/it/user_customization-packages.ssi.po
+++ b/manual/po/it/user_customization-packages.ssi.po
@@ -8,8 +8,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2011-11-07 21:01-0400\n"
-"PO-Revision-Date: 2011-08-02 00:53+0200\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\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"
"Language: it\n"
@@ -22,7 +22,7 @@ msgstr ""
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -36,6 +36,7 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -87,7 +88,7 @@ msgstr "code{"
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -101,6 +102,7 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -287,31 +289,18 @@ msgstr "3~ Mirror delle distribuzioni"
#. type: Plain text
#: en/user_customization-packages.ssi:34
-#, fuzzy
-#| msgid ""
-#| "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."
msgid ""
"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 #{--parent-mirror-*}# options governs which "
+"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 #{--parent-mirror-binary}"
-"# and #{--parent-mirror-binary-security}# values are used, superceding any "
-"mirrors used in an earlier stage."
+"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ù "
@@ -336,38 +325,29 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:38
-#, fuzzy
-#| msgid ""
-#| "To set the distribution mirrors used at build time to point at a local "
-#| "mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-"
-#| "chroot-security}# as follows."
msgid ""
"To set the distribution mirrors used at build time to point at a local "
-"mirror, it is sufficient to set #{--parent-mirror-bootstrap}#, #{--parent-"
-"mirror-chroot-security}# and #{--parent-mirror-chroot-backports}# as follows."
+"mirror, it is sufficient to set #{--mirror-bootstrap}#, #{--mirror-chroot-"
+"security}# and #{--mirror-chroot-backports}# as follows."
msgstr ""
"Per impostare i mirror delle distribuzioni usati in fase di compilazione ad "
-"uno locale, è sufficiente impostare #{--mirror-bootstrap}# e #{--mirror-"
-"chroot-security}# come segue."
+"uno locale, è sufficiente impostare #{--mirror-bootstrap}#, #{--mirror-"
+"chroot-security}# e #{--mirror-chroot-backports}# come segue."
#. type: Plain text
#: en/user_customization-packages.ssi:44
#, no-wrap
msgid ""
-" $ lb config --parent-mirror-bootstrap http://localhost/debian/ \\\n"
-" --parent-mirror-chroot-security http://localhost/debian-security/ \\\n"
-"\t --parent-mirror-chroot-backports http://localhost/debian-backports/\n"
+" $ 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"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:48
-#, fuzzy
-#| msgid ""
-#| "The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
-#| "mirror-bootstrap}# value."
msgid ""
-"The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the #"
-"{--parent-mirror-bootstrap}# value."
+"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+"mirror-bootstrap}# value."
msgstr ""
"Il mirror chroot, specificato da #{--mirror-chroot}#, è impostato al valore "
"di #{--mirror-bootstrap}#."
@@ -379,25 +359,15 @@ msgstr "3~ Mirror delle distribuzioni usate durante l'esecuzione"
#. type: Plain text
#: en/user_customization-packages.ssi:52
-#, fuzzy
-#| msgid ""
-#| "The #{--mirror-binary*}# options govern the distribution mirrors placed "
-#| "in the binary image. These may be used to install additional packages "
-#| "while running the live system. The defaults employ #{cdn.debian.net}#, a "
-#| "service that chooses a geographically close mirror based on the user's IP "
-#| "number. This is a suitable choice when you cannot predict which mirror "
-#| "will be best for all of your users. Or you may specify your own values as "
-#| "shown in the example below. An image built from this configuration would "
-#| "only be suitable for users on a network where \"#{mirror}#\" is reachable."
-msgid ""
-"The #{--parent-mirror-binary*}# options govern the distribution mirrors "
-"placed in the binary image. These may be used to install additional packages "
-"while running the live system. The defaults employ #{cdn.debian.net}#, a "
-"service that chooses a geographically close mirror based on the user's IP "
-"number. This is a suitable choice when you cannot predict which mirror will "
-"be best for all of your users. Or you may specify your own values as shown "
-"in the example below. An image built from this configuration would only be "
-"suitable for users on a network where \"#{mirror}#\" is reachable."
+msgid ""
+"The #{--mirror-binary*}# options govern the distribution mirrors placed in "
+"the binary image. These may be used to install additional packages while "
+"running the live system. The defaults employ #{cdn.debian.net}#, a service "
+"that chooses a geographically close mirror based on the user's IP number. "
+"This is a suitable choice when you cannot predict which mirror will be best "
+"for all of your users. Or you may specify your own values as shown in the "
+"example below. An image built from this configuration would only be suitable "
+"for users on a network where \"#{mirror}#\" is reachable."
msgstr ""
"Le opzioni #{--mirror-binary*}# determinano i mirror delle distribuzioni "
"inseriti nell'immagine binaria. Questi possono essere usati per installare "
@@ -414,8 +384,8 @@ msgstr ""
#: en/user_customization-packages.ssi:57
#, no-wrap
msgid ""
-" $ lb config --parent-mirror-binary http://mirror/debian/ \\\n"
-" --parent-mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --mirror-binary http://mirror/debian/ \\\n"
+" --mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
#. type: Plain text
@@ -425,48 +395,33 @@ msgstr "3~additional-repositories Repository addizionali"
#. type: Plain text
#: en/user_customization-packages.ssi:63
-#, fuzzy
-#| msgid ""
-#| "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/chroot_sources/your-repository.chroot}#, "
-#| "and/or #{config/chroot_sources/your-repository.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."
msgid ""
"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 #{--"
-"parent-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 "
"destinazione. Questi possono essere, per esempio, pacchetti di backport, "
"sperimentali o personalizzati. Per configurare repository aggiuntivi, creare "
-"i file #{config/chroot_sources/vostro-repository.chroot}#, o #{config/"
-"chroot_sources/vostro-repository.binary}#. Come per le opzioni #{--mirror-*}"
+"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."
#. type: Plain text
#: en/user_customization-packages.ssi:65
-#, fuzzy
-#| msgid ""
-#| "For example, #{config/chroot_sources/live.chroot}# allows you to install "
-#| "packages from the debian live snapshot repository at live system build "
-#| "time."
msgid ""
"For example, #{config/archives/live.list.chroot}# allows you to install "
"packages from the debian live snapshot repository at live system build time."
msgstr ""
-"Per esempio, #{config/chroot_sources/live.chroot}# permette di installare "
+"Per esempio, #{config/archives/live.list.chroot}# permette di installare "
"pacchetti dal repository snapshot di debian live al momento della creazione "
"del sistema live."
@@ -478,17 +433,12 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:73
-#, fuzzy
-#| msgid ""
-#| "If you add the same line to #{config/chroot_sources/live.binary}#, the "
-#| "repository will be added to your live system's #{/etc/apt/sources.list.d/}"
-#| "# directory."
msgid ""
"If you add the same line to #{config/archives/live.list.binary}#, the "
"repository will be added to your live system's #{/etc/apt/sources.list.d/}# "
"directory."
msgstr ""
-"Se si aggiunge la stessa riga in #{config/chroot_sources/live.binary}#, il "
+"Se si aggiunge la stessa riga in #{config/archives/live.list.binary}#, il "
"repository verrà aggiunto alla directory #{/etc/apt/sources.list.d/}# del "
"sistema live."
@@ -499,23 +449,18 @@ msgstr "Se il file esiste, saranno prelevati automaticamente."
#. type: Plain text
#: en/user_customization-packages.ssi:77
-#, fuzzy
-#| msgid ""
-#| "You should also put the GPG key used to sign the repository into #{config/"
-#| "chroot_sources/your-repository.{binary,chroot}.gpg}# files."
msgid ""
"You should also put the GPG key used to sign the repository into #{config/"
-"archives/your-repository.gpg.{binary,chroot}}# files."
+"archives/your-repository.key.{binary,chroot}}# files."
msgstr ""
"Bisogna inoltre inserire la chiave GPG usata per firmare il repository nei "
-"file #{config/chroot_sources/vostro-repository.{binary,chroot}.gpg}#."
+"file #{config/archives/vostro-repository.key.{binary,chroot}}#."
#. type: Plain text
#: en/user_customization-packages.ssi:79
-#, fuzzy, no-wrap
-#| msgid "*{Note:}* some preconfigured package repositories are available for easy selection through the #{--repository}# option, e.g. for enabling live snapshots, a simple command is enough to enable it:\n"
+#, 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 "*{Nota:}* alcuni repository di pacchetti preconfigurati sono disponibili per una facile selezione attraverso l'opzione #{--repository}#, per abilitare gli snapshot live è sufficiente un semplice comando:\n"
+msgstr "*{Nota:}* alcuni repository di pacchetti preconfigurati sono disponibili per una facile selezione attraverso l'opzione #{--archives}#, per abilitare gli snapshot live è sufficiente un semplice comando:\n"
#. type: Plain text
#: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
@@ -530,16 +475,6 @@ msgstr "2~choosing-packages-to-install Scegliere i pacchetti da installare"
#. type: Plain text
#: en/user_customization-packages.ssi:89
-#, fuzzy
-#| msgid ""
-#| "There are a number of ways to choose which packages live-build will "
-#| "install in your image, covering a variety of different needs. You can "
-#| "simply name individual packages to install, either with the #{--packages}"
-#| "# option for a few packages, or in a package list of your own for larger "
-#| "numbers. You can also choose larger predefined lists of packages, or use "
-#| "APT tasks. And finally, you may place package files in your #{config/}# "
-#| "tree, which is well suited to testing of new or experimental packages "
-#| "before they are available from a repository."
msgid ""
"There are a number of ways to choose which packages live-build will install "
"in your image, covering a variety of different needs. You can simply name "
@@ -549,13 +484,11 @@ msgid ""
"new or experimental packages before they are available from a repository."
msgstr ""
"Ci sono diversi modi per scegliere quali pacchetti live-build installerà "
-"nell'immagine, coprendo una gamma di esigenze diverse. Si possono scegliere "
-"i pacchetti singolarmente, con l'opzione #{--packages}# per un numero "
-"limitato, o da un elenco per una quantità maggiore di pacchetti. È inoltre "
-"possibile selezionare elenchi predefiniti più grandi o utilizzare i task di "
-"APT. E infine inserire i file dei pacchetti nell'albero #{config/}#, che ben "
-"si adatta alla alle prove di pacchetti nuovi o sperimentali prima che siano "
-"disponibili in un repository."
+"nell'immagine, coprendo una gamma di esigenze diverse. Si possono richiamare "
+"i singoli pacchetti da un elenco o scegliere elenchi predefiniti di "
+"pacchetti oppure utilizzare i task di APT. E infine inserire i file dei "
+"pacchetti nell'albero #{config/}#, che ben si adatta a provare pacchetti "
+"nuovi o sperimentali prima che siano disponibili in un repository."
#. type: Plain text
#: en/user_customization-packages.ssi:91
@@ -585,10 +518,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:95
-#, fuzzy, no-wrap
-#| msgid "The behaviour of live-build when specifying a package that does not exist is determined by your choice of APT utility. See {Choosing apt or aptitude}#choosing-apt-or-aptitude for more details."
+#, no-wrap
msgid "*{Note:}* The behaviour of live-build when specifying a package that does not exist is determined by your choice of APT utility. See {Choosing apt or aptitude}#choosing-apt-or-aptitude for more details.\n"
-msgstr "Quando si specifica un pacchetto che non esiste, il comportamento di live-build è determinato dalla scelta delle utilità di APT. Per ulteriori dettagli si veda {Scegliere apt o aptitude}#choosing-apt-or-aptitude."
+msgstr "*{Nota:}* quando si specifica un pacchetto che non esiste, il comportamento di live-build è determinato dalla scelta delle utilità di APT. Per ulteriori dettagli si veda {Scegliere apt o aptitude}#choosing-apt-or-aptitude."
#. type: Plain text
#: en/user_customization-packages.ssi:97
@@ -597,16 +529,12 @@ msgstr "3~ Elenchi predefiniti di pacchetti"
#. type: Plain text
#: en/user_customization-packages.ssi:99
-#, fuzzy
-#| msgid ""
-#| "The simplest way to use lists is to specify one or more predefined lists "
-#| "with the #{--packages-lists}# option. For example:"
msgid ""
"The simplest way to use lists is to specify one or more predefined lists "
"with the #{--package-lists}# option. For example:"
msgstr ""
"Il modo più semplice per usare gli elenchi è di specificarne uno o più con "
-"l'opzione #{--packages-lists}#. Per esempio:"
+"l'opzione #{--package-lists}#. Per esempio:"
#. type: Plain text
#: en/user_customization-packages.ssi:103
@@ -616,12 +544,6 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:107
-#, fuzzy
-#| msgid ""
-#| "The default location for the list files on your system is #{/usr/share/"
-#| "live/build/lists/}#. To determine the packages in a given list, read the "
-#| "corresponding file, paying attention to included files and conditionals "
-#| "as described in the following sections."
msgid ""
"The default location for the list files on your system is #{/usr/share/live/"
"build/package-lists/}#. To determine the packages in a given list, read the "
@@ -629,9 +551,9 @@ msgid ""
"described in the following sections."
msgstr ""
"Il percorso predefinito per i file elenco sul sistema è #{/usr/share/live/"
-"build/lists/}#. Per determinare i pacchetti in un dato elenco, si legga il "
-"file corrispondente, prestando attenzione ai file inclusi e condizionali "
-"come descritto nella sezioni seguenti."
+"build/package-lists/}#. Per determinare i pacchetti in un dato elenco, si "
+"legga il file corrispondente, prestando attenzione ai file inclusi e "
+"condizionali come descritto nella sezioni seguenti."
#. type: Plain text
#: en/user_customization-packages.ssi:109
@@ -640,30 +562,23 @@ msgstr "3~ Elenchi locali dei pacchetti"
#. type: Plain text
#: en/user_customization-packages.ssi:111
-#, fuzzy
-#| msgid ""
-#| "You may supplement or replace entirely the supplied lists using local "
-#| "package lists stored in #{config/chroot_local-packageslists/}#."
msgid ""
"You may supplement the predefined lists using local package lists stored in #"
"{config/package-lists/}#."
msgstr ""
-"Gli elenchi si possono integrare o sostituire interamente usando quelli "
-"locali dei pacchetti in #{config/chroot_local-packageslists/}#."
+"Gli elenchi predefiniti si possono integrare usando quelli locali dei "
+"pacchetti in #{config/package-lists/}#."
#. type: Plain text
#: en/user_customization-packages.ssi:113
-#, fuzzy
-#| msgid ""
-#| "Package lists that exist in this directory need to have a #{.list}# "
-#| "suffix in order to be processed."
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed, and then an additional stage suffix, #{.chroot}# "
"or #{.binary}# to indicate which stage the list is for."
msgstr ""
-"Per essere processate le liste dei pacchetti che si trovano nella directory "
-"deve avere un suffisso #{.list}#."
+"Per essere processate, gli elenchi dei pacchetti che si trovano in questa "
+"directory devono avere un suffisso #{.list}# e un suffisso #{.chroot}# o #{."
+"binary}# aggiuntivo per indicare per quale fase sia l'elenco."
#. type: Plain text
#: en/user_customization-packages.ssi:115
@@ -694,11 +609,6 @@ msgstr "3~ Estendere un'elenco di pacchetti usando gli include"
#. type: Plain text
#: en/user_customization-packages.ssi:123
-#, fuzzy
-#| msgid ""
-#| "The package lists that are included with live-build make extensive use of "
-#| "includes. Refer to these in the #{/usr/share/live/build/lists/}# "
-#| "directory, as they serve as good examples of how to write your own lists."
msgid ""
"The package lists that are included with live-build make extensive use of "
"includes. Refer to these in the #{/usr/share/live/build/package-lists/}# "
@@ -706,23 +616,19 @@ msgid ""
msgstr ""
"Gli elenchi di pacchetti inclusi in live-build fanno un notevole uso di "
"include. Far riferimento a questi nella directory #{/usr/share/live/build/"
-"lists/}#, in quanto portano ottimi esempi su come scrivere i propri."
+"package-lists/}#, in quanto portano ottimi esempi su come scriverne di "
+"propri."
#. type: Plain text
#: en/user_customization-packages.ssi:125
-#, fuzzy
-#| msgid ""
-#| "For example, to make a list that includes the predefined #{gnome}# list "
-#| "plus iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# "
-#| "with the following contents:"
msgid ""
"For example, to make a list that includes the predefined #{gnome}# list plus "
"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
"contents:"
msgstr ""
"Per esempio, per creare un elenco che includa quello predefinito di #{gnome}"
-"# più iceweasel, creare #{config/chroot_local-packageslists/mygnome.list}# "
-"con i seguenti contenuti:"
+"#più iceweasel, creare #{config/package-lists/mio.elenco.chroot}# con i "
+"seguenti contenuti:"
#. type: Plain text
#: en/user_customization-packages.ssi:130
@@ -837,14 +743,6 @@ msgstr "3~ Task"
#. type: Plain text
#: en/user_customization-packages.ssi:182
-#, fuzzy
-#| msgid ""
-#| "The Debian Installer offers the user choices of a number of preselected "
-#| "lists of packages, each one focused on a particular kind of system, or "
-#| "task a system may be used for, such as \"Graphical desktop environment\", "
-#| "\"Mail server\" or \"Laptop\". These lists are called \"tasks\" and are "
-#| "supported by APT through the \"Task:\" field. You can specify one or more "
-#| "tasks in live-build via the #{--tasks}# option, as in the example below."
msgid ""
"The Debian Installer offers the user choices of a number of preselected "
"lists of packages, each one focused on a particular kind of system, or task "
@@ -858,9 +756,9 @@ msgstr ""
"pacchetti pre-selezionati, ognuno dei quali focalizzato su un particolare "
"tipo di sistema, o il tipo di attività per cui utilizzarlo, come \"Graphical "
"desktop environment\", \"Mail server\" o \"Laptop\". Questi elenchi sono "
-"chiamati \"task\" e sono gestiti da APT atraverso il campo\"Task:\". In live-"
-"build si possono specificare uno o più task per mezzo dell'opzione #{--tasks}"
-"#, come nell'esempio seguente."
+"chiamati \"task\" e sono gestiti da APT attraverso il campo\"Task:\". In "
+"live-build si possono specificare uno o più task inserendoli in una lista in "
+"#{config/task-lists/}#, come nell'esempio seguente."
#. type: Plain text
#: en/user_customization-packages.ssi:187
@@ -890,16 +788,6 @@ msgstr "3~desktop-and-language-tasks Task per desktop e lingua"
#. type: Plain text
#: en/user_customization-packages.ssi:195
-#, fuzzy
-#| msgid ""
-#| "Desktop and language tasks are special cases. In the Debian Installer, if "
-#| "the medium was prepared for a particular desktop environment flavour, the "
-#| "corresponding task will be automatically installed. Thus, there are #"
-#| "{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}# "
-#| "tasks, none of which are offered in #{tasksel}#'s menu. Likewise, there "
-#| "are no menu entries for tasks for languages, but the user's language "
-#| "choice during the install influences the selection of corresponding "
-#| "language tasks."
msgid ""
"Desktop and language tasks are special cases that need some extra planning "
"and configuration. Live images are different from Debian Installer images in "
@@ -911,11 +799,13 @@ msgid ""
"for languages, but the user's language choice during the install influences "
"the selection of corresponding language tasks."
msgstr ""
-"I task per i desktop e la lingua sono un caso speciale. Nell'installatore "
-"Debian, se il supporto è stato preparato per un particolare ambiente "
-"desktop, il corrispondente task verrà automaticamente installato. Perciò ci "
-"sono i task #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# e #{xfce-"
-"desktop}#, nessuno dei quali è offerto nel menu di #{tasksel}#. Allo stesso "
+"I task per i desktop e la lingua sono un caso particolare che necessita di "
+"ulteriori pianificazioni e configurazioni e in questo senso le immagini live "
+"sono diverse da quelle dell'Installatore Debian. Nell'Installatore Debian, "
+"se il supporto è stato preparato per un particolare ambiente desktop, il "
+"corrispondente task verrà automaticamente installato. Perciò ci sono task #"
+"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# e #{xfce-desktop}# "
+"interni, nessuno dei quali è offerto nel menu di #{tasksel}#. Allo stesso "
"modo, non c'è nessuna voce nel menu per i task delle lingue, ma la scelta "
"della lingua dell'utente durante l'installazione influenza la selezione dei "
"corrispondenti task della lingua."
@@ -933,13 +823,6 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:199
-#, fuzzy
-#| msgid ""
-#| "First, there is no provision made yet automatically for language tasks, "
-#| "although a subset of those packages are included if you specify #{lb "
-#| "config --language}#. If you need those tasks, which include such things "
-#| "as language-specific fonts and input-method packages, you need to specify "
-#| "them in your configuration. For example:"
msgid ""
"Because there is no provision made automatically for language tasks, which "
"include such things as language-specific fonts and input-method packages, if "
@@ -947,11 +830,11 @@ msgid ""
"a GNOME desktop image containing support for Japanese might include these "
"tasks:"
msgstr ""
-"Primo, non è stata fatta ancora alcuna previsione sui task della lingua, "
-"sebbene sia incluso un sottoinsieme di questi pacchetti specificando #{lb "
-"config --language}#. Se servono questi task, i quali includono cose come "
-"caratteri specifici per la lingua e pacchetti dei metodi di input, vanno "
-"specificati nella configurazione. Per esempio:"
+"Poiché automaticamente non viene fatta alcuna preparazione sui task della "
+"lingua, i quali includono cose come caratteri specifici per la lingua e "
+"pacchetti per i metodi di input, se li si vogliono, vanno specificati nella "
+"configurazione. Per esempio, un'immagine del desktop GNOME contenente il "
+"supporto per il giapponese può includere questi task:"
#. type: Plain text
#: en/user_customization-packages.ssi:205
@@ -1046,37 +929,23 @@ msgstr "_* Utilizzare repository APT personalizzati"
#. type: Plain text
#: en/user_customization-packages.ssi:232
-#, fuzzy
-#| msgid ""
-#| "Using #{chroot_local-packages}# is simpler to achieve and useful for "
-#| "\"one-off\" customizations but has a number of drawbacks, whilst using a "
-#| "custom APT repository is more time-consuming to set up."
msgid ""
"Using #{packages.chroot}# is simpler to achieve and useful for \"one-off\" "
"customizations but has a number of drawbacks, whilst using a custom APT "
"repository is more time-consuming to set up."
msgstr ""
-"Usando #{chroot_local-packages}# è più semplice da ottenere e utile per una "
+"Usando #{packages.chroot}# è più semplice da ottenere e utile per una "
"personalizzazione \"una tantum\" ma ha una serie di svantaggi, mentre un "
"repository APT personalizzato è più laborioso da configurare."
#. type: Plain text
#: en/user_customization-packages.ssi:234
-#, fuzzy
-#| msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgid "3~ Using #{packages.chroot}# to install custom packages"
msgstr ""
-"3~ Utilizzare #{chroot_local-packages}# per installare pacchetti "
-"personalizzati"
+"3~ Utilizzare #{packages.chroot}# per installare pacchetti personalizzati"
#. type: Plain text
#: en/user_customization-packages.ssi:236
-#, fuzzy
-#| msgid ""
-#| "To install a custom package, simply copy it to the #{config/chroot_local-"
-#| "packages/}# directory. Packages that are inside this directory will be "
-#| "automatically installed into the live system during build - you do not "
-#| "need to specify them elsewhere."
msgid ""
"To install a custom package, simply copy it to the #{config/packages.chroot/}"
"# directory. Packages that are inside this directory will be automatically "
@@ -1084,7 +953,7 @@ msgid ""
"them elsewhere."
msgstr ""
"Per installare un pacchetto personalizzato copiarlo nella directory #{config/"
-"chroot_local-packages/}#; i pacchetti al suo interno verranno installati "
+"packages.chroot/}#; i pacchetti al suo interno verranno installati "
"automaticamente durante la creazione del sistema live, non è necessario "
"specificarli altrove."
@@ -1099,15 +968,11 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:240
-#, fuzzy
-#| msgid ""
-#| "Using #{chroot_local-packages}# for installation of custom packages has "
-#| "disadvantages:"
msgid ""
"Using #{packages.chroot}# for installation of custom packages has "
"disadvantages:"
msgstr ""
-"L'utilizzo di #{chroot_local-packages}# per l'installazione di pacchetti "
+"L'utilizzo di #{packages.chroot}# per l'installazione di pacchetti "
"personalizzati presenta degli svantaggi:"
#. type: Plain text
@@ -1117,16 +982,12 @@ msgstr "_* non è possibile usare secure APT"
#. type: Plain text
#: en/user_customization-packages.ssi:244
-#, fuzzy
-#| msgid ""
-#| "_* You must install all appropriate packages in the #{config/chroot_local-"
-#| "packages/}# directory."
msgid ""
"_* You must install all appropriate packages in the #{config/packages."
"chroot/}# directory."
msgstr ""
"_* è necessario installare i pacchetti adeguati nella directory #{config/"
-"chroot_local-packages/}#."
+"packages.chroot/}#."
#. type: Plain text
#: en/user_customization-packages.ssi:246
@@ -1145,17 +1006,12 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:250
-#, fuzzy
-#| msgid ""
-#| "Unlike using #{chroot_local-packages}#, when using a custom APT "
-#| "repository you must ensure that you specify the packages elsewhere. See "
-#| "{Choosing packages to install}#choosing-packages-to-install for details."
msgid ""
"Unlike using #{packages.chroot}#, when using a custom APT repository you "
"must ensure that you specify the packages elsewhere. See {Choosing packages "
"to install}#choosing-packages-to-install for details."
msgstr ""
-"A differenza di #{chroot_local-packages}#, quando si usa un repository APT "
+"A differenza di #{packages.chroot}#, quando si usa un repository APT "
"personalizzato è necessario assicurarsi di specificare altrove i pacchetti. "
"Per i dettagli si veda {Scegliere i pacchetti da installare}#choosing-"
"packages-to-install."
@@ -1213,14 +1069,6 @@ msgstr "2~ Configurare APT in fase di costruzione"
#. type: Plain text
#: en/user_customization-packages.ssi:262
-#, fuzzy
-#| msgid ""
-#| "You can configure APT through a number of options applied only at build "
-#| "time. (APT configuration used in the running live system may be "
-#| "configured in the normal way for live system contents, that is, by "
-#| "including the appropriate configurations through #{config/"
-#| "chroot_local_includes/}#.) For a complete list, look for options starting "
-#| "with #{apt}# in the #{lb_config}# man page."
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -1232,8 +1080,8 @@ msgstr ""
"APT è configurabile tramite una serie di opzioni applicate solo in fase di "
"costruzione (la configurazione di APT utilizzata nel sistema live in "
"esecuzione può essere configurata nel solito modo, ovvero includendo le "
-"impostazioni appropriate attraverso #{config/chroot_local_includes/}#). Per "
-"un elenco completo, cercare nel manuale di #{lb_config}# le opzioni che "
+"impostazioni appropriate attraverso #{config/includes.chroot/}#). Per un "
+"elenco completo, cercare nel manuale di #{lb_config}# le opzioni che "
"iniziano con #{apt}#."
#. type: Plain text
@@ -1406,12 +1254,6 @@ msgstr "3~apt-pinning APT pinning"
#. type: Plain text
#: en/user_customization-packages.ssi:312
-#, fuzzy
-#| msgid ""
-#| "For background, please first read the #{apt_preferences(5)}# man page. "
-#| "APT pinning can be configured either for build time, or else for run "
-#| "time. For the former, create #{config/chroot_apt/preferences}#. For the "
-#| "latter, create #{config/chroot_local-includes/etc/apt/preferences}#."
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
@@ -1420,8 +1262,8 @@ msgid ""
msgstr ""
"Si prega di leggere prima il manuale di #{apt_preferences(5)}#. Il pinning "
"può essere configurato sia in fase di costruzione sia di esecuzione; per la "
-"prima creare #{config/chroot_apt/preferences}#, per quest'ultima creare #"
-"{config/chroot_local-includes/etc/apt/preferences}#."
+"prima creare #{config/chroot_apt/preferences}# mentre per l'ultima creare #"
+"{config/includes.chroot/etc/apt/preferences}#."
#. type: Plain text
#: en/user_customization-packages.ssi:314
@@ -1445,7 +1287,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
-" $ cat >> config/chroot_apt/preferences <<END\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"
@@ -1474,16 +1316,6 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:339
-#, fuzzy
-#| msgid ""
-#| "Negative pin priorities will prevent a package from being installed, as "
-#| "in the case where you do not want a package that is recommended by "
-#| "another package. Suppose you are building an LXDE image using #{--"
-#| "packages-lists lxde}# option, but don't want the user prompted to store "
-#| "wifi passwords in the keyring. This list includes #{gdm}#, which depends "
-#| "on #{gksu}#, which in turn recommends #{gnome-keyring}#. So you want to "
-#| "omit the recommended #{gnome-keyring}# package. This can be done by "
-#| "adding the following stanza to #{config/chroot_apt/preferences}#:"
msgid ""
"Negative pin priorities will prevent a package from being installed, as in "
"the case where you do not want a package that is recommended by another "
@@ -1496,7 +1328,7 @@ msgid ""
msgstr ""
"Un valore negativo della priorità evita che un pacchetto venga installato, "
"come nel caso in cui non se ne voglia uno raccomandato da un altro. Si "
-"suppone di costruire un'immagine di LXDE utilizzando l'opzione #{--packages-"
+"suppone di costruire un'immagine di LXDE utilizzando l'opzione #{--package-"
"lists lxde}# ma non si desidera che all'utente venga richiesto di salvare la "
"password del wifi nel portachiavi. L'elenco include #{gdm}# che dipende da #"
"{gksu}# che a sua volta raccomanda #{gnome-keyring}#, in questo caso si "
diff --git a/manual/po/it/user_customization-runtime.ssi.po b/manual/po/it/user_customization-runtime.ssi.po
index 487c6e1..d5958d7 100644
--- a/manual/po/it/user_customization-runtime.ssi.po
+++ b/manual/po/it/user_customization-runtime.ssi.po
@@ -2,12 +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.
+# skizzhg <skizzhg at gmx.com>, 2010.
#
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-09-10 23:11+0200\n"
+"PO-Revision-Date: 2011-12-06 08:11+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
"Language: it\n"
@@ -193,12 +194,6 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:12
-#, fuzzy
-#| msgid ""
-#| "You can specify additional groups that the live user will belong to by "
-#| "preseeding the #{passwd/user-default-groups}# debconf value. For example, "
-#| "to add the live user to the #{fuse}# group, add the following to a file "
-#| "in the #{config/chroot_local-preseed}# directory:"
msgid ""
"You can specify additional groups that the live user will belong to by "
"preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
@@ -207,8 +202,8 @@ msgid ""
msgstr ""
"È possibile specificare gruppi aggiuntivi ai quali l'utente live apparterrà "
"preconfigurando il valore #{passwd/user-default-groups}# di debconf. Ad "
-"esempio, per aggiungere l'utente al gruppo #{fuse}#, inserire quanto segue "
-"ad un file nella directory #{config/chroot_local-preseed}#:"
+"esempio, per aggiungere l'utente al gruppo #{fuse}#, inserire la seguente "
+"preconfigurazione in #{config/preseed/}# per la fase chroot:"
#. type: Plain text
#: en/user_customization-runtime.ssi:19
diff --git a/manual/po/it/user_examples.ssi.po b/manual/po/it/user_examples.ssi.po
index f06cc86..99ec522 100644
--- a/manual/po/it/user_examples.ssi.po
+++ b/manual/po/it/user_examples.ssi.po
@@ -8,8 +8,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-13 17:12+0100\n"
-"PO-Revision-Date: 2011-04-16 03:33+0200\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\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"
"Language: it\n"
@@ -27,7 +27,7 @@ msgstr ":B~ Esempi"
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -41,6 +41,7 @@ msgstr ":B~ Esempi"
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/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
@@ -92,7 +93,7 @@ msgstr "code{"
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -106,6 +107,7 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -161,6 +163,12 @@ msgid " # lb build\n"
msgstr ""
#. type: Plain text
+#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#, no-wrap
+msgid " #!/bin/sh\n"
+msgstr ""
+
+#. type: Plain text
#: en/user_examples.ssi:4
msgid "1~examples Examples"
msgstr "1~examples Esempi"
@@ -197,16 +205,6 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:12
-#, fuzzy
-#| msgid ""
-#| "Note that, for the sake of brevity, in these examples we do not specify a "
-#| "local mirror to use for the build. You can speed up downloads "
-#| "considerably if you use a local mirror. You may specify the options when "
-#| "you use #{lb config}#, as described in {Distribution mirrors used at "
-#| "build time}#distribution-mirrors-build-time, or for more convenience, set "
-#| "the default for your build system in #{/etc/live/build.conf}#. Simply "
-#| "create this file and in it, set the corresponding #{LB_MIRROR_*}# "
-#| "variables to your preferred mirror. For example:"
msgid ""
"Note that, for the sake of brevity, in these examples we do not specify a "
"local mirror to use for the build. You can speed up downloads considerably "
@@ -214,9 +212,9 @@ msgid ""
"config}#, as described in {Distribution mirrors used at build time}"
"#distribution-mirrors-build-time, or for more convenience, set the default "
"for your build system in #{/etc/live/build.conf}#. Simply create this file "
-"and in it, set the corresponding #{LB_PARENT_MIRROR_*}# variables to your "
-"preferred mirror. All other mirrors used in the build will be defaulted from "
-"these values. For example:"
+"and in it, set the corresponding #{LB_MIRROR_*}# variables to your preferred "
+"mirror. All other mirrors used in the build will be defaulted from these "
+"values. For example:"
msgstr ""
"Si noti che, per brevità, in questi esempi non specifichiamo un mirror "
"locale da usare per la costruzione. Usando un mirror locale, si possono "
@@ -225,16 +223,17 @@ msgstr ""
"usati in fase di compilazione}#distribution-mirrors-build-time o, più "
"convenientemente, impostare il predefinito per il proprio sistema in #{/etc/"
"live/build.conf}#. Si crei semplicemente questo file e si impostino in esso "
-"le corrispondenti variabili #{LB_MIRROR_*}# per il mirror desiderato. Ad "
+"le corrispondenti variabili #{LB_MIRROR_*}# per il mirror desiderato. Tutti "
+"gli altri mirror utilizzati nella costruzione avranno questi valori, ad "
"esempio:"
#. type: Plain text
#: en/user_examples.ssi:18
#, no-wrap
msgid ""
-" LB_PARENT_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
-" LB_PARENT_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
-" LB_PARENT_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
+" 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"
msgstr ""
#. type: Plain text
@@ -349,15 +348,6 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:63
-#, fuzzy
-#| msgid ""
-#| "Our choice of LXDE for this example reflects our desire to provide a "
-#| "minimal desktop environment, since the focus of the image is the single "
-#| "use we have in mind, the web browser. We could go even further and "
-#| "provide a default configuration for the web browser in #{config/"
-#| "chroot_local-includes/etc/iceweasel/profile/}#, or additional support "
-#| "packages for viewing various kinds of web content, but we leave this as "
-#| "an exercise for the reader."
msgid ""
"Our choice of LXDE for this example reflects our desire to provide a minimal "
"desktop environment, since the focus of the image is the single use we have "
@@ -370,9 +360,9 @@ msgstr ""
"ambiente desktop minimale, dato che il punto focale dell'immagine è il "
"singolo uso che abbiamo in mente, il browser web. Potremmo anche spingerci "
"oltre e fornire una configurazione predefinita per il browser web in #"
-"{config/chroot_local-includes/etc/iceweasel/profile/}#, o pacchetti "
-"addizionali di supporto per la fruizione di vari tipi di contenuti web, ma "
-"lasciamo questo come esercizio per il lettore."
+"{config/includes.chroot/etc/iceweasel/profile/}#, o pacchetti addizionali di "
+"supporto per la fruizione di vari tipi di contenuti web, ma lasciamo questo "
+"come esercizio per il lettore."
#. type: Plain text
#: en/user_examples.ssi:65
@@ -439,12 +429,6 @@ msgid "Edit #{auto/config}# to read as follows:"
msgstr "Modificare #{auto/config}# come segue:"
#. type: Plain text
-#: en/user_examples.ssi:95
-#, no-wrap
-msgid " #!/bin/sh\n"
-msgstr ""
-
-#. type: Plain text
#: en/user_examples.ssi:101
#, no-wrap
msgid ""
@@ -457,10 +441,8 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:105
-#, fuzzy
-#| msgid "3~ Local package lists"
msgid "Now populate your local package list:"
-msgstr "3~ Elenchi locali dei pacchetti"
+msgstr "Popolare ora l'elenco locale dei pacchetti:"
#. type: Plain text
#: en/user_examples.ssi:109
@@ -470,14 +452,6 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:113
-#, fuzzy
-#| msgid ""
-#| "First, #{--architecture i386}# ensures that on our #{amd64}# build "
-#| "system, we build a 32-bit version suitable for use on most machines. "
-#| "Second, we use #{--linux-flavours 686}# because we don't anticipate using "
-#| "this image on much older systems. Third, we've chosen the #{lxde}# "
-#| "package list to give us a minimal desktop. And finally, we have added two "
-#| "initial favourite packages: #{iceweasel}# and #{xchat}#."
msgid ""
"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
"we build a 32-bit version suitable for use on most machines. Second, we use #"
@@ -488,8 +462,8 @@ msgid ""
msgstr ""
"Per prima cosa, #{--architecture 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}# dato che "
-"non prevediamo di usare questa immagine su sistemi troppo vecchi. Terzo, "
+"delle macchine. In secondo luogo, usiamo #{--linux-flavours 686-pae}# dato "
+"che non prevediamo di usare questa immagine su sistemi troppo vecchi. Terzo, "
"abbiamo scelto la lista di pacchetti #{lxde}# per avere un desktop minimale. "
"Infine, abbiamo aggiunto due pacchetti preferiti per cominciare: #{iceweasel}"
"# e #{xchat}#."
@@ -646,11 +620,6 @@ msgstr "*{Caso d'uso:}* creazione di un'immagine con live-build per avviare dire
#. type: Plain text
#: en/user_examples.ssi:179
-#, fuzzy
-#| msgid ""
-#| "Make a build directory and create a skeletal configuration in it built "
-#| "around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
-#| "{xtightvncviewer}#, disabling recommends to make a minimal system:"
msgid ""
"Make a build directory and create a skeletal configuration in it built "
"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
@@ -658,8 +627,8 @@ msgid ""
msgstr ""
"Creare una directory con al suo interno una configurazione scheletrica "
"costruita sulla base dell'elenco di standard-x11, tra cui #{gdm3}#, #"
-"{metacity}# e #{xtightvncviewer}#, disabilitando i raccomandati per ottenere "
-"un sistema minimale:"
+"{metacity}# e #{xvnc4viewer}#, disabilitando i raccomandati per ottenere un "
+"sistema minimale:"
#. type: Plain text
#: en/user_examples.ssi:187
@@ -689,7 +658,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
-" $ cat > config/includes.chroot/etc/skel/.xsession <<END\n"
+" $ cat > config/includes.chroot/etc/skel/.xsession << END\n"
" #!/bin/sh\n"
msgstr ""
@@ -779,22 +748,6 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:240
-#, fuzzy
-#| msgid ""
-#| "The biggest space-saver here, compared to building a standard image on an "
-#| "#{i386}# architecture system, is to select only the #{486}# kernel "
-#| "flavour instead of the default #{-k \"486 686\"}#. Leaving off APT's "
-#| "indices with #{--binary-indices false}# also saves a fair amount of "
-#| "space, the tradeoff being that you need to #{apt-get update}# before "
-#| "using apt in the live system. Choosing the #{minimal}# package list "
-#| "leaves out the large #{locales}# package and associated utilities. "
-#| "Dropping recommended packages with #{--apt-recommends false}# saves some "
-#| "additional space, at the expense of omitting some packages you might "
-#| "otherwise expect to be there, such as #{firmware-linux-free}# which may "
-#| "be needed to support certain hardware. The remaining options shave off "
-#| "additional small amounts of space. It's up to you to decide if the "
-#| "functionality that is sacrificed with each optimization is worth the loss "
-#| "in functionality."
msgid ""
"The biggest space-saver here, compared to building a standard image on an #"
"{i386}# architecture system, is to select only the #{486}# kernel flavour "
@@ -812,10 +765,10 @@ msgid ""
msgstr ""
"Ciò che salva più spazio, comparato alla costruzione di un'immagine standard "
"su un sistema con architettura #{i386}#, è la selezione del solo kernel #"
-"{486}# invece che quello predefinito #{-k \"486 686\"}#. Lasciando fuori "
-"anche gli indici di APT con #{--binary-indices false}# si può salvare una "
-"certa quantità di spazio, il compromesso è usare #{apt-get update}# prima di "
-"usare apt nel sistema live. Scegliendo la lista #{minima}# dei pacchetti si "
+"{486}# invece che quello predefinito #{-k \"486 686-pae\"}#. Lasciando fuori "
+"anche gli indici di APT con #{--apt-indices false}# si può salvare una certa "
+"quantità di spazio, il compromesso è usare #{apt-get update}# prima di usare "
+"apt nel sistema live. Scegliendo la lista #{minima}# dei pacchetti si "
"esclude il grosso pacchetto #{locales}# e le utilità associate. Saltare i "
"pacchetti raccomandati con #{--apt-recommends false}# salva altro spazio, a "
"scapito di alcuni pacchetti che ci si aspetta di trovare, come #{firmware-"
@@ -848,13 +801,6 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:248
-#, fuzzy
-#| msgid ""
-#| "Our initial problem is the discovery of the names of the appropriate "
-#| "tasks. Currently, live-build cannot help with this. While we might get "
-#| "lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#, "
-#| "which can be used to dig it out of the task descriptions in tasksel-data, "
-#| "so to prepare, make sure you have both of those things:"
msgid ""
"Our initial problem is the discovery of the names of the appropriate "
"language tasks. Currently, live-build cannot help with this. While we might "
@@ -862,11 +808,11 @@ msgid ""
"which can be used to dig it out of the task descriptions in tasksel-data, so "
"to prepare, make sure you have both of those things:"
msgstr ""
-"Il problema iniziale è di scoprire i nomi dei task appropriati, attualmente, "
-"live-build non aiuta in questo. Si può essere fortunati o arrivarci con vari "
-"tentativi, ma c'è uno strumento #{grep-dctrl}# il quale può essere "
-"utilizzato per scavare nelle descrizioni in tasksel-data, perciò assicursi "
-"di avere entrambi questi pacchetti:"
+"Il problema iniziale è di scoprire i nomi dei task della lingua appropriati, "
+"attualmente, live-build non aiuta in questo. Si può essere fortunati o "
+"arrivarci con vari tentativi, ma c'è uno strumento #{grep-dctrl}# il quale "
+"può essere utilizzato per scavare nelle descrizioni in tasksel-data, perciò "
+"assicursi di avere entrambi questi pacchetti:"
#. type: Plain text
#: en/user_examples.ssi:252
diff --git a/manual/po/it/user_managing_a_configuration.ssi.po b/manual/po/it/user_managing_a_configuration.ssi.po
index 8d64d82..2e24735 100644
--- a/manual/po/it/user_managing_a_configuration.ssi.po
+++ b/manual/po/it/user_managing_a_configuration.ssi.po
@@ -8,7 +8,7 @@ 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-03-11 11:21+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"
"Language: it\n"
@@ -166,7 +166,7 @@ msgid ""
msgstr ""
"Questo capitolo spiega come gestire una configurazione per una live sin "
"dalla creazione iniziale, attraverso le successive revisioni e rilasci sia "
-"del software live-build che della stessa immagine live."
+"del software live-build che della stessa immagine."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:8
@@ -183,12 +183,12 @@ msgid ""
"default value, that value will not be recomputed from other variables that "
"may change in later revisions."
msgstr ""
-"Le configurazioni live raramente sono perfette da riuscire al primo colpo. "
-"Servono una serie di revisioni prima di essere soddisfatti. Comunque, "
-"possono verificarsi delle incoerenze tra una revisione ed un'altra se non si "
-"presta attenzione. Il problema principale è, una volta che ad una variabile "
-"è assegnato un valore predefinito, tale valore non sarà ricalcolato da altre "
-"variabili che possono cambiare in altre revisioni. "
+"Le configurazioni live raramente sono perfette da riuscire al primo colpo, "
+"servono una serie di revisioni prima di essere soddisfatti. Tuttavia, se non "
+"si presta attenzione, possono verificarsi delle incoerenze tra una revisione "
+"e l'altra se non si presta attenzione. Il problema principale è che una "
+"volta assegnato un valore predefinito ad una variabile, tale valore non sarà "
+"ricalcolato da altre variabili che possono cambiare in altre revisioni."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:12
@@ -198,11 +198,10 @@ msgid ""
"decide to change the distribution, those dependent variables continue to "
"retain old values that are no longer appropriate."
msgstr ""
-"Per esempio, durante la messa a punto della prima distribuzione, molte "
-"variabili 'dependent' sono date dalle caratteristiche della distribuzione. "
-"Quindi, se in seguito si decide di cambiare distribuzione, quelle variabili "
-"dipendenti continueranno a mantenere i vecchi valori i quali non sono più "
-"appropriati "
+"Per esempio, durante la prima configurazione della distribuzione, a molte "
+"variabili 'dipendenti' vengono dati valori predefiniti che si adattino.Per "
+"cui se in seguito si decide di cambiare distribuzione, quelle variabili "
+"continueranno a mantenere vecchi valori non più appropriati."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:14
@@ -213,11 +212,11 @@ msgid ""
"{config/*}# files, which you will then need to use to set the appropriate "
"option again."
msgstr ""
-"Un secondo relativo problema è che se si lancia #{lb config}# e si è "
-"aggiornato live-build ad una nuova versione il quale ha cambiato il nome di "
-"una o più variabili, si può scoprire ciò solamente con una revisione manuale "
-"delle variabili nei file #{config/*}#, bisogna che vengano risistemate, di "
-"nuovo, le appropriate opzioni."
+"Un secondo problema correlato è l'eseguire #{lb config}# e aggiornare alla "
+"nuova versione di live-build il quale ha cambiato il nome di una delle "
+"variabili, lo si può scoprire solamente con una revisione manuale delle "
+"variabili nei file #{config/*}#, che sarà necessario utilizzare per "
+"impostare nuovamente le opzioni appropriate."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:16
@@ -233,20 +232,22 @@ msgid ""
"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)."
msgstr ""
-"Tutto ciò potrebbe essere un fastidio terribile se non fosse per lo script "
-"auto/*, una semplice alternativa ai comandi #{lb config}#, #{lb build}# e #"
-"{lb clean}# che sono disegnati per aiutare nella gestione della "
-"configurazione. Basta creare un semplice script auto/config che contenga il "
-"comando #{lb config}# con le opzioni desiderate, e un auot/clean che rimuova "
-"i file contenenti i valori variabili di configurazione, cosi ogni volta "
-"saranno eseguiti #{lb config}# #{lb clean}#. Questo farà si che la "
-"configurazione sia sempre coerente da una revisione all'altra o dal rilascio "
-"delle varie versioni del live-build."
+"Tutto ciò potrebbe essere un fastidio terribile se non fosse per gli script "
+"auto/*, semplici wrapper ai comandi #{lb config}#, #{lb build}# e #{lb clean}"
+"#, designati per aiutare nella gestione della propria configurazione. Basta "
+"creare uno script auto/config che contenga il comando #{lb config}# con le "
+"opzioni desiderate e un auto/clean che rimuove i file contenenti valori "
+"delle variabili di configurazione, così ogni volta che si usano #{lb config}"
+"# e #{lb clean}# questi file saranno eseguiti. Ciò fà sì che la "
+"configurazione sia coerente da una revisione all'altra e tra i rilasci delle "
+"varie versioni di live-build (sebbene si dovrà comunque fare attenzione "
+"aggiornando live-build, leggendo la documentazione e facendo le modifiche "
+"necessarie)."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:18
msgid "2~ Example auto scripts"
-msgstr "2~ Esempi di auto script"
+msgstr "2~ Esempi di script automatici"
#. type: Plain text
#: en/user_managing_a_configuration.ssi:20
@@ -258,12 +259,12 @@ msgid ""
"Also, don't forget to ensure the scripts are executable (e.g. #{chmod 755 "
"auto/*}#)."
msgstr ""
-"Usare esempi di auto script come il seguente come punto di partenza per una "
-"nuova configurazione di live-build. Prendere nota che quando si chiama il "
-"comando #{lb}# che l'auto script wraps, si deve specificare il parametro #"
-"{noauto}# per essere sicuri che l'auto script chiamato di nuovo "
-"ricorsivamente. Non dimenticare, inoltre, di rendere lo script eseguibile "
-"(es. #{chmod 755 auto/*}#)."
+"Usare esempi di script automatici come il seguente come punto di partenza "
+"per una nuova configurazione di live-build. Si noti che quando si invoca il "
+"comando #{lb}# incluso nello script, si deve specificare il parametro #"
+"{noauto}# per essere certi che lo script stesso non venga richiamato "
+"ricorsivamente. Non dimenticare, inoltre, di accertarsi che gli script siano "
+"eseguibili (es. #{chmod 755 auto/*}#)."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:22
@@ -315,8 +316,8 @@ msgid ""
"We now ship example auto scripts with live-build based on the examples "
"above. You may copy those as your starting point."
msgstr ""
-"Facciamo un esempio di auto script per live-build basato sull'esempio "
-"precedente. Si possono copiare come punto di partenza."
+"Facciamo un esempio di script automatico per live-build basato sugli esempi "
+"precedenti; si possono copiare come punto di partenza."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:58
@@ -326,13 +327,6 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:61
-#, fuzzy
-#| msgid ""
-#| "Edit #{auto/config}#, changing or adding any options as you see fit. In "
-#| "the example above, #{--packages-lists standard}# is set to the default "
-#| "value. Change this to an appropriate value for your image (or delete it "
-#| "if you want to use the default) and add any additional options in "
-#| "continuation lines that follow."
msgid ""
"Edit #{auto/config}#, changing or adding any options as you see fit. In the "
"example above, #{--package-lists standard}# is set to the default value. "
@@ -340,9 +334,8 @@ msgid ""
"to use the default) and add any additional options in continuation lines "
"that follow."
msgstr ""
-"Modifica #{auto/config}# aggiungendo o togliendo le opzioni come meglio "
-"credi. Nel precedente esempio #{--packages-lists standard}# è impostato il "
-"valore predefinito.Cambiare questo in un valore appropriato per l'immagine "
-"( o cancellarlo se si desidera utilizzare un valore predefinito) e "
-"aggiungere eventuali opzioni aggiuntive in continuazione delle righe che "
-"seguono."
+"Modificare #{auto/config}# aggiungendo o togliendo le opzioni come meglio "
+"credi. Nel precedente esempio, #{--package-lists standard}# è impostato al "
+"valore predefinito; cambiarlo in un valore appropriato per l'immagine (o "
+"cancellarlo se si desidera utilizzare un valore predefinito) e aggiungere "
+"eventuali opzioni ulteriori in continuazione delle righe che seguono."
diff --git a/manual/po/it/user_overview.ssi.po b/manual/po/it/user_overview.ssi.po
index 3c24d5a..b2b6e9e 100644
--- a/manual/po/it/user_overview.ssi.po
+++ b/manual/po/it/user_overview.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.
-# skizzhg <skizzhg at gmx.com>
+# skizzhg <skizzhg at gmx.com>, 2010.
#
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-03-11 11:27+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"
"Language: it\n"
@@ -297,17 +297,14 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:34
-#, fuzzy
-#| msgid ""
-#| "Issuing #{lb config}# without any arguments creates a #{config/}# "
-#| "subdirectory which it populates with some default settings:"
msgid ""
"Issuing #{lb config}# without any arguments creates a #{config/}# "
"subdirectory which it populates with some default settings, and a skeleton #"
"{auto/}# subdirectory tree."
msgstr ""
-"L'esecuzione di #{lb config}# senza argomenti crea una sottodirectory di #"
-"{config/}# popolata con alcune impostazioni predefinite:"
+"L'esecuzione di #{lb config}# senza argomenti crea una sottodirectory #"
+"{config/}# popolata con alcune impostazioni predefinite e uno scheletro di "
+"sottodirectory in #{auto/}#."
#. type: Plain text
#: en/user_overview.ssi:40
@@ -320,12 +317,6 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:44
-#, fuzzy
-#| 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 "
-#| "configuration via auto/config (see {Managing a configuration}#managing-a-"
-#| "configuration for details)."
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 "
@@ -334,7 +325,7 @@ msgid ""
msgstr ""
"L'uso di #{lb config}# senza argomenti è adatto ad utenti che necessitano di "
"un'immagine di base o che intendono fornire in seguito una configurazione "
-"più completa tramite auto/config (per i dettagli vedere {Gestire una "
+"più completa tramite #{auto/config}# (per i dettagli vedere {Gestire una "
"configurazione}#managing-a-configuration)."
#. type: Plain text
@@ -376,18 +367,13 @@ msgstr "3~lb-build Il comando #{lb build}#"
#. type: Plain text
#: en/user_overview.ssi:66
-#, fuzzy
-#| 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."
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 ""
"Il comando #{lb build}# legge la configurazione dalla directory #{config/}# "
-"ed esegue ad un livello inferiore i comandi necessari a costruire il sistema "
+"ed esegue a un livello inferiore i comandi necessari a costruire il sistema "
"live."
#. type: Plain text
@@ -435,20 +421,14 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:76
-#, fuzzy
-#| 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 squashfs) is stored. If found, it will create a writable "
-#| "environment, using aufs, for Debian like systems to boot from."
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 "
"squashfs) is stored. If found, it will create a writable environment, using "
"aufs, for Debian like systems to boot from."
msgstr ""
-"All'avvio cercherà supporti in sola lettura che contengano una directory \"/"
-"live\" dove sia presente un filesystem root (spesso un'immagine compressa "
+"All'avvio cercherà supporti in sola lettura che contengano una directory #{/"
+"live/}# dove sia presente un filesystem root (spesso un'immagine compressa "
"come squashfs). Se trovata, creerà un ambiente scrivibile usando aufs, per "
"avviarsi da sistemi simili a Debian."
diff --git a/manual/po/pt_BR/about_manual.ssi.po b/manual/po/pt_BR/about_manual.ssi.po
index 2628e37..a95f572 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: 2011-03-11 17:03+0100\n"
+"POT-Creation-Date: 2012-02-05 17:13+0100\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"
@@ -66,19 +66,21 @@ msgid ""
"While we believe that everything in this manual is important to at least "
"some of our users, we realize it is a lot of material to cover and that you "
"may wish to experience early success using the software before delving into "
-"the details. Therefore, we have provided three tutorials in the {Examples}"
-"#examples section designed to teach you image building and customization "
-"basics. Read {Using the examples}#using-the-examples first, followed by "
-"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
-"utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
-"#tutorial-3. By the end of these tutorials, you will have a taste of what "
-"can be done with Debian Live. We encourage you to return to more in-depth "
-"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
-"or skipping {Building a netboot image}#building-netboot-image, and finishing "
-"by reading the {Customization overview}#customization-overview and the "
-"chapters that follow it. By this point, we hope you are thoroughly excited "
-"by what can be done with Debian Live and motivated to read the rest of the "
-"manual, cover-to-cover."
+"the details. Therefore, we suggest reading in the following order. First, "
+"read this chapter, {About this manual}#about-manual, from the beginning and "
+"ending with the {Terms}#terms section. Next, skip to the three tutorials at "
+"the front of the {Examples}#examples section designed to teach you image "
+"building and customization basics. Read {Using the examples}#using-the-"
+"examples first, followed by {Tutorial 1: A standard image}#tutorial-1, "
+"{Tutorial 2: A web browser utility}#tutorial-2 and finally {Tutorial 3: A "
+"personalized image}#tutorial-3. By the end of these tutorials, you will have "
+"a taste of what can be done with Debian Live. We encourage you to return to "
+"more in-depth study of the manual, perhaps next reading {The basics}#the-"
+"basics, skimming or skipping {Building a netboot image}#building-netboot-"
+"image, and finishing by reading the {Customization overview}#customization-"
+"overview and the chapters that follow it. By this point, we hope you are "
+"thoroughly excited by what can be done with Debian Live and motivated to "
+"read the rest of the manual, cover-to-cover."
msgstr ""
#. type: Plain text
@@ -358,56 +360,59 @@ 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: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-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: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_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_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: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
@@ -416,7 +421,7 @@ 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:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -427,56 +432,59 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi: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: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-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: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_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_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: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
@@ -484,8 +492,8 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: 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:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -537,11 +545,35 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:114
-msgid "3~ Applying patches"
+msgid "It is also possible to build by document type, e.g:"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:118
+#, no-wrap
+msgid " $ make build FORMATS=pdf\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:122
+msgid "Or combine both, e.g:"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:126
+#, no-wrap
+msgid " $ make build FORMATS=html LANGUAGES=it\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:130
+#, fuzzy
+#| msgid "3~ Applying patches"
+msgid "3~ Applying changes"
msgstr "3~ Aplicando patches"
#. type: Plain text
-#: en/about_manual.ssi:116
+#: en/about_manual.ssi:132
msgid ""
"Anyone can directly commit to the repository. However, we ask you to send "
"bigger changes to the mailing list to discuss them first. To push to the "
@@ -553,12 +585,12 @@ msgstr ""
"necessários:"
#. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:134
msgid "_* Fetch the public commit key:"
msgstr "_* Obter a chave publica de commit:"
#. type: Plain text
-#: en/about_manual.ssi:127
+#: en/about_manual.ssi:143
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
@@ -570,12 +602,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:131
+#: en/about_manual.ssi:147
msgid "_* Add the following section to your openssh-client config:"
msgstr "_* Adicione a seguinte sessão na configuração do seu openssh-client:"
#. type: Plain text
-#: en/about_manual.ssi:140
+#: en/about_manual.ssi:156
#, no-wrap
msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
@@ -587,12 +619,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:144
+#: en/about_manual.ssi:160
msgid "_* Check out a clone of the manual through ssh:"
msgstr "_* Fazer o checkout de um clone do manual por ssh:"
#. type: Plain text
-#: en/about_manual.ssi:149
+#: en/about_manual.ssi:165
#, no-wrap
msgid ""
" $ git clone git at live.debian.net:/live-manual.git\n"
@@ -602,14 +634,14 @@ msgstr ""
" $ cd live-manual && git checkout debian-next\n"
#. type: Plain text
-#: en/about_manual.ssi:153
+#: en/about_manual.ssi:169
msgid ""
"_* Note that you should commit any changes on the debian-next branch, not on "
"the debian branch."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:155
+#: en/about_manual.ssi:171
msgid ""
"_* After editing the files in #{manual/en/}#, please call the 'commit' "
"target in the top level directory to sanitize the files and update the "
@@ -620,18 +652,35 @@ msgstr ""
"atualizar os arquivos de tradução. "
#. type: Plain text
-#: en/about_manual.ssi:159
+#: en/about_manual.ssi:175
#, no-wrap
msgid " $ make commit\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:163
+#: en/about_manual.ssi:179
+msgid "_* Then"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:183
+#, no-wrap
+msgid " $ git add .\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:187
+#, fuzzy
+#| msgid ""
+#| "_* After sanitizing, commit the changes. Write commit messages that "
+#| "consist of full, useful sentences in English, starting with a capital "
+#| "letter and ending with a full stop. Usually, these will start with the "
+#| "form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
msgid ""
-"_* After sanitizing, commit the changes. Write commit messages that consist "
-"of full, useful sentences in English, starting with a capital letter and "
-"ending with a full stop. Usually, these will start with the form 'Fixing/"
-"Adding/Removing/Correcting/Translating', e.g."
+"_* After sanitizing and adding the files, commit the changes. Write commit "
+"messages that consist of full, useful sentences in English, starting with a "
+"capital letter and ending with a full stop. Usually, these will start with "
+"the form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
msgstr ""
"_* Depois de higiênizar submeta as mudançãs. Escreva mensagens de submissão, "
"que consistem em sentanças completas úteis, começando por letra maiuscula e "
@@ -639,34 +688,34 @@ msgstr ""
"Adding/Removing/Correcting/Translating'."
#. type: Plain text
-#: en/about_manual.ssi:167
+#: en/about_manual.ssi:191
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:171
+#: en/about_manual.ssi:195
msgid "_* Push the commit to the server:"
msgstr "_* Enviar as submissões para os servidor."
#. type: Plain text
-#: en/about_manual.ssi:175
+#: en/about_manual.ssi:199
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:179
+#: en/about_manual.ssi:203
msgid "3~ Translation"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:181
+#: en/about_manual.ssi:205
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:183
+#: en/about_manual.ssi:207
msgid ""
"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
"in.pot files to your language with your favourite editor (such as poedit). "
@@ -676,15 +725,23 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:185
+#: en/about_manual.ssi:209
msgid ""
"_* Once the new language is added, you can randomly start translating all po "
"files in #{manual/po/}#."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:186
+#: en/about_manual.ssi:211
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
-"are updated from the po files, before #{git commit -a}# and #{git push}#."
+"are updated from the po files and then you can review your changes launching "
+"#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
+"and #{git push}#."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi: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 ""
diff --git a/manual/po/pt_BR/index.html.in.po b/manual/po/pt_BR/index.html.in.po
index 9155185..c810913 100644
--- a/manual/po/pt_BR/index.html.in.po
+++ b/manual/po/pt_BR/index.html.in.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-12-03 18:55+0100\n"
-"PO-Revision-Date: 2011-11-25 22:27+0100\n"
+"POT-Creation-Date: 2012-01-07 16:03+0100\n"
+"PO-Revision-Date: 2011-12-26 19:10+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: \n"
@@ -40,12 +40,12 @@ msgstr ""
msgid ""
"Please report errors, omissions, patches and suggestions to our mailinglist "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/about-manual.en.html#how-to-contribute"
+"org</a> and read about <a href=\"html/live-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
msgstr ""
"Por favor reporte erros, omissões, patches e sugestões para nossa lista de "
"discussão em <a href=\"mailto:debian-live at lists.debian.org\">debian-"
-"live at lists.debian.org</a> e leia sobre <a href=\"html/about-manual.pt_BR."
+"live at lists.debian.org</a> e leia sobre <a href=\"html/live-manual.pt_BR."
"html#how-to-contribute\">como contribuir</a> com o manual."
#. type: Content of: <html><body><h3>
@@ -61,29 +61,29 @@ msgstr "<a href=\"epub/live-manual.pt_BR.epub\">EPUB</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:24
msgid ""
-"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
-"manual.en.html\">single page</a>"
+"HTML: <a href=\"html/live-manual/toc.en.html\">multi page</a>, <a href="
+"\"html/live-manual.en.html\">single page</a>"
msgstr ""
-"HTML: <a href=\"html/index.pt_BR.html\">Páginas multiplas</a>, <a href="
-"\"html/live-manual.pt_BR.html\">Página única</a>"
+"HTML: <a href=\"html/live-manual/toc.pt_BR.html\">Páginas multiplas</a>, <a "
+"href=\"html/live-manual.pt_BR.html\">Página única</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:25
-msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
-msgstr "<a href=\"odf/live-manual.pt_BR.odt\">ODF</a>"
+msgid "<a href=\"odt/live-manual.en.odt\">ODF</a>"
+msgstr "<a href=\"odt/live-manual.pt_BR.odt\">ODF</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:26
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
-"manual.landscape-letter.en.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/portrait.en.a4.pdf\">A4 portrait</a>, <a href=\"pdf/"
+"landscape.en.a4.pdf\">A4 landscape</a>, <a href=\"pdf/portrait.en.letter.pdf"
+"\">letter portrait</a>, <a href=\"pdf/landscape.en.letter.pdf\">letter "
+"landscape</a>"
msgstr ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.pt_BR.pdf\">A4 retrato</a>, <a "
-"href=\"pdf/live-manual.landscape-a4.pt_BR.pdf\">A4 paisagem</a>, <a href="
-"\"pdf/live-manual.portrait-letter.pt_BR.pdf\">US retrato</a>, <a href=\"pdf/"
-"live-manual.landscape-letter.pt_BR.pdf\">US paisagem</a>"
+"PDF: <a href=\"pdf/portrait.pt_BR.a4.pdf\">A4 retrato</a>, <a href=\"pdf/"
+"landscape.pt_BR.a4.pdf\">A4 paisagem</a>, <a href=\"pdf/portrait.pt_BR."
+"letter.pdf\">US retrato</a>, <a href=\"pdf/landscape.pt_BR.letter.pdf\">US "
+"paisagem</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:27
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index 911de33..e29e0b9 100644
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-12-04 10:22+0100\n"
+"POT-Creation-Date: 2012-02-06 18:57+0100\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -36,7 +36,7 @@ msgstr ""
#, no-wrap
msgid ""
"@rights:\n"
-" :copyright: Copyright (C) 2006-2011 Debian Live Project\n"
+" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
" :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.\n"
msgstr ""
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-12-04\n"
+" :published: 2012-02-06\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_basics.ssi.po b/manual/po/pt_BR/user_basics.ssi.po
index 3ed9064..e8d7712 100644
--- a/manual/po/pt_BR/user_basics.ssi.po
+++ b/manual/po/pt_BR/user_basics.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-01-12 08:28-0400\n"
"PO-Revision-Date: 2010-10-20 06:53-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -20,7 +20,7 @@ msgstr ""
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -42,33 +42,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,7 +77,7 @@ 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:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -85,7 +85,7 @@ msgstr "code{"
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -107,33 +107,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 +141,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:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -163,7 +163,7 @@ msgid ""
"for using the three most commonly used image types. The most versatile image "
"type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB "
"portable storage device. In certain special cases, such as the use of "
-"persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter "
+"persistence, #{hdd}# may be more suitable for USB devices. The chapter "
"finishes with instructions for building and using a #{net}# type image, "
"which is a bit more involved due to the setup required on the server. This "
"is a slightly advanced topic for anyone who is not familiar already with "
@@ -552,20 +552,20 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:146
-msgid "2~building-usb-hdd Building a USB/HDD image"
+msgid "2~building-hdd Building an HDD image"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:148
msgid ""
-"Building a USB/HDD image is similar to ISO hybrid in all respects except you "
-"specify #{-b usb-hdd}# and the resulting filename is #{binary.img}# which "
-"cannot be burnt to optical media. It is suitable for booting from USB "
-"sticks, USB hard drives, and various other portable storage devices. "
-"Normally, an ISO hybrid image can be used for this purpose instead, but if "
-"you have a BIOS which does not handle hybrid images properly, or want to use "
-"the remaining space on the media for some purpose, such as a persistence "
-"partition, you need a USB/HDD image."
+"Building an HDD image is similar to ISO hybrid in all respects except you "
+"specify #{-b hdd}# and the resulting filename is #{binary.img}# which cannot "
+"be burnt to optical media. It is suitable for booting from USB sticks, USB "
+"hard drives, and various other portable storage devices. Normally, an ISO "
+"hybrid image can be used for this purpose instead, but if you have a BIOS "
+"which does not handle hybrid images properly, or want to use the remaining "
+"space on the media for some purpose, such as a persistence partition, you "
+"need an HDD image."
msgstr ""
#. type: Plain text
@@ -585,14 +585,14 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:158
msgid ""
-"Run the #{lb config}# command as before, except this time specifying the USB/"
-"HDD image type:"
+"Run the #{lb config}# command as before, except this time specifying the HDD "
+"image type:"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:162
#, no-wrap
-msgid " $ lb config -b usb-hdd\n"
+msgid " $ lb config -b hdd\n"
msgstr ""
#. type: Plain text
@@ -609,22 +609,22 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:176
-msgid "2~using-usb-hdd-image Using a USB/HDD image"
+msgid "2~using-hdd-image Using an HDD image"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:178
msgid ""
"The generated binary image contains a VFAT partition and the syslinux "
-"bootloader, ready to be directly written on a USB stick. Since using a USB/"
-"HDD image is just like using an ISO hybrid image on USB, follow the "
-"instructions in {Using an ISO hybrid live image}#using-iso-hybrid, except "
-"use the filename #{binary.img}# instead of #{binary-hybrid.iso}#."
+"bootloader, ready to be directly written on a USB stick. Since using an HDD "
+"image is just like using an ISO hybrid image on USB, follow the instructions "
+"in {Using an ISO hybrid live image}#using-iso-hybrid, except use the "
+"filename #{binary.img}# instead of #{binary-hybrid.iso}#."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:180
-msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
+msgid "3~testing-hdd-with-qemu Testing an HDD image with Qemu"
msgstr ""
#. type: Plain text
@@ -727,12 +727,12 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:232
msgid ""
-"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
-"serve the filesystem image to the client, so the files must be served via "
-"NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the "
-"location and server, respectively, of the NFS server where the filesytem "
-"image will be located at boot time. Make sure these are set to suitable "
-"values for your network and server."
+"In contrast with the ISO and HDD images, netbooting does not, itself, serve "
+"the filesystem image to the client, so the files must be served via NFS. The "
+"#{--net-root-path}# and #{--net-root-server}# options specify the location "
+"and server, respectively, of the NFS server where the filesytem image will "
+"be located at boot time. Make sure these are set to suitable values for your "
+"network and server."
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-binary.ssi.po b/manual/po/pt_BR/user_customization-binary.ssi.po
index eb4003f..7967ad3 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: 2011-01-20 16:58-0400\n"
+"POT-Creation-Date: 2012-01-15 20:48+0100\n"
"PO-Revision-Date: 2010-11-30 11:20+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,6 +17,138 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/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
+#: 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: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_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
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/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
+#: 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: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_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
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
#: en/user_customization-binary.ssi:2
msgid "B~ Customizing the binary image"
msgstr ""
@@ -34,28 +166,84 @@ msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:8
msgid ""
-"live-build uses syslinux as bootloader by default, which is by default "
-"configured to pause indefinitely at its splash screen. To adjust this, you "
-"can pass #{--syslinux-timeout TIMEOUT}# to #{lb config}#. The value is "
-"specified in units of seconds. A timeout of 0 (zero) disables the timeout "
-"completely. For more information please see syslinux(1)."
+"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."
msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:10
-msgid "2~ ISO metadata"
+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."
msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:12
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
+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
+#, no-wrap
+msgid ""
+" include menu.cfg\n"
+" default vesamenu.c32\n"
+" prompt 0\n"
+" timeout 5\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:25
+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 "
+"in the binary stage. A proposed example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#, no-wrap
+msgid " #!/bin/sh\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:31
+#, 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 ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:37
+msgid "2~ ISO metadata"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:39
+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 "
"identify the version or configuration of an image without booting it."
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:41
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 "
@@ -63,7 +251,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:43
msgid ""
"_* #{LB_ISO_PREPARER/--iso-preparer NAME}#: This should describe the "
"preparer of the image, usually with some contact details. The default for "
@@ -72,7 +260,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:45
msgid ""
"_* #{LB_ISO_PUBLISHER/--iso-publisher NAME}#: This should describe the "
"publisher of the image, usually with some contact details. The maximum "
@@ -80,7 +268,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:19
+#: en/user_customization-binary.ssi:46
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-contents.ssi.po b/manual/po/pt_BR/user_customization-contents.ssi.po
index 442cb93..a713a60 100644
--- a/manual/po/pt_BR/user_customization-contents.ssi.po
+++ b/manual/po/pt_BR/user_customization-contents.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-01-15 16:28+0100\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -20,7 +20,7 @@ msgstr ""
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -34,6 +34,7 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -85,7 +86,7 @@ msgstr "code{"
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -99,6 +100,7 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -169,7 +171,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:8
-msgid "2~ Includes"
+msgid "2~includes Includes"
msgstr ""
#. type: Plain text
@@ -329,7 +331,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:74
-msgid "2~ Hooks"
+msgid "2~hooks Hooks"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index e02e603..78fff44 100644
--- a/manual/po/pt_BR/user_customization-packages.ssi.po
+++ b/manual/po/pt_BR/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 21:01-0400\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -20,7 +20,7 @@ msgstr ""
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -34,6 +34,7 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -85,7 +86,7 @@ msgstr "code{"
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -99,6 +100,7 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -248,15 +250,15 @@ msgstr ""
msgid ""
"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 #{--parent-mirror-*}# options governs which "
+"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 #{--parent-mirror-binary}"
-"# and #{--parent-mirror-binary-security}# values are used, superceding any "
-"mirrors used in an earlier stage."
+"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
@@ -269,24 +271,24 @@ msgstr ""
#: en/user_customization-packages.ssi:38
msgid ""
"To set the distribution mirrors used at build time to point at a local "
-"mirror, it is sufficient to set #{--parent-mirror-bootstrap}#, #{--parent-"
-"mirror-chroot-security}# and #{--parent-mirror-chroot-backports}# as follows."
+"mirror, it is sufficient to set #{--mirror-bootstrap}#, #{--mirror-chroot-"
+"security}# and #{--mirror-chroot-backports}# as follows."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:44
#, no-wrap
msgid ""
-" $ lb config --parent-mirror-bootstrap http://localhost/debian/ \\\n"
-" --parent-mirror-chroot-security http://localhost/debian-security/ \\\n"
-"\t --parent-mirror-chroot-backports http://localhost/debian-backports/\n"
+" $ 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"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:48
msgid ""
-"The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the #"
-"{--parent-mirror-bootstrap}# value."
+"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+"mirror-bootstrap}# value."
msgstr ""
#. type: Plain text
@@ -297,22 +299,22 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:52
msgid ""
-"The #{--parent-mirror-binary*}# options govern the distribution mirrors "
-"placed in the binary image. These may be used to install additional packages "
-"while running the live system. The defaults employ #{cdn.debian.net}#, a "
-"service that chooses a geographically close mirror based on the user's IP "
-"number. This is a suitable choice when you cannot predict which mirror will "
-"be best for all of your users. Or you may specify your own values as shown "
-"in the example below. An image built from this configuration would only be "
-"suitable for users on a network where \"#{mirror}#\" is reachable."
+"The #{--mirror-binary*}# options govern the distribution mirrors placed in "
+"the binary image. These may be used to install additional packages while "
+"running the live system. The defaults employ #{cdn.debian.net}#, a service "
+"that chooses a geographically close mirror based on the user's IP number. "
+"This is a suitable choice when you cannot predict which mirror will be best "
+"for all of your users. Or you may specify your own values as shown in the "
+"example below. An image built from this configuration would only be suitable "
+"for users on a network where \"#{mirror}#\" is reachable."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:57
#, no-wrap
msgid ""
-" $ lb config --parent-mirror-binary http://mirror/debian/ \\\n"
-" --parent-mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --mirror-binary http://mirror/debian/ \\\n"
+" --mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
#. type: Plain text
@@ -328,9 +330,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 #{--"
-"parent-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
@@ -363,7 +365,7 @@ msgstr ""
#: en/user_customization-packages.ssi:77
msgid ""
"You should also put the GPG key used to sign the repository into #{config/"
-"archives/your-repository.gpg.{binary,chroot}}# files."
+"archives/your-repository.key.{binary,chroot}}# files."
msgstr ""
#. type: Plain text
@@ -1025,7 +1027,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
-" $ cat >> config/chroot_apt/preferences <<END\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"
diff --git a/manual/po/pt_BR/user_examples.ssi.po b/manual/po/pt_BR/user_examples.ssi.po
index bce7893..fc4ec25 100644
--- a/manual/po/pt_BR/user_examples.ssi.po
+++ b/manual/po/pt_BR/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-13 17:12+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -25,7 +25,7 @@ msgstr ""
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -39,6 +39,7 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -90,7 +91,7 @@ msgstr "code{"
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -104,6 +105,7 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -159,6 +161,12 @@ msgid " # lb build\n"
msgstr ""
#. type: Plain text
+#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#, no-wrap
+msgid " #!/bin/sh\n"
+msgstr ""
+
+#. type: Plain text
#: en/user_examples.ssi:4
msgid "1~examples Examples"
msgstr ""
@@ -194,18 +202,18 @@ msgid ""
"config}#, as described in {Distribution mirrors used at build time}"
"#distribution-mirrors-build-time, or for more convenience, set the default "
"for your build system in #{/etc/live/build.conf}#. Simply create this file "
-"and in it, set the corresponding #{LB_PARENT_MIRROR_*}# variables to your "
-"preferred mirror. All other mirrors used in the build will be defaulted from "
-"these values. For example:"
+"and in it, set the corresponding #{LB_MIRROR_*}# variables to your preferred "
+"mirror. All other mirrors used in the build will be defaulted from these "
+"values. For example:"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:18
#, no-wrap
msgid ""
-" LB_PARENT_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
-" LB_PARENT_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
-" LB_PARENT_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
+" 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"
msgstr ""
#. type: Plain text
@@ -364,12 +372,6 @@ msgid "Edit #{auto/config}# to read as follows:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:95
-#, no-wrap
-msgid " #!/bin/sh\n"
-msgstr ""
-
-#. type: Plain text
#: en/user_examples.ssi:101
#, no-wrap
msgid ""
@@ -556,7 +558,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
-" $ cat > config/includes.chroot/etc/skel/.xsession <<END\n"
+" $ cat > config/includes.chroot/etc/skel/.xsession << END\n"
" #!/bin/sh\n"
msgstr ""
diff --git a/manual/po/ro/about_manual.ssi.po b/manual/po/ro/about_manual.ssi.po
index 892dd55..26b3a1c 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: 2011-03-11 17:03+0100\n"
+"POT-Creation-Date: 2012-02-05 17:13+0100\n"
"PO-Revision-Date: 2010-10-23 10:34-0200\n"
"Last-Translator: Eugen Paiuc <linux51 at bluewin.ch>\n"
"Language-Team: none\n"
@@ -63,19 +63,21 @@ msgid ""
"While we believe that everything in this manual is important to at least "
"some of our users, we realize it is a lot of material to cover and that you "
"may wish to experience early success using the software before delving into "
-"the details. Therefore, we have provided three tutorials in the {Examples}"
-"#examples section designed to teach you image building and customization "
-"basics. Read {Using the examples}#using-the-examples first, followed by "
-"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
-"utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
-"#tutorial-3. By the end of these tutorials, you will have a taste of what "
-"can be done with Debian Live. We encourage you to return to more in-depth "
-"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
-"or skipping {Building a netboot image}#building-netboot-image, and finishing "
-"by reading the {Customization overview}#customization-overview and the "
-"chapters that follow it. By this point, we hope you are thoroughly excited "
-"by what can be done with Debian Live and motivated to read the rest of the "
-"manual, cover-to-cover."
+"the details. Therefore, we suggest reading in the following order. First, "
+"read this chapter, {About this manual}#about-manual, from the beginning and "
+"ending with the {Terms}#terms section. Next, skip to the three tutorials at "
+"the front of the {Examples}#examples section designed to teach you image "
+"building and customization basics. Read {Using the examples}#using-the-"
+"examples first, followed by {Tutorial 1: A standard image}#tutorial-1, "
+"{Tutorial 2: A web browser utility}#tutorial-2 and finally {Tutorial 3: A "
+"personalized image}#tutorial-3. By the end of these tutorials, you will have "
+"a taste of what can be done with Debian Live. We encourage you to return to "
+"more in-depth study of the manual, perhaps next reading {The basics}#the-"
+"basics, skimming or skipping {Building a netboot image}#building-netboot-"
+"image, and finishing by reading the {Customization overview}#customization-"
+"overview and the chapters that follow it. By this point, we hope you are "
+"thoroughly excited by what can be done with Debian Live and motivated to "
+"read the rest of the manual, cover-to-cover."
msgstr ""
#. type: Plain text
@@ -358,56 +360,59 @@ 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: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-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: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_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_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: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
@@ -416,7 +421,7 @@ 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:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -427,56 +432,59 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi: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: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-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: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_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_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: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
@@ -484,8 +492,8 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: 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:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -537,11 +545,35 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:114
-msgid "3~ Applying patches"
+msgid "It is also possible to build by document type, e.g:"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:118
+#, no-wrap
+msgid " $ make build FORMATS=pdf\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:122
+msgid "Or combine both, e.g:"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:126
+#, no-wrap
+msgid " $ make build FORMATS=html LANGUAGES=it\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:130
+#, fuzzy
+#| msgid "3~ Applying patches"
+msgid "3~ Applying changes"
msgstr "3~ Aplicarea de patch-uri"
#. type: Plain text
-#: en/about_manual.ssi:116
+#: en/about_manual.ssi:132
msgid ""
"Anyone can directly commit to the repository. However, we ask you to send "
"bigger changes to the mailing list to discuss them first. To push to the "
@@ -552,12 +584,12 @@ msgstr ""
"contibutiile la repository, pasii urmatori sunt necesari:"
#. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:134
msgid "_* Fetch the public commit key:"
msgstr "_* Fetch the public commit key:"
#. type: Plain text
-#: en/about_manual.ssi:127
+#: en/about_manual.ssi:143
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
@@ -569,12 +601,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:131
+#: en/about_manual.ssi:147
msgid "_* Add the following section to your openssh-client config:"
msgstr "_* Adaugati urmatoarea sectiuna la openssh-client config:"
#. type: Plain text
-#: en/about_manual.ssi:140
+#: en/about_manual.ssi:156
#, no-wrap
msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
@@ -586,12 +618,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:144
+#: en/about_manual.ssi:160
msgid "_* Check out a clone of the manual through ssh:"
msgstr "_* Checkout un clon al manualului prin ssh:"
#. type: Plain text
-#: en/about_manual.ssi:149
+#: en/about_manual.ssi:165
#, no-wrap
msgid ""
" $ git clone git at live.debian.net:/live-manual.git\n"
@@ -601,14 +633,14 @@ msgstr ""
" $ cd live-manual && git checkout debian-next\n"
#. type: Plain text
-#: en/about_manual.ssi:153
+#: en/about_manual.ssi:169
msgid ""
"_* Note that you should commit any changes on the debian-next branch, not on "
"the debian branch."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:155
+#: en/about_manual.ssi:171
msgid ""
"_* After editing the files in #{manual/en/}#, please call the 'commit' "
"target in the top level directory to sanitize the files and update the "
@@ -616,18 +648,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:159
+#: en/about_manual.ssi:175
#, no-wrap
msgid " $ make commit\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:163
+#: en/about_manual.ssi:179
+msgid "_* Then"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:183
+#, no-wrap
+msgid " $ git add .\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:187
+#, fuzzy
+#| msgid ""
+#| "_* After sanitizing, commit the changes. Write commit messages that "
+#| "consist of full, useful sentences in English, starting with a capital "
+#| "letter and ending with a full stop. Usually, these will start with the "
+#| "form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
msgid ""
-"_* After sanitizing, commit the changes. Write commit messages that consist "
-"of full, useful sentences in English, starting with a capital letter and "
-"ending with a full stop. Usually, these will start with the form 'Fixing/"
-"Adding/Removing/Correcting/Translating', e.g."
+"_* After sanitizing and adding the files, commit the changes. Write commit "
+"messages that consist of full, useful sentences in English, starting with a "
+"capital letter and ending with a full stop. Usually, these will start with "
+"the form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
msgstr ""
"_* Dupa 'sanitizare' 'commit' schimbarile. Scrieti mesajele de commit, care "
"constau in propozitii clare, care incep cu litere Mari, si se incheie cu "
@@ -635,34 +684,34 @@ msgstr ""
"Correcting/Translating':"
#. type: Plain text
-#: en/about_manual.ssi:167
+#: en/about_manual.ssi:191
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:171
+#: en/about_manual.ssi:195
msgid "_* Push the commit to the server:"
msgstr "_* Primite commit-ul la server:"
#. type: Plain text
-#: en/about_manual.ssi:175
+#: en/about_manual.ssi:199
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:179
+#: en/about_manual.ssi:203
msgid "3~ Translation"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:181
+#: en/about_manual.ssi:205
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:183
+#: en/about_manual.ssi:207
msgid ""
"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
"in.pot files to your language with your favourite editor (such as poedit). "
@@ -672,15 +721,23 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:185
+#: en/about_manual.ssi:209
msgid ""
"_* Once the new language is added, you can randomly start translating all po "
"files in #{manual/po/}#."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:186
+#: en/about_manual.ssi:211
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
-"are updated from the po files, before #{git commit -a}# and #{git push}#."
+"are updated from the po files and then you can review your changes launching "
+"#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
+"and #{git push}#."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi: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 ""
diff --git a/manual/po/ro/index.html.in.po b/manual/po/ro/index.html.in.po
index e93290f..c965e08 100644
--- a/manual/po/ro/index.html.in.po
+++ b/manual/po/ro/index.html.in.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-12-03 18:55+0100\n"
-"PO-Revision-Date: 2011-12-03 15:52+0100\n"
+"POT-Creation-Date: 2012-01-07 16:03+0100\n"
+"PO-Revision-Date: 2011-12-26 19:10+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: ro\n"
@@ -40,12 +40,12 @@ msgstr ""
msgid ""
"Please report errors, omissions, patches and suggestions to our mailinglist "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/about-manual.en.html#how-to-contribute"
+"org</a> and read about <a href=\"html/live-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
msgstr ""
"Please report errors, omissions, patches and suggestions to our mailinglist "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/about-manual.ro.html#how-to-contribute"
+"org</a> and read about <a href=\"html/live-manual.ro.html#how-to-contribute"
"\">how to contribute</a> to the manual."
#. type: Content of: <html><body><h3>
@@ -61,29 +61,29 @@ msgstr "<a href=\"epub/live-manual.ro.epub\">EPUB</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:24
msgid ""
-"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
-"manual.en.html\">single page</a>"
+"HTML: <a href=\"html/live-manual/toc.en.html\">multi page</a>, <a href="
+"\"html/live-manual.en.html\">single page</a>"
msgstr ""
-"HTML: <a href=\"html/index.ro.html\">multi page</a>, <a href=\"html/live-"
-"manual.ro.html\">single page</a>"
+"HTML: <a href=\"html/live-manual/toc.ro.html\">multi page</a>, <a href="
+"\"html/live-manual.ro.html\">single page</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:25
-msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
-msgstr "<a href=\"odf/live-manual.ro.odt\">ODF</a>"
+msgid "<a href=\"odt/live-manual.en.odt\">ODF</a>"
+msgstr "<a href=\"odt/live-manual.ro.odt\">ODF</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:26
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
-"manual.landscape-letter.en.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/portrait.en.a4.pdf\">A4 portrait</a>, <a href=\"pdf/"
+"landscape.en.a4.pdf\">A4 landscape</a>, <a href=\"pdf/portrait.en.letter.pdf"
+"\">letter portrait</a>, <a href=\"pdf/landscape.en.letter.pdf\">letter "
+"landscape</a>"
msgstr ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.ro.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.ro.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.ro.pdf\">letter portrait</a>, <a href=\"pdf/live-"
-"manual.landscape-letter.ro.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/portrait.ro.a4.pdf\">A4 portrait</a>, <a href=\"pdf/"
+"landscape.ro.a4.pdf\">A4 landscape</a>, <a href=\"pdf/portrait.ro.letter.pdf"
+"\">letter portrait</a>, <a href=\"pdf/landscape.ro.letter.pdf\">letter "
+"landscape</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:27
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index bc042a4..011c22d 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-12-04 10:22+0100\n"
+"POT-Creation-Date: 2012-02-06 18:57+0100\n"
"PO-Revision-Date: 2010-10-23 00:04+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,7 +37,7 @@ msgstr ""
#, no-wrap
msgid ""
"@rights:\n"
-" :copyright: Copyright (C) 2006-2011 Debian Live Project\n"
+" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
" :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.\n"
msgstr ""
@@ -46,7 +46,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-12-04\n"
+" :published: 2012-02-06\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_basics.ssi.po b/manual/po/ro/user_basics.ssi.po
index 94812d3..dd059e7 100644
--- a/manual/po/ro/user_basics.ssi.po
+++ b/manual/po/ro/user_basics.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-01-12 08:28-0400\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -21,7 +21,7 @@ msgstr ""
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -43,33 +43,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,7 +78,7 @@ 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:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -86,7 +86,7 @@ msgstr "code{"
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -108,33 +108,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 +142,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:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -164,7 +164,7 @@ msgid ""
"for using the three most commonly used image types. The most versatile image "
"type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB "
"portable storage device. In certain special cases, such as the use of "
-"persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter "
+"persistence, #{hdd}# may be more suitable for USB devices. The chapter "
"finishes with instructions for building and using a #{net}# type image, "
"which is a bit more involved due to the setup required on the server. This "
"is a slightly advanced topic for anyone who is not familiar already with "
@@ -553,20 +553,20 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:146
-msgid "2~building-usb-hdd Building a USB/HDD image"
+msgid "2~building-hdd Building an HDD image"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:148
msgid ""
-"Building a USB/HDD image is similar to ISO hybrid in all respects except you "
-"specify #{-b usb-hdd}# and the resulting filename is #{binary.img}# which "
-"cannot be burnt to optical media. It is suitable for booting from USB "
-"sticks, USB hard drives, and various other portable storage devices. "
-"Normally, an ISO hybrid image can be used for this purpose instead, but if "
-"you have a BIOS which does not handle hybrid images properly, or want to use "
-"the remaining space on the media for some purpose, such as a persistence "
-"partition, you need a USB/HDD image."
+"Building an HDD image is similar to ISO hybrid in all respects except you "
+"specify #{-b hdd}# and the resulting filename is #{binary.img}# which cannot "
+"be burnt to optical media. It is suitable for booting from USB sticks, USB "
+"hard drives, and various other portable storage devices. Normally, an ISO "
+"hybrid image can be used for this purpose instead, but if you have a BIOS "
+"which does not handle hybrid images properly, or want to use the remaining "
+"space on the media for some purpose, such as a persistence partition, you "
+"need an HDD image."
msgstr ""
#. type: Plain text
@@ -586,14 +586,14 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:158
msgid ""
-"Run the #{lb config}# command as before, except this time specifying the USB/"
-"HDD image type:"
+"Run the #{lb config}# command as before, except this time specifying the HDD "
+"image type:"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:162
#, no-wrap
-msgid " $ lb config -b usb-hdd\n"
+msgid " $ lb config -b hdd\n"
msgstr ""
#. type: Plain text
@@ -610,22 +610,22 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:176
-msgid "2~using-usb-hdd-image Using a USB/HDD image"
+msgid "2~using-hdd-image Using an HDD image"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:178
msgid ""
"The generated binary image contains a VFAT partition and the syslinux "
-"bootloader, ready to be directly written on a USB stick. Since using a USB/"
-"HDD image is just like using an ISO hybrid image on USB, follow the "
-"instructions in {Using an ISO hybrid live image}#using-iso-hybrid, except "
-"use the filename #{binary.img}# instead of #{binary-hybrid.iso}#."
+"bootloader, ready to be directly written on a USB stick. Since using an HDD "
+"image is just like using an ISO hybrid image on USB, follow the instructions "
+"in {Using an ISO hybrid live image}#using-iso-hybrid, except use the "
+"filename #{binary.img}# instead of #{binary-hybrid.iso}#."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:180
-msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
+msgid "3~testing-hdd-with-qemu Testing an HDD image with Qemu"
msgstr ""
#. type: Plain text
@@ -728,12 +728,12 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:232
msgid ""
-"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
-"serve the filesystem image to the client, so the files must be served via "
-"NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the "
-"location and server, respectively, of the NFS server where the filesytem "
-"image will be located at boot time. Make sure these are set to suitable "
-"values for your network and server."
+"In contrast with the ISO and HDD images, netbooting does not, itself, serve "
+"the filesystem image to the client, so the files must be served via NFS. The "
+"#{--net-root-path}# and #{--net-root-server}# options specify the location "
+"and server, respectively, of the NFS server where the filesytem image will "
+"be located at boot time. Make sure these are set to suitable values for your "
+"network and server."
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_customization-binary.ssi.po b/manual/po/ro/user_customization-binary.ssi.po
index 2fd18c2..5719ce1 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: 2011-01-20 16:58-0400\n"
+"POT-Creation-Date: 2012-01-15 20:48+0100\n"
"PO-Revision-Date: 2010-11-30 11:20+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,6 +18,138 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/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
+#: 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: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_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
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/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
+#: 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: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_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
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
#: en/user_customization-binary.ssi:2
msgid "B~ Customizing the binary image"
msgstr ""
@@ -35,28 +167,84 @@ msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:8
msgid ""
-"live-build uses syslinux as bootloader by default, which is by default "
-"configured to pause indefinitely at its splash screen. To adjust this, you "
-"can pass #{--syslinux-timeout TIMEOUT}# to #{lb config}#. The value is "
-"specified in units of seconds. A timeout of 0 (zero) disables the timeout "
-"completely. For more information please see syslinux(1)."
+"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."
msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:10
-msgid "2~ ISO metadata"
+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."
msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:12
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
+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
+#, no-wrap
+msgid ""
+" include menu.cfg\n"
+" default vesamenu.c32\n"
+" prompt 0\n"
+" timeout 5\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:25
+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 "
+"in the binary stage. A proposed example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#, no-wrap
+msgid " #!/bin/sh\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:31
+#, 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 ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:37
+msgid "2~ ISO metadata"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:39
+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 "
"identify the version or configuration of an image without booting it."
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:41
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 "
@@ -64,7 +252,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:43
msgid ""
"_* #{LB_ISO_PREPARER/--iso-preparer NAME}#: This should describe the "
"preparer of the image, usually with some contact details. The default for "
@@ -73,7 +261,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:45
msgid ""
"_* #{LB_ISO_PUBLISHER/--iso-publisher NAME}#: This should describe the "
"publisher of the image, usually with some contact details. The maximum "
@@ -81,7 +269,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:19
+#: en/user_customization-binary.ssi:46
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-contents.ssi.po b/manual/po/ro/user_customization-contents.ssi.po
index 6d3543b..30fe07b 100644
--- a/manual/po/ro/user_customization-contents.ssi.po
+++ b/manual/po/ro/user_customization-contents.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-01-15 16:28+0100\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -21,7 +21,7 @@ msgstr ""
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -35,6 +35,7 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -86,7 +87,7 @@ msgstr "code{"
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -100,6 +101,7 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -170,7 +172,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:8
-msgid "2~ Includes"
+msgid "2~includes Includes"
msgstr ""
#. type: Plain text
@@ -330,7 +332,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:74
-msgid "2~ Hooks"
+msgid "2~hooks Hooks"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index 7ab64d6..841b5b1 100644
--- a/manual/po/ro/user_customization-packages.ssi.po
+++ b/manual/po/ro/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 21:01-0400\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -21,7 +21,7 @@ msgstr ""
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -35,6 +35,7 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -86,7 +87,7 @@ msgstr "code{"
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -100,6 +101,7 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -249,15 +251,15 @@ msgstr ""
msgid ""
"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 #{--parent-mirror-*}# options governs which "
+"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 #{--parent-mirror-binary}"
-"# and #{--parent-mirror-binary-security}# values are used, superceding any "
-"mirrors used in an earlier stage."
+"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
@@ -270,24 +272,24 @@ msgstr ""
#: en/user_customization-packages.ssi:38
msgid ""
"To set the distribution mirrors used at build time to point at a local "
-"mirror, it is sufficient to set #{--parent-mirror-bootstrap}#, #{--parent-"
-"mirror-chroot-security}# and #{--parent-mirror-chroot-backports}# as follows."
+"mirror, it is sufficient to set #{--mirror-bootstrap}#, #{--mirror-chroot-"
+"security}# and #{--mirror-chroot-backports}# as follows."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:44
#, no-wrap
msgid ""
-" $ lb config --parent-mirror-bootstrap http://localhost/debian/ \\\n"
-" --parent-mirror-chroot-security http://localhost/debian-security/ \\\n"
-"\t --parent-mirror-chroot-backports http://localhost/debian-backports/\n"
+" $ 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"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:48
msgid ""
-"The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the #"
-"{--parent-mirror-bootstrap}# value."
+"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+"mirror-bootstrap}# value."
msgstr ""
#. type: Plain text
@@ -298,22 +300,22 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:52
msgid ""
-"The #{--parent-mirror-binary*}# options govern the distribution mirrors "
-"placed in the binary image. These may be used to install additional packages "
-"while running the live system. The defaults employ #{cdn.debian.net}#, a "
-"service that chooses a geographically close mirror based on the user's IP "
-"number. This is a suitable choice when you cannot predict which mirror will "
-"be best for all of your users. Or you may specify your own values as shown "
-"in the example below. An image built from this configuration would only be "
-"suitable for users on a network where \"#{mirror}#\" is reachable."
+"The #{--mirror-binary*}# options govern the distribution mirrors placed in "
+"the binary image. These may be used to install additional packages while "
+"running the live system. The defaults employ #{cdn.debian.net}#, a service "
+"that chooses a geographically close mirror based on the user's IP number. "
+"This is a suitable choice when you cannot predict which mirror will be best "
+"for all of your users. Or you may specify your own values as shown in the "
+"example below. An image built from this configuration would only be suitable "
+"for users on a network where \"#{mirror}#\" is reachable."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:57
#, no-wrap
msgid ""
-" $ lb config --parent-mirror-binary http://mirror/debian/ \\\n"
-" --parent-mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --mirror-binary http://mirror/debian/ \\\n"
+" --mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
#. type: Plain text
@@ -329,9 +331,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 #{--"
-"parent-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
@@ -364,7 +366,7 @@ msgstr ""
#: en/user_customization-packages.ssi:77
msgid ""
"You should also put the GPG key used to sign the repository into #{config/"
-"archives/your-repository.gpg.{binary,chroot}}# files."
+"archives/your-repository.key.{binary,chroot}}# files."
msgstr ""
#. type: Plain text
@@ -1026,7 +1028,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
-" $ cat >> config/chroot_apt/preferences <<END\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"
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index 3f33218..392faf8 100644
--- a/manual/po/ro/user_examples.ssi.po
+++ b/manual/po/ro/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-13 17:12+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -26,7 +26,7 @@ msgstr ""
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -40,6 +40,7 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -91,7 +92,7 @@ msgstr "code{"
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -105,6 +106,7 @@ msgstr "code{"
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -160,6 +162,12 @@ msgid " # lb build\n"
msgstr ""
#. type: Plain text
+#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#, no-wrap
+msgid " #!/bin/sh\n"
+msgstr ""
+
+#. type: Plain text
#: en/user_examples.ssi:4
msgid "1~examples Examples"
msgstr ""
@@ -195,18 +203,18 @@ msgid ""
"config}#, as described in {Distribution mirrors used at build time}"
"#distribution-mirrors-build-time, or for more convenience, set the default "
"for your build system in #{/etc/live/build.conf}#. Simply create this file "
-"and in it, set the corresponding #{LB_PARENT_MIRROR_*}# variables to your "
-"preferred mirror. All other mirrors used in the build will be defaulted from "
-"these values. For example:"
+"and in it, set the corresponding #{LB_MIRROR_*}# variables to your preferred "
+"mirror. All other mirrors used in the build will be defaulted from these "
+"values. For example:"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:18
#, no-wrap
msgid ""
-" LB_PARENT_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
-" LB_PARENT_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
-" LB_PARENT_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
+" 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"
msgstr ""
#. type: Plain text
@@ -365,12 +373,6 @@ msgid "Edit #{auto/config}# to read as follows:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:95
-#, no-wrap
-msgid " #!/bin/sh\n"
-msgstr ""
-
-#. type: Plain text
#: en/user_examples.ssi:101
#, no-wrap
msgid ""
@@ -557,7 +559,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
-" $ cat > config/includes.chroot/etc/skel/.xsession <<END\n"
+" $ cat > config/includes.chroot/etc/skel/.xsession << END\n"
" #!/bin/sh\n"
msgstr ""
diff --git a/manual/pot/about_manual.ssi.pot b/manual/pot/about_manual.ssi.pot
index 5c1d827..3168cab 100644
--- a/manual/pot/about_manual.ssi.pot
+++ b/manual/pot/about_manual.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2012-02-05 17:13+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"
@@ -61,19 +61,21 @@ msgid ""
"While we believe that everything in this manual is important to at least "
"some of our users, we realize it is a lot of material to cover and that you "
"may wish to experience early success using the software before delving into "
-"the details. Therefore, we have provided three tutorials in the {Examples}"
-"#examples section designed to teach you image building and customization "
-"basics. Read {Using the examples}#using-the-examples first, followed by "
-"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
-"utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
-"#tutorial-3. By the end of these tutorials, you will have a taste of what "
-"can be done with Debian Live. We encourage you to return to more in-depth "
-"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
-"or skipping {Building a netboot image}#building-netboot-image, and finishing "
-"by reading the {Customization overview}#customization-overview and the "
-"chapters that follow it. By this point, we hope you are thoroughly excited "
-"by what can be done with Debian Live and motivated to read the rest of the "
-"manual, cover-to-cover."
+"the details. Therefore, we suggest reading in the following order. First, "
+"read this chapter, {About this manual}#about-manual, from the beginning and "
+"ending with the {Terms}#terms section. Next, skip to the three tutorials at "
+"the front of the {Examples}#examples section designed to teach you image "
+"building and customization basics. Read {Using the examples}#using-the-"
+"examples first, followed by {Tutorial 1: A standard image}#tutorial-1, "
+"{Tutorial 2: A web browser utility}#tutorial-2 and finally {Tutorial 3: A "
+"personalized image}#tutorial-3. By the end of these tutorials, you will have "
+"a taste of what can be done with Debian Live. We encourage you to return to "
+"more in-depth study of the manual, perhaps next reading {The basics}#the-"
+"basics, skimming or skipping {Building a netboot image}#building-netboot-"
+"image, and finishing by reading the {Customization overview}#customization-"
+"overview and the chapters that follow it. By this point, we hope you are "
+"thoroughly excited by what can be done with Debian Live and motivated to "
+"read the rest of the manual, cover-to-cover."
msgstr ""
#. type: Plain text
@@ -307,9 +309,10 @@ 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
@@ -323,40 +326,42 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-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_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_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: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
@@ -365,7 +370,7 @@ 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:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -376,9 +381,10 @@ 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
@@ -392,40 +398,42 @@ msgstr ""
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-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_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_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: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
@@ -433,8 +441,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:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
@@ -481,11 +489,33 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:114
-msgid "3~ Applying patches"
+msgid "It is also possible to build by document type, e.g:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:116
+#: en/about_manual.ssi:118
+#, no-wrap
+msgid " $ make build FORMATS=pdf\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:122
+msgid "Or combine both, e.g:"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:126
+#, no-wrap
+msgid " $ make build FORMATS=html LANGUAGES=it\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:130
+msgid "3~ Applying changes"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:132
msgid ""
"Anyone can directly commit to the repository. However, we ask you to send "
"bigger changes to the mailing list to discuss them first. To push to the "
@@ -493,12 +523,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:134
msgid "_* Fetch the public commit key:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:127
+#: en/about_manual.ssi:143
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
@@ -510,12 +540,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:131
+#: en/about_manual.ssi:147
msgid "_* Add the following section to your openssh-client config:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:140
+#: en/about_manual.ssi:156
#, no-wrap
msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
@@ -527,12 +557,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:144
+#: en/about_manual.ssi:160
msgid "_* Check out a clone of the manual through ssh:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:149
+#: en/about_manual.ssi:165
#, no-wrap
msgid ""
" $ git clone git at live.debian.net:/live-manual.git\n"
@@ -540,14 +570,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:153
+#: en/about_manual.ssi:169
msgid ""
"_* Note that you should commit any changes on the debian-next branch, not on "
"the debian branch."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:155
+#: en/about_manual.ssi:171
msgid ""
"_* After editing the files in #{manual/en/}#, please call the 'commit' "
"target in the top level directory to sanitize the files and update the "
@@ -555,49 +585,60 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:159
+#: en/about_manual.ssi:175
#, no-wrap
msgid " $ make commit\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:163
+#: en/about_manual.ssi:179
+msgid "_* Then"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:183
+#, no-wrap
+msgid " $ git add .\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:187
msgid ""
-"_* After sanitizing, commit the changes. Write commit messages that consist "
-"of full, useful sentences in English, starting with a capital letter and "
-"ending with a full stop. Usually, these will start with the form 'Fixing/"
-"Adding/Removing/Correcting/Translating', e.g."
+"_* After sanitizing and adding the files, commit the changes. Write commit "
+"messages that consist of full, useful sentences in English, starting with a "
+"capital letter and ending with a full stop. Usually, these will start with "
+"the form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:167
+#: en/about_manual.ssi:191
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:171
+#: en/about_manual.ssi:195
msgid "_* Push the commit to the server:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:175
+#: en/about_manual.ssi:199
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:179
+#: en/about_manual.ssi:203
msgid "3~ Translation"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:181
+#: en/about_manual.ssi:205
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:183
+#: en/about_manual.ssi:207
msgid ""
"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
"in.pot files to your language with your favourite editor (such as poedit). "
@@ -607,15 +648,23 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:185
+#: en/about_manual.ssi:209
msgid ""
"_* Once the new language is added, you can randomly start translating all po "
"files in #{manual/po/}#."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:186
+#: en/about_manual.ssi:211
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
-"are updated from the po files, before #{git commit -a}# and #{git push}#."
+"are updated from the po files and then you can review your changes launching "
+"#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
+"and #{git push}#."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi: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 ""
diff --git a/manual/pot/index.html.in.pot b/manual/pot/index.html.in.pot
index 7ee9eb3..7909322 100644
--- a/manual/pot/index.html.in.pot
+++ b/manual/pot/index.html.in.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-12-03 18:55+0100\n"
+"POT-Creation-Date: 2012-01-07 16:03+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"
@@ -39,7 +39,7 @@ msgstr ""
msgid ""
"Please report errors, omissions, patches and suggestions to our mailinglist "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/about-manual.en.html#how-to-contribute"
+"org</a> and read about <a href=\"html/live-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
msgstr ""
@@ -56,22 +56,22 @@ msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:24
msgid ""
-"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
-"manual.en.html\">single page</a>"
+"HTML: <a href=\"html/live-manual/toc.en.html\">multi page</a>, <a href="
+"\"html/live-manual.en.html\">single page</a>"
msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:25
-msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
+msgid "<a href=\"odt/live-manual.en.odt\">ODF</a>"
msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:26
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
-"manual.landscape-letter.en.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/portrait.en.a4.pdf\">A4 portrait</a>, <a href=\"pdf/"
+"landscape.en.a4.pdf\">A4 landscape</a>, <a href=\"pdf/portrait.en.letter.pdf"
+"\">letter portrait</a>, <a href=\"pdf/landscape.en.letter.pdf\">letter "
+"landscape</a>"
msgstr ""
#. type: Content of: <html><body><ul><li>
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index e5de218..165f81a 100644
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-12-04 10:22+0100\n"
+"POT-Creation-Date: 2012-02-06 18:57+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -36,7 +36,7 @@ msgstr ""
#, no-wrap
msgid ""
"@rights:\n"
-" :copyright: Copyright (C) 2006-2011 Debian Live Project\n"
+" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
" :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.\n"
msgstr ""
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-12-04\n"
+" :published: 2012-02-06\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_basics.ssi.pot b/manual/pot/user_basics.ssi.pot
index dbed8ee..0cd1d12 100644
--- a/manual/pot/user_basics.ssi.pot
+++ b/manual/pot/user_basics.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-02 12:23-0200\n"
+"POT-Creation-Date: 2012-01-12 08:28-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"
@@ -20,7 +20,7 @@ msgstr ""
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -42,33 +42,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,7 +77,7 @@ 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:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -85,7 +85,7 @@ msgstr ""
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -107,33 +107,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 +141,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:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
@@ -163,7 +163,7 @@ msgid ""
"for using the three most commonly used image types. The most versatile image "
"type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB "
"portable storage device. In certain special cases, such as the use of "
-"persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter "
+"persistence, #{hdd}# may be more suitable for USB devices. The chapter "
"finishes with instructions for building and using a #{net}# type image, "
"which is a bit more involved due to the setup required on the server. This "
"is a slightly advanced topic for anyone who is not familiar already with "
@@ -552,20 +552,20 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:146
-msgid "2~building-usb-hdd Building a USB/HDD image"
+msgid "2~building-hdd Building an HDD image"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:148
msgid ""
-"Building a USB/HDD image is similar to ISO hybrid in all respects except you "
-"specify #{-b usb-hdd}# and the resulting filename is #{binary.img}# which "
-"cannot be burnt to optical media. It is suitable for booting from USB "
-"sticks, USB hard drives, and various other portable storage devices. "
-"Normally, an ISO hybrid image can be used for this purpose instead, but if "
-"you have a BIOS which does not handle hybrid images properly, or want to use "
-"the remaining space on the media for some purpose, such as a persistence "
-"partition, you need a USB/HDD image."
+"Building an HDD image is similar to ISO hybrid in all respects except you "
+"specify #{-b hdd}# and the resulting filename is #{binary.img}# which cannot "
+"be burnt to optical media. It is suitable for booting from USB sticks, USB "
+"hard drives, and various other portable storage devices. Normally, an ISO "
+"hybrid image can be used for this purpose instead, but if you have a BIOS "
+"which does not handle hybrid images properly, or want to use the remaining "
+"space on the media for some purpose, such as a persistence partition, you "
+"need an HDD image."
msgstr ""
#. type: Plain text
@@ -585,14 +585,14 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:158
msgid ""
-"Run the #{lb config}# command as before, except this time specifying the USB/"
-"HDD image type:"
+"Run the #{lb config}# command as before, except this time specifying the HDD "
+"image type:"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:162
#, no-wrap
-msgid " $ lb config -b usb-hdd\n"
+msgid " $ lb config -b hdd\n"
msgstr ""
#. type: Plain text
@@ -609,22 +609,22 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:176
-msgid "2~using-usb-hdd-image Using a USB/HDD image"
+msgid "2~using-hdd-image Using an HDD image"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:178
msgid ""
"The generated binary image contains a VFAT partition and the syslinux "
-"bootloader, ready to be directly written on a USB stick. Since using a USB/"
-"HDD image is just like using an ISO hybrid image on USB, follow the "
-"instructions in {Using an ISO hybrid live image}#using-iso-hybrid, except "
-"use the filename #{binary.img}# instead of #{binary-hybrid.iso}#."
+"bootloader, ready to be directly written on a USB stick. Since using an HDD "
+"image is just like using an ISO hybrid image on USB, follow the instructions "
+"in {Using an ISO hybrid live image}#using-iso-hybrid, except use the "
+"filename #{binary.img}# instead of #{binary-hybrid.iso}#."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:180
-msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
+msgid "3~testing-hdd-with-qemu Testing an HDD image with Qemu"
msgstr ""
#. type: Plain text
@@ -727,12 +727,12 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:232
msgid ""
-"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
-"serve the filesystem image to the client, so the files must be served via "
-"NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the "
-"location and server, respectively, of the NFS server where the filesytem "
-"image will be located at boot time. Make sure these are set to suitable "
-"values for your network and server."
+"In contrast with the ISO and HDD images, netbooting does not, itself, serve "
+"the filesystem image to the client, so the files must be served via NFS. The "
+"#{--net-root-path}# and #{--net-root-server}# options specify the location "
+"and server, respectively, of the NFS server where the filesytem image will "
+"be located at boot time. Make sure these are set to suitable values for your "
+"network and server."
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_customization-binary.ssi.pot b/manual/pot/user_customization-binary.ssi.pot
index abfd7a4..93b4659 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: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2012-01-15 20:48+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"
@@ -17,6 +17,138 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/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
+#: 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: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_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
+msgid "code{"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/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
+#: 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: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_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
+msgid "}code"
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-binary.ssi:2
msgid "B~ Customizing the binary image"
msgstr ""
@@ -34,28 +166,84 @@ msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:8
msgid ""
-"live-build uses syslinux as bootloader by default, which is by default "
-"configured to pause indefinitely at its splash screen. To adjust this, you "
-"can pass #{--syslinux-timeout TIMEOUT}# to #{lb config}#. The value is "
-"specified in units of seconds. A timeout of 0 (zero) disables the timeout "
-"completely. For more information please see syslinux(1)."
+"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."
msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:10
-msgid "2~ ISO metadata"
+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."
msgstr ""
#. type: Plain text
#: en/user_customization-binary.ssi:12
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
+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
+#, no-wrap
+msgid ""
+" include menu.cfg\n"
+" default vesamenu.c32\n"
+" prompt 0\n"
+" timeout 5\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:25
+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 "
+"in the binary stage. A proposed example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#, no-wrap
+msgid " #!/bin/sh\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:31
+#, 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 ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:37
+msgid "2~ ISO metadata"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:39
+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 "
"identify the version or configuration of an image without booting it."
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:41
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 "
@@ -63,7 +251,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:43
msgid ""
"_* #{LB_ISO_PREPARER/--iso-preparer NAME}#: This should describe the "
"preparer of the image, usually with some contact details. The default for "
@@ -72,7 +260,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:45
msgid ""
"_* #{LB_ISO_PUBLISHER/--iso-publisher NAME}#: This should describe the "
"publisher of the image, usually with some contact details. The maximum "
@@ -80,7 +268,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:19
+#: en/user_customization-binary.ssi:46
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-contents.ssi.pot b/manual/pot/user_customization-contents.ssi.pot
index d8950f0..2f4f5d2 100644
--- a/manual/pot/user_customization-contents.ssi.pot
+++ b/manual/pot/user_customization-contents.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-07 21:01-0400\n"
+"POT-Creation-Date: 2012-01-15 16:28+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"
@@ -20,7 +20,7 @@ msgstr ""
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -34,6 +34,7 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -85,7 +86,7 @@ msgstr ""
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -99,6 +100,7 @@ msgstr ""
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -169,7 +171,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:8
-msgid "2~ Includes"
+msgid "2~includes Includes"
msgstr ""
#. type: Plain text
@@ -329,7 +331,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:74
-msgid "2~ Hooks"
+msgid "2~hooks Hooks"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index eb25145..4c7f56a 100644
--- a/manual/pot/user_customization-packages.ssi.pot
+++ b/manual/pot/user_customization-packages.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-07 21:01-0400\n"
+"POT-Creation-Date: 2012-01-18 18:00-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"
@@ -20,7 +20,7 @@ msgstr ""
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -34,6 +34,7 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -85,7 +86,7 @@ msgstr ""
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -99,6 +100,7 @@ msgstr ""
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -248,15 +250,15 @@ msgstr ""
msgid ""
"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 #{--parent-mirror-*}# options governs which "
+"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 #{--parent-mirror-binary}"
-"# and #{--parent-mirror-binary-security}# values are used, superceding any "
-"mirrors used in an earlier stage."
+"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
@@ -269,24 +271,24 @@ msgstr ""
#: en/user_customization-packages.ssi:38
msgid ""
"To set the distribution mirrors used at build time to point at a local "
-"mirror, it is sufficient to set #{--parent-mirror-bootstrap}#, #{--parent-"
-"mirror-chroot-security}# and #{--parent-mirror-chroot-backports}# as follows."
+"mirror, it is sufficient to set #{--mirror-bootstrap}#, #{--mirror-chroot-"
+"security}# and #{--mirror-chroot-backports}# as follows."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:44
#, no-wrap
msgid ""
-" $ lb config --parent-mirror-bootstrap http://localhost/debian/ \\\n"
-" --parent-mirror-chroot-security http://localhost/debian-security/ \\\n"
-"\t --parent-mirror-chroot-backports http://localhost/debian-backports/\n"
+" $ 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"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:48
msgid ""
-"The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the #"
-"{--parent-mirror-bootstrap}# value."
+"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+"mirror-bootstrap}# value."
msgstr ""
#. type: Plain text
@@ -297,22 +299,22 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:52
msgid ""
-"The #{--parent-mirror-binary*}# options govern the distribution mirrors "
-"placed in the binary image. These may be used to install additional packages "
-"while running the live system. The defaults employ #{cdn.debian.net}#, a "
-"service that chooses a geographically close mirror based on the user's IP "
-"number. This is a suitable choice when you cannot predict which mirror will "
-"be best for all of your users. Or you may specify your own values as shown "
-"in the example below. An image built from this configuration would only be "
-"suitable for users on a network where \"#{mirror}#\" is reachable."
+"The #{--mirror-binary*}# options govern the distribution mirrors placed in "
+"the binary image. These may be used to install additional packages while "
+"running the live system. The defaults employ #{cdn.debian.net}#, a service "
+"that chooses a geographically close mirror based on the user's IP number. "
+"This is a suitable choice when you cannot predict which mirror will be best "
+"for all of your users. Or you may specify your own values as shown in the "
+"example below. An image built from this configuration would only be suitable "
+"for users on a network where \"#{mirror}#\" is reachable."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:57
#, no-wrap
msgid ""
-" $ lb config --parent-mirror-binary http://mirror/debian/ \\\n"
-" --parent-mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --mirror-binary http://mirror/debian/ \\\n"
+" --mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
#. type: Plain text
@@ -328,9 +330,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 #{--"
-"parent-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
@@ -363,7 +365,7 @@ msgstr ""
#: en/user_customization-packages.ssi:77
msgid ""
"You should also put the GPG key used to sign the repository into #{config/"
-"archives/your-repository.gpg.{binary,chroot}}# files."
+"archives/your-repository.key.{binary,chroot}}# files."
msgstr ""
#. type: Plain text
@@ -1025,7 +1027,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
-" $ cat >> config/chroot_apt/preferences <<END\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"
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index 06a4125..b14bce3 100644
--- a/manual/pot/user_examples.ssi.pot
+++ b/manual/pot/user_examples.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-13 17:12+0100\n"
+"POT-Creation-Date: 2012-01-18 18:00-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"
@@ -25,7 +25,7 @@ msgstr ""
#: 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:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -39,6 +39,7 @@ msgstr ""
#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -90,7 +91,7 @@ msgstr ""
#: 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:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -104,6 +105,7 @@ msgstr ""
#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
@@ -159,6 +161,12 @@ msgid " # lb build\n"
msgstr ""
#. type: Plain text
+#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#, no-wrap
+msgid " #!/bin/sh\n"
+msgstr ""
+
+#. type: Plain text
#: en/user_examples.ssi:4
msgid "1~examples Examples"
msgstr ""
@@ -194,18 +202,18 @@ msgid ""
"config}#, as described in {Distribution mirrors used at build time}"
"#distribution-mirrors-build-time, or for more convenience, set the default "
"for your build system in #{/etc/live/build.conf}#. Simply create this file "
-"and in it, set the corresponding #{LB_PARENT_MIRROR_*}# variables to your "
-"preferred mirror. All other mirrors used in the build will be defaulted from "
-"these values. For example:"
+"and in it, set the corresponding #{LB_MIRROR_*}# variables to your preferred "
+"mirror. All other mirrors used in the build will be defaulted from these "
+"values. For example:"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:18
#, no-wrap
msgid ""
-" LB_PARENT_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
-" LB_PARENT_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
-" LB_PARENT_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
+" 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"
msgstr ""
#. type: Plain text
@@ -364,12 +372,6 @@ msgid "Edit #{auto/config}# to read as follows:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:95
-#, no-wrap
-msgid " #!/bin/sh\n"
-msgstr ""
-
-#. type: Plain text
#: en/user_examples.ssi:101
#, no-wrap
msgid ""
@@ -556,7 +558,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
-" $ cat > config/includes.chroot/etc/skel/.xsession <<END\n"
+" $ cat > config/includes.chroot/etc/skel/.xsession << END\n"
" #!/bin/sh\n"
msgstr ""
diff --git a/manual/pt_BR/_sisu/.empty b/manual/pt_BR/_sisu/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/manual/pt_BR/_sisu/image/.empty b/manual/pt_BR/_sisu/image/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/manual/pt_BR/_sisu/sisurc.yml b/manual/pt_BR/_sisu/sisurc.yml
deleted file mode 100644
index 788cd67..0000000
--- a/manual/pt_BR/_sisu/sisurc.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-# Name: SiSU - Simple information Structuring Universe
-# Author: Ralph at Amissah.com
-# Description: Site wide envionment defaults set here
-# system environment info / resource configuration file, for sisu
-# License: GPL v3 or later
-# site environment configuration file
-# this file should be configured and live in
-# /etc/sisu #per environment settings, overridden by:
-# ~/.sisu #per user settings, overridden by:
-# ./_sisu #per local markup directory settings
-#% #image source directory, main path and subdirectories
-#image:
-# path: 'sisu_working'
-# public: '_sisu/image'
-# #all: 'image'
-#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
-webserv:
- path: 'build'
- url_root: 'http://live.debian.net/manual' #without dir stub
-# images: '_sisu/image'
-# man: 'man'
-# cgi: '/usr/lib/cgi-bin'
-# feed: 'feed'
-# sqlite: 'sisu/sqlite'
-# webrick_url: true
-#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
-#show_output_on: 'local:8111'
-#webserv_cgi:
-# host: localhost
-# base_path: ~
-# port: '8081'
-# user: ~
-show_output_on: 'filesystem_url'
-#texinfo display output
-#texinfo:
-# stub: 'texinfo'
-##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
-#processing:
-# path: '~'
-# dir: '.sisu_processing~'
-# metaverse: 'metaverse'
-# tune: 'tune'
-# latex: 'tex'
-# texinfo: 'texinfo'
-# concord_max: 400000
-#% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)
-flag:
- color: true # making colour default -c is toggle, and will now toggle colour off
- default: '-NhwepoabxXyYv' # -m run by default; includes verbose
- i: '-hwpoay' # -m run by default
- ii: '-NhwepoabxXy' # -m run by default
- iii: '-NhwepoabxXyY' # -m run by default
- iv: '-NhwepoabxXYDy --update' # -m run by default
- v: '-NhwepoabxXYDyv --update' # -m run by default; includes verbose
-#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
-default:
- papersize: 'A4,letter'
- #texpdf_font: 'Liberation Serif' # 'Liberation Sans' 'Liberation Serif'
- #text_wrap: 78
- #emphasis: 'bold' #make *{emphasis}* 'bold', 'italics' or 'underscore', default if not configured is 'bold'
- #digest: 'sha' #sha is sha256, default is md5
- #multilingual: false
- #language_file: 2
- #language: 'English'
-#% markup, make *{emphasis}* 'bold' or 'italics', default if not configured is 'bold'
-#% settings used by ssh scp
-#remote:
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-#% webrick information
-#webrick:
-# port: '8081'
-#% sql database info, postgresql and sqlite
-#db:
-# share_source: false # boolean, default is false
-# postgresql:
-# port: # '[port (default is 5432)]'
-# host: # '[if not localhost, provide host tcp/ip address or domain name]''
-# user: # '[(if different from user) provide username]'
-# password: # '[password if required]'
-# sqlite:
-# path: ~ # './sisu_sqlite.db'
-# port: "**"
-#% possible values ~, true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'.
-#will only ignore if value set to false, absence or nil will not remove program as should operate without rc file
-#ie in case of ~ will ignore and use hard coded defaults within program), true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'
-#on value true system defaults used, to change, e.g. editor specify
-permission_set:
- zap: false
- css_modify: false
-# remote_base_site: true
-program_set:
- rmagick: false
-# wc: true
-# editor: true
-# postgresql: true
-# sqlite: true
-# tidy: true
-# rexml: true
-# pdflatex: true
-#program_select:
-# editor: 'gvim -c :R -c :S'
-# pdf_viewer: 'evince'
-# web_browser: 'firefox' #'iceweasel' #'epiphany' #'galeon' #'konqueror' #'kazehakase'
-# console_www_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
-# epub_viewer: 'ebook-viewer' #'calibre' #'okular' #'fbreader'
-# odf_viewer: 'oowriter' #'abiword'
-# xml_viewer: 'xml-viewer'
-# man: 'nroff -man' #'groff -man -Tascii' # 'nroff -man'
-#promo: sisu_icon, sisu, sisu_search_libre, open_society, fsf, ruby
-#search:
-# sisu:
-# flag: true
-## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
-# action: http://search.sisudoc.org
-# db: sisu
-# title: sample search form
-# hyperestraier:
-# flag: true
-# action: http://search.sisudoc.org/cgi-bin/estseek.cgi?
diff --git a/manual/pt_BR/_sisu/skin/doc/skin_debian-live.rb b/manual/pt_BR/_sisu/skin/doc/skin_debian-live.rb
deleted file mode 100644
index 137636c..0000000
--- a/manual/pt_BR/_sisu/skin/doc/skin_debian-live.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-module SiSU_Viz
- require "#{SiSU_lib}/defaults" #<url:zxy_defaults.rb>
- class Skin
- #% path
- def path_root
- './sisu/' # the only parameter that cannot be changed here
- end
- def path_rel
- '../'
- end
- #% url
- def url_root_http
- 'http://live.debian.net/manual/'
- end
- def url_home
- 'http://live.debian.net/'
- end
- def url_site # used in pdf header
- 'http://live.debian.net'
- end
- def url_txt # text to go with url usually stripped url
- ''
- end
- def url_home_url
- '../index.html'
- end
- def url_footer_signature
- ''
- end
- #% color
- def color_band1
- '"#ffffff"'
- end
- def color_band2
- '"#ffffff"'
- end
- #% txt
- def txt_hp
- ' Debian'
- end
- def txt_home
- 'Debian'
- end
- def txt_signature
- ''
- end
- #% icon
- def icon_home_button
- 'debian_home.png'
- end
- def icon_home_banner
- home_button
- end
- #% banner
- def banner_home_button
- %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n}
- end
- def banner_home_and_index_buttons
- %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}</td><td width="60%"><center><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#ffffff"><font face="arial" size="2"><a href="toc" target="_top"> This text sub- <br /> Table of Contents </a></font>#{table_close}</center></center></td><td width="20%"> #{table_close}}
- end
- def banner_band
- %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}}
- end
- end
- class TeX
- def header_center
- "\\chead{\\href{#{@vz.url_site}/}{live.debian.net}}"
- end
- def home_url
- "\\href{#{@vz.url_site}/}{live.debian.net}"
- end
- def home
- "\\href{#{@vz.url_site}/}{Debian Live}"
- end
- def owner_chapter
- "Document owner details"
- end
- end
-end
diff --git a/manual/pt_BR/about_manual.ssi b/manual/pt_BR/about_manual.ssi
index 0ef9e7f..bff4e4c 100644
--- a/manual/pt_BR/about_manual.ssi
+++ b/manual/pt_BR/about_manual.ssi
@@ -24,19 +24,21 @@ respectivamente. Esse simbolo não é parte do comando.
While we believe that everything in this manual is important to at least
some of our users, we realize it is a lot of material to cover and that you
may wish to experience early success using the software before delving into
-the details. Therefore, we have provided three tutorials in the
-{Examples}#examples section designed to teach you image building and
-customization basics. Read {Using the examples}#using-the-examples first,
-followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web
-browser utility}#tutorial-2 and finally {Tutorial 3: A personalized
-image}#tutorial-3. By the end of these tutorials, you will have a taste of
-what can be done with Debian Live. We encourage you to return to more
-in-depth study of the manual, perhaps next reading {The basics}#the-basics,
-skimming or skipping {Building a netboot image}#building-netboot-image, and
-finishing by reading the {Customization overview}#customization-overview and
-the chapters that follow it. By this point, we hope you are thoroughly
-excited by what can be done with Debian Live and motivated to read the rest
-of the manual, cover-to-cover.
+the details. Therefore, we suggest reading in the following order. First,
+read this chapter, {About this manual}#about-manual, from the beginning and
+ending with the {Terms}#terms section. Next, skip to the three tutorials at
+the front of the {Examples}#examples section designed to teach you image
+building and customization basics. Read {Using the
+examples}#using-the-examples first, followed by {Tutorial 1: A standard
+image}#tutorial-1, {Tutorial 2: A web browser utility}#tutorial-2 and
+finally {Tutorial 3: A personalized image}#tutorial-3. By the end of these
+tutorials, you will have a taste of what can be done with Debian Live. We
+encourage you to return to more in-depth study of the manual, perhaps next
+reading {The basics}#the-basics, skimming or skipping {Building a netboot
+image}#building-netboot-image, and finishing by reading the {Customization
+overview}#customization-overview and the chapters that follow it. By this
+point, we hope you are thoroughly excited by what can be done with Debian
+Live and motivated to read the rest of the manual, cover-to-cover.
2~terms Terminologia
@@ -183,7 +185,23 @@ code{
}code
-3~ Aplicando patches
+It is also possible to build by document type, e.g:
+
+code{
+
+ $ make build FORMATS=pdf
+
+}code
+
+Or combine both, e.g:
+
+code{
+
+ $ make build FORMATS=html LANGUAGES=it
+
+}code
+
+3~ Applying changes
Diretamente cometer ao repoitório é possivel por qualquer um. No entanto,
nós pedimo que você mande maiores mudanças para a lista de e-mail para
@@ -238,10 +256,18 @@ code{
}code
-_* Depois de higiênizar submeta as mudançãs. Escreva mensagens de submissão,
-que consistem em sentanças completas úteis, começando por letra maiuscula e
-acabando com uma parada total. Normalmente iniciando com as formas
-'Fixing/Adding/Removing/Correcting/Translating'.
+_* Then
+
+code{
+
+ $ git add .
+
+}code
+
+_* After sanitizing and adding the files, commit the changes. Write commit
+messages that consist of full, useful sentences in English, starting with a
+capital letter and ending with a full stop. Usually, these will start with
+the form 'Fixing/Adding/Removing/Correcting/Translating', e.g.
code{
@@ -271,4 +297,8 @@ _* Once the new language is added, you can randomly start translating all po
files in #{manual/po/}#.
_* Don't forget you need #{make commit}# to ensure the translated manuals
-are updated from the po files, before #{git commit -a}# and #{git push}#.
+are updated from the po files and then you can review your changes launching
+#{make build}# before #{git add .}#, #{git commit -a -m "Translating..."}#
+and #{git push}#.
+
+*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.
diff --git a/manual/pt_BR/index.html.in b/manual/pt_BR/index.html.in
index bf06a76..99c958a 100644
--- a/manual/pt_BR/index.html.in
+++ b/manual/pt_BR/index.html.in
@@ -19,7 +19,7 @@ be incomplete or may not be up to date.
Por favor reporte erros, omissões, patches e sugestões para nossa lista de
discussão em <a
href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
-e leia sobre <a href="html/about-manual.pt_BR.html#how-to-contribute">como
+e leia sobre <a href="html/live-manual.pt_BR.html#how-to-contribute">como
contribuir</a> com o manual.
</p>
@@ -27,13 +27,13 @@ contribuir</a> com o manual.
<ul>
<li><a href="epub/live-manual.pt_BR.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.pt_BR.html">Páginas multiplas</a>, <a
+ <li>HTML: <a href="html/live-manual/toc.pt_BR.html">Páginas multiplas</a>, <a
href="html/live-manual.pt_BR.html">Página única</a></li>
- <li><a href="odf/live-manual.pt_BR.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.pt_BR.pdf">A4 retrato</a>, <a
-href="pdf/live-manual.landscape-a4.pt_BR.pdf">A4 paisagem</a>, <a
-href="pdf/live-manual.portrait-letter.pt_BR.pdf">US retrato</a>, <a
-href="pdf/live-manual.landscape-letter.pt_BR.pdf">US paisagem</a></li>
+ <li><a href="odt/live-manual.pt_BR.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/portrait.pt_BR.a4.pdf">A4 retrato</a>, <a
+href="pdf/landscape.pt_BR.a4.pdf">A4 paisagem</a>, <a
+href="pdf/portrait.pt_BR.letter.pdf">US retrato</a>, <a
+href="pdf/landscape.pt_BR.letter.pdf">US paisagem</a></li>
<li><a href="txt/live-manual.pt_BR.txt">Texto plano</a></li>
</ul>
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index 75eb990..485e4aa 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -5,11 +5,11 @@
@creator: Debian Live Project <debian-live at lists.debian.org>
@rights:
- :copyright: Copyright (C) 2006-2011 Debian Live Project
+ :copyright: Copyright (C) 2006-2012 Debian Live Project
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-12-04
+ :published: 2012-02-06
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/pt_BR/user_basics.ssi b/manual/pt_BR/user_basics.ssi
index 4c42960..2eee04a 100644
--- a/manual/pt_BR/user_basics.ssi
+++ b/manual/pt_BR/user_basics.ssi
@@ -6,7 +6,7 @@ This chapter contains a brief overview of the build process and instructions
for using the three most commonly used image types. The most versatile image
type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB
portable storage device. In certain special cases, such as the use of
-persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter
+persistence, #{hdd}# may be more suitable for USB devices. The chapter
finishes with instructions for building and using a #{net}# type image,
which is a bit more involved due to the setup required on the server. This
is a slightly advanced topic for anyone who is not familiar already with
@@ -229,16 +229,16 @@ code{
}code
-2~building-usb-hdd Building a USB/HDD image
+2~building-hdd Building an HDD image
-Building a USB/HDD image is similar to ISO hybrid in all respects except you
-specify #{-b usb-hdd}# and the resulting filename is #{binary.img}# which
-cannot be burnt to optical media. It is suitable for booting from USB
-sticks, USB hard drives, and various other portable storage
-devices. Normally, an ISO hybrid image can be used for this purpose instead,
-but if you have a BIOS which does not handle hybrid images properly, or want
-to use the remaining space on the media for some purpose, such as a
-persistence partition, you need a USB/HDD image.
+Building an HDD image is similar to ISO hybrid in all respects except you
+specify #{-b hdd}# and the resulting filename is #{binary.img}# which cannot
+be burnt to optical media. It is suitable for booting from USB sticks, USB
+hard drives, and various other portable storage devices. Normally, an ISO
+hybrid image can be used for this purpose instead, but if you have a BIOS
+which does not handle hybrid images properly, or want to use the remaining
+space on the media for some purpose, such as a persistence partition, you
+need an HDD image.
Note: if you created an ISO hybrid image with the previous example, you will
need to clean up your working directory with the #{lb clean}# command (see
@@ -250,12 +250,12 @@ code{
}code
-Run the #{lb config}# command as before, except this time specifying the
-USB/HDD image type:
+Run the #{lb config}# command as before, except this time specifying the HDD
+image type:
code{
- $ lb config -b usb-hdd
+ $ lb config -b hdd
}code
@@ -270,15 +270,15 @@ code{
When the build finishes, a #{binary.img}# file should be present in the
current directory.
-2~using-usb-hdd-image Using a USB/HDD image
+2~using-hdd-image Using an HDD image
The generated binary image contains a VFAT partition and the syslinux
-bootloader, ready to be directly written on a USB stick. Since using a
-USB/HDD image is just like using an ISO hybrid image on USB, follow the
-instructions in {Using an ISO hybrid live image}#using-iso-hybrid, except
-use the filename #{binary.img}# instead of #{binary-hybrid.iso}#.
+bootloader, ready to be directly written on a USB stick. Since using an HDD
+image is just like using an ISO hybrid image on USB, follow the instructions
+in {Using an ISO hybrid live image}#using-iso-hybrid, except use the
+filename #{binary.img}# instead of #{binary-hybrid.iso}#.
-3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu
+3~testing-hdd-with-qemu Testing an HDD image with Qemu
First, install QEMU as described above in {Testing an ISO image with
QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on
@@ -345,12 +345,12 @@ code{
}code
-In contrast with the ISO and USB/HDD images, netbooting does not, itself,
-serve the filesystem image to the client, so the files must be served via
-NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the
-location and server, respectively, of the NFS server where the filesytem
-image will be located at boot time. Make sure these are set to suitable
-values for your network and server.
+In contrast with the ISO and HDD images, netbooting does not, itself, serve
+the filesystem image to the client, so the files must be served via NFS. The
+#{--net-root-path}# and #{--net-root-server}# options specify the location
+and server, respectively, of the NFS server where the filesytem image will
+be located at boot time. Make sure these are set to suitable values for your
+network and server.
Now build the image with the #{lb build}# command:
diff --git a/manual/pt_BR/user_customization-binary.ssi b/manual/pt_BR/user_customization-binary.ssi
index 6f843f8..1902f77 100644
--- a/manual/pt_BR/user_customization-binary.ssi
+++ b/manual/pt_BR/user_customization-binary.ssi
@@ -4,11 +4,43 @@ B~ Customizing the binary image
2~ Bootloader
-live-build uses syslinux as bootloader by default, which is by default
-configured to pause indefinitely at its splash screen. To adjust this, you
-can pass #{--syslinux-timeout TIMEOUT}# to #{lb config}#. The value is
-specified in units of seconds. A timeout of 0 (zero) disables the timeout
-completely. For more information please see syslinux(1).
+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.
+
+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.
+
+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/}#
+
+A modified *{isolinux.cfg}* to boot after five seconds would be similar to
+this:
+
+code{
+
+ include menu.cfg
+ default vesamenu.c32
+ prompt 0
+ timeout 5
+
+}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:
+
+code{
+
+ #!/bin/sh
+
+ sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg
+
+}code
+
+For more information please see man syslinux(1).
2~ ISO metadata
diff --git a/manual/pt_BR/user_customization-contents.ssi b/manual/pt_BR/user_customization-contents.ssi
index 5759093..4d67a3c 100644
--- a/manual/pt_BR/user_customization-contents.ssi
+++ b/manual/pt_BR/user_customization-contents.ssi
@@ -9,7 +9,7 @@ execute arbitrary commands at different stages of the build and at boot
time, and preseeding allows you to configure packages when they are
installed by supplying answers to debconf questions.
-2~ Includes
+2~includes Includes
While ideally a Debian live system would include files entirely provided by
unmodified Debian packages, it is sometimes convenient to provide or modify
@@ -105,7 +105,7 @@ Otherwise, the material will be installed by live-build in #{/includes/}# by
default on the media filesystem, or else you can specify an alternate path
with #{--includes}#.
-2~ Hooks
+2~hooks Hooks
Hooks allow commands to be performed in the chroot and binary stages of the
build in order to customize the image.
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index 75d3198..01fd8c2 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -62,40 +62,39 @@ also modifies live-build behaviour to suit the derivatives.
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 #{--parent-mirror-*}# options governs which
+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
-#{--parent-mirror-binary}# and #{--parent-mirror-binary-security}# values
-are used, superceding any mirrors used in an earlier stage.
+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
To set the distribution mirrors used at build time to point at a local
-mirror, it is sufficient to set #{--parent-mirror-bootstrap}#,
-#{--parent-mirror-chroot-security}# and #{--parent-mirror-chroot-backports}#
-as follows.
+mirror, it is sufficient to set #{--mirror-bootstrap}#,
+#{--mirror-chroot-security}# and #{--mirror-chroot-backports}# as follows.
code{
- $ lb config --parent-mirror-bootstrap http://localhost/debian/ \
- --parent-mirror-chroot-security http://localhost/debian-security/ \
- --parent-mirror-chroot-backports http://localhost/debian-backports/
+ $ lb config --mirror-bootstrap http://localhost/debian/ \
+ --mirror-chroot-security http://localhost/debian-security/ \
+ --mirror-chroot-backports http://localhost/debian-backports/
}code
-The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the
-#{--parent-mirror-bootstrap}# value.
+The chroot mirror, specified by #{--mirror-chroot}#, defaults to the
+#{--mirror-bootstrap}# value.
3~ Distribution mirrors used at run time
-The #{--parent-mirror-binary*}# options govern the distribution mirrors
-placed in the binary image. These may be used to install additional packages
-while running the live system. The defaults employ #{cdn.debian.net}#, a
-service that chooses a geographically close mirror based on the user's IP
+The #{--mirror-binary*}# options govern the distribution mirrors placed in
+the binary image. These may be used to install additional packages while
+running the live system. The defaults employ #{cdn.debian.net}#, a service
+that chooses a geographically close mirror based on the user's IP
number. This is a suitable choice when you cannot predict which mirror will
be best for all of your users. Or you may specify your own values as shown
in the example below. An image built from this configuration would only be
@@ -103,8 +102,8 @@ suitable for users on a network where "#{mirror}#" is reachable.
code{
- $ lb config --parent-mirror-binary http://mirror/debian/ \
- --parent-mirror-binary-security http://mirror/debian-security/
+ $ lb config --mirror-binary http://mirror/debian/ \
+ --mirror-binary-security http://mirror/debian-security/
}code
@@ -115,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
-#{--parent-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.
@@ -135,7 +134,7 @@ directory.
If such files exist, they will be picked up automatically.
You should also put the GPG key used to sign the repository into
-#{config/archives/your-repository.gpg.{binary,chroot}}# files.
+#{config/archives/your-repository.key.{binary,chroot}}# files.
*{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:
@@ -518,7 +517,7 @@ accomplish this:
code{
$ echo "deb http://mirror/debian sid main" > config/archives/sid.list.chroot
- $ cat >> config/chroot_apt/preferences <<END
+ $ cat >> config/chroot_apt/preferences << END
Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
Pin: release n=sid
Pin-Priority: 600
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
index ba37423..56c8726 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/pt_BR/user_examples.ssi
@@ -19,15 +19,15 @@ if you use a local mirror. You may specify the options when you use #{lb
config}#, as described in {Distribution mirrors used at build
time}#distribution-mirrors-build-time, or for more convenience, set the
default for your build system in #{/etc/live/build.conf}#. Simply create
-this file and in it, set the corresponding #{LB_PARENT_MIRROR_*}# variables
-to your preferred mirror. All other mirrors used in the build will be
-defaulted from these values. For example:
+this file and in it, set the corresponding #{LB_MIRROR_*}# variables to your
+preferred mirror. All other mirrors used in the build will be defaulted from
+these values. For example:
code{
- LB_PARENT_MIRROR_BOOTSTRAP="http://mirror/debian"
- LB_PARENT_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
- LB_PARENT_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
+ LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
}code
@@ -255,7 +255,7 @@ to port #{5901}# on a server at #{192.168.1.2}#:
code{
$ mkdir -p config/includes.chroot/etc/skel
- $ cat > config/includes.chroot/etc/skel/.xsession <<END
+ $ cat > config/includes.chroot/etc/skel/.xsession << END
#!/bin/sh
/usr/bin/metacity &
diff --git a/manual/ro/_sisu/.empty b/manual/ro/_sisu/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/manual/ro/_sisu/image/.empty b/manual/ro/_sisu/image/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/manual/ro/_sisu/sisurc.yml b/manual/ro/_sisu/sisurc.yml
deleted file mode 100644
index 788cd67..0000000
--- a/manual/ro/_sisu/sisurc.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-# Name: SiSU - Simple information Structuring Universe
-# Author: Ralph at Amissah.com
-# Description: Site wide envionment defaults set here
-# system environment info / resource configuration file, for sisu
-# License: GPL v3 or later
-# site environment configuration file
-# this file should be configured and live in
-# /etc/sisu #per environment settings, overridden by:
-# ~/.sisu #per user settings, overridden by:
-# ./_sisu #per local markup directory settings
-#% #image source directory, main path and subdirectories
-#image:
-# path: 'sisu_working'
-# public: '_sisu/image'
-# #all: 'image'
-#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
-webserv:
- path: 'build'
- url_root: 'http://live.debian.net/manual' #without dir stub
-# images: '_sisu/image'
-# man: 'man'
-# cgi: '/usr/lib/cgi-bin'
-# feed: 'feed'
-# sqlite: 'sisu/sqlite'
-# webrick_url: true
-#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
-#show_output_on: 'local:8111'
-#webserv_cgi:
-# host: localhost
-# base_path: ~
-# port: '8081'
-# user: ~
-show_output_on: 'filesystem_url'
-#texinfo display output
-#texinfo:
-# stub: 'texinfo'
-##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
-#processing:
-# path: '~'
-# dir: '.sisu_processing~'
-# metaverse: 'metaverse'
-# tune: 'tune'
-# latex: 'tex'
-# texinfo: 'texinfo'
-# concord_max: 400000
-#% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)
-flag:
- color: true # making colour default -c is toggle, and will now toggle colour off
- default: '-NhwepoabxXyYv' # -m run by default; includes verbose
- i: '-hwpoay' # -m run by default
- ii: '-NhwepoabxXy' # -m run by default
- iii: '-NhwepoabxXyY' # -m run by default
- iv: '-NhwepoabxXYDy --update' # -m run by default
- v: '-NhwepoabxXYDyv --update' # -m run by default; includes verbose
-#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
-default:
- papersize: 'A4,letter'
- #texpdf_font: 'Liberation Serif' # 'Liberation Sans' 'Liberation Serif'
- #text_wrap: 78
- #emphasis: 'bold' #make *{emphasis}* 'bold', 'italics' or 'underscore', default if not configured is 'bold'
- #digest: 'sha' #sha is sha256, default is md5
- #multilingual: false
- #language_file: 2
- #language: 'English'
-#% markup, make *{emphasis}* 'bold' or 'italics', default if not configured is 'bold'
-#% settings used by ssh scp
-#remote:
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-#% webrick information
-#webrick:
-# port: '8081'
-#% sql database info, postgresql and sqlite
-#db:
-# share_source: false # boolean, default is false
-# postgresql:
-# port: # '[port (default is 5432)]'
-# host: # '[if not localhost, provide host tcp/ip address or domain name]''
-# user: # '[(if different from user) provide username]'
-# password: # '[password if required]'
-# sqlite:
-# path: ~ # './sisu_sqlite.db'
-# port: "**"
-#% possible values ~, true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'.
-#will only ignore if value set to false, absence or nil will not remove program as should operate without rc file
-#ie in case of ~ will ignore and use hard coded defaults within program), true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'
-#on value true system defaults used, to change, e.g. editor specify
-permission_set:
- zap: false
- css_modify: false
-# remote_base_site: true
-program_set:
- rmagick: false
-# wc: true
-# editor: true
-# postgresql: true
-# sqlite: true
-# tidy: true
-# rexml: true
-# pdflatex: true
-#program_select:
-# editor: 'gvim -c :R -c :S'
-# pdf_viewer: 'evince'
-# web_browser: 'firefox' #'iceweasel' #'epiphany' #'galeon' #'konqueror' #'kazehakase'
-# console_www_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
-# epub_viewer: 'ebook-viewer' #'calibre' #'okular' #'fbreader'
-# odf_viewer: 'oowriter' #'abiword'
-# xml_viewer: 'xml-viewer'
-# man: 'nroff -man' #'groff -man -Tascii' # 'nroff -man'
-#promo: sisu_icon, sisu, sisu_search_libre, open_society, fsf, ruby
-#search:
-# sisu:
-# flag: true
-## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
-# action: http://search.sisudoc.org
-# db: sisu
-# title: sample search form
-# hyperestraier:
-# flag: true
-# action: http://search.sisudoc.org/cgi-bin/estseek.cgi?
diff --git a/manual/ro/_sisu/skin/doc/skin_debian-live.rb b/manual/ro/_sisu/skin/doc/skin_debian-live.rb
deleted file mode 100644
index 137636c..0000000
--- a/manual/ro/_sisu/skin/doc/skin_debian-live.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-module SiSU_Viz
- require "#{SiSU_lib}/defaults" #<url:zxy_defaults.rb>
- class Skin
- #% path
- def path_root
- './sisu/' # the only parameter that cannot be changed here
- end
- def path_rel
- '../'
- end
- #% url
- def url_root_http
- 'http://live.debian.net/manual/'
- end
- def url_home
- 'http://live.debian.net/'
- end
- def url_site # used in pdf header
- 'http://live.debian.net'
- end
- def url_txt # text to go with url usually stripped url
- ''
- end
- def url_home_url
- '../index.html'
- end
- def url_footer_signature
- ''
- end
- #% color
- def color_band1
- '"#ffffff"'
- end
- def color_band2
- '"#ffffff"'
- end
- #% txt
- def txt_hp
- ' Debian'
- end
- def txt_home
- 'Debian'
- end
- def txt_signature
- ''
- end
- #% icon
- def icon_home_button
- 'debian_home.png'
- end
- def icon_home_banner
- home_button
- end
- #% banner
- def banner_home_button
- %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n}
- end
- def banner_home_and_index_buttons
- %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}</td><td width="60%"><center><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#ffffff"><font face="arial" size="2"><a href="toc" target="_top"> This text sub- <br /> Table of Contents </a></font>#{table_close}</center></center></td><td width="20%"> #{table_close}}
- end
- def banner_band
- %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}}
- end
- end
- class TeX
- def header_center
- "\\chead{\\href{#{@vz.url_site}/}{live.debian.net}}"
- end
- def home_url
- "\\href{#{@vz.url_site}/}{live.debian.net}"
- end
- def home
- "\\href{#{@vz.url_site}/}{Debian Live}"
- end
- def owner_chapter
- "Document owner details"
- end
- end
-end
diff --git a/manual/ro/about_manual.ssi b/manual/ro/about_manual.ssi
index ecafa34..a4bbbda 100644
--- a/manual/ro/about_manual.ssi
+++ b/manual/ro/about_manual.ssi
@@ -22,19 +22,21 @@ a distinge intre acesti utilizatori se vor folosi #{$}# respectiv #{#}#
While we believe that everything in this manual is important to at least
some of our users, we realize it is a lot of material to cover and that you
may wish to experience early success using the software before delving into
-the details. Therefore, we have provided three tutorials in the
-{Examples}#examples section designed to teach you image building and
-customization basics. Read {Using the examples}#using-the-examples first,
-followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web
-browser utility}#tutorial-2 and finally {Tutorial 3: A personalized
-image}#tutorial-3. By the end of these tutorials, you will have a taste of
-what can be done with Debian Live. We encourage you to return to more
-in-depth study of the manual, perhaps next reading {The basics}#the-basics,
-skimming or skipping {Building a netboot image}#building-netboot-image, and
-finishing by reading the {Customization overview}#customization-overview and
-the chapters that follow it. By this point, we hope you are thoroughly
-excited by what can be done with Debian Live and motivated to read the rest
-of the manual, cover-to-cover.
+the details. Therefore, we suggest reading in the following order. First,
+read this chapter, {About this manual}#about-manual, from the beginning and
+ending with the {Terms}#terms section. Next, skip to the three tutorials at
+the front of the {Examples}#examples section designed to teach you image
+building and customization basics. Read {Using the
+examples}#using-the-examples first, followed by {Tutorial 1: A standard
+image}#tutorial-1, {Tutorial 2: A web browser utility}#tutorial-2 and
+finally {Tutorial 3: A personalized image}#tutorial-3. By the end of these
+tutorials, you will have a taste of what can be done with Debian Live. We
+encourage you to return to more in-depth study of the manual, perhaps next
+reading {The basics}#the-basics, skimming or skipping {Building a netboot
+image}#building-netboot-image, and finishing by reading the {Customization
+overview}#customization-overview and the chapters that follow it. By this
+point, we hope you are thoroughly excited by what can be done with Debian
+Live and motivated to read the rest of the manual, cover-to-cover.
2~terms Termeni
@@ -179,7 +181,23 @@ code{
}code
-3~ Aplicarea de patch-uri
+It is also possible to build by document type, e.g:
+
+code{
+
+ $ make build FORMATS=pdf
+
+}code
+
+Or combine both, e.g:
+
+code{
+
+ $ make build FORMATS=html LANGUAGES=it
+
+}code
+
+3~ Applying changes
Commiterea in direct este la indemana oricui. Totusi, va rugam sa trimeteti
schimbarile mai mari , spre discutie , la mailing list. Pentru a fi trimise
@@ -233,10 +251,18 @@ code{
}code
-_* Dupa 'sanitizare' 'commit' schimbarile. Scrieti mesajele de commit, care
-constau in propozitii clare, care incep cu litere Mari, si se incheie cu
-punct si sens. Inceputul poate fii de forma
-'Fixing/Adding/Removing/Correcting/Translating':
+_* Then
+
+code{
+
+ $ git add .
+
+}code
+
+_* After sanitizing and adding the files, commit the changes. Write commit
+messages that consist of full, useful sentences in English, starting with a
+capital letter and ending with a full stop. Usually, these will start with
+the form 'Fixing/Adding/Removing/Correcting/Translating', e.g.
code{
@@ -266,4 +292,8 @@ _* Once the new language is added, you can randomly start translating all po
files in #{manual/po/}#.
_* Don't forget you need #{make commit}# to ensure the translated manuals
-are updated from the po files, before #{git commit -a}# and #{git push}#.
+are updated from the po files and then you can review your changes launching
+#{make build}# before #{git add .}#, #{git commit -a -m "Translating..."}#
+and #{git push}#.
+
+*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.
diff --git a/manual/ro/index.html.in b/manual/ro/index.html.in
index 951cf9f..b09c34d 100644
--- a/manual/ro/index.html.in
+++ b/manual/ro/index.html.in
@@ -19,7 +19,7 @@ be incomplete or may not be up to date.
Please report errors, omissions, patches and suggestions to our mailinglist
at <a
href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
-and read about <a href="html/about-manual.ro.html#how-to-contribute">how to
+and read about <a href="html/live-manual.ro.html#how-to-contribute">how to
contribute</a> to the manual.
</p>
@@ -27,13 +27,13 @@ contribute</a> to the manual.
<ul>
<li><a href="epub/live-manual.ro.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.ro.html">multi page</a>, <a
+ <li>HTML: <a href="html/live-manual/toc.ro.html">multi page</a>, <a
href="html/live-manual.ro.html">single page</a></li>
- <li><a href="odf/live-manual.ro.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.ro.pdf">A4 portrait</a>, <a
-href="pdf/live-manual.landscape-a4.ro.pdf">A4 landscape</a>, <a
-href="pdf/live-manual.portrait-letter.ro.pdf">letter portrait</a>, <a
-href="pdf/live-manual.landscape-letter.ro.pdf">letter landscape</a></li>
+ <li><a href="odt/live-manual.ro.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/portrait.ro.a4.pdf">A4 portrait</a>, <a
+href="pdf/landscape.ro.a4.pdf">A4 landscape</a>, <a
+href="pdf/portrait.ro.letter.pdf">letter portrait</a>, <a
+href="pdf/landscape.ro.letter.pdf">letter landscape</a></li>
<li><a href="txt/live-manual.ro.txt">Plain text</a></li>
</ul>
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index 75eb990..485e4aa 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -5,11 +5,11 @@
@creator: Debian Live Project <debian-live at lists.debian.org>
@rights:
- :copyright: Copyright (C) 2006-2011 Debian Live Project
+ :copyright: Copyright (C) 2006-2012 Debian Live Project
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-12-04
+ :published: 2012-02-06
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/ro/user_basics.ssi b/manual/ro/user_basics.ssi
index 4c42960..2eee04a 100644
--- a/manual/ro/user_basics.ssi
+++ b/manual/ro/user_basics.ssi
@@ -6,7 +6,7 @@ This chapter contains a brief overview of the build process and instructions
for using the three most commonly used image types. The most versatile image
type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB
portable storage device. In certain special cases, such as the use of
-persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter
+persistence, #{hdd}# may be more suitable for USB devices. The chapter
finishes with instructions for building and using a #{net}# type image,
which is a bit more involved due to the setup required on the server. This
is a slightly advanced topic for anyone who is not familiar already with
@@ -229,16 +229,16 @@ code{
}code
-2~building-usb-hdd Building a USB/HDD image
+2~building-hdd Building an HDD image
-Building a USB/HDD image is similar to ISO hybrid in all respects except you
-specify #{-b usb-hdd}# and the resulting filename is #{binary.img}# which
-cannot be burnt to optical media. It is suitable for booting from USB
-sticks, USB hard drives, and various other portable storage
-devices. Normally, an ISO hybrid image can be used for this purpose instead,
-but if you have a BIOS which does not handle hybrid images properly, or want
-to use the remaining space on the media for some purpose, such as a
-persistence partition, you need a USB/HDD image.
+Building an HDD image is similar to ISO hybrid in all respects except you
+specify #{-b hdd}# and the resulting filename is #{binary.img}# which cannot
+be burnt to optical media. It is suitable for booting from USB sticks, USB
+hard drives, and various other portable storage devices. Normally, an ISO
+hybrid image can be used for this purpose instead, but if you have a BIOS
+which does not handle hybrid images properly, or want to use the remaining
+space on the media for some purpose, such as a persistence partition, you
+need an HDD image.
Note: if you created an ISO hybrid image with the previous example, you will
need to clean up your working directory with the #{lb clean}# command (see
@@ -250,12 +250,12 @@ code{
}code
-Run the #{lb config}# command as before, except this time specifying the
-USB/HDD image type:
+Run the #{lb config}# command as before, except this time specifying the HDD
+image type:
code{
- $ lb config -b usb-hdd
+ $ lb config -b hdd
}code
@@ -270,15 +270,15 @@ code{
When the build finishes, a #{binary.img}# file should be present in the
current directory.
-2~using-usb-hdd-image Using a USB/HDD image
+2~using-hdd-image Using an HDD image
The generated binary image contains a VFAT partition and the syslinux
-bootloader, ready to be directly written on a USB stick. Since using a
-USB/HDD image is just like using an ISO hybrid image on USB, follow the
-instructions in {Using an ISO hybrid live image}#using-iso-hybrid, except
-use the filename #{binary.img}# instead of #{binary-hybrid.iso}#.
+bootloader, ready to be directly written on a USB stick. Since using an HDD
+image is just like using an ISO hybrid image on USB, follow the instructions
+in {Using an ISO hybrid live image}#using-iso-hybrid, except use the
+filename #{binary.img}# instead of #{binary-hybrid.iso}#.
-3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu
+3~testing-hdd-with-qemu Testing an HDD image with Qemu
First, install QEMU as described above in {Testing an ISO image with
QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on
@@ -345,12 +345,12 @@ code{
}code
-In contrast with the ISO and USB/HDD images, netbooting does not, itself,
-serve the filesystem image to the client, so the files must be served via
-NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the
-location and server, respectively, of the NFS server where the filesytem
-image will be located at boot time. Make sure these are set to suitable
-values for your network and server.
+In contrast with the ISO and HDD images, netbooting does not, itself, serve
+the filesystem image to the client, so the files must be served via NFS. The
+#{--net-root-path}# and #{--net-root-server}# options specify the location
+and server, respectively, of the NFS server where the filesytem image will
+be located at boot time. Make sure these are set to suitable values for your
+network and server.
Now build the image with the #{lb build}# command:
diff --git a/manual/ro/user_customization-binary.ssi b/manual/ro/user_customization-binary.ssi
index 6f843f8..1902f77 100644
--- a/manual/ro/user_customization-binary.ssi
+++ b/manual/ro/user_customization-binary.ssi
@@ -4,11 +4,43 @@ B~ Customizing the binary image
2~ Bootloader
-live-build uses syslinux as bootloader by default, which is by default
-configured to pause indefinitely at its splash screen. To adjust this, you
-can pass #{--syslinux-timeout TIMEOUT}# to #{lb config}#. The value is
-specified in units of seconds. A timeout of 0 (zero) disables the timeout
-completely. For more information please see syslinux(1).
+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.
+
+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.
+
+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/}#
+
+A modified *{isolinux.cfg}* to boot after five seconds would be similar to
+this:
+
+code{
+
+ include menu.cfg
+ default vesamenu.c32
+ prompt 0
+ timeout 5
+
+}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:
+
+code{
+
+ #!/bin/sh
+
+ sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg
+
+}code
+
+For more information please see man syslinux(1).
2~ ISO metadata
diff --git a/manual/ro/user_customization-contents.ssi b/manual/ro/user_customization-contents.ssi
index 5759093..4d67a3c 100644
--- a/manual/ro/user_customization-contents.ssi
+++ b/manual/ro/user_customization-contents.ssi
@@ -9,7 +9,7 @@ execute arbitrary commands at different stages of the build and at boot
time, and preseeding allows you to configure packages when they are
installed by supplying answers to debconf questions.
-2~ Includes
+2~includes Includes
While ideally a Debian live system would include files entirely provided by
unmodified Debian packages, it is sometimes convenient to provide or modify
@@ -105,7 +105,7 @@ Otherwise, the material will be installed by live-build in #{/includes/}# by
default on the media filesystem, or else you can specify an alternate path
with #{--includes}#.
-2~ Hooks
+2~hooks Hooks
Hooks allow commands to be performed in the chroot and binary stages of the
build in order to customize the image.
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index 75d3198..01fd8c2 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -62,40 +62,39 @@ also modifies live-build behaviour to suit the derivatives.
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 #{--parent-mirror-*}# options governs which
+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
-#{--parent-mirror-binary}# and #{--parent-mirror-binary-security}# values
-are used, superceding any mirrors used in an earlier stage.
+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
To set the distribution mirrors used at build time to point at a local
-mirror, it is sufficient to set #{--parent-mirror-bootstrap}#,
-#{--parent-mirror-chroot-security}# and #{--parent-mirror-chroot-backports}#
-as follows.
+mirror, it is sufficient to set #{--mirror-bootstrap}#,
+#{--mirror-chroot-security}# and #{--mirror-chroot-backports}# as follows.
code{
- $ lb config --parent-mirror-bootstrap http://localhost/debian/ \
- --parent-mirror-chroot-security http://localhost/debian-security/ \
- --parent-mirror-chroot-backports http://localhost/debian-backports/
+ $ lb config --mirror-bootstrap http://localhost/debian/ \
+ --mirror-chroot-security http://localhost/debian-security/ \
+ --mirror-chroot-backports http://localhost/debian-backports/
}code
-The chroot mirror, specified by #{--parent-mirror-chroot}#, defaults to the
-#{--parent-mirror-bootstrap}# value.
+The chroot mirror, specified by #{--mirror-chroot}#, defaults to the
+#{--mirror-bootstrap}# value.
3~ Distribution mirrors used at run time
-The #{--parent-mirror-binary*}# options govern the distribution mirrors
-placed in the binary image. These may be used to install additional packages
-while running the live system. The defaults employ #{cdn.debian.net}#, a
-service that chooses a geographically close mirror based on the user's IP
+The #{--mirror-binary*}# options govern the distribution mirrors placed in
+the binary image. These may be used to install additional packages while
+running the live system. The defaults employ #{cdn.debian.net}#, a service
+that chooses a geographically close mirror based on the user's IP
number. This is a suitable choice when you cannot predict which mirror will
be best for all of your users. Or you may specify your own values as shown
in the example below. An image built from this configuration would only be
@@ -103,8 +102,8 @@ suitable for users on a network where "#{mirror}#" is reachable.
code{
- $ lb config --parent-mirror-binary http://mirror/debian/ \
- --parent-mirror-binary-security http://mirror/debian-security/
+ $ lb config --mirror-binary http://mirror/debian/ \
+ --mirror-binary-security http://mirror/debian-security/
}code
@@ -115,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
-#{--parent-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.
@@ -135,7 +134,7 @@ directory.
If such files exist, they will be picked up automatically.
You should also put the GPG key used to sign the repository into
-#{config/archives/your-repository.gpg.{binary,chroot}}# files.
+#{config/archives/your-repository.key.{binary,chroot}}# files.
*{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:
@@ -518,7 +517,7 @@ accomplish this:
code{
$ echo "deb http://mirror/debian sid main" > config/archives/sid.list.chroot
- $ cat >> config/chroot_apt/preferences <<END
+ $ cat >> config/chroot_apt/preferences << END
Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
Pin: release n=sid
Pin-Priority: 600
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
index ba37423..56c8726 100644
--- a/manual/ro/user_examples.ssi
+++ b/manual/ro/user_examples.ssi
@@ -19,15 +19,15 @@ if you use a local mirror. You may specify the options when you use #{lb
config}#, as described in {Distribution mirrors used at build
time}#distribution-mirrors-build-time, or for more convenience, set the
default for your build system in #{/etc/live/build.conf}#. Simply create
-this file and in it, set the corresponding #{LB_PARENT_MIRROR_*}# variables
-to your preferred mirror. All other mirrors used in the build will be
-defaulted from these values. For example:
+this file and in it, set the corresponding #{LB_MIRROR_*}# variables to your
+preferred mirror. All other mirrors used in the build will be defaulted from
+these values. For example:
code{
- LB_PARENT_MIRROR_BOOTSTRAP="http://mirror/debian"
- LB_PARENT_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
- LB_PARENT_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
+ LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_MIRROR_CHROOT_BACKPORTS="http://mirror/debian-updates"
}code
@@ -255,7 +255,7 @@ to port #{5901}# on a server at #{192.168.1.2}#:
code{
$ mkdir -p config/includes.chroot/etc/skel
- $ cat > config/includes.chroot/etc/skel/.xsession <<END
+ $ cat > config/includes.chroot/etc/skel/.xsession << END
#!/bin/sh
/usr/bin/metacity &
--
live-manual
More information about the debian-live-changes
mailing list