[SCM] live-manual branch, debian-next, updated. debian/3.0_a17-1-13-gbf1fcd1
chals
chals at altorricon.com
Sat Sep 29 13:29:11 UTC 2012
The following commit has been merged in the debian-next branch:
commit bf1fcd1bd5c9c071cc133f22da7bdb335f129142
Author: chals <chals at altorricon.com>
Date: Sat Sep 29 15:28:30 2012 +0200
Translating project_git.ssi.po into Catalan.
diff --git a/manual/ca/about_manual.ssi b/manual/ca/about_manual.ssi
index b0615b9..11f597a 100644
--- a/manual/ca/about_manual.ssi
+++ b/manual/ca/about_manual.ssi
@@ -120,6 +120,8 @@ _* Ben Armstrong
_* Brendan Sleight
+_* Carlos Zuferri
+
_* Chris Lamb
_* Daniel Baumann
@@ -153,9 +155,9 @@ llicències. Recordar que per ser acceptada, la contribució ha de tenir una
llicencia igual que la resta del document, a saber, la versió de la GPL 3 o
superior.
-Les fonts d'aquest manual es mantenen utilitzant el sistema de control de
-versions Git. Es pot obtenir una còpia actualitzada mitjançant l'execució
-de:
+The sources for this manual are maintained using the Git version control
+system (see {Git repositories}#git-repositories). You can check out the
+latest copy by executing:
code{
diff --git a/manual/ca/live-manual.ssm b/manual/ca/live-manual.ssm
index f58b2bc..1c02fe2 100644
--- a/manual/ca/live-manual.ssm
+++ b/manual/ca/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Aquest programa és un programari lliure: es pot redistribuir i/o modificar sota els termes de la Llicència Pública General de la GNU com és publicada per la Free Software Foundation, ja sigui la versió 3 de la Llicència, o (si ho preferiu) qualsevol versió posterior.<br><br>Aquest programa es distribueix amb l'esperança que sigui útil, però sense cap garantia, fins i tot sense la garantia implícita de COMERCIALITZACIÓ o ADEQUACIÓ PER A PROPÒSITS DETERMINATS. Vegeu la Llicència General Pública de la GNU per a més detalls.<br><br>Haurieu de rebre una còpia de la Llicència Pública General de la GNU amb aquest programa. Si no és així, consulteu http://www.gnu.org/licenses/. <br><br>El text complet de la Llicència Pública General de la GNU es pot trobar a /usr/share/common-licenses/GPL-3.
@date:
- :published: 28.09.2012
+ :published: 2012-09-29
@publisher: Projecte Debian Live <debian-live at lists.debian.org>
@@ -57,6 +57,8 @@
<< project_procedures.ssi
+<< project_git.ssi
+
:B~ Exemples
<< user_examples.ssi
diff --git a/manual/ca/project_git.ssi b/manual/ca/project_git.ssi
new file mode 100644
index 0000000..c6b55b3
--- /dev/null
+++ b/manual/ca/project_git.ssi
@@ -0,0 +1,57 @@
+B~ Repositoris Git
+
+1~git-repositories Repositoris Git
+
+L'arbre git del projecte Debian Live es compon de diverses branques
+diferents. Hi ha una llista de tots els repositoris a
+http://live.debian.net/gitweb Les branques *{debian}* i *{debian-next}* són
+particularment notables perquè contenen el treball real que, amb el temps,
+serà inclòs en cada nova versió.
+
+Les URLs git del projecte tenen la forma:
+#{protocol://live.debian.net/git/repositori}#.
+
+Per tant, per tal de clonar live-manual en només lectura, llançar:
+
+code{
+
+ $ git clone git://live.debian.net/git/live-manual.git
+
+}code
+
+O,
+
+code{
+
+ $ git clone http://live.debian.net/git/live-manual.git
+
+}code
+
+Les adreces per clonar amb permís d'escriptura tenen la forma:
+#{git at live.debian.net:/repositori}#.
+
+Així que, de nou, per clonar live-manual, però a través de ssh escriure:
+
+code{
+
+ $ git clone git at live.debian.net:/live-manual.git
+
+}code
+
+Després de clonar qualsevol dels repositoris existents, estarem a la branca
+*{debian}*. Això és apropiat per fer una ullada a l'estat de l'última versió
+del projecte, però abans de començar a treballar és fonamental canviar a la
+branca *{debian-next}*. Per fer això:
+
+code{
+
+ $ git checkout debian-next
+
+}code
+
+La branca *{debian-next}*, que no sempre és fast-forward, és on es realitzen
+tots els canvis abans de fusionar-los amb la branca *{debian}. Per fer una
+analogia, és com un camp de proves. Si s'està treballant en aquesta branca i
+es necessari fer un pull, s'haurà de fer un #{git pull --rebase}# perquè les
+modificacions locals es guardin mentre s'actualitza des del servidor i
+llavors els canvis locals es posaran al damunt de tot.
diff --git a/manual/ca/user_customization-packages.ssi b/manual/ca/user_customization-packages.ssi
index ad4bda8..05f54b2 100644
--- a/manual/ca/user_customization-packages.ssi
+++ b/manual/ca/user_customization-packages.ssi
@@ -98,15 +98,15 @@ defecte pren el mateix valor que #{--mirror-bootstrap}#
3~ Miralls de distribució utilitzats en temps d'execució
-Les opcions #{--mirror-binary*}# governen els miralls de distribució
-coŀlocats a la imatge binària. Aquestes poden ser utilitzades per instaŀlar
-paquets addicionals mentre s'executa el sistema en viu. Els valors per
-defecte utilitzan #{cdn.debian.net}#, un servei que tria un mirall
-geogràficament a prop en funció del número IP de l'usuari. Aquesta és una
-opció adequada quan no es pot predir quin serà el millor mirall per tots els
-usuaris. O es pot especificar els valors propis com es mostra en l'exemple
-següent. Una imatge construïda a partir d'aquesta configuració només seria
-convenient per als usuaris en una xarxa on "#{mirror}#" és abastable.
+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 #{http.debian.net}#, a service
+that chooses a geographically close mirror based, among other things, on the
+user's IP family and the availability of the mirrors. 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{
@@ -645,24 +645,16 @@ wheezy. El que segueix aconseguira això:
code{
- $ echo "deb http://mirror/debian sid main" > config/archives/sid.list.chroot
- $ cat >> config/chroot_apt/preferences << END
- Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
+ $ echo "deb http://mirror/debian/ sid main" > config/archives/sid.list.chroot
+ $ cat >> config/chroot_apt/preferences << EOF
+ Package: live-*
Pin: release n=sid
Pin-Priority: 600
Package: *
Pin: release n=sid
Pin-Priority: 1
- END
-
-}code
-
-*{Nota:}* Es poden usar comodins en els noms dels paquets (per exemple, *{Package: live-*}*) amb la versió 0.8.14 o superior d'Apt. Això significa que funciona amb wheezy utilitzant:
-
-code{
-
-$ lb config --distribution wheezy
+ EOF
}code
diff --git a/manual/ca/user_examples.ssi b/manual/ca/user_examples.ssi
index ea29917..4c197ca 100644
--- a/manual/ca/user_examples.ssi
+++ b/manual/ca/user_examples.ssi
@@ -28,9 +28,9 @@ construcció adoptaran valors per defecte segons aquests valors. Per exemple:
code{
- LB_MIRROR_BOOTSTRAP="http://mirror/debian"
- LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
- LB_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-backports/"
}code
@@ -306,14 +306,14 @@ posarà en marxa /{metacity}/ i iniciarà /{xvncviewer}/, connectant al port
code{
$ mkdir -p config/includes.chroot/etc/skel
- $ cat > config/includes.chroot/etc/skel/.xsession << END
+ $ cat > config/includes.chroot/etc/skel/.xsession << EOF
#!/bin/sh
/usr/bin/metacity &
/usr/bin/xvncviewer 192.168.1.2:1
exit
- END
+ EOF
}code
diff --git a/manual/de/about_manual.ssi b/manual/de/about_manual.ssi
index 42ba50d..5688407 100644
--- a/manual/de/about_manual.ssi
+++ b/manual/de/about_manual.ssi
@@ -117,6 +117,8 @@ _* Ben Armstrong
_* Brendan Sleight
+_* Carlos Zuferri
+
_* Chris Lamb
_* Daniel Baumann
@@ -150,7 +152,8 @@ contribution must be licensed under the same license as the rest of the
document, namely, GPL version 3 or later.
The sources for this manual are maintained using the Git version control
-system. You can check out the latest copy by executing:
+system (see {Git repositories}#git-repositories). You can check out the
+latest copy by executing:
code{
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index 4c7770d..ecb8a95 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäss Version 3 der Lizenz oder (nach Ihrer Option) jeder späteren Version.<br><br>Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, dass es Ihnen von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.<br><br>Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem Programm erhalten haben. Falls nicht, siehe <http://www.gnu.org/licenses/>.<br><br>Der komplette Text der GNU General Public License kann in der Datei /usr/share/common-licenses/GPL-3 gefunden werden.
@date:
- :published: 28.09.2012
+ :published: 2012-09-29
@publisher: Debian Live Projekt <debian-live at lists.debian.org>
@@ -57,6 +57,8 @@
<< project_procedures.ssi
+<< project_git.ssi
+
:B~ Beispiele
<< user_examples.ssi
diff --git a/manual/de/project_git.ssi b/manual/de/project_git.ssi
new file mode 100644
index 0000000..c3f1b3f
--- /dev/null
+++ b/manual/de/project_git.ssi
@@ -0,0 +1,57 @@
+B~ Git repositories
+
+1~git-repositories Git repositories
+
+The git tree of the Debian Live Project is made up of several different
+branches. There is a list of all the available repositories at
+http://live.debian.net/gitweb The *{debian}* and the *{debian-next}*
+branches are particularly noteworthy because they contain the actual work
+that will eventually be included in each new release.
+
+The project's git URLs have the form:
+#{protocol://live.debian.net/git/repository}#.
+
+Thus, in order to clone live-manual read-only, launch:
+
+code{
+
+ $ git clone git://live.debian.net/git/live-manual.git
+
+}code
+
+Or,
+
+code{
+
+ $ git clone http://live.debian.net/git/live-manual.git
+
+}code
+
+The cloning addresses with write permission have the form:
+#{git at live.debian.net:/repository}#.
+
+So, again, to clone live-manual but over ssh you must type:
+
+code{
+
+ $ git clone git at live.debian.net:/live-manual.git
+
+}code
+
+After cloning any of the existing repositories, you will be on the
+*{debian}* branch. This is appropriate to take a look at the state of the
+project's latest release but before starting work it is crucial to switch to
+the *{debian-next}* branch. To do so:
+
+code{
+
+ $ git checkout debian-next
+
+}code
+
+The *{debian-next}* branch, which is not always fast-forward, is where all
+the changes are committed first before being merged into the *{debian}*
+branch. To make an analogy, it is like a testing ground. If you are working
+on this branch and need to pull, you will have to do a #{git pull --rebase}#
+so that your local modifications are staged while pulling from the server
+and then your changes will be put on top of it all.
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index 1bce020..f692dc0 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -93,12 +93,13 @@ The chroot mirror, specified by #{--mirror-chroot}#, defaults to the
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.
+running the live system. The defaults employ #{http.debian.net}#, a service
+that chooses a geographically close mirror based, among other things, on the
+user's IP family and the availability of the mirrors. 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{
@@ -612,24 +613,16 @@ accomplish this:
code{
- $ echo "deb http://mirror/debian sid main" > config/archives/sid.list.chroot
- $ cat >> config/chroot_apt/preferences << END
- Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
+ $ echo "deb http://mirror/debian/ sid main" > config/archives/sid.list.chroot
+ $ cat >> config/chroot_apt/preferences << EOF
+ Package: live-*
Pin: release n=sid
Pin-Priority: 600
Package: *
Pin: release n=sid
Pin-Priority: 1
- END
-
-}code
-
-*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:
-
-code{
-
-$ lb config --distribution wheezy
+ EOF
}code
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
index eb958e3..5878370 100644
--- a/manual/de/user_examples.ssi
+++ b/manual/de/user_examples.ssi
@@ -25,9 +25,9 @@ these values. For example:
code{
- LB_MIRROR_BOOTSTRAP="http://mirror/debian"
- LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
- LB_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-backports/"
}code
@@ -290,14 +290,14 @@ 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 << EOF
#!/bin/sh
/usr/bin/metacity &
/usr/bin/xvncviewer 192.168.1.2:1
exit
- END
+ EOF
}code
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 99ed508..00893ea 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2012-09-28
+ :published: 2012-09-29
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/en/project_git.ssi b/manual/en/project_git.ssi
index e525bbb..5b75d5e 100644
--- a/manual/en/project_git.ssi
+++ b/manual/en/project_git.ssi
@@ -4,7 +4,7 @@ B~ Git repositories
The git tree of the Debian Live Project is made up of several different branches. There is a list of all the available repositories at http://live.debian.net/gitweb The *{debian}* and the *{debian-next}* branches are particularly noteworthy because they contain the actual work that will eventually be included in each new release.
-The project's git URLs have the form: #{protocol://live.debian.net/git/repository}#.
+The project's git URLs have the form: #{protocol://live.debian.net/git/repository}#.
Thus, in order to clone live-manual read-only, launch:
@@ -22,7 +22,7 @@ code{
}code
-The cloning addresses with write permission have the form: #{git at live.debian.net:/repository}#.
+The cloning addresses with write permission have the form: #{git at live.debian.net:/repository}#.
So, again, to clone live-manual but over ssh you must type:
diff --git a/manual/es/about_manual.ssi b/manual/es/about_manual.ssi
index 8a73236..c093c6e 100644
--- a/manual/es/about_manual.ssi
+++ b/manual/es/about_manual.ssi
@@ -131,6 +131,8 @@ _* Ben Armstrong
_* Brendan Sleight
+_* Carlos Zuferri
+
_* Chris Lamb
_* Daniel Baumann
@@ -163,9 +165,9 @@ e incluir la declaración de licencia. Se hace notar que para ser aceptada,
una contribución debe ser licenciada bajo la misma licencia que el resto del
documento, esto es, GPL versión 3 o posterior.
-Los originales de este manual se mantienen utilizando el sistema de control
-de versiones Git. Se puede obtener la copia más actualizada ejecutando la
-siguiente orden:
+The sources for this manual are maintained using the Git version control
+system (see {Git repositories}#git-repositories). You can check out the
+latest copy by executing:
code{
diff --git a/manual/es/live-manual.ssm b/manual/es/live-manual.ssm
index 78b7a56..83a4c0a 100644
--- a/manual/es/live-manual.ssm
+++ b/manual/es/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Este programa es software libre: puede ser redistribuido y/o modificado bajo los términos de la GNU General Public License publicada por la Free Software Foundation, bien de la versión 3 de la Licencia, o (a su elección) cualquier versión posterior. <br><br> Este programa se distribuye con la esperanza de que sea útil, pero SIN NINGUNA GARANTÍA, incluso sin la garantía implícita de COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la GNU General Public License para más detalles. <br><br> Debería haber recibido una copia de la General Public License GNU junto con este programa. Si no, vea http://www.gnu.org/licenses/. <br><br> El texto completo de la GNU Licencia Pública General se pueden encontrar en /usr/share/common-licenses/GPL-3
@date:
- :published: 28.09.2012
+ :published: 2012-09-29
@publisher: Proyecto Debian Live <debian-live at lists.debian.org>
@@ -57,6 +57,8 @@
<< project_procedures.ssi
+<< project_git.ssi
+
:B~ Ejemplos
<< user_examples.ssi
diff --git a/manual/es/project_git.ssi b/manual/es/project_git.ssi
new file mode 100644
index 0000000..c3f1b3f
--- /dev/null
+++ b/manual/es/project_git.ssi
@@ -0,0 +1,57 @@
+B~ Git repositories
+
+1~git-repositories Git repositories
+
+The git tree of the Debian Live Project is made up of several different
+branches. There is a list of all the available repositories at
+http://live.debian.net/gitweb The *{debian}* and the *{debian-next}*
+branches are particularly noteworthy because they contain the actual work
+that will eventually be included in each new release.
+
+The project's git URLs have the form:
+#{protocol://live.debian.net/git/repository}#.
+
+Thus, in order to clone live-manual read-only, launch:
+
+code{
+
+ $ git clone git://live.debian.net/git/live-manual.git
+
+}code
+
+Or,
+
+code{
+
+ $ git clone http://live.debian.net/git/live-manual.git
+
+}code
+
+The cloning addresses with write permission have the form:
+#{git at live.debian.net:/repository}#.
+
+So, again, to clone live-manual but over ssh you must type:
+
+code{
+
+ $ git clone git at live.debian.net:/live-manual.git
+
+}code
+
+After cloning any of the existing repositories, you will be on the
+*{debian}* branch. This is appropriate to take a look at the state of the
+project's latest release but before starting work it is crucial to switch to
+the *{debian-next}* branch. To do so:
+
+code{
+
+ $ git checkout debian-next
+
+}code
+
+The *{debian-next}* branch, which is not always fast-forward, is where all
+the changes are committed first before being merged into the *{debian}*
+branch. To make an analogy, it is like a testing ground. If you are working
+on this branch and need to pull, you will have to do a #{git pull --rebase}#
+so that your local modifications are staged while pulling from the server
+and then your changes will be put on top of it all.
diff --git a/manual/es/user_customization-packages.ssi b/manual/es/user_customization-packages.ssi
index 586b1aa..027e1d1 100644
--- a/manual/es/user_customization-packages.ssi
+++ b/manual/es/user_customization-packages.ssi
@@ -105,16 +105,15 @@ 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 #{--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 predecir que réplica será la mejor para todos los
-usuarios. También se puede especificar valores personalizados como se
-muestra en el siguiente ejemplo. Una imagen construida con esta
-configuración solamente sería accesible a los usuarios de una red donde
-"#{mirror}#" fuese alcanzable.
+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 #{http.debian.net}#, a service
+that chooses a geographically close mirror based, among other things, on the
+user's IP family and the availability of the mirrors. 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{
@@ -670,24 +669,16 @@ 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
- Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
+ $ echo "deb http://mirror/debian/ sid main" > config/archives/sid.list.chroot
+ $ cat >> config/chroot_apt/preferences << EOF
+ Package: live-*
Pin: release n=sid
Pin-Priority: 600
Package: *
Pin: release n=sid
Pin-Priority: 1
- END
-
-}code
-
-*{Nota:}* Se pueden usar comodines en los nombres de los paquetes a fijar (p.ej. *{Package: live-*}*) si se usa una versión de apt igual o superior a 0.8.14. Esto significa que funciona con wheezy usando:
-
-code{
-
-$ lb config --distribution wheezy
+ EOF
}code
diff --git a/manual/es/user_examples.ssi b/manual/es/user_examples.ssi
index ce781a2..aa3f576 100644
--- a/manual/es/user_examples.ssi
+++ b/manual/es/user_examples.ssi
@@ -29,9 +29,9 @@ estos valores por defecto. Por ejemplo:
code{
- LB_MIRROR_BOOTSTRAP="http://mirror/debian"
- LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
- LB_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-backports/"
}code
@@ -309,14 +309,14 @@ puerto #{5901}# de un servidor en #{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 << EOF
#!/bin/sh
/usr/bin/metacity &
/usr/bin/xvncviewer 192.168.1.2:1
exit
- END
+ EOF
}code
diff --git a/manual/fr/about_manual.ssi b/manual/fr/about_manual.ssi
index 4dac7ef..3bff125 100644
--- a/manual/fr/about_manual.ssi
+++ b/manual/fr/about_manual.ssi
@@ -124,6 +124,8 @@ _* Ben Armstrong
_* Brendan Sleight
+_* Carlos Zuferri
+
_* Chris Lamb
_* Daniel Baumann
@@ -156,8 +158,9 @@ copyright et inclure la mention légale relative à la licence. Notez que pour
être acceptée, la contribution doit être déposée sous la même licence que le
reste du document, c'est-à-dire la GPL version 3 ou ultérieure.
-Les sources de ce manuel sont maintenues à l'aide du logiciel de gestion de
-versions Git. Vous pouvez obtenir la dernière copie en exécutant:
+The sources for this manual are maintained using the Git version control
+system (see {Git repositories}#git-repositories). You can check out the
+latest copy by executing:
code{
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index fedfd8b..a57ce88 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Ce programme est un logiciel libre; vous pouvez le redistribuer ou le modifier suivant les termes de la Licence Générale Publique GNU telle que publiée par la Free Software Foundation: soit la version 3 de cette licence, soit (à votre gré) toute version ultérieure.<br><br>Ce programme est distribué dans l’espoir qu’il vous sera utile, mais SANS AUCUNE GARANTIE: sans même la garantie implicite de COMMERCIALISABILITÉ ni d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez la Licence Générale Publique GNU pour plus de détails.<br><br>Vous devriez avoir reçu une copie de la Licence Générale Publique GNU avec ce programme ; si ce n’est pas le cas, consultez http://www.gnu.org/licenses/. <br><br>Le texte complet de la Licence Générale Publique GNU peut être trouvé dans le fichier / usr/share/common-licenses/GPL-3
@date:
- :published: 28.09.2012
+ :published: 2012-09-29
@publisher: Projet Debian Live <debian-live at lists.debian.org>
@@ -57,6 +57,8 @@
<< project_procedures.ssi
+<< project_git.ssi
+
:B~ Exemples
<< user_examples.ssi
diff --git a/manual/fr/project_git.ssi b/manual/fr/project_git.ssi
new file mode 100644
index 0000000..c3f1b3f
--- /dev/null
+++ b/manual/fr/project_git.ssi
@@ -0,0 +1,57 @@
+B~ Git repositories
+
+1~git-repositories Git repositories
+
+The git tree of the Debian Live Project is made up of several different
+branches. There is a list of all the available repositories at
+http://live.debian.net/gitweb The *{debian}* and the *{debian-next}*
+branches are particularly noteworthy because they contain the actual work
+that will eventually be included in each new release.
+
+The project's git URLs have the form:
+#{protocol://live.debian.net/git/repository}#.
+
+Thus, in order to clone live-manual read-only, launch:
+
+code{
+
+ $ git clone git://live.debian.net/git/live-manual.git
+
+}code
+
+Or,
+
+code{
+
+ $ git clone http://live.debian.net/git/live-manual.git
+
+}code
+
+The cloning addresses with write permission have the form:
+#{git at live.debian.net:/repository}#.
+
+So, again, to clone live-manual but over ssh you must type:
+
+code{
+
+ $ git clone git at live.debian.net:/live-manual.git
+
+}code
+
+After cloning any of the existing repositories, you will be on the
+*{debian}* branch. This is appropriate to take a look at the state of the
+project's latest release but before starting work it is crucial to switch to
+the *{debian-next}* branch. To do so:
+
+code{
+
+ $ git checkout debian-next
+
+}code
+
+The *{debian-next}* branch, which is not always fast-forward, is where all
+the changes are committed first before being merged into the *{debian}*
+branch. To make an analogy, it is like a testing ground. If you are working
+on this branch and need to pull, you will have to do a #{git pull --rebase}#
+so that your local modifications are staged while pulling from the server
+and then your changes will be put on top of it all.
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index 72c45ba..c9ec72e 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -101,16 +101,15 @@ valeur #{--mirror-bootstrap}#.
3~ Miroirs de distribution utilisés au moment de l'exécution
-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ée 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 #{http.debian.net}#, a service
+that chooses a geographically close mirror based, among other things, on the
+user's IP family and the availability of the mirrors. 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{
@@ -651,24 +650,16 @@ 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
- Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
+ $ echo "deb http://mirror/debian/ sid main" > config/archives/sid.list.chroot
+ $ cat >> config/chroot_apt/preferences << EOF
+ Package: live-*
Pin: release n=sid
Pin-Priority: 600
Package: *
Pin: release n=sid
Pin-Priority: 1
- END
-
-}code
-
-*{Remarque:}* Caractères génériques peuvent être utilisés dans les noms des paquets (par exemple *{Package: live-*}*) avec la version 0.8.14 ou supérieure d'Apt. Cela signifie qu'il fonctionne avec wheezy en utilisant:
-
-code{
-
-$ lb config --distribution wheezy
+ EOF
}code
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index a02b705..b2d3e0f 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -29,9 +29,9 @@ ces valeurs. Par exemple:
code{
- LB_MIRROR_BOOTSTRAP="http://mirror/debian"
- LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
- LB_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-backports/"
}code
@@ -310,14 +310,14 @@ qui va lancer /{metacity}/ et commencer /{xvncviewer}/, en reliant le port
code{
$ mkdir -p config/includes.chroot/etc/skel
- $ cat > config/includes.chroot/etc/skel/.xsession << END
+ $ cat > config/includes.chroot/etc/skel/.xsession << EOF
#!/bin/sh
/usr/bin/metacity &
/usr/bin/xvncviewer 192.168.1.2:1
exit
- END
+ EOF
}code
diff --git a/manual/it/about_manual.ssi b/manual/it/about_manual.ssi
index 1336f1c..5725050 100644
--- a/manual/it/about_manual.ssi
+++ b/manual/it/about_manual.ssi
@@ -118,6 +118,8 @@ _* Ben Armstrong
_* Brendan Sleight
+_* Carlos Zuferri
+
_* Chris Lamb
_* Daniel Baumann
@@ -150,8 +152,9 @@ detentore del copyright e di includere la licenza. Si noti che, per essere
accettato, il contributo deve essere distribuito con la stessa licenza del
resto del documento, ovvero la GPL versione 3 o successiva.
-I sorgenti di questo manuale sono mantenuti utilizzando il sistema di
-controllo Git. Si può visionare la copia più recente eseguendo:
+The sources for this manual are maintained using the Git version control
+system (see {Git repositories}#git-repositories). You can check out the
+latest copy by executing:
code{
diff --git a/manual/it/live-manual.ssm b/manual/it/live-manual.ssm
index 1087b86..6458569 100644
--- a/manual/it/live-manual.ssm
+++ b/manual/it/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Questo programma è software libero: è possibile ridistribuirlo e modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, sia la versione 3 della licenza o (a scelta) una versione successiva.<br><br>Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori dettagli.<br><br>Si dovrebbe aver ricevuto una copia della GNU General Public License con questo programma. In caso contrario, vedere http://www.gnu.org/licenses/. <br><br>Il testo completo della GNU General Public License può essere trovato nel file /usr/share/common-licenses/GPL-3.
@date:
- :published: 28.09.2012
+ :published: 2012-09-29
@publisher: Debian Live Project <debian-live at lists.debian.org>
@@ -57,6 +57,8 @@
<< project_procedures.ssi
+<< project_git.ssi
+
:B~ Esempi
<< user_examples.ssi
diff --git a/manual/it/project_git.ssi b/manual/it/project_git.ssi
new file mode 100644
index 0000000..c3f1b3f
--- /dev/null
+++ b/manual/it/project_git.ssi
@@ -0,0 +1,57 @@
+B~ Git repositories
+
+1~git-repositories Git repositories
+
+The git tree of the Debian Live Project is made up of several different
+branches. There is a list of all the available repositories at
+http://live.debian.net/gitweb The *{debian}* and the *{debian-next}*
+branches are particularly noteworthy because they contain the actual work
+that will eventually be included in each new release.
+
+The project's git URLs have the form:
+#{protocol://live.debian.net/git/repository}#.
+
+Thus, in order to clone live-manual read-only, launch:
+
+code{
+
+ $ git clone git://live.debian.net/git/live-manual.git
+
+}code
+
+Or,
+
+code{
+
+ $ git clone http://live.debian.net/git/live-manual.git
+
+}code
+
+The cloning addresses with write permission have the form:
+#{git at live.debian.net:/repository}#.
+
+So, again, to clone live-manual but over ssh you must type:
+
+code{
+
+ $ git clone git at live.debian.net:/live-manual.git
+
+}code
+
+After cloning any of the existing repositories, you will be on the
+*{debian}* branch. This is appropriate to take a look at the state of the
+project's latest release but before starting work it is crucial to switch to
+the *{debian-next}* branch. To do so:
+
+code{
+
+ $ git checkout debian-next
+
+}code
+
+The *{debian-next}* branch, which is not always fast-forward, is where all
+the changes are committed first before being merged into the *{debian}*
+branch. To make an analogy, it is like a testing ground. If you are working
+on this branch and need to pull, you will have to do a #{git pull --rebase}#
+so that your local modifications are staged while pulling from the server
+and then your changes will be put on top of it all.
diff --git a/manual/it/user_customization-packages.ssi b/manual/it/user_customization-packages.ssi
index da10aaa..4081aed 100644
--- a/manual/it/user_customization-packages.ssi
+++ b/manual/it/user_customization-packages.ssi
@@ -99,16 +99,15 @@ di #{--mirror-bootstrap}#.
3~ Mirror delle distribuzioni usate durante l'esecuzione
-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}#".
+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 #{http.debian.net}#, a service
+that chooses a geographically close mirror based, among other things, on the
+user's IP family and the availability of the mirrors. 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{
@@ -625,24 +624,16 @@ servirà allo scopo:
code{
- $ echo "deb http://mirror/debian sid main" > config/archives/sid.list.chroot
- $ cat >> config/chroot_apt/preferences << END
- Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
+ $ echo "deb http://mirror/debian/ sid main" > config/archives/sid.list.chroot
+ $ cat >> config/chroot_apt/preferences << EOF
+ Package: live-*
Pin: release n=sid
Pin-Priority: 600
Package: *
Pin: release n=sid
Pin-Priority: 1
- END
-
-}code
-
-*{Nota:}* con la versione 0.8.14 o superiore di Apt si possono utilizzare wildcard nei nomi dei pacchetti (*{Package: live-*}*). Ciò significa che funziona con wheezy usando:
-
-code{
-
-$ lb config --distribution wheezy
+ EOF
}code
diff --git a/manual/it/user_examples.ssi b/manual/it/user_examples.ssi
index dc42ffd..674c726 100644
--- a/manual/it/user_examples.ssi
+++ b/manual/it/user_examples.ssi
@@ -27,9 +27,9 @@ questi valori, ad esempio:
code{
- LB_MIRROR_BOOTSTRAP="http://mirror/debian"
- LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
- LB_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-backports/"
}code
@@ -305,14 +305,14 @@ connesso alla porta #{5901}# su un server con indirizzo #{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 << EOF
#!/bin/sh
/usr/bin/metacity &
/usr/bin/xvncviewer 192.168.1.2:1
exit
- END
+ EOF
}code
diff --git a/manual/po/ca/about_manual.ssi.po b/manual/po/ca/about_manual.ssi.po
index 904caf6..46a546e 100644
--- a/manual/po/ca/about_manual.ssi.po
+++ b/manual/po/ca/about_manual.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-08-31 14:04+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2012-06-26 19:41+0200\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -322,61 +322,66 @@ msgstr "_* Brendan Sleight"
#. type: Plain text
#: en/about_manual.ssi:60
+msgid "_* Carlos Zuferri"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:62
msgid "_* Chris Lamb"
msgstr "_* Chris Lamb"
#. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:64
msgid "_* Daniel Baumann"
msgstr "_* Daniel Baumann"
#. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:66
msgid "_* Franklin Piat"
msgstr "_* Franklin Piat"
#. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:68
msgid "_* Jonas Stein"
msgstr "_* Jonas Stein"
#. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:70
msgid "_* Kai Hendry"
msgstr "_* Kai Hendry"
#. type: Plain text
-#: en/about_manual.ssi:70
+#: en/about_manual.ssi:72
msgid "_* Marco Amadori"
msgstr "_* Marco Amadori"
#. type: Plain text
-#: en/about_manual.ssi:72
+#: en/about_manual.ssi:74
msgid "_* Mathieu Geli"
msgstr "_* Mathieu Geli"
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:76
msgid "_* Matthias Kirschner"
msgstr "_* Matthias Kirschner"
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:78
msgid "_* Richard Nelson"
msgstr "_* Richard Nelson"
#. type: Plain text
-#: en/about_manual.ssi:78
+#: en/about_manual.ssi:80
msgid "_* Trent W. Buck"
msgstr "_* Trent W. Buck"
#. type: Plain text
-#: en/about_manual.ssi:80
+#: en/about_manual.ssi:82
msgid "2~how-to-contribute Contributing to this document"
msgstr "2~how-to-contribute Contribuir en aquest document"
#. type: Plain text
-#: en/about_manual.ssi:82
+#: en/about_manual.ssi:84
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -389,7 +394,7 @@ msgstr ""
"secció {Contacte}#contact per més informació."
#. type: Plain text
-#: en/about_manual.ssi:84
+#: en/about_manual.ssi:86
msgid ""
"When submitting a contribution, please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted, the "
@@ -402,34 +407,41 @@ msgstr ""
"igual que la resta del document, a saber, la versió de la GPL 3 o superior."
#. type: Plain text
-#: en/about_manual.ssi:86
+#: en/about_manual.ssi:88
+#, fuzzy
+#| msgid ""
+#| "The sources for this manual are maintained using the Git version control "
+#| "system. You can check out the latest copy by executing:"
msgid ""
"The sources for this manual are maintained using the Git version control "
-"system. You can check out the latest copy by executing:"
+"system (see {Git repositories}#git-repositories). You can check out the "
+"latest copy by executing:"
msgstr ""
"Les fonts d'aquest manual es mantenen utilitzant el sistema de control de "
"versions Git. Es pot obtenir una còpia actualitzada mitjançant l'execució de:"
#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:51
-#: en/project_procedures.ssi:63 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
-#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
@@ -447,17 +459,19 @@ msgstr ""
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:187
#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:269
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:311
-#: en/user_customization-packages.ssi:328
-#: en/user_customization-packages.ssi:336 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:338
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:149
+#: en/user_customization-runtime.ssi:158 en/user_customization-runtime.ssi:173
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
@@ -482,30 +496,32 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:90
+#: en/about_manual.ssi:92
msgid "$ git clone git://live.debian.net/git/live-manual.git"
msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
-#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
-#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
-#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:59
-#: en/project_procedures.ssi:136 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
-#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
@@ -523,17 +539,19 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: en/user_customization-packages.ssi:183
#: en/user_customization-packages.ssi:193
#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:324
-#: en/user_customization-packages.ssi:332
-#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:21
+#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:367
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:163
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:163 en/user_customization-runtime.ssi:181
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
@@ -558,7 +576,7 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/about_manual.ssi:94
+#: en/about_manual.ssi:96
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -569,13 +587,13 @@ msgstr ""
"necessaris per a la seva construcció mitjançant l'execució de:"
#. type: Plain text
-#: en/about_manual.ssi:98
+#: en/about_manual.ssi:100
#, no-wrap
msgid " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
msgstr "# apt-get install make po4a sisu-complete libnokogiri-ruby\n"
#. type: Plain text
-#: en/about_manual.ssi:102
+#: en/about_manual.ssi:104
msgid ""
"You may build the live-manual from the top level directory of your Git "
"checkout by executing:"
@@ -584,13 +602,13 @@ msgstr ""
"Git mitjançant l'execució de:"
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:108
#, no-wrap
msgid " $ make build\n"
msgstr " $ make build\n"
#. type: Plain text
-#: en/about_manual.ssi:110
+#: en/about_manual.ssi:112
msgid ""
"Since it takes a while to build the manual in all supported languages, you "
"may find it convenient when proofing to build for only one language, e.g. by "
@@ -601,40 +619,40 @@ msgstr ""
"sol idioma, per exemple, mitjançant l'execució de:"
#. type: Plain text
-#: en/about_manual.ssi:114
+#: en/about_manual.ssi:116
#, no-wrap
msgid " $ make build LANGUAGES=en\n"
msgstr "$ make build LANGUAGES=en\n"
#. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:120
msgid "It is also possible to build by document type, e.g:"
msgstr "També es possible crear per tipus de document, per exemple: "
#. type: Plain text
-#: en/about_manual.ssi:122
+#: en/about_manual.ssi:124
#, no-wrap
msgid " $ make build FORMATS=pdf\n"
msgstr " $ make build FORMATS=pdf\n"
#. type: Plain text
-#: en/about_manual.ssi:126
+#: en/about_manual.ssi:128
msgid "Or combine both, e.g:"
msgstr "O combinar tot dos, per exemple:"
#. type: Plain text
-#: en/about_manual.ssi:130
+#: en/about_manual.ssi:132
#, no-wrap
msgid " $ make build LANGUAGES=it FORMATS=html\n"
msgstr " $ make build LANGUAGES=it FORMATS=html\n"
#. type: Plain text
-#: en/about_manual.ssi:134
+#: en/about_manual.ssi:136
msgid "3~ Applying changes"
msgstr "3~ Aplicar canvis"
#. type: Plain text
-#: en/about_manual.ssi:136
+#: en/about_manual.ssi:138
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 "
@@ -646,12 +664,12 @@ msgstr ""
"procediment:"
#. type: Plain text
-#: en/about_manual.ssi:138
+#: en/about_manual.ssi:140
msgid "_* Fetch the public commit key:"
msgstr "_* Obtenir la clau pública:"
#. type: Plain text
-#: en/about_manual.ssi:147
+#: en/about_manual.ssi:149
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
@@ -669,13 +687,13 @@ msgstr ""
" $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*\n"
#. type: Plain text
-#: en/about_manual.ssi:151
+#: en/about_manual.ssi:153
msgid "_* Add the following section to your openssh-client config:"
msgstr ""
"_* Afegir la següent secció a la configuració del vostre openssh-client:"
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:162
#, no-wrap
msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
@@ -693,12 +711,12 @@ msgstr ""
" EOF\n"
#. type: Plain text
-#: en/about_manual.ssi:164
+#: en/about_manual.ssi:166
msgid "_* Check out a clone of the manual through ssh:"
msgstr "_* Fer una còpia del manual a través de ssh:"
#. type: Plain text
-#: en/about_manual.ssi:169
+#: en/about_manual.ssi:171
#, no-wrap
msgid ""
" $ git clone git at live.debian.net:/live-manual.git\n"
@@ -708,7 +726,7 @@ msgstr ""
" $ cd live-manual && git checkout debian-next\n"
#. type: Plain text
-#: en/about_manual.ssi:173
+#: en/about_manual.ssi:175
msgid ""
"_* Note that you should commit any changes on the debian-next branch, not on "
"the debian branch."
@@ -717,7 +735,7 @@ msgstr ""
"a la branca debian."
#. type: Plain text
-#: en/about_manual.ssi:175
+#: en/about_manual.ssi:177
msgid ""
"_* Do not use #{make commit}# unless you are updating translations in this "
"commit, and in that case, do not mix changes to the English manual and "
@@ -730,7 +748,7 @@ msgstr ""
"Veure la secció {Traducció}#translation per a més detalls."
#. type: Plain text
-#: en/about_manual.ssi:177
+#: en/about_manual.ssi:179
msgid ""
"_* Write commit messages that consist of complete, meaningful sentences in "
"English, starting with a capital letter and ending with a full stop. "
@@ -743,34 +761,34 @@ msgstr ""
"Correcting/Translating', per exemple:"
#. type: Plain text
-#: en/about_manual.ssi:181
+#: en/about_manual.ssi:183
#, 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:185
+#: en/about_manual.ssi:187
msgid "_* Push the commit to the server:"
msgstr "_* Fer un push al servidor:"
#. type: Plain text
-#: en/about_manual.ssi:189
+#: en/about_manual.ssi:191
#, no-wrap
msgid " $ git push\n"
msgstr " $ git push\n"
#. type: Plain text
-#: en/about_manual.ssi:193
+#: en/about_manual.ssi:195
msgid "3~translation Translation"
msgstr "3~translation Traducció"
#. type: Plain text
-#: en/about_manual.ssi:195
+#: en/about_manual.ssi:197
msgid "To start a translation for a new language, follow these steps:"
msgstr "Per començar la traducció d'un idioma nou, seguir aquests passos:"
#. type: Plain text
-#: en/about_manual.ssi:197
+#: en/about_manual.ssi:199
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 "
@@ -783,7 +801,7 @@ msgstr ""
"correu perquè l'equip de traducció pugui comprovar la seva integritat."
#. type: Plain text
-#: en/about_manual.ssi:199
+#: en/about_manual.ssi:201
msgid ""
"_* To enable a new language in the autobuild it is enough to add the initial "
"translated files to #{manual/po/${LANGUAGE}/}# and run #{make commit}#. And "
@@ -794,7 +812,7 @@ msgstr ""
"llavors editar #{manual/_sisu/home/index.html}#."
#. type: Plain text
-#: en/about_manual.ssi:201
+#: en/about_manual.ssi:203
msgid ""
"_* Once the new language is added, you can randomly continue translating the "
"remaining po files in #{manual/po/}#."
@@ -803,7 +821,7 @@ msgstr ""
"resta de fitxers dins de #{manual/po/}# a l'atzar."
#. type: Plain text
-#: en/about_manual.ssi:203
+#: en/about_manual.ssi:205
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
"are updated from the po files and then you can review your changes launching "
@@ -816,7 +834,7 @@ msgstr ""
"commit -a -m \"Translating...\"}# i #{git push}#."
#. type: Plain text
-#: en/about_manual.ssi:204
+#: en/about_manual.ssi:206
#, no-wrap
msgid "*{Note:}* You can use #{make clean}# to clean your git tree before pushing. This step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
msgstr "*{Nota:}* Es pot utilitzar #{make clean}# per netejar l'arbre git abans de fer un push. Aquest pas no és obligatori, gràcies al fitxer .gitignore, però és una bona pràctica per evitar enviar fitxers de forma involuntària.\n"
diff --git a/manual/po/ca/live-manual.ssm.po b/manual/po/ca/live-manual.ssm.po
index c842b58..66ac742 100644
--- a/manual/po/ca/live-manual.ssm.po
+++ b/manual/po/ca/live-manual.ssm.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-09-28 09:48+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2012-08-26 14:11+0200\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -47,13 +47,16 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:13
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "@date:\n"
+#| " :published: 2012-09-28\n"
msgid ""
"@date:\n"
-" :published: 2012-09-28\n"
+" :published: 2012-09-29\n"
msgstr ""
"@date:\n"
-" :published: 28.09.2012\n"
+" :published: 29.09.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
@@ -172,21 +175,28 @@ msgid "<< project_procedures.ssi"
msgstr "<< project_procedures.ssi"
#. type: Plain text
-#: en/live-manual.ssm:61 en/user_examples.ssi:2
+#: en/live-manual.ssm:61
+#, fuzzy
+#| msgid "<< project_bugs.ssi"
+msgid "<< project_git.ssi"
+msgstr "<< project_bugs.ssi"
+
+#. type: Plain text
+#: en/live-manual.ssm:63 en/user_examples.ssi:2
msgid ":B~ Examples"
msgstr ":B~ Exemples"
#. type: Plain text
-#: en/live-manual.ssm:63
+#: en/live-manual.ssm:65
msgid "<< user_examples.ssi"
msgstr "<< user_examples.ssi"
#. type: Plain text
-#: en/live-manual.ssm:65 en/style_guide.ssi:2
+#: en/live-manual.ssm:67 en/style_guide.ssi:2
msgid ":B~ Appendix"
msgstr ":B~ Apèndix"
#. type: Plain text
-#: en/live-manual.ssm:66
+#: en/live-manual.ssm:68
msgid "<< style_guide.ssi"
msgstr "<< style_guide.ssi"
diff --git a/manual/po/ca/project_git.ssi.po b/manual/po/ca/project_git.ssi.po
new file mode 100644
index 0000000..c30ba25
--- /dev/null
+++ b/manual/po/ca/project_git.ssi.po
@@ -0,0 +1,278 @@
+# Catalan translations for live-manual package
+# This file is distributed under the same license as the live-manual package.
+# Carlos Zuferri <chals at altorricon.com>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
+"PO-Revision-Date: 2012-09-28 20:38+0100\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: none\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
+#: 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:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:338
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:149
+#: en/user_customization-runtime.ssi:158 en/user_customization-runtime.ssi:173
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:201 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:233 en/user_examples.ssi:247
+#: en/user_examples.ssi:256 en/user_examples.ssi:264 en/user_examples.ssi:284
+#: en/user_examples.ssi:292 en/user_examples.ssi:301 en/user_examples.ssi:311
+#: 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:142
+#: en/user_installation.ssi:153 en/user_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
+#: 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:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:367
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:163 en/user_customization-runtime.ssi:181
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:205 en/user_examples.ssi:213
+#: en/user_examples.ssi:229 en/user_examples.ssi:237 en/user_examples.ssi:252
+#: en/user_examples.ssi:260 en/user_examples.ssi:268 en/user_examples.ssi:288
+#: en/user_examples.ssi:297 en/user_examples.ssi:307 en/user_examples.ssi:325
+#: 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:147
+#: en/user_installation.ssi:156 en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/project_git.ssi:2
+msgid "B~ Git repositories"
+msgstr "B~ Repositoris Git"
+
+#. type: Plain text
+#: en/project_git.ssi:4
+msgid "1~git-repositories Git repositories"
+msgstr "1~git-repositories Repositoris Git "
+
+#. type: Plain text
+#: en/project_git.ssi:6
+msgid ""
+"The git tree of the Debian Live Project is made up of several different "
+"branches. There is a list of all the available repositories at http://live."
+"debian.net/gitweb The *{debian}* and the *{debian-next}* branches are "
+"particularly noteworthy because they contain the actual work that will "
+"eventually be included in each new release."
+msgstr ""
+"L'arbre git del projecte Debian Live es compon de diverses branques "
+"diferents. Hi ha una llista de tots els repositoris a http://live.debian.net/"
+"gitweb Les branques *{debian}* i *{debian-next}* són particularment "
+"notables perquè contenen el treball real que, amb el temps, serà inclòs en "
+"cada nova versió."
+
+#. type: Plain text
+#: en/project_git.ssi:8
+msgid ""
+"The project's git URLs have the form: #{protocol://live.debian.net/git/"
+"repository}#."
+msgstr ""
+"Les URLs git del projecte tenen la forma: #{protocol://live.debian.net/git/"
+"repositori}#."
+
+#. type: Plain text
+#: en/project_git.ssi:10
+msgid "Thus, in order to clone live-manual read-only, launch:"
+msgstr "Per tant, per tal de clonar live-manual en només lectura, llançar:"
+
+#. type: Plain text
+#: en/project_git.ssi:14
+#, no-wrap
+msgid " $ git clone git://live.debian.net/git/live-manual.git\n"
+msgstr " $ git clone git://live.debian.net/git/live-manual.git\n"
+
+#. type: Plain text
+#: en/project_git.ssi:18
+msgid "Or,"
+msgstr "O,"
+
+#. type: Plain text
+#: en/project_git.ssi:22
+#, no-wrap
+msgid " $ git clone http://live.debian.net/git/live-manual.git\n"
+msgstr " $ git clone http://live.debian.net/git/live-manual.git\n"
+
+#. type: Plain text
+#: en/project_git.ssi:26
+msgid ""
+"The cloning addresses with write permission have the form: #{git at live.debian."
+"net:/repository}#."
+msgstr ""
+"Les adreces per clonar amb permís d'escriptura tenen la forma: #{git at live."
+"debian.net:/repositori}#."
+
+#. type: Plain text
+#: en/project_git.ssi:28
+msgid "So, again, to clone live-manual but over ssh you must type:"
+msgstr ""
+"Així que, de nou, per clonar live-manual, però a través de ssh escriure:"
+
+#. type: Plain text
+#: en/project_git.ssi:32
+#, no-wrap
+msgid " $ git clone git at live.debian.net:/live-manual.git\n"
+msgstr " $ git clone git at live.debian.net:/live-manual.git\n"
+
+#. type: Plain text
+#: en/project_git.ssi:36
+msgid ""
+"After cloning any of the existing repositories, you will be on the *{debian}"
+"* branch. This is appropriate to take a look at the state of the project's "
+"latest release but before starting work it is crucial to switch to the *"
+"{debian-next}* branch. To do so:"
+msgstr ""
+"Després de clonar qualsevol dels repositoris existents, estarem a la branca *"
+"{debian}*. Això és apropiat per fer una ullada a l'estat de l'última versió "
+"del projecte, però abans de començar a treballar és fonamental canviar a la "
+"branca *{debian-next}*. Per fer això:"
+
+#. type: Plain text
+#: en/project_git.ssi:40
+#, no-wrap
+msgid " $ git checkout debian-next\n"
+msgstr " $ git checkout debian-next\n"
+
+#. type: Plain text
+#: en/project_git.ssi:43
+msgid ""
+"The *{debian-next}* branch, which is not always fast-forward, is where all "
+"the changes are committed first before being merged into the *{debian}* "
+"branch. To make an analogy, it is like a testing ground. If you are working "
+"on this branch and need to pull, you will have to do a #{git pull --rebase}# "
+"so that your local modifications are staged while pulling from the server "
+"and then your changes will be put on top of it all."
+msgstr ""
+"La branca *{debian-next}*, que no sempre és fast-forward, és on es realitzen "
+"tots els canvis abans de fusionar-los amb la branca *{debian}. Per fer una "
+"analogia, és com un camp de proves. Si s'està treballant en aquesta branca i "
+"es necessari fer un pull, s'haurà de fer un #{git pull --rebase}# perquè les "
+"modificacions locals es guardin mentre s'actualitza des del servidor i "
+"llavors els canvis locals es posaran al damunt de tot."
diff --git a/manual/po/ca/user_customization-packages.ssi.po b/manual/po/ca/user_customization-packages.ssi.po
index 2ec3144..453d665 100644
--- a/manual/po/ca/user_customization-packages.ssi.po
+++ b/manual/po/ca/user_customization-packages.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-09-26 17:09+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2012-09-26 19:26+0100\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -16,25 +16,27 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:51
-#: en/project_procedures.ssi:63 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
-#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
@@ -58,8 +60,7 @@ msgstr ""
#: en/user_customization-packages.ssi:324
#: en/user_customization-packages.ssi:338
#: en/user_customization-packages.ssi:354
-#: en/user_customization-packages.ssi:371
-#: en/user_customization-packages.ssi:379 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
@@ -90,25 +91,27 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
-#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
-#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:59
-#: en/project_procedures.ssi:136 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
-#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
@@ -132,8 +135,7 @@ msgstr "code{"
#: en/user_customization-packages.ssi:328
#: en/user_customization-packages.ssi:342
#: en/user_customization-packages.ssi:367
-#: en/user_customization-packages.ssi:375
-#: en/user_customization-packages.ssi:384 en/user_customization-runtime.ssi:21
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
@@ -375,15 +377,26 @@ msgstr "3~ Miralls de distribució utilitzats en temps d'execució"
#. 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 #{--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."
+"running the live system. The defaults employ #{http.debian.net}#, a service "
+"that chooses a geographically close mirror based, among other things, on the "
+"user's IP family and the availability of the mirrors. 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 opcions #{--mirror-binary*}# governen els miralls de distribució "
"coŀlocats a la imatge binària. Aquestes poden ser utilitzades per instaŀlar "
@@ -1565,11 +1578,17 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:360
-#, no-wrap
-msgid ""
-" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
-" $ cat >> config/chroot_apt/preferences << END\n"
-" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
+#, fuzzy, no-wrap
+#| msgid ""
+#| " $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
+#| " $ cat >> config/chroot_apt/preferences << END\n"
+#| " Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
+#| " Pin: release n=sid\n"
+#| " Pin-Priority: 600\n"
+msgid ""
+" $ echo \"deb http://mirror/debian/ sid main\" > config/archives/sid.list.chroot\n"
+" $ cat >> config/chroot_apt/preferences << EOF\n"
+" Package: live-*\n"
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
@@ -1581,12 +1600,17 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:365
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " Package: *\n"
+#| " Pin: release n=sid\n"
+#| " Pin-Priority: 1\n"
+#| " END\n"
msgid ""
" Package: *\n"
" Pin: release n=sid\n"
" Pin-Priority: 1\n"
-" END\n"
+" EOF\n"
msgstr ""
" Package: *\n"
" Pin: release n=sid\n"
@@ -1595,17 +1619,6 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:369
-#, no-wrap
-msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:\n"
-msgstr "*{Nota:}* Es poden usar comodins en els noms dels paquets (per exemple, *{Package: live-*}*) amb la versió 0.8.14 o superior d'Apt. Això significa que funciona amb wheezy utilitzant:\n"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:373
-msgid "$ lb config --distribution wheezy"
-msgstr "$ lb config --distribution wheezy"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:377
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 "
@@ -1628,7 +1641,7 @@ msgstr ""
"preferences}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:383
+#: en/user_customization-packages.ssi:375
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/ca/user_examples.ssi.po b/manual/po/ca/user_examples.ssi.po
index 48dd8ce..a1cffc9 100644
--- a/manual/po/ca/user_examples.ssi.po
+++ b/manual/po/ca/user_examples.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-08-30 14:19+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2012-08-26 12:27+0200\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -16,30 +16,32 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
-#: en/live-manual.ssm:61 en/user_examples.ssi:2
+#: en/live-manual.ssm:63 en/user_examples.ssi:2
msgid ":B~ Examples"
msgstr ":B~ Exemples"
#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
-#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
-#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
@@ -57,17 +59,19 @@ msgstr ":B~ Exemples"
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:187
#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:269
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:311
-#: en/user_customization-packages.ssi:328
-#: en/user_customization-packages.ssi:336 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:338
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:149
+#: en/user_customization-runtime.ssi:158 en/user_customization-runtime.ssi:173
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
@@ -92,25 +96,27 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
-#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
-#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
-#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
-#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
@@ -128,17 +134,19 @@ msgstr "code{"
#: en/user_customization-packages.ssi:183
#: en/user_customization-packages.ssi:193
#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:324
-#: en/user_customization-packages.ssi:332
-#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:21
+#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:367
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:163
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:163 en/user_customization-runtime.ssi:181
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
@@ -250,11 +258,15 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:18
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " 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"
msgid ""
-" 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"
+" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian/\"\n"
+" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security/\"\n"
+" LB_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-backports/\"\n"
msgstr ""
" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
@@ -752,10 +764,14 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:221
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " $ mkdir -p config/includes.chroot/etc/skel\n"
+#| " $ cat > config/includes.chroot/etc/skel/.xsession << END\n"
+#| " #!/bin/sh\n"
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 << EOF\n"
" #!/bin/sh\n"
msgstr ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -774,10 +790,13 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:227
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " exit\n"
+#| " END\n"
msgid ""
" exit\n"
-" END\n"
+" EOF\n"
msgstr ""
" exit\n"
" END\n"
diff --git a/manual/po/de/about_manual.ssi.po b/manual/po/de/about_manual.ssi.po
index afdfadc..5ae64bc 100644
--- a/manual/po/de/about_manual.ssi.po
+++ b/manual/po/de/about_manual.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-08-31 14:04+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -262,61 +262,66 @@ msgstr "_* Brendan Sleight"
#. type: Plain text
#: en/about_manual.ssi:60
+msgid "_* Carlos Zuferri"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:62
msgid "_* Chris Lamb"
msgstr "_* Chris Lamb"
#. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:64
msgid "_* Daniel Baumann"
msgstr "_* Daniel Baumann"
#. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:66
msgid "_* Franklin Piat"
msgstr "_* Franklin Piat"
#. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:68
msgid "_* Jonas Stein"
msgstr "_* Jonas Stein"
#. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:70
msgid "_* Kai Hendry"
msgstr "_* Kai Hendry"
#. type: Plain text
-#: en/about_manual.ssi:70
+#: en/about_manual.ssi:72
msgid "_* Marco Amadori"
msgstr "_* Marco Amadori"
#. type: Plain text
-#: en/about_manual.ssi:72
+#: en/about_manual.ssi:74
msgid "_* Mathieu Geli"
msgstr "_* Mathieu Geli"
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:76
msgid "_* Matthias Kirschner"
msgstr "_* Matthias Kirschner"
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:78
msgid "_* Richard Nelson"
msgstr "_* Richard Nelson"
#. type: Plain text
-#: en/about_manual.ssi:78
+#: en/about_manual.ssi:80
msgid "_* Trent W. Buck"
msgstr "_* Trent W. Buck"
#. type: Plain text
-#: en/about_manual.ssi:80
+#: en/about_manual.ssi:82
msgid "2~how-to-contribute Contributing to this document"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:82
+#: en/about_manual.ssi:84
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -325,7 +330,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84
+#: en/about_manual.ssi:86
msgid ""
"When submitting a contribution, please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted, the "
@@ -334,32 +339,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:86
+#: en/about_manual.ssi:88
msgid ""
"The sources for this manual are maintained using the Git version control "
-"system. You can check out the latest copy by executing:"
+"system (see {Git repositories}#git-repositories). You can check out the "
+"latest copy by executing:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:51
-#: en/project_procedures.ssi:63 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
-#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
@@ -377,17 +385,19 @@ msgstr ""
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:187
#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:269
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:311
-#: en/user_customization-packages.ssi:328
-#: en/user_customization-packages.ssi:336 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:338
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:149
+#: en/user_customization-runtime.ssi:158 en/user_customization-runtime.ssi:173
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
@@ -412,30 +422,32 @@ msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:90
+#: en/about_manual.ssi:92
msgid "$ git clone git://live.debian.net/git/live-manual.git"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
-#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
-#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:59
-#: en/project_procedures.ssi:136 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
-#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
@@ -453,17 +465,19 @@ msgstr ""
#: en/user_customization-packages.ssi:183
#: en/user_customization-packages.ssi:193
#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:324
-#: en/user_customization-packages.ssi:332
-#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:21
+#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:367
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:163
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:163 en/user_customization-runtime.ssi:181
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
@@ -488,7 +502,7 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:94
+#: en/about_manual.ssi:96
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -496,26 +510,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:98
+#: en/about_manual.ssi:100
#, no-wrap
msgid " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:102
+#: en/about_manual.ssi:104
msgid ""
"You may build the live-manual from the top level directory of your Git "
"checkout by executing:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:108
#, no-wrap
msgid " $ make build\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:110
+#: en/about_manual.ssi:112
msgid ""
"Since it takes a while to build the manual in all supported languages, you "
"may find it convenient when proofing to build for only one language, e.g. by "
@@ -523,40 +537,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:114
+#: en/about_manual.ssi:116
#, no-wrap
msgid " $ make build LANGUAGES=en\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:120
msgid "It is also possible to build by document type, e.g:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:122
+#: en/about_manual.ssi:124
#, no-wrap
msgid " $ make build FORMATS=pdf\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:126
+#: en/about_manual.ssi:128
msgid "Or combine both, e.g:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:130
+#: en/about_manual.ssi:132
#, no-wrap
msgid " $ make build LANGUAGES=it FORMATS=html\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:134
+#: en/about_manual.ssi:136
msgid "3~ Applying changes"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:136
+#: en/about_manual.ssi:138
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 "
@@ -564,12 +578,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:138
+#: en/about_manual.ssi:140
msgid "_* Fetch the public commit key:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:147
+#: en/about_manual.ssi:149
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
@@ -581,12 +595,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:151
+#: en/about_manual.ssi:153
msgid "_* Add the following section to your openssh-client config:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:162
#, no-wrap
msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
@@ -598,12 +612,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:164
+#: en/about_manual.ssi:166
msgid "_* Check out a clone of the manual through ssh:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:169
+#: en/about_manual.ssi:171
#, no-wrap
msgid ""
" $ git clone git at live.debian.net:/live-manual.git\n"
@@ -611,14 +625,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:173
+#: en/about_manual.ssi:175
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:175
+#: en/about_manual.ssi:177
msgid ""
"_* Do not use #{make commit}# unless you are updating translations in this "
"commit, and in that case, do not mix changes to the English manual and "
@@ -627,7 +641,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:177
+#: en/about_manual.ssi:179
msgid ""
"_* Write commit messages that consist of complete, meaningful sentences in "
"English, starting with a capital letter and ending with a full stop. "
@@ -636,34 +650,34 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:181
+#: en/about_manual.ssi:183
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:185
+#: en/about_manual.ssi:187
msgid "_* Push the commit to the server:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:189
+#: en/about_manual.ssi:191
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:193
+#: en/about_manual.ssi:195
msgid "3~translation Translation"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:195
+#: en/about_manual.ssi:197
msgid "To start a translation for a new language, follow these steps:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:197
+#: en/about_manual.ssi:199
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 "
@@ -672,7 +686,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:199
+#: en/about_manual.ssi:201
msgid ""
"_* To enable a new language in the autobuild it is enough to add the initial "
"translated files to #{manual/po/${LANGUAGE}/}# and run #{make commit}#. And "
@@ -680,14 +694,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:201
+#: en/about_manual.ssi:203
msgid ""
"_* Once the new language is added, you can randomly continue translating the "
"remaining po files in #{manual/po/}#."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:203
+#: en/about_manual.ssi:205
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
"are updated from the po files and then you can review your changes launching "
@@ -696,7 +710,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:204
+#: en/about_manual.ssi:206
#, no-wrap
msgid "*{Note:}* You can use #{make clean}# to clean your git tree before pushing. This step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
msgstr ""
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index 2c34c77..da485f6 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-09-28 09:48+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -47,13 +47,16 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:13
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "@date:\n"
+#| " :published: 2012-09-28\n"
msgid ""
"@date:\n"
-" :published: 2012-09-28\n"
+" :published: 2012-09-29\n"
msgstr ""
"@date:\n"
-" :published: 28.09.2012\n"
+" :published: 29.09.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
@@ -167,21 +170,28 @@ msgid "<< project_procedures.ssi"
msgstr "<< project_procedures.ssi"
#. type: Plain text
-#: en/live-manual.ssm:61 en/user_examples.ssi:2
+#: en/live-manual.ssm:61
+#, fuzzy
+#| msgid "<< project_bugs.ssi"
+msgid "<< project_git.ssi"
+msgstr "<< project_bugs.ssi"
+
+#. type: Plain text
+#: en/live-manual.ssm:63 en/user_examples.ssi:2
msgid ":B~ Examples"
msgstr ":B~ Beispiele"
#. type: Plain text
-#: en/live-manual.ssm:63
+#: en/live-manual.ssm:65
msgid "<< user_examples.ssi"
msgstr "<< user_examples.ssi"
#. type: Plain text
-#: en/live-manual.ssm:65 en/style_guide.ssi:2
+#: en/live-manual.ssm:67 en/style_guide.ssi:2
msgid ":B~ Appendix"
msgstr ":B~ Anhang"
#. type: Plain text
-#: en/live-manual.ssm:66
+#: en/live-manual.ssm:68
msgid "<< style_guide.ssi"
msgstr "<< style_guide.ssi"
diff --git a/manual/po/de/project_git.ssi.po b/manual/po/de/project_git.ssi.po
new file mode 100644
index 0000000..7b74376
--- /dev/null
+++ b/manual/po/de/project_git.ssi.po
@@ -0,0 +1,260 @@
+# German translations for live-manual package
+# Copyright (C) 2012 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
+"PO-Revision-Date: 2012-09-29 15:21+0300\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
+#: 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:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:338
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:149
+#: en/user_customization-runtime.ssi:158 en/user_customization-runtime.ssi:173
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:201 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:233 en/user_examples.ssi:247
+#: en/user_examples.ssi:256 en/user_examples.ssi:264 en/user_examples.ssi:284
+#: en/user_examples.ssi:292 en/user_examples.ssi:301 en/user_examples.ssi:311
+#: 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:142
+#: en/user_installation.ssi:153 en/user_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
+msgid "code{"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
+#: 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:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:367
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:163 en/user_customization-runtime.ssi:181
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:205 en/user_examples.ssi:213
+#: en/user_examples.ssi:229 en/user_examples.ssi:237 en/user_examples.ssi:252
+#: en/user_examples.ssi:260 en/user_examples.ssi:268 en/user_examples.ssi:288
+#: en/user_examples.ssi:297 en/user_examples.ssi:307 en/user_examples.ssi:325
+#: 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:147
+#: en/user_installation.ssi:156 en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
+msgid "}code"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:2
+msgid "B~ Git repositories"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:4
+msgid "1~git-repositories Git repositories"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:6
+msgid ""
+"The git tree of the Debian Live Project is made up of several different "
+"branches. There is a list of all the available repositories at http://live."
+"debian.net/gitweb The *{debian}* and the *{debian-next}* branches are "
+"particularly noteworthy because they contain the actual work that will "
+"eventually be included in each new release."
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:8
+msgid ""
+"The project's git URLs have the form: #{protocol://live.debian.net/git/"
+"repository}#."
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:10
+msgid "Thus, in order to clone live-manual read-only, launch:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:14
+#, no-wrap
+msgid " $ git clone git://live.debian.net/git/live-manual.git\n"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:18
+msgid "Or,"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:22
+#, no-wrap
+msgid " $ git clone http://live.debian.net/git/live-manual.git\n"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:26
+msgid ""
+"The cloning addresses with write permission have the form: #{git at live.debian."
+"net:/repository}#."
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:28
+msgid "So, again, to clone live-manual but over ssh you must type:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:32
+#, no-wrap
+msgid " $ git clone git at live.debian.net:/live-manual.git\n"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:36
+msgid ""
+"After cloning any of the existing repositories, you will be on the *{debian}"
+"* branch. This is appropriate to take a look at the state of the project's "
+"latest release but before starting work it is crucial to switch to the *"
+"{debian-next}* branch. To do so:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:40
+#, no-wrap
+msgid " $ git checkout debian-next\n"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:43
+msgid ""
+"The *{debian-next}* branch, which is not always fast-forward, is where all "
+"the changes are committed first before being merged into the *{debian}* "
+"branch. To make an analogy, it is like a testing ground. If you are working "
+"on this branch and need to pull, you will have to do a #{git pull --rebase}# "
+"so that your local modifications are staged while pulling from the server "
+"and then your changes will be put on top of it all."
+msgstr ""
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index 418b6f4..826342f 100644
--- a/manual/po/de/user_customization-packages.ssi.po
+++ b/manual/po/de/user_customization-packages.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-09-26 17:09+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -16,25 +16,27 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:51
-#: en/project_procedures.ssi:63 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
-#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
@@ -58,8 +60,7 @@ msgstr ""
#: en/user_customization-packages.ssi:324
#: en/user_customization-packages.ssi:338
#: en/user_customization-packages.ssi:354
-#: en/user_customization-packages.ssi:371
-#: en/user_customization-packages.ssi:379 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
@@ -90,25 +91,27 @@ msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
-#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
-#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:59
-#: en/project_procedures.ssi:136 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
-#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
@@ -132,8 +135,7 @@ msgstr ""
#: en/user_customization-packages.ssi:328
#: en/user_customization-packages.ssi:342
#: en/user_customization-packages.ssi:367
-#: en/user_customization-packages.ssi:375
-#: en/user_customization-packages.ssi:384 en/user_customization-runtime.ssi:21
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
@@ -316,12 +318,13 @@ msgstr ""
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."
+"running the live system. The defaults employ #{http.debian.net}#, a service "
+"that chooses a geographically close mirror based, among other things, on the "
+"user's IP family and the availability of the mirrors. 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
@@ -1183,9 +1186,9 @@ msgstr ""
#: en/user_customization-packages.ssi:360
#, no-wrap
msgid ""
-" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
-" $ cat >> config/chroot_apt/preferences << END\n"
-" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
+" $ echo \"deb http://mirror/debian/ sid main\" > config/archives/sid.list.chroot\n"
+" $ cat >> config/chroot_apt/preferences << EOF\n"
+" Package: live-*\n"
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
@@ -1197,22 +1200,11 @@ msgid ""
" Package: *\n"
" Pin: release n=sid\n"
" Pin-Priority: 1\n"
-" END\n"
+" EOF\n"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:369
-#, no-wrap
-msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:373
-msgid "$ lb config --distribution wheezy"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:377
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 "
@@ -1226,7 +1218,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:383
+#: en/user_customization-packages.ssi:375
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index 2e1cc3a..af6fbd4 100644
--- a/manual/po/de/user_examples.ssi.po
+++ b/manual/po/de/user_examples.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-08-30 14:19+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -16,30 +16,32 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
-#: en/live-manual.ssm:61 en/user_examples.ssi:2
+#: en/live-manual.ssm:63 en/user_examples.ssi:2
msgid ":B~ Examples"
msgstr ":B~ Beispiele"
#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
-#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
-#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
@@ -57,17 +59,19 @@ msgstr ":B~ Beispiele"
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:187
#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:269
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:311
-#: en/user_customization-packages.ssi:328
-#: en/user_customization-packages.ssi:336 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:338
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:149
+#: en/user_customization-runtime.ssi:158 en/user_customization-runtime.ssi:173
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
@@ -92,25 +96,27 @@ msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
-#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
-#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
-#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
-#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
@@ -128,17 +134,19 @@ msgstr ""
#: en/user_customization-packages.ssi:183
#: en/user_customization-packages.ssi:193
#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:324
-#: en/user_customization-packages.ssi:332
-#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:21
+#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:367
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:163
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:163 en/user_customization-runtime.ssi:181
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
@@ -233,9 +241,9 @@ msgstr ""
#: en/user_examples.ssi:18
#, no-wrap
msgid ""
-" 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"
+" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian/\"\n"
+" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security/\"\n"
+" LB_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-backports/\"\n"
msgstr ""
#. type: Plain text
@@ -618,7 +626,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 << EOF\n"
" #!/bin/sh\n"
msgstr ""
@@ -635,7 +643,7 @@ msgstr ""
#, no-wrap
msgid ""
" exit\n"
-" END\n"
+" EOF\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/es/about_manual.ssi.po b/manual/po/es/about_manual.ssi.po
index 1cd703a..40288c1 100644
--- a/manual/po/es/about_manual.ssi.po
+++ b/manual/po/es/about_manual.ssi.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-31 14:04+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2012-08-07 13:59+0200\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -348,61 +348,66 @@ msgstr "_* Brendan Sleight"
#. type: Plain text
#: en/about_manual.ssi:60
+msgid "_* Carlos Zuferri"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:62
msgid "_* Chris Lamb"
msgstr "_* Chris Lamb"
#. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:64
msgid "_* Daniel Baumann"
msgstr "_* Daniel Baumann"
#. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:66
msgid "_* Franklin Piat"
msgstr "_* Franklin Piat"
#. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:68
msgid "_* Jonas Stein"
msgstr "_* Jonas Stein"
#. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:70
msgid "_* Kai Hendry"
msgstr "_* Kai Hendry"
#. type: Plain text
-#: en/about_manual.ssi:70
+#: en/about_manual.ssi:72
msgid "_* Marco Amadori"
msgstr "_* Marco Amadori"
#. type: Plain text
-#: en/about_manual.ssi:72
+#: en/about_manual.ssi:74
msgid "_* Mathieu Geli"
msgstr "_* Mathieu Geli"
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:76
msgid "_* Matthias Kirschner"
msgstr "_* Matthias Kirschner"
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:78
msgid "_* Richard Nelson"
msgstr "_* Richard Nelson"
#. type: Plain text
-#: en/about_manual.ssi:78
+#: en/about_manual.ssi:80
msgid "_* Trent W. Buck"
msgstr "_* Trent W. Buck"
#. type: Plain text
-#: en/about_manual.ssi:80
+#: en/about_manual.ssi:82
msgid "2~how-to-contribute Contributing to this document"
msgstr "2~how-to-contribute Cómo contribuir en este documento"
#. type: Plain text
-#: en/about_manual.ssi:82
+#: en/about_manual.ssi:84
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -415,7 +420,7 @@ msgstr ""
"sección {Contacto}#contact para más información."
#. type: Plain text
-#: en/about_manual.ssi:84
+#: en/about_manual.ssi:86
msgid ""
"When submitting a contribution, please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted, the "
@@ -428,35 +433,42 @@ msgstr ""
"documento, esto es, GPL versión 3 o posterior."
#. type: Plain text
-#: en/about_manual.ssi:86
+#: en/about_manual.ssi:88
+#, fuzzy
+#| msgid ""
+#| "The sources for this manual are maintained using the Git version control "
+#| "system. You can check out the latest copy by executing:"
msgid ""
"The sources for this manual are maintained using the Git version control "
-"system. You can check out the latest copy by executing:"
+"system (see {Git repositories}#git-repositories). You can check out the "
+"latest copy by executing:"
msgstr ""
"Los originales de este manual se mantienen utilizando el sistema de control "
"de versiones Git. Se puede obtener la copia más actualizada ejecutando la "
"siguiente orden:"
#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:51
-#: en/project_procedures.ssi:63 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
-#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
@@ -474,17 +486,19 @@ msgstr ""
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:187
#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:269
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:311
-#: en/user_customization-packages.ssi:328
-#: en/user_customization-packages.ssi:336 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:338
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:149
+#: en/user_customization-runtime.ssi:158 en/user_customization-runtime.ssi:173
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
@@ -509,30 +523,32 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:90
+#: en/about_manual.ssi:92
msgid "$ git clone git://live.debian.net/git/live-manual.git"
msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
-#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
-#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
-#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:59
-#: en/project_procedures.ssi:136 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
-#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
@@ -550,17 +566,19 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: en/user_customization-packages.ssi:183
#: en/user_customization-packages.ssi:193
#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:324
-#: en/user_customization-packages.ssi:332
-#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:21
+#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:367
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:163
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:163 en/user_customization-runtime.ssi:181
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
@@ -585,7 +603,7 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/about_manual.ssi:94
+#: en/about_manual.ssi:96
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -596,13 +614,13 @@ msgstr ""
"necesarios para la construcción de live-manual ejecutando la siguiente orden:"
#. type: Plain text
-#: en/about_manual.ssi:98
+#: en/about_manual.ssi:100
#, no-wrap
msgid " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
msgstr " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
#. type: Plain text
-#: en/about_manual.ssi:102
+#: en/about_manual.ssi:104
msgid ""
"You may build the live-manual from the top level directory of your Git "
"checkout by executing:"
@@ -612,13 +630,13 @@ msgstr ""
"la siguiente orden:"
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:108
#, no-wrap
msgid " $ make build\n"
msgstr " $ make build\n"
#. type: Plain text
-#: en/about_manual.ssi:110
+#: en/about_manual.ssi:112
msgid ""
"Since it takes a while to build the manual in all supported languages, you "
"may find it convenient when proofing to build for only one language, e.g. by "
@@ -629,40 +647,40 @@ msgstr ""
"la siguiente orden:"
#. type: Plain text
-#: en/about_manual.ssi:114
+#: en/about_manual.ssi:116
#, no-wrap
msgid " $ make build LANGUAGES=en\n"
msgstr " $ make build LANGUAGES=en\n"
#. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:120
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:122
+#: en/about_manual.ssi:124
#, no-wrap
msgid " $ make build FORMATS=pdf\n"
msgstr " $ make build FORMATS=pdf\n"
#. type: Plain text
-#: en/about_manual.ssi:126
+#: en/about_manual.ssi:128
msgid "Or combine both, e.g:"
msgstr "O combinar ambos, por ejemplo:"
#. type: Plain text
-#: en/about_manual.ssi:130
+#: en/about_manual.ssi:132
#, no-wrap
msgid " $ make build LANGUAGES=it FORMATS=html\n"
msgstr " $ make build LANGUAGES=it FORMATS=html\n"
#. type: Plain text
-#: en/about_manual.ssi:134
+#: en/about_manual.ssi:136
msgid "3~ Applying changes"
msgstr "3~ Aplicar cambios"
#. type: Plain text
-#: en/about_manual.ssi:136
+#: en/about_manual.ssi:138
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 "
@@ -674,12 +692,12 @@ msgstr ""
"el siguiente procedimiento:"
#. type: Plain text
-#: en/about_manual.ssi:138
+#: en/about_manual.ssi:140
msgid "_* Fetch the public commit key:"
msgstr "_* Obtener la clave pública de entrega:"
#. type: Plain text
-#: en/about_manual.ssi:147
+#: en/about_manual.ssi:149
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
@@ -697,14 +715,14 @@ msgstr ""
" $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*\n"
#. type: Plain text
-#: en/about_manual.ssi:151
+#: en/about_manual.ssi:153
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:"
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:162
#, no-wrap
msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
@@ -722,12 +740,12 @@ msgstr ""
" EOF\n"
#. type: Plain text
-#: en/about_manual.ssi:164
+#: en/about_manual.ssi:166
msgid "_* Check out a clone of the manual through ssh:"
msgstr "_* Obtener un clon del manual mediante git utilizando ssh:"
#. type: Plain text
-#: en/about_manual.ssi:169
+#: en/about_manual.ssi:171
#, no-wrap
msgid ""
" $ git clone git at live.debian.net:/live-manual.git\n"
@@ -737,7 +755,7 @@ msgstr ""
" $ cd live-manual && git checkout debian-next\n"
#. type: Plain text
-#: en/about_manual.ssi:173
+#: en/about_manual.ssi:175
msgid ""
"_* Note that you should commit any changes on the debian-next branch, not on "
"the debian branch."
@@ -746,7 +764,7 @@ msgstr ""
"Debian."
#. type: Plain text
-#: en/about_manual.ssi:175
+#: en/about_manual.ssi:177
msgid ""
"_* Do not use #{make commit}# unless you are updating translations in this "
"commit, and in that case, do not mix changes to the English manual and "
@@ -759,7 +777,7 @@ msgstr ""
"sección {Tranducción}#translation para más detalles."
#. type: Plain text
-#: en/about_manual.ssi:177
+#: en/about_manual.ssi:179
msgid ""
"_* Write commit messages that consist of complete, meaningful sentences in "
"English, starting with a capital letter and ending with a full stop. "
@@ -772,38 +790,38 @@ msgstr ""
"con la forma 'Fixing/Adding/Removing/Correcting/Translating', por ejemplo:"
#. type: Plain text
-#: en/about_manual.ssi:181
+#: en/about_manual.ssi:183
#, 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:185
+#: en/about_manual.ssi:187
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:189
+#: en/about_manual.ssi:191
#, no-wrap
msgid " $ git push\n"
msgstr " $ git push\n"
#. type: Plain text
-#: en/about_manual.ssi:193
+#: en/about_manual.ssi:195
msgid "3~translation Translation"
msgstr "3~translation Traducción"
#. type: Plain text
-#: en/about_manual.ssi:195
+#: en/about_manual.ssi:197
msgid "To start a translation for a new language, follow these steps:"
msgstr ""
"Para comenzar la traducción de un idioma nuevo, se deben seguir los "
"siguientes pasos:"
#. type: Plain text
-#: en/about_manual.ssi:197
+#: en/about_manual.ssi:199
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 "
@@ -816,7 +834,7 @@ msgstr ""
"para que el equipo de traducción pueda revisar su integridad."
#. type: Plain text
-#: en/about_manual.ssi:199
+#: en/about_manual.ssi:201
msgid ""
"_* To enable a new language in the autobuild it is enough to add the initial "
"translated files to #{manual/po/${LANGUAGE}/}# and run #{make commit}#. And "
@@ -827,7 +845,7 @@ msgstr ""
"{make commit}#. Y entonces editar #{manual/_sisu/home/index.html}#."
#. type: Plain text
-#: en/about_manual.ssi:201
+#: en/about_manual.ssi:203
msgid ""
"_* Once the new language is added, you can randomly continue translating the "
"remaining po files in #{manual/po/}#."
@@ -837,7 +855,7 @@ msgstr ""
"aleatoria."
#. type: Plain text
-#: en/about_manual.ssi:203
+#: en/about_manual.ssi:205
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
"are updated from the po files and then you can review your changes launching "
@@ -851,7 +869,7 @@ msgstr ""
"\"Translating...\"}# y #{git push}#."
#. type: Plain text
-#: en/about_manual.ssi:204
+#: en/about_manual.ssi:206
#, no-wrap
msgid "*{Note:}* You can use #{make clean}# to clean your git tree before pushing. This step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
msgstr "*{Nota:}* Se puede utilizar #{make clean}# para limpiar el árbol git antes de enviar los cambios. Este 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/live-manual.ssm.po b/manual/po/es/live-manual.ssm.po
index c2c5b79..64b078d 100644
--- a/manual/po/es/live-manual.ssm.po
+++ b/manual/po/es/live-manual.ssm.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-09-28 09:48+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2012-08-07 14:03+0200\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -47,13 +47,16 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:13
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "@date:\n"
+#| " :published: 2012-09-28\n"
msgid ""
"@date:\n"
-" :published: 2012-09-28\n"
+" :published: 2012-09-29\n"
msgstr ""
"@date:\n"
-" :published: 28.09.2012\n"
+" :published: 29.09.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
@@ -172,21 +175,28 @@ msgid "<< project_procedures.ssi"
msgstr "<< project_procedures.ssi"
#. type: Plain text
-#: en/live-manual.ssm:61 en/user_examples.ssi:2
+#: en/live-manual.ssm:61
+#, fuzzy
+#| msgid "<< project_bugs.ssi"
+msgid "<< project_git.ssi"
+msgstr "<< project_bugs.ssi"
+
+#. type: Plain text
+#: en/live-manual.ssm:63 en/user_examples.ssi:2
msgid ":B~ Examples"
msgstr ":B~ Ejemplos"
#. type: Plain text
-#: en/live-manual.ssm:63
+#: en/live-manual.ssm:65
msgid "<< user_examples.ssi"
msgstr "<< user_examples.ssi"
#. type: Plain text
-#: en/live-manual.ssm:65 en/style_guide.ssi:2
+#: en/live-manual.ssm:67 en/style_guide.ssi:2
msgid ":B~ Appendix"
msgstr ":B~ Apéndice"
#. type: Plain text
-#: en/live-manual.ssm:66
+#: en/live-manual.ssm:68
msgid "<< style_guide.ssi"
msgstr "<< style_guide.ssi"
diff --git a/manual/po/es/project_git.ssi.po b/manual/po/es/project_git.ssi.po
new file mode 100644
index 0000000..f9a91eb
--- /dev/null
+++ b/manual/po/es/project_git.ssi.po
@@ -0,0 +1,265 @@
+# Spanish translations for live-manual package
+# Copyright (C) 2012 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
+"PO-Revision-Date: 2012-09-29 15:21+0300\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
+#: 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:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:338
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:149
+#: en/user_customization-runtime.ssi:158 en/user_customization-runtime.ssi:173
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:201 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:233 en/user_examples.ssi:247
+#: en/user_examples.ssi:256 en/user_examples.ssi:264 en/user_examples.ssi:284
+#: en/user_examples.ssi:292 en/user_examples.ssi:301 en/user_examples.ssi:311
+#: 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:142
+#: en/user_installation.ssi:153 en/user_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
+#: 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:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:367
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:163 en/user_customization-runtime.ssi:181
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:205 en/user_examples.ssi:213
+#: en/user_examples.ssi:229 en/user_examples.ssi:237 en/user_examples.ssi:252
+#: en/user_examples.ssi:260 en/user_examples.ssi:268 en/user_examples.ssi:288
+#: en/user_examples.ssi:297 en/user_examples.ssi:307 en/user_examples.ssi:325
+#: 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:147
+#: en/user_installation.ssi:156 en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/project_git.ssi:2
+msgid "B~ Git repositories"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:4
+#, fuzzy
+#| msgid "3~additional-repositories Additional repositories"
+msgid "1~git-repositories Git repositories"
+msgstr "3~additional-repositories Repositorios adicionales"
+
+#. type: Plain text
+#: en/project_git.ssi:6
+msgid ""
+"The git tree of the Debian Live Project is made up of several different "
+"branches. There is a list of all the available repositories at http://live."
+"debian.net/gitweb The *{debian}* and the *{debian-next}* branches are "
+"particularly noteworthy because they contain the actual work that will "
+"eventually be included in each new release."
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:8
+msgid ""
+"The project's git URLs have the form: #{protocol://live.debian.net/git/"
+"repository}#."
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:10
+msgid "Thus, in order to clone live-manual read-only, launch:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:14
+#, fuzzy, no-wrap
+#| msgid "$ git clone git://live.debian.net/git/live-manual.git"
+msgid " $ git clone git://live.debian.net/git/live-manual.git\n"
+msgstr "$ git clone git://live.debian.net/git/live-manual.git"
+
+#. type: Plain text
+#: en/project_git.ssi:18
+msgid "Or,"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:22
+#, fuzzy, no-wrap
+#| msgid "$ git clone git://live.debian.net/git/live-manual.git"
+msgid " $ git clone http://live.debian.net/git/live-manual.git\n"
+msgstr "$ git clone git://live.debian.net/git/live-manual.git"
+
+#. type: Plain text
+#: en/project_git.ssi:26
+msgid ""
+"The cloning addresses with write permission have the form: #{git at live.debian."
+"net:/repository}#."
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:28
+msgid "So, again, to clone live-manual but over ssh you must type:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:32
+#, fuzzy, no-wrap
+#| msgid "$ git clone git://live.debian.net/git/live-manual.git"
+msgid " $ git clone git at live.debian.net:/live-manual.git\n"
+msgstr "$ git clone git://live.debian.net/git/live-manual.git"
+
+#. type: Plain text
+#: en/project_git.ssi:36
+msgid ""
+"After cloning any of the existing repositories, you will be on the *{debian}"
+"* branch. This is appropriate to take a look at the state of the project's "
+"latest release but before starting work it is crucial to switch to the *"
+"{debian-next}* branch. To do so:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:40
+#, no-wrap
+msgid " $ git checkout debian-next\n"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:43
+msgid ""
+"The *{debian-next}* branch, which is not always fast-forward, is where all "
+"the changes are committed first before being merged into the *{debian}* "
+"branch. To make an analogy, it is like a testing ground. If you are working "
+"on this branch and need to pull, you will have to do a #{git pull --rebase}# "
+"so that your local modifications are staged while pulling from the server "
+"and then your changes will be put on top of it all."
+msgstr ""
diff --git a/manual/po/es/user_customization-packages.ssi.po b/manual/po/es/user_customization-packages.ssi.po
index 8b29066..3629c04 100644
--- a/manual/po/es/user_customization-packages.ssi.po
+++ b/manual/po/es/user_customization-packages.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-09-26 17:09+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2012-09-26 17:58+0100\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -18,25 +18,27 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:51
-#: en/project_procedures.ssi:63 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
-#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
@@ -60,8 +62,7 @@ msgstr ""
#: en/user_customization-packages.ssi:324
#: en/user_customization-packages.ssi:338
#: en/user_customization-packages.ssi:354
-#: en/user_customization-packages.ssi:371
-#: en/user_customization-packages.ssi:379 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
@@ -92,25 +93,27 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
-#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
-#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:59
-#: en/project_procedures.ssi:136 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
-#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
@@ -134,8 +137,7 @@ msgstr "code{"
#: en/user_customization-packages.ssi:328
#: en/user_customization-packages.ssi:342
#: en/user_customization-packages.ssi:367
-#: en/user_customization-packages.ssi:375
-#: en/user_customization-packages.ssi:384 en/user_customization-runtime.ssi:21
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
@@ -384,15 +386,26 @@ msgstr "3~ Réplicas de distribución Debian utilizadas en la ejecución."
#. 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 #{--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."
+"running the live system. The defaults employ #{http.debian.net}#, a service "
+"that chooses a geographically close mirror based, among other things, on the "
+"user's IP family and the availability of the mirrors. 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 "
@@ -1589,11 +1602,17 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:360
-#, no-wrap
-msgid ""
-" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
-" $ cat >> config/chroot_apt/preferences << END\n"
-" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
+#, fuzzy, no-wrap
+#| msgid ""
+#| " $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
+#| " $ cat >> config/chroot_apt/preferences << END\n"
+#| " Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
+#| " Pin: release n=sid\n"
+#| " Pin-Priority: 600\n"
+msgid ""
+" $ echo \"deb http://mirror/debian/ sid main\" > config/archives/sid.list.chroot\n"
+" $ cat >> config/chroot_apt/preferences << EOF\n"
+" Package: live-*\n"
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
@@ -1605,12 +1624,17 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:365
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " Package: *\n"
+#| " Pin: release n=sid\n"
+#| " Pin-Priority: 1\n"
+#| " END\n"
msgid ""
" Package: *\n"
" Pin: release n=sid\n"
" Pin-Priority: 1\n"
-" END\n"
+" EOF\n"
msgstr ""
" Package: *\n"
" Pin: release n=sid\n"
@@ -1619,17 +1643,6 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:369
-#, no-wrap
-msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:\n"
-msgstr "*{Nota:}* Se pueden usar comodines en los nombres de los paquetes a fijar (p.ej. *{Package: live-*}*) si se usa una versión de apt igual o superior a 0.8.14. Esto significa que funciona con wheezy usando:\n"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:373
-msgid "$ lb config --distribution wheezy"
-msgstr "$ lb config --distribution wheezy"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:377
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 "
@@ -1653,7 +1666,7 @@ msgstr ""
"contenido a #{config/chroot_apt/preferences}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:383
+#: en/user_customization-packages.ssi:375
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/es/user_examples.ssi.po b/manual/po/es/user_examples.ssi.po
index a0ce2b9..5e5a3e7 100644
--- a/manual/po/es/user_examples.ssi.po
+++ b/manual/po/es/user_examples.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-08-30 14:19+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2012-08-14 15:16+0200\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -18,30 +18,32 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
-#: en/live-manual.ssm:61 en/user_examples.ssi:2
+#: en/live-manual.ssm:63 en/user_examples.ssi:2
msgid ":B~ Examples"
msgstr ":B~ Ejemplos"
#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
-#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
-#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
@@ -59,17 +61,19 @@ msgstr ":B~ Ejemplos"
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:187
#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:269
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:311
-#: en/user_customization-packages.ssi:328
-#: en/user_customization-packages.ssi:336 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:338
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:149
+#: en/user_customization-runtime.ssi:158 en/user_customization-runtime.ssi:173
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
@@ -94,25 +98,27 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
-#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
-#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
-#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
-#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
@@ -130,17 +136,19 @@ msgstr "code{"
#: en/user_customization-packages.ssi:183
#: en/user_customization-packages.ssi:193
#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:324
-#: en/user_customization-packages.ssi:332
-#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:21
+#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:367
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:163
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:163 en/user_customization-runtime.ssi:181
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
@@ -252,11 +260,15 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:18
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " 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"
msgid ""
-" 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"
+" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian/\"\n"
+" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security/\"\n"
+" LB_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-backports/\"\n"
msgstr ""
" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
@@ -757,10 +769,14 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:221
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " $ mkdir -p config/includes.chroot/etc/skel\n"
+#| " $ cat > config/includes.chroot/etc/skel/.xsession << END\n"
+#| " #!/bin/sh\n"
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 << EOF\n"
" #!/bin/sh\n"
msgstr ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -779,10 +795,13 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:227
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " exit\n"
+#| " END\n"
msgid ""
" exit\n"
-" END\n"
+" EOF\n"
msgstr ""
" exit\n"
" END\n"
diff --git a/manual/po/fr/about_manual.ssi.po b/manual/po/fr/about_manual.ssi.po
index 0c9c310..3121fd5 100644
--- a/manual/po/fr/about_manual.ssi.po
+++ b/manual/po/fr/about_manual.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-08-31 14:04+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2012-08-07 14:49+0200\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -329,61 +329,66 @@ msgstr "_* Brendan Sleight"
#. type: Plain text
#: en/about_manual.ssi:60
+msgid "_* Carlos Zuferri"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:62
msgid "_* Chris Lamb"
msgstr "_* Chris Lamb"
#. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:64
msgid "_* Daniel Baumann"
msgstr "_* Daniel Baumann"
#. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:66
msgid "_* Franklin Piat"
msgstr "_* Franklin Piat"
#. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:68
msgid "_* Jonas Stein"
msgstr "_* Jonas Stein"
#. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:70
msgid "_* Kai Hendry"
msgstr "_* Kai Hendry"
#. type: Plain text
-#: en/about_manual.ssi:70
+#: en/about_manual.ssi:72
msgid "_* Marco Amadori"
msgstr "_* Marco Amadori"
#. type: Plain text
-#: en/about_manual.ssi:72
+#: en/about_manual.ssi:74
msgid "_* Mathieu Geli"
msgstr "_* Mathieu Geli"
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:76
msgid "_* Matthias Kirschner"
msgstr "_* Matthias Kirschner"
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:78
msgid "_* Richard Nelson"
msgstr "_* Richard Nelson"
#. type: Plain text
-#: en/about_manual.ssi:78
+#: en/about_manual.ssi:80
msgid "_* Trent W. Buck"
msgstr "_* Trent W. Buck"
#. type: Plain text
-#: en/about_manual.ssi:80
+#: en/about_manual.ssi:82
msgid "2~how-to-contribute Contributing to this document"
msgstr "2~how-to-contribute Contribuer à ce document"
#. type: Plain text
-#: en/about_manual.ssi:82
+#: en/about_manual.ssi:84
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -396,7 +401,7 @@ msgstr ""
"plaît voir {Contact}#contact pour plus d'informations."
#. type: Plain text
-#: en/about_manual.ssi:84
+#: en/about_manual.ssi:86
msgid ""
"When submitting a contribution, please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted, the "
@@ -409,34 +414,41 @@ msgstr ""
"reste du document, c'est-à-dire la GPL version 3 ou ultérieure."
#. type: Plain text
-#: en/about_manual.ssi:86
+#: en/about_manual.ssi:88
+#, fuzzy
+#| msgid ""
+#| "The sources for this manual are maintained using the Git version control "
+#| "system. You can check out the latest copy by executing:"
msgid ""
"The sources for this manual are maintained using the Git version control "
-"system. You can check out the latest copy by executing:"
+"system (see {Git repositories}#git-repositories). You can check out the "
+"latest copy by executing:"
msgstr ""
"Les sources de ce manuel sont maintenues à l'aide du logiciel de gestion de "
"versions Git. Vous pouvez obtenir la dernière copie en exécutant:"
#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:51
-#: en/project_procedures.ssi:63 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
-#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
@@ -454,17 +466,19 @@ msgstr ""
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:187
#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:269
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:311
-#: en/user_customization-packages.ssi:328
-#: en/user_customization-packages.ssi:336 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:338
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:149
+#: en/user_customization-runtime.ssi:158 en/user_customization-runtime.ssi:173
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
@@ -489,30 +503,32 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:90
+#: en/about_manual.ssi:92
msgid "$ git clone git://live.debian.net/git/live-manual.git"
msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
-#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
-#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
-#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:59
-#: en/project_procedures.ssi:136 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
-#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
@@ -530,17 +546,19 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: en/user_customization-packages.ssi:183
#: en/user_customization-packages.ssi:193
#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:324
-#: en/user_customization-packages.ssi:332
-#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:21
+#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:367
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:163
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:163 en/user_customization-runtime.ssi:181
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
@@ -565,7 +583,7 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/about_manual.ssi:94
+#: en/about_manual.ssi:96
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -576,13 +594,13 @@ msgstr ""
"sont installés en exécutant:"
#. type: Plain text
-#: en/about_manual.ssi:98
+#: en/about_manual.ssi:100
#, no-wrap
msgid " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
msgstr " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
#. type: Plain text
-#: en/about_manual.ssi:102
+#: en/about_manual.ssi:104
msgid ""
"You may build the live-manual from the top level directory of your Git "
"checkout by executing:"
@@ -591,13 +609,13 @@ msgstr ""
"votre Git checkout en exécutant:"
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:108
#, no-wrap
msgid " $ make build\n"
msgstr " $ make build\n"
#. type: Plain text
-#: en/about_manual.ssi:110
+#: en/about_manual.ssi:112
msgid ""
"Since it takes a while to build the manual in all supported languages, you "
"may find it convenient when proofing to build for only one language, e.g. by "
@@ -608,41 +626,41 @@ msgstr ""
"par exemple en exécutant:"
#. type: Plain text
-#: en/about_manual.ssi:114
+#: en/about_manual.ssi:116
#, no-wrap
msgid " $ make build LANGUAGES=en\n"
msgstr " $ make build LANGUAGES=en\n"
#. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:120
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:122
+#: en/about_manual.ssi:124
#, no-wrap
msgid " $ make build FORMATS=pdf\n"
msgstr " $ make build FORMATS=pdf\n"
#. type: Plain text
-#: en/about_manual.ssi:126
+#: en/about_manual.ssi:128
msgid "Or combine both, e.g:"
msgstr "Ou combiner les deux, par exemple:"
#. type: Plain text
-#: en/about_manual.ssi:130
+#: en/about_manual.ssi:132
#, no-wrap
msgid " $ make build LANGUAGES=it FORMATS=html\n"
msgstr " $ make build LANGUAGES=it FORMATS=html\n"
#. type: Plain text
-#: en/about_manual.ssi:134
+#: en/about_manual.ssi:136
msgid "3~ Applying changes"
msgstr "3~ Appliquer des modifications"
#. type: Plain text
-#: en/about_manual.ssi:136
+#: en/about_manual.ssi:138
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 "
@@ -654,12 +672,12 @@ msgstr ""
"sont nécessaires."
#. type: Plain text
-#: en/about_manual.ssi:138
+#: en/about_manual.ssi:140
msgid "_* Fetch the public commit key:"
msgstr "_* Téléchargez la clé publique:"
#. type: Plain text
-#: en/about_manual.ssi:147
+#: en/about_manual.ssi:149
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
@@ -677,12 +695,12 @@ msgstr ""
" $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*\n"
#. type: Plain text
-#: en/about_manual.ssi:151
+#: en/about_manual.ssi:153
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:160
+#: en/about_manual.ssi:162
#, no-wrap
msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
@@ -700,12 +718,12 @@ msgstr ""
" EOF\n"
#. type: Plain text
-#: en/about_manual.ssi:164
+#: en/about_manual.ssi:166
msgid "_* Check out a clone of the manual through ssh:"
msgstr "_* Clonez le manuel via ssh:"
#. type: Plain text
-#: en/about_manual.ssi:169
+#: en/about_manual.ssi:171
#, no-wrap
msgid ""
" $ git clone git at live.debian.net:/live-manual.git\n"
@@ -715,7 +733,7 @@ msgstr ""
" $ cd live-manual && git checkout debian-next\n"
#. type: Plain text
-#: en/about_manual.ssi:173
+#: en/about_manual.ssi:175
msgid ""
"_* Note that you should commit any changes on the debian-next branch, not on "
"the debian branch."
@@ -724,7 +742,7 @@ msgstr ""
"pas sur la branche debian."
#. type: Plain text
-#: en/about_manual.ssi:175
+#: en/about_manual.ssi:177
msgid ""
"_* Do not use #{make commit}# unless you are updating translations in this "
"commit, and in that case, do not mix changes to the English manual and "
@@ -738,7 +756,7 @@ msgstr ""
"#translation pour plus de détails."
#. type: Plain text
-#: en/about_manual.ssi:177
+#: en/about_manual.ssi:179
msgid ""
"_* Write commit messages that consist of complete, meaningful sentences in "
"English, starting with a capital letter and ending with a full stop. "
@@ -750,34 +768,34 @@ msgstr ""
"forme 'Fixing/Adding/Removing/Correcting/Translating', par exemple"
#. type: Plain text
-#: en/about_manual.ssi:181
+#: en/about_manual.ssi:183
#, 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:185
+#: en/about_manual.ssi:187
msgid "_* Push the commit to the server:"
msgstr "_* Envoyez votre commit au serveur:"
#. type: Plain text
-#: en/about_manual.ssi:189
+#: en/about_manual.ssi:191
#, no-wrap
msgid " $ git push\n"
msgstr " $ git push\n"
#. type: Plain text
-#: en/about_manual.ssi:193
+#: en/about_manual.ssi:195
msgid "3~translation Translation"
msgstr "3~translation Traduction"
#. type: Plain text
-#: en/about_manual.ssi:195
+#: en/about_manual.ssi:197
msgid "To start a translation for a new language, follow these steps:"
msgstr "Pour commencer la traduction d'une nouvelle langue, suivez ces étapes:"
#. type: Plain text
-#: en/about_manual.ssi:197
+#: en/about_manual.ssi:199
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 "
@@ -790,7 +808,7 @@ msgstr ""
"afin que l'équipe de traduction puisse vérifier leur intégrité."
#. type: Plain text
-#: en/about_manual.ssi:199
+#: en/about_manual.ssi:201
msgid ""
"_* To enable a new language in the autobuild it is enough to add the initial "
"translated files to #{manual/po/${LANGUAGE}/}# and run #{make commit}#. And "
@@ -801,7 +819,7 @@ msgstr ""
"commit}#. Et alors modifier #{manual/_sisu/home/index.html}#."
#. type: Plain text
-#: en/about_manual.ssi:201
+#: en/about_manual.ssi:203
msgid ""
"_* Once the new language is added, you can randomly continue translating the "
"remaining po files in #{manual/po/}#."
@@ -810,7 +828,7 @@ msgstr ""
"traduction des fichiers po dans #{manual/po/}# de façon aléatoire."
#. type: Plain text
-#: en/about_manual.ssi:203
+#: en/about_manual.ssi:205
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
"are updated from the po files and then you can review your changes launching "
@@ -823,7 +841,7 @@ msgstr ""
"{git commit -a -m \"Translating...\"}# et #{git push}#."
#. type: Plain text
-#: en/about_manual.ssi:204
+#: en/about_manual.ssi:206
#, no-wrap
msgid "*{Note:}* You can use #{make clean}# to clean your git tree before pushing. This step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
msgstr "*{Remarque:}* Vous pouvez utiliser #{make clean}# pour nettoyer votre arbre git avant de faire un push. Cette étape n'est pas obligatoire grâce au fichier .gitignore mais c'est une bonne pratique pour éviter d'envoyer certains fichiers involontairement.\n"
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index 110270b..df56ad8 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-09-28 09:48+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2012-08-07 14:55+0200\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -47,13 +47,16 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:13
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "@date:\n"
+#| " :published: 2012-09-28\n"
msgid ""
"@date:\n"
-" :published: 2012-09-28\n"
+" :published: 2012-09-29\n"
msgstr ""
"@date:\n"
-" :published: 28.09.2012\n"
+" :published: 29.09.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
@@ -172,21 +175,28 @@ msgid "<< project_procedures.ssi"
msgstr "<< project_procedures.ssi"
#. type: Plain text
-#: en/live-manual.ssm:61 en/user_examples.ssi:2
+#: en/live-manual.ssm:61
+#, fuzzy
+#| msgid "<< project_bugs.ssi"
+msgid "<< project_git.ssi"
+msgstr "<< project_bugs.ssi"
+
+#. type: Plain text
+#: en/live-manual.ssm:63 en/user_examples.ssi:2
msgid ":B~ Examples"
msgstr ":B~ Exemples"
#. type: Plain text
-#: en/live-manual.ssm:63
+#: en/live-manual.ssm:65
msgid "<< user_examples.ssi"
msgstr "<< user_examples.ssi"
#. type: Plain text
-#: en/live-manual.ssm:65 en/style_guide.ssi:2
+#: en/live-manual.ssm:67 en/style_guide.ssi:2
msgid ":B~ Appendix"
msgstr ":B~ Appendix"
#. type: Plain text
-#: en/live-manual.ssm:66
+#: en/live-manual.ssm:68
msgid "<< style_guide.ssi"
msgstr "<< style_guide.ssi"
diff --git a/manual/po/fr/project_git.ssi.po b/manual/po/fr/project_git.ssi.po
new file mode 100644
index 0000000..d5d4441
--- /dev/null
+++ b/manual/po/fr/project_git.ssi.po
@@ -0,0 +1,265 @@
+# French translations for live-manual package
+# Copyright (C) 2012 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
+"PO-Revision-Date: 2012-09-29 15:21+0300\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
+#: 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:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:338
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:149
+#: en/user_customization-runtime.ssi:158 en/user_customization-runtime.ssi:173
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:201 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:233 en/user_examples.ssi:247
+#: en/user_examples.ssi:256 en/user_examples.ssi:264 en/user_examples.ssi:284
+#: en/user_examples.ssi:292 en/user_examples.ssi:301 en/user_examples.ssi:311
+#: 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:142
+#: en/user_installation.ssi:153 en/user_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
+#: 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:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:367
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:163 en/user_customization-runtime.ssi:181
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:205 en/user_examples.ssi:213
+#: en/user_examples.ssi:229 en/user_examples.ssi:237 en/user_examples.ssi:252
+#: en/user_examples.ssi:260 en/user_examples.ssi:268 en/user_examples.ssi:288
+#: en/user_examples.ssi:297 en/user_examples.ssi:307 en/user_examples.ssi:325
+#: 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:147
+#: en/user_installation.ssi:156 en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/project_git.ssi:2
+msgid "B~ Git repositories"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:4
+#, fuzzy
+#| msgid "3~additional-repositories Additional repositories"
+msgid "1~git-repositories Git repositories"
+msgstr "3~additional-repositories Dépôts additionnels"
+
+#. type: Plain text
+#: en/project_git.ssi:6
+msgid ""
+"The git tree of the Debian Live Project is made up of several different "
+"branches. There is a list of all the available repositories at http://live."
+"debian.net/gitweb The *{debian}* and the *{debian-next}* branches are "
+"particularly noteworthy because they contain the actual work that will "
+"eventually be included in each new release."
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:8
+msgid ""
+"The project's git URLs have the form: #{protocol://live.debian.net/git/"
+"repository}#."
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:10
+msgid "Thus, in order to clone live-manual read-only, launch:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:14
+#, fuzzy, no-wrap
+#| msgid "$ git clone git://live.debian.net/git/live-manual.git"
+msgid " $ git clone git://live.debian.net/git/live-manual.git\n"
+msgstr "$ git clone git://live.debian.net/git/live-manual.git"
+
+#. type: Plain text
+#: en/project_git.ssi:18
+msgid "Or,"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:22
+#, fuzzy, no-wrap
+#| msgid "$ git clone git://live.debian.net/git/live-manual.git"
+msgid " $ git clone http://live.debian.net/git/live-manual.git\n"
+msgstr "$ git clone git://live.debian.net/git/live-manual.git"
+
+#. type: Plain text
+#: en/project_git.ssi:26
+msgid ""
+"The cloning addresses with write permission have the form: #{git at live.debian."
+"net:/repository}#."
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:28
+msgid "So, again, to clone live-manual but over ssh you must type:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:32
+#, fuzzy, no-wrap
+#| msgid "$ git clone git://live.debian.net/git/live-manual.git"
+msgid " $ git clone git at live.debian.net:/live-manual.git\n"
+msgstr "$ git clone git://live.debian.net/git/live-manual.git"
+
+#. type: Plain text
+#: en/project_git.ssi:36
+msgid ""
+"After cloning any of the existing repositories, you will be on the *{debian}"
+"* branch. This is appropriate to take a look at the state of the project's "
+"latest release but before starting work it is crucial to switch to the *"
+"{debian-next}* branch. To do so:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:40
+#, no-wrap
+msgid " $ git checkout debian-next\n"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:43
+msgid ""
+"The *{debian-next}* branch, which is not always fast-forward, is where all "
+"the changes are committed first before being merged into the *{debian}* "
+"branch. To make an analogy, it is like a testing ground. If you are working "
+"on this branch and need to pull, you will have to do a #{git pull --rebase}# "
+"so that your local modifications are staged while pulling from the server "
+"and then your changes will be put on top of it all."
+msgstr ""
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index 0eddb8d..64ce699 100644
--- a/manual/po/fr/user_customization-packages.ssi.po
+++ b/manual/po/fr/user_customization-packages.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-09-26 17:09+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2012-09-27 18:06+0100\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -16,25 +16,27 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:51
-#: en/project_procedures.ssi:63 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
-#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
@@ -58,8 +60,7 @@ msgstr ""
#: en/user_customization-packages.ssi:324
#: en/user_customization-packages.ssi:338
#: en/user_customization-packages.ssi:354
-#: en/user_customization-packages.ssi:371
-#: en/user_customization-packages.ssi:379 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
@@ -90,25 +91,27 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
-#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
-#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:59
-#: en/project_procedures.ssi:136 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
-#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
@@ -132,8 +135,7 @@ msgstr "code{"
#: en/user_customization-packages.ssi:328
#: en/user_customization-packages.ssi:342
#: en/user_customization-packages.ssi:367
-#: en/user_customization-packages.ssi:375
-#: en/user_customization-packages.ssi:384 en/user_customization-runtime.ssi:21
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
@@ -376,15 +378,26 @@ msgstr "3~ Miroirs de distribution utilisés au moment de l'exécution"
#. 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 #{--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."
+"running the live system. The defaults employ #{http.debian.net}#, a service "
+"that chooses a geographically close mirror based, among other things, on the "
+"user's IP family and the availability of the mirrors. 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 "
@@ -1570,11 +1583,17 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:360
-#, no-wrap
-msgid ""
-" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
-" $ cat >> config/chroot_apt/preferences << END\n"
-" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
+#, fuzzy, no-wrap
+#| msgid ""
+#| " $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
+#| " $ cat >> config/chroot_apt/preferences << END\n"
+#| " Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
+#| " Pin: release n=sid\n"
+#| " Pin-Priority: 600\n"
+msgid ""
+" $ echo \"deb http://mirror/debian/ sid main\" > config/archives/sid.list.chroot\n"
+" $ cat >> config/chroot_apt/preferences << EOF\n"
+" Package: live-*\n"
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
@@ -1586,12 +1605,17 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:365
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " Package: *\n"
+#| " Pin: release n=sid\n"
+#| " Pin-Priority: 1\n"
+#| " END\n"
msgid ""
" Package: *\n"
" Pin: release n=sid\n"
" Pin-Priority: 1\n"
-" END\n"
+" EOF\n"
msgstr ""
" Package: *\n"
" Pin: release n=sid\n"
@@ -1600,17 +1624,6 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:369
-#, no-wrap
-msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:\n"
-msgstr "*{Remarque:}* Caractères génériques peuvent être utilisés dans les noms des paquets (par exemple *{Package: live-*}*) avec la version 0.8.14 ou supérieure d'Apt. Cela signifie qu'il fonctionne avec wheezy en utilisant:\n"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:373
-msgid "$ lb config --distribution wheezy"
-msgstr "$ lb config --distribution wheezy"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:377
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 "
@@ -1633,7 +1646,7 @@ msgstr ""
"en ajoutant la strophe suivante à #{config/chroot_apt/preferences}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:383
+#: en/user_customization-packages.ssi:375
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index a20f23a..a93888c 100644
--- a/manual/po/fr/user_examples.ssi.po
+++ b/manual/po/fr/user_examples.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-08-30 14:19+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2012-08-14 15:17+0200\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -16,30 +16,32 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
-#: en/live-manual.ssm:61 en/user_examples.ssi:2
+#: en/live-manual.ssm:63 en/user_examples.ssi:2
msgid ":B~ Examples"
msgstr ":B~ Exemples"
#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
-#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
-#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
@@ -57,17 +59,19 @@ msgstr ":B~ Exemples"
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:187
#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:269
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:311
-#: en/user_customization-packages.ssi:328
-#: en/user_customization-packages.ssi:336 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:338
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:149
+#: en/user_customization-runtime.ssi:158 en/user_customization-runtime.ssi:173
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
@@ -92,25 +96,27 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
-#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
-#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
-#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
-#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
@@ -128,17 +134,19 @@ msgstr "code{"
#: en/user_customization-packages.ssi:183
#: en/user_customization-packages.ssi:193
#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:324
-#: en/user_customization-packages.ssi:332
-#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:21
+#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:367
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:163
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:163 en/user_customization-runtime.ssi:181
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
@@ -250,11 +258,15 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:18
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " 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"
msgid ""
-" 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"
+" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian/\"\n"
+" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security/\"\n"
+" LB_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-backports/\"\n"
msgstr ""
" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
@@ -754,10 +766,14 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:221
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " $ mkdir -p config/includes.chroot/etc/skel\n"
+#| " $ cat > config/includes.chroot/etc/skel/.xsession << END\n"
+#| " #!/bin/sh\n"
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 << EOF\n"
" #!/bin/sh\n"
msgstr ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -776,10 +792,13 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:227
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " exit\n"
+#| " END\n"
msgid ""
" exit\n"
-" END\n"
+" EOF\n"
msgstr ""
" exit\n"
" END\n"
diff --git a/manual/po/it/about_manual.ssi.po b/manual/po/it/about_manual.ssi.po
index 405f876..ffcaa3d 100644
--- a/manual/po/it/about_manual.ssi.po
+++ b/manual/po/it/about_manual.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-08-31 14:04+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2012-09-28 10:01+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -320,61 +320,66 @@ msgstr "_* Brendan Sleight"
#. type: Plain text
#: en/about_manual.ssi:60
+msgid "_* Carlos Zuferri"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:62
msgid "_* Chris Lamb"
msgstr "_* Chris Lamb"
#. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:64
msgid "_* Daniel Baumann"
msgstr "_* Daniel Baumann"
#. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:66
msgid "_* Franklin Piat"
msgstr "_* Franklin Piat"
#. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:68
msgid "_* Jonas Stein"
msgstr "_* Jonas Stein"
#. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:70
msgid "_* Kai Hendry"
msgstr "_* Kai Hendry"
#. type: Plain text
-#: en/about_manual.ssi:70
+#: en/about_manual.ssi:72
msgid "_* Marco Amadori"
msgstr "_* Marco Amadori"
#. type: Plain text
-#: en/about_manual.ssi:72
+#: en/about_manual.ssi:74
msgid "_* Mathieu Geli"
msgstr "_* Mathieu Geli"
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:76
msgid "_* Matthias Kirschner"
msgstr "_* Matthias Kirschner"
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:78
msgid "_* Richard Nelson"
msgstr "_* Richard Nelson"
#. type: Plain text
-#: en/about_manual.ssi:78
+#: en/about_manual.ssi:80
msgid "_* Trent W. Buck"
msgstr "_* Trent W. Buck"
#. type: Plain text
-#: en/about_manual.ssi:80
+#: en/about_manual.ssi:82
msgid "2~how-to-contribute Contributing to this document"
msgstr "2~how-to-contribute Contribuire a questo documento"
#. type: Plain text
-#: en/about_manual.ssi:82
+#: en/about_manual.ssi:84
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -387,7 +392,7 @@ msgstr ""
"{Contatti}#contact."
#. type: Plain text
-#: en/about_manual.ssi:84
+#: en/about_manual.ssi:86
msgid ""
"When submitting a contribution, please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted, the "
@@ -400,34 +405,41 @@ msgstr ""
"resto del documento, ovvero la GPL versione 3 o successiva."
#. type: Plain text
-#: en/about_manual.ssi:86
+#: en/about_manual.ssi:88
+#, fuzzy
+#| msgid ""
+#| "The sources for this manual are maintained using the Git version control "
+#| "system. You can check out the latest copy by executing:"
msgid ""
"The sources for this manual are maintained using the Git version control "
-"system. You can check out the latest copy by executing:"
+"system (see {Git repositories}#git-repositories). You can check out the "
+"latest copy by executing:"
msgstr ""
"I sorgenti di questo manuale sono mantenuti utilizzando il sistema di "
"controllo Git. Si può visionare la copia più recente eseguendo:"
#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:51
-#: en/project_procedures.ssi:63 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
-#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
@@ -445,17 +457,19 @@ msgstr ""
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:187
#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:269
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:311
-#: en/user_customization-packages.ssi:328
-#: en/user_customization-packages.ssi:336 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:338
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:149
+#: en/user_customization-runtime.ssi:158 en/user_customization-runtime.ssi:173
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
@@ -480,30 +494,32 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:90
+#: en/about_manual.ssi:92
msgid "$ git clone git://live.debian.net/git/live-manual.git"
msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
-#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
-#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
-#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:59
-#: en/project_procedures.ssi:136 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
-#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
@@ -521,17 +537,19 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: en/user_customization-packages.ssi:183
#: en/user_customization-packages.ssi:193
#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:324
-#: en/user_customization-packages.ssi:332
-#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:21
+#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:367
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:163
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:163 en/user_customization-runtime.ssi:181
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
@@ -556,7 +574,7 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/about_manual.ssi:94
+#: en/about_manual.ssi:96
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -567,13 +585,13 @@ msgstr ""
"avere installati i pacchetti necessari per la sua compilazione eseguendo:"
#. type: Plain text
-#: en/about_manual.ssi:98
+#: en/about_manual.ssi:100
#, no-wrap
msgid " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
msgstr " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
#. type: Plain text
-#: en/about_manual.ssi:102
+#: en/about_manual.ssi:104
msgid ""
"You may build the live-manual from the top level directory of your Git "
"checkout by executing:"
@@ -582,13 +600,13 @@ msgstr ""
"Git eseguendo:"
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:108
#, no-wrap
msgid " $ make build\n"
msgstr " $ make build\n"
#. type: Plain text
-#: en/about_manual.ssi:110
+#: en/about_manual.ssi:112
msgid ""
"Since it takes a while to build the manual in all supported languages, you "
"may find it convenient when proofing to build for only one language, e.g. by "
@@ -599,40 +617,40 @@ msgstr ""
"eseguendo:"
#. type: Plain text
-#: en/about_manual.ssi:114
+#: en/about_manual.ssi:116
#, no-wrap
msgid " $ make build LANGUAGES=en\n"
msgstr " $ make build LANGUAGES=en\n"
#. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:120
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:122
+#: en/about_manual.ssi:124
#, no-wrap
msgid " $ make build FORMATS=pdf\n"
msgstr " $ make build FORMATS=pdf\n"
#. type: Plain text
-#: en/about_manual.ssi:126
+#: en/about_manual.ssi:128
msgid "Or combine both, e.g:"
msgstr "O entrambi:"
#. type: Plain text
-#: en/about_manual.ssi:130
+#: en/about_manual.ssi:132
#, no-wrap
msgid " $ make build LANGUAGES=it FORMATS=html\n"
msgstr " $ make build LANGUAGES=it FORMATS=html\n"
#. type: Plain text
-#: en/about_manual.ssi:134
+#: en/about_manual.ssi:136
msgid "3~ Applying changes"
msgstr "3~ Applicare le modifiche"
#. type: Plain text
-#: en/about_manual.ssi:136
+#: en/about_manual.ssi:138
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 "
@@ -644,12 +662,12 @@ msgstr ""
"questa procedura:"
#. type: Plain text
-#: en/about_manual.ssi:138
+#: en/about_manual.ssi:140
msgid "_* Fetch the public commit key:"
msgstr "_* Prelevare la chiave pubblica:"
#. type: Plain text
-#: en/about_manual.ssi:147
+#: en/about_manual.ssi:149
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
@@ -667,14 +685,14 @@ msgstr ""
" $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*\n"
#. type: Plain text
-#: en/about_manual.ssi:151
+#: en/about_manual.ssi:153
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:160
+#: en/about_manual.ssi:162
#, no-wrap
msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
@@ -692,12 +710,12 @@ msgstr ""
" EOF\n"
#. type: Plain text
-#: en/about_manual.ssi:164
+#: en/about_manual.ssi:166
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:169
+#: en/about_manual.ssi:171
#, no-wrap
msgid ""
" $ git clone git at live.debian.net:/live-manual.git\n"
@@ -707,7 +725,7 @@ msgstr ""
" $ cd live-manual && git checkout debian-next\n"
#. type: Plain text
-#: en/about_manual.ssi:173
+#: en/about_manual.ssi:175
msgid ""
"_* Note that you should commit any changes on the debian-next branch, not on "
"the debian branch."
@@ -716,7 +734,7 @@ msgstr ""
"su quello debian."
#. type: Plain text
-#: en/about_manual.ssi:175
+#: en/about_manual.ssi:177
msgid ""
"_* Do not use #{make commit}# unless you are updating translations in this "
"commit, and in that case, do not mix changes to the English manual and "
@@ -729,7 +747,7 @@ msgstr ""
"maggiori dettagli vedere la sezione {Traduzione}#translation."
#. type: Plain text
-#: en/about_manual.ssi:177
+#: en/about_manual.ssi:179
msgid ""
"_* Write commit messages that consist of complete, meaningful sentences in "
"English, starting with a capital letter and ending with a full stop. "
@@ -742,35 +760,35 @@ msgstr ""
"ad esempio:"
#. type: Plain text
-#: en/about_manual.ssi:181
+#: en/about_manual.ssi:183
#, 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:185
+#: en/about_manual.ssi:187
msgid "_* Push the commit to the server:"
msgstr "_* Inviare il commit al server:"
#. type: Plain text
-#: en/about_manual.ssi:189
+#: en/about_manual.ssi:191
#, no-wrap
msgid " $ git push\n"
msgstr " $ git push\n"
#. type: Plain text
-#: en/about_manual.ssi:193
+#: en/about_manual.ssi:195
msgid "3~translation Translation"
msgstr "3~translation Traduzione"
#. type: Plain text
-#: en/about_manual.ssi:195
+#: en/about_manual.ssi:197
msgid "To start a translation for a new language, follow these steps:"
msgstr ""
"Per iniziare una traduzione per una nuova lingua, seguire questi passi:"
#. type: Plain text
-#: en/about_manual.ssi:197
+#: en/about_manual.ssi:199
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 "
@@ -783,7 +801,7 @@ msgstr ""
"che il team di traduzione possa controllarne l'integrità."
#. type: Plain text
-#: en/about_manual.ssi:199
+#: en/about_manual.ssi:201
msgid ""
"_* To enable a new language in the autobuild it is enough to add the initial "
"translated files to #{manual/po/${LANGUAGE}/}# and run #{make commit}#. And "
@@ -794,7 +812,7 @@ msgstr ""
"commit}#. Quindi modificare il file #{manual/_sisu/home/index.html}#."
#. type: Plain text
-#: en/about_manual.ssi:201
+#: en/about_manual.ssi:203
msgid ""
"_* Once the new language is added, you can randomly continue translating the "
"remaining po files in #{manual/po/}#."
@@ -804,7 +822,7 @@ msgstr ""
"preferisce."
#. type: Plain text
-#: en/about_manual.ssi:203
+#: en/about_manual.ssi:205
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
"are updated from the po files and then you can review your changes launching "
@@ -817,7 +835,7 @@ msgstr ""
"{git commit -a -m \"Translating...\"}# e #{git push}#."
#. type: Plain text
-#: en/about_manual.ssi:204
+#: en/about_manual.ssi:206
#, no-wrap
msgid "*{Note:}* You can use #{make clean}# to clean your git tree before pushing. This step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
msgstr "*{Nota:}* si può usare #{make clean}# per pulire l'albero del repository git locale prima del push. Grazie al file .gitignore questo passo non è obbligatorio ma è una buona abitudine che evita di fare involontariamente il commit di certi file.\n"
diff --git a/manual/po/it/live-manual.ssm.po b/manual/po/it/live-manual.ssm.po
index 6eaee9b..9c955b8 100644
--- a/manual/po/it/live-manual.ssm.po
+++ b/manual/po/it/live-manual.ssm.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-09-28 09:48+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2012-09-28 10:09+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -47,13 +47,16 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:13
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "@date:\n"
+#| " :published: 2012-09-28\n"
msgid ""
"@date:\n"
-" :published: 2012-09-28\n"
+" :published: 2012-09-29\n"
msgstr ""
"@date:\n"
-" :published: 28.09.2012\n"
+" :published: 29.09.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
@@ -172,21 +175,28 @@ msgid "<< project_procedures.ssi"
msgstr "<< project_procedures.ssi"
#. type: Plain text
-#: en/live-manual.ssm:61 en/user_examples.ssi:2
+#: en/live-manual.ssm:61
+#, fuzzy
+#| msgid "<< project_bugs.ssi"
+msgid "<< project_git.ssi"
+msgstr "<< project_bugs.ssi"
+
+#. type: Plain text
+#: en/live-manual.ssm:63 en/user_examples.ssi:2
msgid ":B~ Examples"
msgstr ":B~ Esempi"
#. type: Plain text
-#: en/live-manual.ssm:63
+#: en/live-manual.ssm:65
msgid "<< user_examples.ssi"
msgstr "<< user_examples.ssi"
#. type: Plain text
-#: en/live-manual.ssm:65 en/style_guide.ssi:2
+#: en/live-manual.ssm:67 en/style_guide.ssi:2
msgid ":B~ Appendix"
msgstr ":B~ Appendice"
#. type: Plain text
-#: en/live-manual.ssm:66
+#: en/live-manual.ssm:68
msgid "<< style_guide.ssi"
msgstr "<< style_guide.ssi"
diff --git a/manual/po/it/project_git.ssi.po b/manual/po/it/project_git.ssi.po
new file mode 100644
index 0000000..c6b60e0
--- /dev/null
+++ b/manual/po/it/project_git.ssi.po
@@ -0,0 +1,265 @@
+# Italian translations for live-manual package
+# Copyright (C) 2012 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
+"PO-Revision-Date: 2012-09-29 15:21+0300\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
+#: 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:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:338
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:149
+#: en/user_customization-runtime.ssi:158 en/user_customization-runtime.ssi:173
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:201 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:233 en/user_examples.ssi:247
+#: en/user_examples.ssi:256 en/user_examples.ssi:264 en/user_examples.ssi:284
+#: en/user_examples.ssi:292 en/user_examples.ssi:301 en/user_examples.ssi:311
+#: 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:142
+#: en/user_installation.ssi:153 en/user_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
+#: 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:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:367
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:163 en/user_customization-runtime.ssi:181
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:205 en/user_examples.ssi:213
+#: en/user_examples.ssi:229 en/user_examples.ssi:237 en/user_examples.ssi:252
+#: en/user_examples.ssi:260 en/user_examples.ssi:268 en/user_examples.ssi:288
+#: en/user_examples.ssi:297 en/user_examples.ssi:307 en/user_examples.ssi:325
+#: 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:147
+#: en/user_installation.ssi:156 en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/project_git.ssi:2
+msgid "B~ Git repositories"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:4
+#, fuzzy
+#| msgid "3~additional-repositories Additional repositories"
+msgid "1~git-repositories Git repositories"
+msgstr "3~additional-repositories Repository addizionali"
+
+#. type: Plain text
+#: en/project_git.ssi:6
+msgid ""
+"The git tree of the Debian Live Project is made up of several different "
+"branches. There is a list of all the available repositories at http://live."
+"debian.net/gitweb The *{debian}* and the *{debian-next}* branches are "
+"particularly noteworthy because they contain the actual work that will "
+"eventually be included in each new release."
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:8
+msgid ""
+"The project's git URLs have the form: #{protocol://live.debian.net/git/"
+"repository}#."
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:10
+msgid "Thus, in order to clone live-manual read-only, launch:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:14
+#, fuzzy, no-wrap
+#| msgid "$ git clone git://live.debian.net/git/live-manual.git"
+msgid " $ git clone git://live.debian.net/git/live-manual.git\n"
+msgstr "$ git clone git://live.debian.net/git/live-manual.git"
+
+#. type: Plain text
+#: en/project_git.ssi:18
+msgid "Or,"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:22
+#, fuzzy, no-wrap
+#| msgid "$ git clone git://live.debian.net/git/live-manual.git"
+msgid " $ git clone http://live.debian.net/git/live-manual.git\n"
+msgstr "$ git clone git://live.debian.net/git/live-manual.git"
+
+#. type: Plain text
+#: en/project_git.ssi:26
+msgid ""
+"The cloning addresses with write permission have the form: #{git at live.debian."
+"net:/repository}#."
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:28
+msgid "So, again, to clone live-manual but over ssh you must type:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:32
+#, fuzzy, no-wrap
+#| msgid "$ git clone git://live.debian.net/git/live-manual.git"
+msgid " $ git clone git at live.debian.net:/live-manual.git\n"
+msgstr "$ git clone git://live.debian.net/git/live-manual.git"
+
+#. type: Plain text
+#: en/project_git.ssi:36
+msgid ""
+"After cloning any of the existing repositories, you will be on the *{debian}"
+"* branch. This is appropriate to take a look at the state of the project's "
+"latest release but before starting work it is crucial to switch to the *"
+"{debian-next}* branch. To do so:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:40
+#, no-wrap
+msgid " $ git checkout debian-next\n"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:43
+msgid ""
+"The *{debian-next}* branch, which is not always fast-forward, is where all "
+"the changes are committed first before being merged into the *{debian}* "
+"branch. To make an analogy, it is like a testing ground. If you are working "
+"on this branch and need to pull, you will have to do a #{git pull --rebase}# "
+"so that your local modifications are staged while pulling from the server "
+"and then your changes will be put on top of it all."
+msgstr ""
diff --git a/manual/po/it/user_customization-packages.ssi.po b/manual/po/it/user_customization-packages.ssi.po
index 304c25a..27a304f 100644
--- a/manual/po/it/user_customization-packages.ssi.po
+++ b/manual/po/it/user_customization-packages.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-09-26 17:09+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2012-09-20 22:01+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -18,25 +18,27 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:51
-#: en/project_procedures.ssi:63 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
-#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
@@ -60,8 +62,7 @@ msgstr ""
#: en/user_customization-packages.ssi:324
#: en/user_customization-packages.ssi:338
#: en/user_customization-packages.ssi:354
-#: en/user_customization-packages.ssi:371
-#: en/user_customization-packages.ssi:379 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
@@ -92,25 +93,27 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
-#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
-#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:59
-#: en/project_procedures.ssi:136 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
-#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
@@ -134,8 +137,7 @@ msgstr "code{"
#: en/user_customization-packages.ssi:328
#: en/user_customization-packages.ssi:342
#: en/user_customization-packages.ssi:367
-#: en/user_customization-packages.ssi:375
-#: en/user_customization-packages.ssi:384 en/user_customization-runtime.ssi:21
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
@@ -378,15 +380,26 @@ 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 #{--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."
+"running the live system. The defaults employ #{http.debian.net}#, a service "
+"that chooses a geographically close mirror based, among other things, on the "
+"user's IP family and the availability of the mirrors. 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 "
@@ -1511,11 +1524,17 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:360
-#, no-wrap
-msgid ""
-" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
-" $ cat >> config/chroot_apt/preferences << END\n"
-" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
+#, fuzzy, no-wrap
+#| msgid ""
+#| " $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
+#| " $ cat >> config/chroot_apt/preferences << END\n"
+#| " Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
+#| " Pin: release n=sid\n"
+#| " Pin-Priority: 600\n"
+msgid ""
+" $ echo \"deb http://mirror/debian/ sid main\" > config/archives/sid.list.chroot\n"
+" $ cat >> config/chroot_apt/preferences << EOF\n"
+" Package: live-*\n"
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
@@ -1527,12 +1546,17 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:365
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " Package: *\n"
+#| " Pin: release n=sid\n"
+#| " Pin-Priority: 1\n"
+#| " END\n"
msgid ""
" Package: *\n"
" Pin: release n=sid\n"
" Pin-Priority: 1\n"
-" END\n"
+" EOF\n"
msgstr ""
" Package: *\n"
" Pin: release n=sid\n"
@@ -1541,17 +1565,6 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:369
-#, no-wrap
-msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:\n"
-msgstr "*{Nota:}* con la versione 0.8.14 o superiore di Apt si possono utilizzare wildcard nei nomi dei pacchetti (*{Package: live-*}*). Ciò significa che funziona con wheezy usando:\n"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:373
-msgid "$ lb config --distribution wheezy"
-msgstr "$ lb config --distribution wheezy"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:377
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 "
@@ -1574,7 +1587,7 @@ msgstr ""
"chroot_apt/preferences}# la seguente istruzione:"
#. type: Plain text
-#: en/user_customization-packages.ssi:383
+#: en/user_customization-packages.ssi:375
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/it/user_examples.ssi.po b/manual/po/it/user_examples.ssi.po
index a19ba08..908f7fc 100644
--- a/manual/po/it/user_examples.ssi.po
+++ b/manual/po/it/user_examples.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-08-30 14:19+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2012-09-27 22:43+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -18,30 +18,32 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
-#: en/live-manual.ssm:61 en/user_examples.ssi:2
+#: en/live-manual.ssm:63 en/user_examples.ssi:2
msgid ":B~ Examples"
msgstr ":B~ Esempi"
#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
-#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
-#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
@@ -59,17 +61,19 @@ msgstr ":B~ Esempi"
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:187
#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:269
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:311
-#: en/user_customization-packages.ssi:328
-#: en/user_customization-packages.ssi:336 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:338
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:149
+#: en/user_customization-runtime.ssi:158 en/user_customization-runtime.ssi:173
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
@@ -94,25 +98,27 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
-#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
-#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
-#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
-#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
@@ -130,17 +136,19 @@ msgstr "code{"
#: en/user_customization-packages.ssi:183
#: en/user_customization-packages.ssi:193
#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:324
-#: en/user_customization-packages.ssi:332
-#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:21
+#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:367
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:163
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:163 en/user_customization-runtime.ssi:181
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
@@ -251,11 +259,15 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:18
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " 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"
msgid ""
-" 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"
+" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian/\"\n"
+" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security/\"\n"
+" LB_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-backports/\"\n"
msgstr ""
" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
@@ -752,10 +764,14 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:221
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " $ mkdir -p config/includes.chroot/etc/skel\n"
+#| " $ cat > config/includes.chroot/etc/skel/.xsession << END\n"
+#| " #!/bin/sh\n"
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 << EOF\n"
" #!/bin/sh\n"
msgstr ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -774,10 +790,13 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:227
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " exit\n"
+#| " END\n"
msgid ""
" exit\n"
-" END\n"
+" EOF\n"
msgstr ""
" exit\n"
" END\n"
diff --git a/manual/po/pt_BR/about_manual.ssi.po b/manual/po/pt_BR/about_manual.ssi.po
index 7dbe4bb..e50b89e 100644
--- a/manual/po/pt_BR/about_manual.ssi.po
+++ b/manual/po/pt_BR/about_manual.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-08-31 14:04+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2012-08-28 11:54-0500\n"
"Last-Translator: Willer Gomes Júnior <willer at ogomes.com>\n"
"Language-Team: none\n"
@@ -322,61 +322,66 @@ msgstr "_* Brendan Sleight"
#. type: Plain text
#: en/about_manual.ssi:60
+msgid "_* Carlos Zuferri"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:62
msgid "_* Chris Lamb"
msgstr "_* Chris Lamb"
#. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:64
msgid "_* Daniel Baumann"
msgstr "_* Daniel Baumann"
#. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:66
msgid "_* Franklin Piat"
msgstr "_* Franklin Piat"
#. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:68
msgid "_* Jonas Stein"
msgstr "_* Jonas Stein"
#. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:70
msgid "_* Kai Hendry"
msgstr "_* Kai Hendry"
#. type: Plain text
-#: en/about_manual.ssi:70
+#: en/about_manual.ssi:72
msgid "_* Marco Amadori"
msgstr "_* Marco Amadori"
#. type: Plain text
-#: en/about_manual.ssi:72
+#: en/about_manual.ssi:74
msgid "_* Mathieu Geli"
msgstr "_* Mathieu Geli"
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:76
msgid "_* Matthias Kirschner"
msgstr "_* Matthias Kirschner"
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:78
msgid "_* Richard Nelson"
msgstr "_* Richard Nelson"
#. type: Plain text
-#: en/about_manual.ssi:78
+#: en/about_manual.ssi:80
msgid "_* Trent W. Buck"
msgstr "_* Trent W. Buck"
#. type: Plain text
-#: en/about_manual.ssi:80
+#: en/about_manual.ssi:82
msgid "2~how-to-contribute Contributing to this document"
msgstr "2~how-to-contribute Contribuindo com esse documento"
#. type: Plain text
-#: en/about_manual.ssi:82
+#: en/about_manual.ssi:84
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -389,7 +394,7 @@ msgstr ""
"consulte a seção {Contato}#contact para mais informações."
#. type: Plain text
-#: en/about_manual.ssi:84
+#: en/about_manual.ssi:86
msgid ""
"When submitting a contribution, please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted, the "
@@ -402,34 +407,41 @@ msgstr ""
"licenças do resto do documento, ou seja, GPL versão 3 ou superior."
#. type: Plain text
-#: en/about_manual.ssi:86
+#: en/about_manual.ssi:88
+#, fuzzy
+#| msgid ""
+#| "The sources for this manual are maintained using the Git version control "
+#| "system. You can check out the latest copy by executing:"
msgid ""
"The sources for this manual are maintained using the Git version control "
-"system. You can check out the latest copy by executing:"
+"system (see {Git repositories}#git-repositories). You can check out the "
+"latest copy by executing:"
msgstr ""
"Os fontes para esse manual são mantidos usando o sistema de controle de "
"versão Git. Você pode fazer o checkout da ultima cópia executando:"
#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:51
-#: en/project_procedures.ssi:63 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
-#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
@@ -447,17 +459,19 @@ msgstr ""
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:187
#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:269
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:311
-#: en/user_customization-packages.ssi:328
-#: en/user_customization-packages.ssi:336 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:338
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:149
+#: en/user_customization-runtime.ssi:158 en/user_customization-runtime.ssi:173
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
@@ -482,30 +496,32 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:90
+#: en/about_manual.ssi:92
msgid "$ git clone git://live.debian.net/git/live-manual.git"
msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
-#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
-#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
-#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:59
-#: en/project_procedures.ssi:136 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
-#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
@@ -523,17 +539,19 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: en/user_customization-packages.ssi:183
#: en/user_customization-packages.ssi:193
#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:324
-#: en/user_customization-packages.ssi:332
-#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:21
+#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:367
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:163
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:163 en/user_customization-runtime.ssi:181
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
@@ -558,7 +576,7 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/about_manual.ssi:94
+#: en/about_manual.ssi:96
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -569,13 +587,13 @@ msgstr ""
"contruir estão instalados, executando:"
#. type: Plain text
-#: en/about_manual.ssi:98
+#: en/about_manual.ssi:100
#, no-wrap
msgid " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
msgstr " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
#. type: Plain text
-#: en/about_manual.ssi:102
+#: en/about_manual.ssi:104
msgid ""
"You may build the live-manual from the top level directory of your Git "
"checkout by executing:"
@@ -584,13 +602,13 @@ msgstr ""
"diretório do seu Git checkout executando:"
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:108
#, no-wrap
msgid " $ make build\n"
msgstr " $ make build\n"
#. type: Plain text
-#: en/about_manual.ssi:110
+#: en/about_manual.ssi:112
msgid ""
"Since it takes a while to build the manual in all supported languages, you "
"may find it convenient when proofing to build for only one language, e.g. by "
@@ -601,40 +619,40 @@ msgstr ""
"idioma, por exemplo, executando:"
#. type: Plain text
-#: en/about_manual.ssi:114
+#: en/about_manual.ssi:116
#, no-wrap
msgid " $ make build LANGUAGES=en\n"
msgstr " $ make build LANGUAGES=en\n"
#. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:120
msgid "It is also possible to build by document type, e.g:"
msgstr "Também é possível construir, por tipo de documento, por exemplo:"
#. type: Plain text
-#: en/about_manual.ssi:122
+#: en/about_manual.ssi:124
#, no-wrap
msgid " $ make build FORMATS=pdf\n"
msgstr " $ make build FORMATS=pdf\n"
#. type: Plain text
-#: en/about_manual.ssi:126
+#: en/about_manual.ssi:128
msgid "Or combine both, e.g:"
msgstr "Ou a combinação dos dois, por exemplo:"
#. type: Plain text
-#: en/about_manual.ssi:130
+#: en/about_manual.ssi:132
#, no-wrap
msgid " $ make build LANGUAGES=it FORMATS=html\n"
msgstr " $ make build LANGUAGES=it FORMATS=html\n"
#. type: Plain text
-#: en/about_manual.ssi:134
+#: en/about_manual.ssi:136
msgid "3~ Applying changes"
msgstr "3~ Aplicando Atualizações"
#. type: Plain text
-#: en/about_manual.ssi:136
+#: en/about_manual.ssi:138
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 "
@@ -645,12 +663,12 @@ msgstr ""
"primeiro. Para enviar ao repositório, os seguintes passos são necessários:"
#. type: Plain text
-#: en/about_manual.ssi:138
+#: en/about_manual.ssi:140
msgid "_* Fetch the public commit key:"
msgstr "_* Obter a chave publica de commit:"
#. type: Plain text
-#: en/about_manual.ssi:147
+#: en/about_manual.ssi:149
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
@@ -668,12 +686,12 @@ msgstr ""
" $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*\n"
#. type: Plain text
-#: en/about_manual.ssi:151
+#: en/about_manual.ssi:153
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:160
+#: en/about_manual.ssi:162
#, no-wrap
msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
@@ -691,12 +709,12 @@ msgstr ""
" EOF\n"
#. type: Plain text
-#: en/about_manual.ssi:164
+#: en/about_manual.ssi:166
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:169
+#: en/about_manual.ssi:171
#, no-wrap
msgid ""
" $ git clone git at live.debian.net:/live-manual.git\n"
@@ -706,7 +724,7 @@ msgstr ""
" $ cd live-manual && git checkout debian-next\n"
#. type: Plain text
-#: en/about_manual.ssi:173
+#: en/about_manual.ssi:175
msgid ""
"_* Note that you should commit any changes on the debian-next branch, not on "
"the debian branch."
@@ -715,7 +733,7 @@ msgstr ""
"no ramo debian."
#. type: Plain text
-#: en/about_manual.ssi:175
+#: en/about_manual.ssi:177
msgid ""
"_* Do not use #{make commit}# unless you are updating translations in this "
"commit, and in that case, do not mix changes to the English manual and "
@@ -728,7 +746,7 @@ msgstr ""
"{Tradução}#translation para mais detalhes."
#. type: Plain text
-#: en/about_manual.ssi:177
+#: en/about_manual.ssi:179
msgid ""
"_* Write commit messages that consist of complete, meaningful sentences in "
"English, starting with a capital letter and ending with a full stop. "
@@ -741,34 +759,34 @@ msgstr ""
"Translating'."
#. type: Plain text
-#: en/about_manual.ssi:181
+#: en/about_manual.ssi:183
#, 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:185
+#: en/about_manual.ssi:187
msgid "_* Push the commit to the server:"
msgstr "_* Enviar as submissões para os servidor."
#. type: Plain text
-#: en/about_manual.ssi:189
+#: en/about_manual.ssi:191
#, no-wrap
msgid " $ git push\n"
msgstr " $ git push\n"
#. type: Plain text
-#: en/about_manual.ssi:193
+#: en/about_manual.ssi:195
msgid "3~translation Translation"
msgstr "3~translation Tradução"
#. type: Plain text
-#: en/about_manual.ssi:195
+#: en/about_manual.ssi:197
msgid "To start a translation for a new language, follow these steps:"
msgstr "Para começar uma tradução para uma nova linguagem, siga estes passos:"
#. type: Plain text
-#: en/about_manual.ssi:197
+#: en/about_manual.ssi:199
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 "
@@ -781,7 +799,7 @@ msgstr ""
"email assim o time de tradução poderá verificar sua integridade."
#. type: Plain text
-#: en/about_manual.ssi:199
+#: en/about_manual.ssi:201
msgid ""
"_* To enable a new language in the autobuild it is enough to add the initial "
"translated files to #{manual/po/${LANGUAGE}/}# and run #{make commit}#. And "
@@ -792,7 +810,7 @@ msgstr ""
"#. E então editar #{manual/_sisu/home/index.html}#."
#. type: Plain text
-#: en/about_manual.ssi:201
+#: en/about_manual.ssi:203
msgid ""
"_* Once the new language is added, you can randomly continue translating the "
"remaining po files in #{manual/po/}#."
@@ -801,7 +819,7 @@ msgstr ""
"continuar a traduzir o restante dos arquivos .po na pasta #{manual/po/}#."
#. type: Plain text
-#: en/about_manual.ssi:203
+#: en/about_manual.ssi:205
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
"are updated from the po files and then you can review your changes launching "
@@ -814,7 +832,7 @@ msgstr ""
"#, #{git commit -a -m \"Translating...\"}# e #{git push}#."
#. type: Plain text
-#: en/about_manual.ssi:204
+#: en/about_manual.ssi:206
#, no-wrap
msgid "*{Note:}* You can use #{make clean}# to clean your git tree before pushing. This step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
msgstr "*{Observação:}* Você pode usar #{make clean}# para limpar a sua árvore git antes de enviar. Este passo não é obrigatório graças ao gitignore., Mas é uma boa prática para evitar enviar arquivos involuntariamente.\n"
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index ffea329..210deef 100644
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-09-28 09:48+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2012-08-29 06:56-0500\n"
"Last-Translator: Willer Gomes Júnior <willer at ogomes.com>\n"
"Language-Team: none\n"
@@ -47,13 +47,16 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:13
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "@date:\n"
+#| " :published: 2012-09-28\n"
msgid ""
"@date:\n"
-" :published: 2012-09-28\n"
+" :published: 2012-09-29\n"
msgstr ""
"@date:\n"
-" :published: 28-09-2012\n"
+" :published: 29-09-2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
@@ -172,21 +175,28 @@ msgid "<< project_procedures.ssi"
msgstr "<< project_procedures.ssi"
#. type: Plain text
-#: en/live-manual.ssm:61 en/user_examples.ssi:2
+#: en/live-manual.ssm:61
+#, fuzzy
+#| msgid "<< project_bugs.ssi"
+msgid "<< project_git.ssi"
+msgstr "<< project_bugs.ssi"
+
+#. type: Plain text
+#: en/live-manual.ssm:63 en/user_examples.ssi:2
msgid ":B~ Examples"
msgstr ":B~ Exemplos"
#. type: Plain text
-#: en/live-manual.ssm:63
+#: en/live-manual.ssm:65
msgid "<< user_examples.ssi"
msgstr "<< user_examples.ssi"
#. type: Plain text
-#: en/live-manual.ssm:65 en/style_guide.ssi:2
+#: en/live-manual.ssm:67 en/style_guide.ssi:2
msgid ":B~ Appendix"
msgstr ":B~ Apendice"
#. type: Plain text
-#: en/live-manual.ssm:66
+#: en/live-manual.ssm:68
msgid "<< style_guide.ssi"
msgstr "<< style_guide.ssi"
diff --git a/manual/po/pt_BR/project_git.ssi.po b/manual/po/pt_BR/project_git.ssi.po
new file mode 100644
index 0000000..28c0fd1
--- /dev/null
+++ b/manual/po/pt_BR/project_git.ssi.po
@@ -0,0 +1,263 @@
+# Portuguese translations for live-manual package
+# Copyright (C) 2012 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
+"PO-Revision-Date: 2012-09-29 15:21+0300\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
+#: 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:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:338
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:149
+#: en/user_customization-runtime.ssi:158 en/user_customization-runtime.ssi:173
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:201 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:233 en/user_examples.ssi:247
+#: en/user_examples.ssi:256 en/user_examples.ssi:264 en/user_examples.ssi:284
+#: en/user_examples.ssi:292 en/user_examples.ssi:301 en/user_examples.ssi:311
+#: 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:142
+#: en/user_installation.ssi:153 en/user_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
+#: 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:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:367
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:163 en/user_customization-runtime.ssi:181
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:205 en/user_examples.ssi:213
+#: en/user_examples.ssi:229 en/user_examples.ssi:237 en/user_examples.ssi:252
+#: en/user_examples.ssi:260 en/user_examples.ssi:268 en/user_examples.ssi:288
+#: en/user_examples.ssi:297 en/user_examples.ssi:307 en/user_examples.ssi:325
+#: 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:147
+#: en/user_installation.ssi:156 en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/project_git.ssi:2
+msgid "B~ Git repositories"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:4
+msgid "1~git-repositories Git repositories"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:6
+msgid ""
+"The git tree of the Debian Live Project is made up of several different "
+"branches. There is a list of all the available repositories at http://live."
+"debian.net/gitweb The *{debian}* and the *{debian-next}* branches are "
+"particularly noteworthy because they contain the actual work that will "
+"eventually be included in each new release."
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:8
+msgid ""
+"The project's git URLs have the form: #{protocol://live.debian.net/git/"
+"repository}#."
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:10
+msgid "Thus, in order to clone live-manual read-only, launch:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:14
+#, fuzzy, no-wrap
+#| msgid "$ git clone git://live.debian.net/git/live-manual.git"
+msgid " $ git clone git://live.debian.net/git/live-manual.git\n"
+msgstr "$ git clone git://live.debian.net/git/live-manual.git"
+
+#. type: Plain text
+#: en/project_git.ssi:18
+msgid "Or,"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:22
+#, fuzzy, no-wrap
+#| msgid "$ git clone git://live.debian.net/git/live-manual.git"
+msgid " $ git clone http://live.debian.net/git/live-manual.git\n"
+msgstr "$ git clone git://live.debian.net/git/live-manual.git"
+
+#. type: Plain text
+#: en/project_git.ssi:26
+msgid ""
+"The cloning addresses with write permission have the form: #{git at live.debian."
+"net:/repository}#."
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:28
+msgid "So, again, to clone live-manual but over ssh you must type:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:32
+#, fuzzy, no-wrap
+#| msgid "$ git clone git://live.debian.net/git/live-manual.git"
+msgid " $ git clone git at live.debian.net:/live-manual.git\n"
+msgstr "$ git clone git://live.debian.net/git/live-manual.git"
+
+#. type: Plain text
+#: en/project_git.ssi:36
+msgid ""
+"After cloning any of the existing repositories, you will be on the *{debian}"
+"* branch. This is appropriate to take a look at the state of the project's "
+"latest release but before starting work it is crucial to switch to the *"
+"{debian-next}* branch. To do so:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:40
+#, no-wrap
+msgid " $ git checkout debian-next\n"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:43
+msgid ""
+"The *{debian-next}* branch, which is not always fast-forward, is where all "
+"the changes are committed first before being merged into the *{debian}* "
+"branch. To make an analogy, it is like a testing ground. If you are working "
+"on this branch and need to pull, you will have to do a #{git pull --rebase}# "
+"so that your local modifications are staged while pulling from the server "
+"and then your changes will be put on top of it all."
+msgstr ""
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index c03eeaa..9211b7c 100644
--- a/manual/po/pt_BR/user_customization-packages.ssi.po
+++ b/manual/po/pt_BR/user_customization-packages.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-09-26 17:09+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -16,25 +16,27 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:51
-#: en/project_procedures.ssi:63 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
-#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
@@ -58,8 +60,7 @@ msgstr ""
#: en/user_customization-packages.ssi:324
#: en/user_customization-packages.ssi:338
#: en/user_customization-packages.ssi:354
-#: en/user_customization-packages.ssi:371
-#: en/user_customization-packages.ssi:379 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
@@ -90,25 +91,27 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
-#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
-#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:59
-#: en/project_procedures.ssi:136 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
-#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
@@ -132,8 +135,7 @@ msgstr "code{"
#: en/user_customization-packages.ssi:328
#: en/user_customization-packages.ssi:342
#: en/user_customization-packages.ssi:367
-#: en/user_customization-packages.ssi:375
-#: en/user_customization-packages.ssi:384 en/user_customization-runtime.ssi:21
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
@@ -316,12 +318,13 @@ msgstr ""
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."
+"running the live system. The defaults employ #{http.debian.net}#, a service "
+"that chooses a geographically close mirror based, among other things, on the "
+"user's IP family and the availability of the mirrors. 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
@@ -1185,9 +1188,9 @@ msgstr ""
#: en/user_customization-packages.ssi:360
#, no-wrap
msgid ""
-" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
-" $ cat >> config/chroot_apt/preferences << END\n"
-" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
+" $ echo \"deb http://mirror/debian/ sid main\" > config/archives/sid.list.chroot\n"
+" $ cat >> config/chroot_apt/preferences << EOF\n"
+" Package: live-*\n"
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
@@ -1199,22 +1202,11 @@ msgid ""
" Package: *\n"
" Pin: release n=sid\n"
" Pin-Priority: 1\n"
-" END\n"
+" EOF\n"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:369
-#, no-wrap
-msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:373
-msgid "$ lb config --distribution wheezy"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:377
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 "
@@ -1228,7 +1220,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:383
+#: en/user_customization-packages.ssi:375
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/pt_BR/user_examples.ssi.po b/manual/po/pt_BR/user_examples.ssi.po
index c4804d9..f32a073 100644
--- a/manual/po/pt_BR/user_examples.ssi.po
+++ b/manual/po/pt_BR/user_examples.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-08-30 14:19+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -16,30 +16,32 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/live-manual.ssm:61 en/user_examples.ssi:2
+#: en/live-manual.ssm:63 en/user_examples.ssi:2
msgid ":B~ Examples"
msgstr ":B~ Exemplos"
#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
-#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
-#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
@@ -57,17 +59,19 @@ msgstr ":B~ Exemplos"
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:187
#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:269
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:311
-#: en/user_customization-packages.ssi:328
-#: en/user_customization-packages.ssi:336 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:338
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:149
+#: en/user_customization-runtime.ssi:158 en/user_customization-runtime.ssi:173
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
@@ -92,25 +96,27 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
-#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
-#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
-#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
-#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
@@ -128,17 +134,19 @@ msgstr "code{"
#: en/user_customization-packages.ssi:183
#: en/user_customization-packages.ssi:193
#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:324
-#: en/user_customization-packages.ssi:332
-#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:21
+#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:367
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:163
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:163 en/user_customization-runtime.ssi:181
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
@@ -233,9 +241,9 @@ msgstr ""
#: en/user_examples.ssi:18
#, no-wrap
msgid ""
-" 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"
+" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian/\"\n"
+" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security/\"\n"
+" LB_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-backports/\"\n"
msgstr ""
#. type: Plain text
@@ -618,7 +626,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 << EOF\n"
" #!/bin/sh\n"
msgstr ""
@@ -635,7 +643,7 @@ msgstr ""
#, no-wrap
msgid ""
" exit\n"
-" END\n"
+" EOF\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/about_manual.ssi.po b/manual/po/ro/about_manual.ssi.po
index dba056f..b7f3b3f 100644
--- a/manual/po/ro/about_manual.ssi.po
+++ b/manual/po/ro/about_manual.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-08-31 14:04+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2012-08-14 01:56-0500\n"
"Last-Translator: Bogdan Alexandru Dragoiu <poplar at sdf.org>\n"
"Language-Team: none\n"
@@ -300,61 +300,66 @@ msgstr "_* Brendan Sleight"
#. type: Plain text
#: en/about_manual.ssi:60
+msgid "_* Carlos Zuferri"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:62
msgid "_* Chris Lamb"
msgstr "_* Chris Lamb"
#. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:64
msgid "_* Daniel Baumann"
msgstr "_* Daniel Baumann"
#. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:66
msgid "_* Franklin Piat"
msgstr "_* Franklin Piat"
#. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:68
msgid "_* Jonas Stein"
msgstr "_* Jonas Stein"
#. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:70
msgid "_* Kai Hendry"
msgstr "_* Kai Hendry"
#. type: Plain text
-#: en/about_manual.ssi:70
+#: en/about_manual.ssi:72
msgid "_* Marco Amadori"
msgstr "_* Marco Amadori"
#. type: Plain text
-#: en/about_manual.ssi:72
+#: en/about_manual.ssi:74
msgid "_* Mathieu Geli"
msgstr "_* Mathieu Geli"
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:76
msgid "_* Matthias Kirschner"
msgstr "_* Matthias Kirschner"
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:78
msgid "_* Richard Nelson"
msgstr "_* Richard Nelson"
#. type: Plain text
-#: en/about_manual.ssi:78
+#: en/about_manual.ssi:80
msgid "_* Trent W. Buck"
msgstr "_* Trent W. Buck"
#. type: Plain text
-#: en/about_manual.ssi:80
+#: en/about_manual.ssi:82
msgid "2~how-to-contribute Contributing to this document"
msgstr "2~how-to-contribute Cum se poate contribui la acest document"
#. type: Plain text
-#: en/about_manual.ssi:82
+#: en/about_manual.ssi:84
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -367,7 +372,7 @@ msgstr ""
"#contact pentru mai multe informatii."
#. type: Plain text
-#: en/about_manual.ssi:84
+#: en/about_manual.ssi:86
msgid ""
"When submitting a contribution, please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted, the "
@@ -380,34 +385,41 @@ msgstr ""
"documentului , adica GPL version 3 or later."
#. type: Plain text
-#: en/about_manual.ssi:86
+#: en/about_manual.ssi:88
+#, fuzzy
+#| msgid ""
+#| "The sources for this manual are maintained using the Git version control "
+#| "system. You can check out the latest copy by executing:"
msgid ""
"The sources for this manual are maintained using the Git version control "
-"system. You can check out the latest copy by executing:"
+"system (see {Git repositories}#git-repositories). You can check out the "
+"latest copy by executing:"
msgstr ""
"Sursele acestui manual sunt gerate folosind Git version control system. Pute-"
"ti checkout ultima copie prin executarea :"
#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:51
-#: en/project_procedures.ssi:63 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
-#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
@@ -425,17 +437,19 @@ msgstr ""
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:187
#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:269
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:311
-#: en/user_customization-packages.ssi:328
-#: en/user_customization-packages.ssi:336 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:338
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:149
+#: en/user_customization-runtime.ssi:158 en/user_customization-runtime.ssi:173
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
@@ -460,30 +474,32 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:90
+#: en/about_manual.ssi:92
msgid "$ git clone git://live.debian.net/git/live-manual.git"
msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
-#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
-#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
-#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:59
-#: en/project_procedures.ssi:136 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
-#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
@@ -501,17 +517,19 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: en/user_customization-packages.ssi:183
#: en/user_customization-packages.ssi:193
#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:324
-#: en/user_customization-packages.ssi:332
-#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:21
+#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:367
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:163
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:163 en/user_customization-runtime.ssi:181
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
@@ -536,7 +554,7 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/about_manual.ssi:94
+#: en/about_manual.ssi:96
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -547,13 +565,13 @@ msgstr ""
"pentru 'building' sunt instalate, prin executatea comenzii:"
#. type: Plain text
-#: en/about_manual.ssi:98
+#: en/about_manual.ssi:100
#, no-wrap
msgid " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:102
+#: en/about_manual.ssi:104
msgid ""
"You may build the live-manual from the top level directory of your Git "
"checkout by executing:"
@@ -562,13 +580,13 @@ msgstr ""
"al dvs, prin executatea:"
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:108
#, no-wrap
msgid " $ make build\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:110
+#: en/about_manual.ssi:112
msgid ""
"Since it takes a while to build the manual in all supported languages, you "
"may find it convenient when proofing to build for only one language, e.g. by "
@@ -576,42 +594,42 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:114
+#: en/about_manual.ssi:116
#, no-wrap
msgid " $ make build LANGUAGES=en\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:120
msgid "It is also possible to build by document type, e.g:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:122
+#: en/about_manual.ssi:124
#, no-wrap
msgid " $ make build FORMATS=pdf\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:126
+#: en/about_manual.ssi:128
msgid "Or combine both, e.g:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:130
+#: en/about_manual.ssi:132
#, no-wrap
msgid " $ make build LANGUAGES=it FORMATS=html\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:134
+#: en/about_manual.ssi:136
#, fuzzy
#| msgid "3~ Applying patches"
msgid "3~ Applying changes"
msgstr "3~ Aplicarea de patch-uri"
#. type: Plain text
-#: en/about_manual.ssi:136
+#: en/about_manual.ssi:138
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 "
@@ -622,12 +640,12 @@ msgstr ""
"contibutiile la repository, pasii urmatori sunt necesari:"
#. type: Plain text
-#: en/about_manual.ssi:138
+#: en/about_manual.ssi:140
msgid "_* Fetch the public commit key:"
msgstr "_* Fetch the public commit key:"
#. type: Plain text
-#: en/about_manual.ssi:147
+#: en/about_manual.ssi:149
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
@@ -639,12 +657,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:151
+#: en/about_manual.ssi:153
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:160
+#: en/about_manual.ssi:162
#, no-wrap
msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
@@ -656,12 +674,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:164
+#: en/about_manual.ssi:166
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:169
+#: en/about_manual.ssi:171
#, no-wrap
msgid ""
" $ git clone git at live.debian.net:/live-manual.git\n"
@@ -671,14 +689,14 @@ msgstr ""
" $ cd live-manual && git checkout debian-next\n"
#. type: Plain text
-#: en/about_manual.ssi:173
+#: en/about_manual.ssi:175
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:175
+#: en/about_manual.ssi:177
msgid ""
"_* Do not use #{make commit}# unless you are updating translations in this "
"commit, and in that case, do not mix changes to the English manual and "
@@ -687,7 +705,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:177
+#: en/about_manual.ssi:179
#, fuzzy
#| msgid ""
#| "_* Write commit messages that consist of full, useful sentences in "
@@ -705,34 +723,34 @@ msgstr ""
"'Fixing/Adding/Removing/Correcting/Translating':"
#. type: Plain text
-#: en/about_manual.ssi:181
+#: en/about_manual.ssi:183
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:185
+#: en/about_manual.ssi:187
msgid "_* Push the commit to the server:"
msgstr "_* Primite commit-ul la server:"
#. type: Plain text
-#: en/about_manual.ssi:189
+#: en/about_manual.ssi:191
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:193
+#: en/about_manual.ssi:195
msgid "3~translation Translation"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:195
+#: en/about_manual.ssi:197
msgid "To start a translation for a new language, follow these steps:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:197
+#: en/about_manual.ssi:199
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 "
@@ -741,7 +759,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:199
+#: en/about_manual.ssi:201
msgid ""
"_* To enable a new language in the autobuild it is enough to add the initial "
"translated files to #{manual/po/${LANGUAGE}/}# and run #{make commit}#. And "
@@ -749,14 +767,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:201
+#: en/about_manual.ssi:203
msgid ""
"_* Once the new language is added, you can randomly continue translating the "
"remaining po files in #{manual/po/}#."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:203
+#: en/about_manual.ssi:205
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
"are updated from the po files and then you can review your changes launching "
@@ -765,7 +783,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:204
+#: en/about_manual.ssi:206
#, no-wrap
msgid "*{Note:}* You can use #{make clean}# to clean your git tree before pushing. This step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
msgstr ""
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index 09c0ed3..0d174a4 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-09-28 09:48+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2012-07-26 23:14+0200\n"
"Last-Translator: Victor Nitu <victor at debian-linux.ro>\n"
"Language-Team: none\n"
@@ -47,13 +47,16 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:13
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "@date:\n"
+#| " :published: 2012-09-28\n"
msgid ""
"@date:\n"
-" :published: 2012-09-28\n"
+" :published: 2012-09-29\n"
msgstr ""
"@date:\n"
-" :published: 28.09.2012\n"
+" :published: 29.09.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
@@ -172,21 +175,28 @@ msgid "<< project_procedures.ssi"
msgstr "<< project_procedures.ssi"
#. type: Plain text
-#: en/live-manual.ssm:61 en/user_examples.ssi:2
+#: en/live-manual.ssm:61
+#, fuzzy
+#| msgid "<< project_bugs.ssi"
+msgid "<< project_git.ssi"
+msgstr "<< project_bugs.ssi"
+
+#. type: Plain text
+#: en/live-manual.ssm:63 en/user_examples.ssi:2
msgid ":B~ Examples"
msgstr ":B~ Exemple"
#. type: Plain text
-#: en/live-manual.ssm:63
+#: en/live-manual.ssm:65
msgid "<< user_examples.ssi"
msgstr "<< user_examples.ssi"
#. type: Plain text
-#: en/live-manual.ssm:65 en/style_guide.ssi:2
+#: en/live-manual.ssm:67 en/style_guide.ssi:2
msgid ":B~ Appendix"
msgstr ":B~ Anexă"
#. type: Plain text
-#: en/live-manual.ssm:66
+#: en/live-manual.ssm:68
msgid "<< style_guide.ssi"
msgstr "<< style_guide.ssi"
diff --git a/manual/po/ro/project_git.ssi.po b/manual/po/ro/project_git.ssi.po
new file mode 100644
index 0000000..49d1a53
--- /dev/null
+++ b/manual/po/ro/project_git.ssi.po
@@ -0,0 +1,264 @@
+# Romanian translations for live-manual package
+# Copyright (C) 2012 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
+"PO-Revision-Date: 2012-09-29 15:21+0300\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
+#: 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:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:338
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:149
+#: en/user_customization-runtime.ssi:158 en/user_customization-runtime.ssi:173
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:201 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:233 en/user_examples.ssi:247
+#: en/user_examples.ssi:256 en/user_examples.ssi:264 en/user_examples.ssi:284
+#: en/user_examples.ssi:292 en/user_examples.ssi:301 en/user_examples.ssi:311
+#: 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:142
+#: en/user_installation.ssi:153 en/user_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
+#: 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:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:367
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:163 en/user_customization-runtime.ssi:181
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:205 en/user_examples.ssi:213
+#: en/user_examples.ssi:229 en/user_examples.ssi:237 en/user_examples.ssi:252
+#: en/user_examples.ssi:260 en/user_examples.ssi:268 en/user_examples.ssi:288
+#: en/user_examples.ssi:297 en/user_examples.ssi:307 en/user_examples.ssi:325
+#: 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:147
+#: en/user_installation.ssi:156 en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/project_git.ssi:2
+msgid "B~ Git repositories"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:4
+msgid "1~git-repositories Git repositories"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:6
+msgid ""
+"The git tree of the Debian Live Project is made up of several different "
+"branches. There is a list of all the available repositories at http://live."
+"debian.net/gitweb The *{debian}* and the *{debian-next}* branches are "
+"particularly noteworthy because they contain the actual work that will "
+"eventually be included in each new release."
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:8
+msgid ""
+"The project's git URLs have the form: #{protocol://live.debian.net/git/"
+"repository}#."
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:10
+msgid "Thus, in order to clone live-manual read-only, launch:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:14
+#, fuzzy, no-wrap
+#| msgid "$ git clone git://live.debian.net/git/live-manual.git"
+msgid " $ git clone git://live.debian.net/git/live-manual.git\n"
+msgstr "$ git clone git://live.debian.net/git/live-manual.git"
+
+#. type: Plain text
+#: en/project_git.ssi:18
+msgid "Or,"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:22
+#, fuzzy, no-wrap
+#| msgid "$ git clone git://live.debian.net/git/live-manual.git"
+msgid " $ git clone http://live.debian.net/git/live-manual.git\n"
+msgstr "$ git clone git://live.debian.net/git/live-manual.git"
+
+#. type: Plain text
+#: en/project_git.ssi:26
+msgid ""
+"The cloning addresses with write permission have the form: #{git at live.debian."
+"net:/repository}#."
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:28
+msgid "So, again, to clone live-manual but over ssh you must type:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:32
+#, fuzzy, no-wrap
+#| msgid "$ git clone git://live.debian.net/git/live-manual.git"
+msgid " $ git clone git at live.debian.net:/live-manual.git\n"
+msgstr "$ git clone git://live.debian.net/git/live-manual.git"
+
+#. type: Plain text
+#: en/project_git.ssi:36
+msgid ""
+"After cloning any of the existing repositories, you will be on the *{debian}"
+"* branch. This is appropriate to take a look at the state of the project's "
+"latest release but before starting work it is crucial to switch to the *"
+"{debian-next}* branch. To do so:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:40
+#, no-wrap
+msgid " $ git checkout debian-next\n"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:43
+msgid ""
+"The *{debian-next}* branch, which is not always fast-forward, is where all "
+"the changes are committed first before being merged into the *{debian}* "
+"branch. To make an analogy, it is like a testing ground. If you are working "
+"on this branch and need to pull, you will have to do a #{git pull --rebase}# "
+"so that your local modifications are staged while pulling from the server "
+"and then your changes will be put on top of it all."
+msgstr ""
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index 19b94c9..832d469 100644
--- a/manual/po/ro/user_customization-packages.ssi.po
+++ b/manual/po/ro/user_customization-packages.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-09-26 17:09+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,25 +17,27 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:51
-#: en/project_procedures.ssi:63 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
-#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
@@ -59,8 +61,7 @@ msgstr ""
#: en/user_customization-packages.ssi:324
#: en/user_customization-packages.ssi:338
#: en/user_customization-packages.ssi:354
-#: en/user_customization-packages.ssi:371
-#: en/user_customization-packages.ssi:379 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
@@ -91,25 +92,27 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
-#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
-#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:59
-#: en/project_procedures.ssi:136 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
-#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
@@ -133,8 +136,7 @@ msgstr "code{"
#: en/user_customization-packages.ssi:328
#: en/user_customization-packages.ssi:342
#: en/user_customization-packages.ssi:367
-#: en/user_customization-packages.ssi:375
-#: en/user_customization-packages.ssi:384 en/user_customization-runtime.ssi:21
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
@@ -317,12 +319,13 @@ msgstr ""
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."
+"running the live system. The defaults employ #{http.debian.net}#, a service "
+"that chooses a geographically close mirror based, among other things, on the "
+"user's IP family and the availability of the mirrors. 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
@@ -1186,9 +1189,9 @@ msgstr ""
#: en/user_customization-packages.ssi:360
#, no-wrap
msgid ""
-" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
-" $ cat >> config/chroot_apt/preferences << END\n"
-" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
+" $ echo \"deb http://mirror/debian/ sid main\" > config/archives/sid.list.chroot\n"
+" $ cat >> config/chroot_apt/preferences << EOF\n"
+" Package: live-*\n"
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
@@ -1200,22 +1203,11 @@ msgid ""
" Package: *\n"
" Pin: release n=sid\n"
" Pin-Priority: 1\n"
-" END\n"
+" EOF\n"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:369
-#, no-wrap
-msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:373
-msgid "$ lb config --distribution wheezy"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:377
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 "
@@ -1229,7 +1221,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:383
+#: en/user_customization-packages.ssi:375
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index 8aecd37..0e57ebc 100644
--- a/manual/po/ro/user_examples.ssi.po
+++ b/manual/po/ro/user_examples.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-08-30 14:19+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,30 +17,32 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. type: Plain text
-#: en/live-manual.ssm:61 en/user_examples.ssi:2
+#: en/live-manual.ssm:63 en/user_examples.ssi:2
msgid ":B~ Examples"
msgstr ":B~ Exemple"
#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
-#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
-#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
@@ -58,17 +60,19 @@ msgstr ":B~ Exemple"
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:187
#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:269
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:311
-#: en/user_customization-packages.ssi:328
-#: en/user_customization-packages.ssi:336 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:338
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:149
+#: en/user_customization-runtime.ssi:158 en/user_customization-runtime.ssi:173
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
@@ -93,25 +97,27 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
-#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
-#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
-#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
-#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
@@ -129,17 +135,19 @@ msgstr "code{"
#: en/user_customization-packages.ssi:183
#: en/user_customization-packages.ssi:193
#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:324
-#: en/user_customization-packages.ssi:332
-#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:21
+#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:367
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:163
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:163 en/user_customization-runtime.ssi:181
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
@@ -234,9 +242,9 @@ msgstr ""
#: en/user_examples.ssi:18
#, no-wrap
msgid ""
-" 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"
+" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian/\"\n"
+" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security/\"\n"
+" LB_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-backports/\"\n"
msgstr ""
#. type: Plain text
@@ -619,7 +627,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 << EOF\n"
" #!/bin/sh\n"
msgstr ""
@@ -636,7 +644,7 @@ msgstr ""
#, no-wrap
msgid ""
" exit\n"
-" END\n"
+" EOF\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po4a.cfg b/manual/po4a.cfg
index dd14f99..995eb73 100644
--- a/manual/po4a.cfg
+++ b/manual/po4a.cfg
@@ -5,6 +5,7 @@
[type: text] en/about_project.ssi $lang:$lang/about_project.ssi
[type: text] en/project_bugs.ssi $lang:$lang/project_bugs.ssi
[type: text] en/project_coding-style.ssi $lang:$lang/project_coding-style.ssi
+[type: text] en/project_git.ssi $lang:$lang/project_git.ssi
[type: text] en/project_procedures.ssi $lang:$lang/project_procedures.ssi
[type: text] en/style_guide.ssi $lang:$lang/style_guide.ssi
[type: text] en/user_basics.ssi $lang:$lang/user_basics.ssi
diff --git a/manual/pot/about_manual.ssi.pot b/manual/pot/about_manual.ssi.pot
index ac233e7..72ddd70 100644
--- a/manual/pot/about_manual.ssi.pot
+++ b/manual/pot/about_manual.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-08-31 14:04+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -240,61 +240,66 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:60
-msgid "_* Chris Lamb"
+msgid "_* Carlos Zuferri"
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:62
-msgid "_* Daniel Baumann"
+msgid "_* Chris Lamb"
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:64
-msgid "_* Franklin Piat"
+msgid "_* Daniel Baumann"
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:66
-msgid "_* Jonas Stein"
+msgid "_* Franklin Piat"
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:68
-msgid "_* Kai Hendry"
+msgid "_* Jonas Stein"
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:70
-msgid "_* Marco Amadori"
+msgid "_* Kai Hendry"
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:72
-msgid "_* Mathieu Geli"
+msgid "_* Marco Amadori"
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:74
-msgid "_* Matthias Kirschner"
+msgid "_* Mathieu Geli"
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:76
-msgid "_* Richard Nelson"
+msgid "_* Matthias Kirschner"
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:78
-msgid "_* Trent W. Buck"
+msgid "_* Richard Nelson"
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:80
-msgid "2~how-to-contribute Contributing to this document"
+msgid "_* Trent W. Buck"
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:82
+msgid "2~how-to-contribute Contributing to this document"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:84
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -303,7 +308,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84
+#: en/about_manual.ssi:86
msgid ""
"When submitting a contribution, please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted, the "
@@ -312,32 +317,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:86
+#: en/about_manual.ssi:88
msgid ""
"The sources for this manual are maintained using the Git version control "
-"system. You can check out the latest copy by executing:"
+"system (see {Git repositories}#git-repositories). You can check out the "
+"latest copy by executing:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:51
-#: en/project_procedures.ssi:63 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
-#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
@@ -355,17 +363,19 @@ msgstr ""
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:187
#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:269
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:311
-#: en/user_customization-packages.ssi:328
-#: en/user_customization-packages.ssi:336 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:338
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:149
+#: en/user_customization-runtime.ssi:158 en/user_customization-runtime.ssi:173
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
@@ -390,30 +400,32 @@ msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:90
+#: en/about_manual.ssi:92
msgid "$ git clone git://live.debian.net/git/live-manual.git"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
-#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
-#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:59
-#: en/project_procedures.ssi:136 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
-#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
@@ -431,17 +443,19 @@ msgstr ""
#: en/user_customization-packages.ssi:183
#: en/user_customization-packages.ssi:193
#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:324
-#: en/user_customization-packages.ssi:332
-#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:21
+#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:367
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:163
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:163 en/user_customization-runtime.ssi:181
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
@@ -466,7 +480,7 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:94
+#: en/about_manual.ssi:96
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -474,26 +488,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:98
+#: en/about_manual.ssi:100
#, no-wrap
msgid " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:102
+#: en/about_manual.ssi:104
msgid ""
"You may build the live-manual from the top level directory of your Git "
"checkout by executing:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:108
#, no-wrap
msgid " $ make build\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:110
+#: en/about_manual.ssi:112
msgid ""
"Since it takes a while to build the manual in all supported languages, you "
"may find it convenient when proofing to build for only one language, e.g. by "
@@ -501,40 +515,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:114
+#: en/about_manual.ssi:116
#, no-wrap
msgid " $ make build LANGUAGES=en\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:118
+#: en/about_manual.ssi:120
msgid "It is also possible to build by document type, e.g:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:122
+#: en/about_manual.ssi:124
#, no-wrap
msgid " $ make build FORMATS=pdf\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:126
+#: en/about_manual.ssi:128
msgid "Or combine both, e.g:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:130
+#: en/about_manual.ssi:132
#, no-wrap
msgid " $ make build LANGUAGES=it FORMATS=html\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:134
+#: en/about_manual.ssi:136
msgid "3~ Applying changes"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:136
+#: en/about_manual.ssi:138
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 "
@@ -542,12 +556,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:138
+#: en/about_manual.ssi:140
msgid "_* Fetch the public commit key:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:147
+#: en/about_manual.ssi:149
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
@@ -559,12 +573,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:151
+#: en/about_manual.ssi:153
msgid "_* Add the following section to your openssh-client config:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:162
#, no-wrap
msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
@@ -576,12 +590,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:164
+#: en/about_manual.ssi:166
msgid "_* Check out a clone of the manual through ssh:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:169
+#: en/about_manual.ssi:171
#, no-wrap
msgid ""
" $ git clone git at live.debian.net:/live-manual.git\n"
@@ -589,14 +603,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:173
+#: en/about_manual.ssi:175
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:175
+#: en/about_manual.ssi:177
msgid ""
"_* Do not use #{make commit}# unless you are updating translations in this "
"commit, and in that case, do not mix changes to the English manual and "
@@ -605,7 +619,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:177
+#: en/about_manual.ssi:179
msgid ""
"_* Write commit messages that consist of complete, meaningful sentences in "
"English, starting with a capital letter and ending with a full stop. "
@@ -614,34 +628,34 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:181
+#: en/about_manual.ssi:183
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:185
+#: en/about_manual.ssi:187
msgid "_* Push the commit to the server:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:189
+#: en/about_manual.ssi:191
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:193
+#: en/about_manual.ssi:195
msgid "3~translation Translation"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:195
+#: en/about_manual.ssi:197
msgid "To start a translation for a new language, follow these steps:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:197
+#: en/about_manual.ssi:199
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 "
@@ -650,7 +664,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:199
+#: en/about_manual.ssi:201
msgid ""
"_* To enable a new language in the autobuild it is enough to add the initial "
"translated files to #{manual/po/${LANGUAGE}/}# and run #{make commit}#. And "
@@ -658,14 +672,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:201
+#: en/about_manual.ssi:203
msgid ""
"_* Once the new language is added, you can randomly continue translating the "
"remaining po files in #{manual/po/}#."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:203
+#: en/about_manual.ssi:205
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
"are updated from the po files and then you can review your changes launching "
@@ -674,7 +688,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:204
+#: en/about_manual.ssi:206
#, no-wrap
msgid "*{Note:}* You can use #{make clean}# to clean your git tree before pushing. This step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
msgstr ""
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index ab22e2c..1e40aa2 100644
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-09-28 09:48+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-09-28\n"
+" :published: 2012-09-29\n"
msgstr ""
#. type: Plain text
@@ -160,21 +160,26 @@ msgid "<< project_procedures.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:61 en/user_examples.ssi:2
+#: en/live-manual.ssm:61
+msgid "<< project_git.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:63 en/user_examples.ssi:2
msgid ":B~ Examples"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:63
+#: en/live-manual.ssm:65
msgid "<< user_examples.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:65 en/style_guide.ssi:2
+#: en/live-manual.ssm:67 en/style_guide.ssi:2
msgid ":B~ Appendix"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:66
+#: en/live-manual.ssm:68
msgid "<< style_guide.ssi"
msgstr ""
diff --git a/manual/pot/project_git.ssi.pot b/manual/pot/project_git.ssi.pot
new file mode 100644
index 0000000..5b286b7
--- /dev/null
+++ b/manual/pot/project_git.ssi.pot
@@ -0,0 +1,260 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
+#: 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:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:338
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:149
+#: en/user_customization-runtime.ssi:158 en/user_customization-runtime.ssi:173
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:201 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:233 en/user_examples.ssi:247
+#: en/user_examples.ssi:256 en/user_examples.ssi:264 en/user_examples.ssi:284
+#: en/user_examples.ssi:292 en/user_examples.ssi:301 en/user_examples.ssi:311
+#: 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:142
+#: en/user_installation.ssi:153 en/user_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
+msgid "code{"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
+#: 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:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:367
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:163 en/user_customization-runtime.ssi:181
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:205 en/user_examples.ssi:213
+#: en/user_examples.ssi:229 en/user_examples.ssi:237 en/user_examples.ssi:252
+#: en/user_examples.ssi:260 en/user_examples.ssi:268 en/user_examples.ssi:288
+#: en/user_examples.ssi:297 en/user_examples.ssi:307 en/user_examples.ssi:325
+#: 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:147
+#: en/user_installation.ssi:156 en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
+msgid "}code"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:2
+msgid "B~ Git repositories"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:4
+msgid "1~git-repositories Git repositories"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:6
+msgid ""
+"The git tree of the Debian Live Project is made up of several different "
+"branches. There is a list of all the available repositories at http://live."
+"debian.net/gitweb The *{debian}* and the *{debian-next}* branches are "
+"particularly noteworthy because they contain the actual work that will "
+"eventually be included in each new release."
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:8
+msgid ""
+"The project's git URLs have the form: #{protocol://live.debian.net/git/"
+"repository}#."
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:10
+msgid "Thus, in order to clone live-manual read-only, launch:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:14
+#, no-wrap
+msgid " $ git clone git://live.debian.net/git/live-manual.git\n"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:18
+msgid "Or,"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:22
+#, no-wrap
+msgid " $ git clone http://live.debian.net/git/live-manual.git\n"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:26
+msgid ""
+"The cloning addresses with write permission have the form: #{git at live.debian."
+"net:/repository}#."
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:28
+msgid "So, again, to clone live-manual but over ssh you must type:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:32
+#, no-wrap
+msgid " $ git clone git at live.debian.net:/live-manual.git\n"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:36
+msgid ""
+"After cloning any of the existing repositories, you will be on the *{debian}"
+"* branch. This is appropriate to take a look at the state of the project's "
+"latest release but before starting work it is crucial to switch to the *"
+"{debian-next}* branch. To do so:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:40
+#, no-wrap
+msgid " $ git checkout debian-next\n"
+msgstr ""
+
+#. type: Plain text
+#: en/project_git.ssi:43
+msgid ""
+"The *{debian-next}* branch, which is not always fast-forward, is where all "
+"the changes are committed first before being merged into the *{debian}* "
+"branch. To make an analogy, it is like a testing ground. If you are working "
+"on this branch and need to pull, you will have to do a #{git pull --rebase}# "
+"so that your local modifications are staged while pulling from the server "
+"and then your changes will be put on top of it all."
+msgstr ""
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index 227b678..a00a2f7 100644
--- a/manual/pot/user_customization-packages.ssi.pot
+++ b/manual/pot/user_customization-packages.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-09-26 17:09+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,25 +17,27 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:51
-#: en/project_procedures.ssi:63 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
-#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
@@ -59,8 +61,7 @@ msgstr ""
#: en/user_customization-packages.ssi:324
#: en/user_customization-packages.ssi:338
#: en/user_customization-packages.ssi:354
-#: en/user_customization-packages.ssi:371
-#: en/user_customization-packages.ssi:379 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
@@ -91,25 +92,27 @@ msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
-#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
-#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:59
-#: en/project_procedures.ssi:136 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
-#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
@@ -133,8 +136,7 @@ msgstr ""
#: en/user_customization-packages.ssi:328
#: en/user_customization-packages.ssi:342
#: en/user_customization-packages.ssi:367
-#: en/user_customization-packages.ssi:375
-#: en/user_customization-packages.ssi:384 en/user_customization-runtime.ssi:21
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
@@ -317,12 +319,13 @@ msgstr ""
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."
+"running the live system. The defaults employ #{http.debian.net}#, a service "
+"that chooses a geographically close mirror based, among other things, on the "
+"user's IP family and the availability of the mirrors. 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
@@ -1184,9 +1187,9 @@ msgstr ""
#: en/user_customization-packages.ssi:360
#, no-wrap
msgid ""
-" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
-" $ cat >> config/chroot_apt/preferences << END\n"
-" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
+" $ echo \"deb http://mirror/debian/ sid main\" > config/archives/sid.list.chroot\n"
+" $ cat >> config/chroot_apt/preferences << EOF\n"
+" Package: live-*\n"
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
@@ -1198,22 +1201,11 @@ msgid ""
" Package: *\n"
" Pin: release n=sid\n"
" Pin-Priority: 1\n"
-" END\n"
+" EOF\n"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:369
-#, no-wrap
-msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:373
-msgid "$ lb config --distribution wheezy"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:377
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 "
@@ -1227,7 +1219,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:383
+#: en/user_customization-packages.ssi:375
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index f9ab580..c4e99d5 100644
--- a/manual/pot/user_examples.ssi.pot
+++ b/manual/pot/user_examples.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-08-30 14:19+0300\n"
+"POT-Creation-Date: 2012-09-29 15:21+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,30 +17,32 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#: en/live-manual.ssm:61 en/user_examples.ssi:2
+#: en/live-manual.ssm:63 en/user_examples.ssi:2
msgid ":B~ Examples"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
+#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
+#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
+#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
-#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
-#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_git.ssi:12 en/project_git.ssi:20 en/project_git.ssi:30
+#: en/project_git.ssi:38 en/project_procedures.ssi:12
+#: en/project_procedures.ssi:51 en/project_procedures.ssi:63
+#: en/style_guide.ssi:124 en/style_guide.ssi:134 en/style_guide.ssi:144
+#: en/style_guide.ssi:154 en/style_guide.ssi:164 en/style_guide.ssi:177
+#: en/user_basics.ssi:32 en/user_basics.ssi:42 en/user_basics.ssi:58
+#: en/user_basics.ssi:73 en/user_basics.ssi:108 en/user_basics.ssi:116
+#: en/user_basics.ssi:128 en/user_basics.ssi:140 en/user_basics.ssi:152
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:184
+#: en/user_basics.ssi:194 en/user_basics.ssi:202 en/user_basics.ssi:218
+#: en/user_basics.ssi:226 en/user_basics.ssi:236 en/user_basics.ssi:254
+#: en/user_basics.ssi:282 en/user_basics.ssi:298 en/user_basics.ssi:306
+#: en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:24
#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
@@ -58,17 +60,19 @@ msgstr ""
#: en/user_customization-packages.ssi:177
#: en/user_customization-packages.ssi:187
#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:269
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:311
-#: en/user_customization-packages.ssi:328
-#: en/user_customization-packages.ssi:336 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:338
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:371 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
-#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:149
+#: en/user_customization-runtime.ssi:158 en/user_customization-runtime.ssi:173
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
@@ -93,25 +97,27 @@ msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
-#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
-#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
+#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
+#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
+#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
+#: en/about_manual.ssi:185 en/about_manual.ssi:193 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
-#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
-#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_git.ssi:16 en/project_git.ssi:24 en/project_git.ssi:34
+#: en/project_git.ssi:42 en/project_procedures.ssi:16
+#: en/project_procedures.ssi:59 en/project_procedures.ssi:136
+#: en/style_guide.ssi:128 en/style_guide.ssi:138 en/style_guide.ssi:148
+#: en/style_guide.ssi:158 en/style_guide.ssi:173 en/style_guide.ssi:182
+#: en/user_basics.ssi:36 en/user_basics.ssi:46 en/user_basics.ssi:64
+#: en/user_basics.ssi:77 en/user_basics.ssi:112 en/user_basics.ssi:120
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:156
+#: en/user_basics.ssi:164 en/user_basics.ssi:172 en/user_basics.ssi:188
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:222
+#: en/user_basics.ssi:230 en/user_basics.ssi:240 en/user_basics.ssi:274
+#: en/user_basics.ssi:286 en/user_basics.ssi:302 en/user_basics.ssi:310
+#: en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:29
#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
@@ -129,17 +135,19 @@ msgstr ""
#: en/user_customization-packages.ssi:183
#: en/user_customization-packages.ssi:193
#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:324
-#: en/user_customization-packages.ssi:332
-#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:21
+#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:367
+#: en/user_customization-packages.ssi:376 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
-#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:163
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:163 en/user_customization-runtime.ssi:181
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
@@ -234,9 +242,9 @@ msgstr ""
#: en/user_examples.ssi:18
#, no-wrap
msgid ""
-" 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"
+" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian/\"\n"
+" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security/\"\n"
+" LB_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-backports/\"\n"
msgstr ""
#. type: Plain text
@@ -619,7 +627,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 << EOF\n"
" #!/bin/sh\n"
msgstr ""
@@ -636,7 +644,7 @@ msgstr ""
#, no-wrap
msgid ""
" exit\n"
-" END\n"
+" EOF\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pt_BR/about_manual.ssi b/manual/pt_BR/about_manual.ssi
index 39941f7..9d53a62 100644
--- a/manual/pt_BR/about_manual.ssi
+++ b/manual/pt_BR/about_manual.ssi
@@ -115,6 +115,8 @@ _* Ben Armstrong
_* Brendan Sleight
+_* Carlos Zuferri
+
_* Chris Lamb
_* Daniel Baumann
@@ -148,8 +150,9 @@ licenciamento. Note que para ser aceita, a contribuição deve ser licenciada
sobre as mesmas licenças do resto do documento, ou seja, GPL versão 3 ou
superior.
-Os fontes para esse manual são mantidos usando o sistema de controle de
-versão Git. Você pode fazer o checkout da ultima cópia executando:
+The sources for this manual are maintained using the Git version control
+system (see {Git repositories}#git-repositories). You can check out the
+latest copy by executing:
code{
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index 847cbdb..d2371f8 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Este programa é software livre: você pode redistribuí-lo e/ou modificá-lo sob os termos da GNU General Public License conforme publicado pela Free Software Foundation, tanto a versão 3 da Licença, ou (a seu critério) qualquer versão posterior <br> <br> Este programa é distribuído na esperança de ser útil, mas SEM QUALQUER GARANTIA, sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO PARA UM DETERMINADO PROPÓSITO. Veja a GNU General Public License para mais detalhes. <br><br> Você deve ter recebido uma cópia da GNU General Public License junto com este programa. Se não, veja http://www.gnu.org/licenses/. <br><br> O texto completo da GNU General Public License pode ser encontrado no arquivo /usr/share/common-licenses/GPL-3.
@date:
- :published: 28-09-2012
+ :published: 2012-09-29
@publisher: Projeto Debian Live <debian-live at lists.debian.org>
@@ -57,6 +57,8 @@
<< project_procedures.ssi
+<< project_git.ssi
+
:B~ Exemplos
<< user_examples.ssi
diff --git a/manual/pt_BR/project_git.ssi b/manual/pt_BR/project_git.ssi
new file mode 100644
index 0000000..c3f1b3f
--- /dev/null
+++ b/manual/pt_BR/project_git.ssi
@@ -0,0 +1,57 @@
+B~ Git repositories
+
+1~git-repositories Git repositories
+
+The git tree of the Debian Live Project is made up of several different
+branches. There is a list of all the available repositories at
+http://live.debian.net/gitweb The *{debian}* and the *{debian-next}*
+branches are particularly noteworthy because they contain the actual work
+that will eventually be included in each new release.
+
+The project's git URLs have the form:
+#{protocol://live.debian.net/git/repository}#.
+
+Thus, in order to clone live-manual read-only, launch:
+
+code{
+
+ $ git clone git://live.debian.net/git/live-manual.git
+
+}code
+
+Or,
+
+code{
+
+ $ git clone http://live.debian.net/git/live-manual.git
+
+}code
+
+The cloning addresses with write permission have the form:
+#{git at live.debian.net:/repository}#.
+
+So, again, to clone live-manual but over ssh you must type:
+
+code{
+
+ $ git clone git at live.debian.net:/live-manual.git
+
+}code
+
+After cloning any of the existing repositories, you will be on the
+*{debian}* branch. This is appropriate to take a look at the state of the
+project's latest release but before starting work it is crucial to switch to
+the *{debian-next}* branch. To do so:
+
+code{
+
+ $ git checkout debian-next
+
+}code
+
+The *{debian-next}* branch, which is not always fast-forward, is where all
+the changes are committed first before being merged into the *{debian}*
+branch. To make an analogy, it is like a testing ground. If you are working
+on this branch and need to pull, you will have to do a #{git pull --rebase}#
+so that your local modifications are staged while pulling from the server
+and then your changes will be put on top of it all.
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index 1bce020..f692dc0 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -93,12 +93,13 @@ The chroot mirror, specified by #{--mirror-chroot}#, defaults to the
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.
+running the live system. The defaults employ #{http.debian.net}#, a service
+that chooses a geographically close mirror based, among other things, on the
+user's IP family and the availability of the mirrors. 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{
@@ -612,24 +613,16 @@ accomplish this:
code{
- $ echo "deb http://mirror/debian sid main" > config/archives/sid.list.chroot
- $ cat >> config/chroot_apt/preferences << END
- Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
+ $ echo "deb http://mirror/debian/ sid main" > config/archives/sid.list.chroot
+ $ cat >> config/chroot_apt/preferences << EOF
+ Package: live-*
Pin: release n=sid
Pin-Priority: 600
Package: *
Pin: release n=sid
Pin-Priority: 1
- END
-
-}code
-
-*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:
-
-code{
-
-$ lb config --distribution wheezy
+ EOF
}code
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
index bdcbf2b..e1fab4b 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/pt_BR/user_examples.ssi
@@ -25,9 +25,9 @@ these values. For example:
code{
- LB_MIRROR_BOOTSTRAP="http://mirror/debian"
- LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
- LB_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-backports/"
}code
@@ -290,14 +290,14 @@ 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 << EOF
#!/bin/sh
/usr/bin/metacity &
/usr/bin/xvncviewer 192.168.1.2:1
exit
- END
+ EOF
}code
diff --git a/manual/ro/about_manual.ssi b/manual/ro/about_manual.ssi
index ada955b..64b1f7b 100644
--- a/manual/ro/about_manual.ssi
+++ b/manual/ro/about_manual.ssi
@@ -113,6 +113,8 @@ _* Ben Armstrong
_* Brendan Sleight
+_* Carlos Zuferri
+
_* Chris Lamb
_* Daniel Baumann
@@ -145,8 +147,9 @@ copyright-ul si sub ce licenta este publicata. A se nota ca o contrinutie
este acceptata daca este licentiata in acceeasi termeni ca si restul
documentului , adica GPL version 3 or later.
-Sursele acestui manual sunt gerate folosind Git version control
-system. Pute-ti checkout ultima copie prin executarea :
+The sources for this manual are maintained using the Git version control
+system (see {Git repositories}#git-repositories). You can check out the
+latest copy by executing:
code{
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index c8fe01c..6f40bbc 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Acest program este liber: poate fi redistribuit și/sau modificat în conformitate cu termenii Licenței Publice Generale GNU (GPL), precum este publicată de către Free Software Foundation, fie versiunea 3 a licenței, sau (opțional) orice altă versiune ulterioară..<br><br>Acest program este distribuit cu speranța că va fi util, dar FĂRĂ NICIO GARANȚIE; fără a avea garanția VANDABILITĂȚII sau ÎNDEPLINIRII UNUI ANUME SCOP. Vezi Licența Publică Generală GNU pentru mai multe detalii.<br><br>Ar trebui să fi orimit o copie a Licenței Publice Generale GNU împreună cu acest program. În caz contrar, vezi http://www.gnu.org/licenses/. <br><br>Textul complet al Licenței Publice Generale poate fi găsit în fișierul /usr/share/common-licenses/GPL-3.
@date:
- :published: 28.09.2012
+ :published: 2012-09-29
@publisher: Proiectul Debian Live <debian-live at lists.debian.org>
@@ -57,6 +57,8 @@
<< project_procedures.ssi
+<< project_git.ssi
+
:B~ Exemple
<< user_examples.ssi
diff --git a/manual/ro/project_git.ssi b/manual/ro/project_git.ssi
new file mode 100644
index 0000000..c3f1b3f
--- /dev/null
+++ b/manual/ro/project_git.ssi
@@ -0,0 +1,57 @@
+B~ Git repositories
+
+1~git-repositories Git repositories
+
+The git tree of the Debian Live Project is made up of several different
+branches. There is a list of all the available repositories at
+http://live.debian.net/gitweb The *{debian}* and the *{debian-next}*
+branches are particularly noteworthy because they contain the actual work
+that will eventually be included in each new release.
+
+The project's git URLs have the form:
+#{protocol://live.debian.net/git/repository}#.
+
+Thus, in order to clone live-manual read-only, launch:
+
+code{
+
+ $ git clone git://live.debian.net/git/live-manual.git
+
+}code
+
+Or,
+
+code{
+
+ $ git clone http://live.debian.net/git/live-manual.git
+
+}code
+
+The cloning addresses with write permission have the form:
+#{git at live.debian.net:/repository}#.
+
+So, again, to clone live-manual but over ssh you must type:
+
+code{
+
+ $ git clone git at live.debian.net:/live-manual.git
+
+}code
+
+After cloning any of the existing repositories, you will be on the
+*{debian}* branch. This is appropriate to take a look at the state of the
+project's latest release but before starting work it is crucial to switch to
+the *{debian-next}* branch. To do so:
+
+code{
+
+ $ git checkout debian-next
+
+}code
+
+The *{debian-next}* branch, which is not always fast-forward, is where all
+the changes are committed first before being merged into the *{debian}*
+branch. To make an analogy, it is like a testing ground. If you are working
+on this branch and need to pull, you will have to do a #{git pull --rebase}#
+so that your local modifications are staged while pulling from the server
+and then your changes will be put on top of it all.
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index 1bce020..f692dc0 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -93,12 +93,13 @@ The chroot mirror, specified by #{--mirror-chroot}#, defaults to the
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.
+running the live system. The defaults employ #{http.debian.net}#, a service
+that chooses a geographically close mirror based, among other things, on the
+user's IP family and the availability of the mirrors. 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{
@@ -612,24 +613,16 @@ accomplish this:
code{
- $ echo "deb http://mirror/debian sid main" > config/archives/sid.list.chroot
- $ cat >> config/chroot_apt/preferences << END
- Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
+ $ echo "deb http://mirror/debian/ sid main" > config/archives/sid.list.chroot
+ $ cat >> config/chroot_apt/preferences << EOF
+ Package: live-*
Pin: release n=sid
Pin-Priority: 600
Package: *
Pin: release n=sid
Pin-Priority: 1
- END
-
-}code
-
-*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:
-
-code{
-
-$ lb config --distribution wheezy
+ EOF
}code
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
index 47d87cd..0742b6d 100644
--- a/manual/ro/user_examples.ssi
+++ b/manual/ro/user_examples.ssi
@@ -25,9 +25,9 @@ these values. For example:
code{
- LB_MIRROR_BOOTSTRAP="http://mirror/debian"
- LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
- LB_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-backports/"
}code
@@ -290,14 +290,14 @@ 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 << EOF
#!/bin/sh
/usr/bin/metacity &
/usr/bin/xvncviewer 192.168.1.2:1
exit
- END
+ EOF
}code
--
live-manual
More information about the debian-live-changes
mailing list