[SCM] live-manual branch, debian, updated. debian/2.0_a12-1-26-g4c66e75
Ben Armstrong
synrg at debian.org
Wed Dec 8 21:27:46 UTC 2010
The following commit has been merged in the debian branch:
commit 4c66e75f55f9de8f2454f2dde483d1a3227963bd
Author: Ben Armstrong <synrg at debian.org>
Date: Wed Dec 8 17:27:29 2010 -0400
Catching up language strings for about manual, user basics, etc.
diff --git a/manual/de/about_manual.ssi b/manual/de/about_manual.ssi
index 2290096..ea75406 100644
--- a/manual/de/about_manual.ssi
+++ b/manual/de/about_manual.ssi
@@ -23,9 +23,9 @@ the details. Therefore, we have provided three tutorials in the
{Examples}#examples section designed to teach you image building and
customization basics. Read {Using the examples}#using-the-examples first,
followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web
-browser utility}#tutorial-2 and finally {Tutorial 3: A personal travelling
-companion}#tutorial-3. By the end of these tutorials, you will have a taste
-of what can be done with Debian Live. We encourage you to return to more
+browser utility}#tutorial-2 and finally {Tutorial 3: A personalized
+image}#tutorial-3. By the end of these tutorials, you will have a taste of
+what can be done with Debian Live. We encourage you to return to more
in-depth study of the manual, perhaps next reading {The basics}#the-basics,
skimming or skipping {Building a netboot image}#building-netboot-image, and
finishing by reading the {Customization overview}#customization-overview and
@@ -177,9 +177,9 @@ $ make build LANGUAGES=en
3~ Applying patches
-Directly commiting to the repository is possible by anyone. However, we ask
-you to send bigger changes to the mailing list to discuss them first. In
-order to push to the repository, the following steps are required.
+Anyone can directly commit to the repository. However, we ask you to send
+bigger changes to the mailing list to discuss them first. To push to the
+repository, you must follow this procedure:
_* Fetch the public commit key:
@@ -187,10 +187,10 @@ code{
$ mkdir -p ~/.ssh/identity.d
$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \
- -O ~/.ssh/identity.d/live.debian.net
+ -O ~/.ssh/identity.d/gitosis at live.debian.net
$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
- -O ~/.ssh/identity.d/live.debian.net.pub
-$ chmod 0600 ~/.ssh/identity.d/live.debian.net*
+ -O ~/.ssh/identity.d/gitosis at live.debian.net.pub
+$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*
}code
@@ -207,7 +207,7 @@ EOF
}code
-_* Checkout a clone of the manual through ssh:
+_* Check out a clone of the manual through ssh:
code{
@@ -215,9 +215,9 @@ $ git clone gitosis at live.debian.net:/live-manual.git
}code
-_* After editing the files in manual/en/, please call the 'commit' target in
-the top level directory to sanitize the files and update the translation
-files:
+_* After editing the files in #{manual/en/}#, please call the 'commit'
+target in the top level directory to sanitize the files and update the
+translation files:
code{
@@ -225,14 +225,14 @@ $ make commit
}code
-_* After sanitizing commit the changes. Write commit messages, that consist
-of full useful sentences in English, starting with a capital letter and
-ending with a full stop. Usually starting with the form
-'Fixing/Adding/Removing/Correcting/Translating':
+_* After sanitizing, commit the changes. Write commit messages that consist
+of full, useful sentences in English, starting with a capital letter and
+ending with a full stop. Usually, these will start with the form
+'Fixing/Adding/Removing/Correcting/Translating', e.g.
code{
-$ git commit -a
+$ git commit -a -m "Adding a section on applying patches."
}code
@@ -246,12 +246,13 @@ $ git push
3~ Translation
-Submitting a translation for a new language is recommended in two steps:
+To submit a translation for a new language, follow these two steps:
_* Translate the about_manual.ssi.pot, about_project.ssi.pot and
index.html.in.pot files to your language with your favourite editor (such as
-poedit). Send translated files to the mailing list. It will then be included
-and autobuild for that language enabled.
+poedit). Send translated files to the mailing list. Once we have reviewed
+your submission, we will add the new language to the manual and will enable
+it in the autobuild.
_* Once the new language is added, you can randomly start translating all
other pot files.
diff --git a/manual/de/index.html.in b/manual/de/index.html.in
index d975787..79f39c0 100644
--- a/manual/de/index.html.in
+++ b/manual/de/index.html.in
@@ -43,8 +43,8 @@ href="pdf/live-manual.landscape-letter.pdf">Letter Querformat</a></li>
<h3>Quellen</h3>
<p>
- The sources for this manual is available in a <a
-href="http://git.or.cz/">Git</a> repository at live.debian.net.
+ Die Quellen dieses Handbuches sind in einem <a
+href="http://git.or.cz/">Git</a> Repository auf live.debian.net verfügbar.
</p>
<ul>
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
index 84c482b..3d68a35 100644
--- a/manual/de/user_examples.ssi
+++ b/manual/de/user_examples.ssi
@@ -54,7 +54,7 @@ Now, as superuser, build the image, saving a log as you build with #{tee}#.
code{
-# lb_build 2>&1 | tee binary.log
+# lb build 2>&1 | tee binary.log
}code
diff --git a/manual/fr/about_manual.ssi b/manual/fr/about_manual.ssi
index b320a2e..b6e88be 100644
--- a/manual/fr/about_manual.ssi
+++ b/manual/fr/about_manual.ssi
@@ -24,9 +24,9 @@ the details. Therefore, we have provided three tutorials in the
{Examples}#examples section designed to teach you image building and
customization basics. Read {Using the examples}#using-the-examples first,
followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web
-browser utility}#tutorial-2 and finally {Tutorial 3: A personal travelling
-companion}#tutorial-3. By the end of these tutorials, you will have a taste
-of what can be done with Debian Live. We encourage you to return to more
+browser utility}#tutorial-2 and finally {Tutorial 3: A personalized
+image}#tutorial-3. By the end of these tutorials, you will have a taste of
+what can be done with Debian Live. We encourage you to return to more
in-depth study of the manual, perhaps next reading {The basics}#the-basics,
skimming or skipping {Building a netboot image}#building-netboot-image, and
finishing by reading the {Customization overview}#customization-overview and
@@ -182,10 +182,9 @@ $ make build LANGUAGES=en
3~ Appliquer des patches
-Les contributions directes au répertoire sont possibles pour tout le
-monde. Cependant, nous vous demandons d'envoyer les changements conséquents
-sur la liste de discussion au préalable. Afin de de faire un push sur le
-répertoire, les étapes suivantes sont nécessaires.
+Anyone can directly commit to the repository. However, we ask you to send
+bigger changes to the mailing list to discuss them first. To push to the
+repository, you must follow this procedure:
_* Téléchargez la clé publique:
@@ -213,7 +212,7 @@ EOF
}code
-_* Clonez le manuel via ssh:
+_* Check out a clone of the manual through ssh:
code{
@@ -221,9 +220,9 @@ $ git clone gitosis at live.debian.net:/live-manual.git
}code
-_* Après édition des fichiers dans manual/en/, veuillez appeler 'commit'
-dans le dossier racine du répertoire afin de de nettoyer les fichier et de
-mettre à jour les fichiers de traduction:
+_* After editing the files in #{manual/en/}#, please call the 'commit'
+target in the top level directory to sanitize the files and update the
+translation files:
code{
@@ -231,14 +230,14 @@ $ make commit
}code
-_* After sanitizing commit the changes. Write commit messages, that consist
-of full useful sentences in English, starting with a capital letter and
-ending with a full stop. Usually starting with the form
-'Fixing/Adding/Removing/Correcting/Translating':
+_* After sanitizing, commit the changes. Write commit messages that consist
+of full, useful sentences in English, starting with a capital letter and
+ending with a full stop. Usually, these will start with the form
+'Fixing/Adding/Removing/Correcting/Translating', e.g.
code{
-$ git commit -a
+$ git commit -a -m "Adding a section on applying patches."
}code
@@ -252,12 +251,13 @@ $ git push
3~ Translation
-Submitting a translation for a new language is recommended in two steps:
+To submit a translation for a new language, follow these two steps:
_* Translate the about_manual.ssi.pot, about_project.ssi.pot and
index.html.in.pot files to your language with your favourite editor (such as
-poedit). Send translated files to the mailing list. It will then be included
-and autobuild for that language enabled.
+poedit). Send translated files to the mailing list. Once we have reviewed
+your submission, we will add the new language to the manual and will enable
+it in the autobuild.
_* Once the new language is added, you can randomly start translating all
other pot files.
diff --git a/manual/fr/index.html.in b/manual/fr/index.html.in
index c53a9e0..bb91dda 100644
--- a/manual/fr/index.html.in
+++ b/manual/fr/index.html.in
@@ -41,8 +41,8 @@ href="pdf/live-manual.landscape-letter.pdf">US paysage</a></li>
<h3>Source</h3>
<p>
- The sources for this manual is available in a <a
-href="http://git.or.cz/">Git</a> repository at live.debian.net.
+ Les sources de ce manuel sont disponibles dans un répertoire <a
+href="http://git.or.cz/">Git</a> sur live.debian.net.
</p>
<ul>
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index 84c482b..3d68a35 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -54,7 +54,7 @@ Now, as superuser, build the image, saving a log as you build with #{tee}#.
code{
-# lb_build 2>&1 | tee binary.log
+# lb build 2>&1 | tee binary.log
}code
diff --git a/manual/it/about_manual.ssi b/manual/it/about_manual.ssi
index 92b898b..e94020b 100644
--- a/manual/it/about_manual.ssi
+++ b/manual/it/about_manual.ssi
@@ -16,23 +16,22 @@ di super-utente, i comandi sono preceduti rispettivamente da #{$}# o
2~ Per gli impazienti
-Sebbene crediamo che ogni cosa in questo manuale sia importante almeno per
-alcuni dei nostri utenti, ci rendiamo conto che c'è tanto materiale da
-trattare e che si potrebbe voler provare il software prima di entrare nei
-dettagli. Pertanto, abbiamo messo a disposizione nella sezione
-{Examples}#examples tre tutorial progettati per insegnarvi le basi della
-costruzione delle immagini e della personalizzazione. Si legga innanzitutto
-{Using the examples}#using-the-examples, seguito da {Tutorial 1: A standard
-image}#tutorial-1, {Tutorial 2: A web browser utility}#tutorial-2 e, infine,
-{Tutorial 3: A personal travelling companion}#tutorial-3. Alla fine di
-queste esercitazioni, si avrà un assaggio di ciò che si può fare con Debian
-Live. Ti invitiamo ad uno studio più approfondito del manuale, magari
-leggendo in seguito {The basics}#the-basics, sfogliando o saltando {Building
-a netboot image}#building-netboot-image, e finendo con la lettura di
-{Customization overview}#customization-overview e dei capitoli che lo
-seguono. A questo punto, ci auguriamo che tu sia davvero eccitato per ciò
-che si può fare con Debian Live e motivato a leggere il resto del manuale,
-da cima a fondo.
+While we believe that everything in this manual is important to at least
+some of our users, we realize it is a lot of material to cover and that you
+may wish to experience early success using the software before delving into
+the details. Therefore, we have provided three tutorials in the
+{Examples}#examples section designed to teach you image building and
+customization basics. Read {Using the examples}#using-the-examples first,
+followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web
+browser utility}#tutorial-2 and finally {Tutorial 3: A personalized
+image}#tutorial-3. By the end of these tutorials, you will have a taste of
+what can be done with Debian Live. We encourage you to return to more
+in-depth study of the manual, perhaps next reading {The basics}#the-basics,
+skimming or skipping {Building a netboot image}#building-netboot-image, and
+finishing by reading the {Customization overview}#customization-overview and
+the chapters that follow it. By this point, we hope you are thoroughly
+excited by what can be done with Debian Live and motivated to read the rest
+of the manual, cover-to-cover.
2~terms Glossario
@@ -179,10 +178,9 @@ $ make build LANGUAGES=en
3~ Applicare le patch
-Chiunque può eseguire il commit direttamente sul repository; tuttavia
-chiediamo di inviare le modifiche più corpose in mailing list, per poterne
-prima discuterne. Per eseguire il push sul repository sono necessari i
-seguenti passi.
+Anyone can directly commit to the repository. However, we ask you to send
+bigger changes to the mailing list to discuss them first. To push to the
+repository, you must follow this procedure:
_* Prelevare la chiave pubblica:
@@ -190,10 +188,10 @@ code{
$ mkdir -p ~/.ssh/identity.d
$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \
- -O ~/.ssh/identity.d/live.debian.net
+ -O ~/.ssh/identity.d/gitosis at live.debian.net
$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
- -O ~/.ssh/identity.d/live.debian.net.pub
-$ chmod 0600 ~/.ssh/identity.d/live.debian.net*
+ -O ~/.ssh/identity.d/gitosis at live.debian.net.pub
+$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*
}code
@@ -211,7 +209,7 @@ EOF
}code
-_* Scaricare tramite ssh un clone del manuale:
+_* Check out a clone of the manual through ssh:
code{
@@ -219,9 +217,9 @@ $ git clone gitosis at live.debian.net:/live-manual.git
}code
-_* Dopo aver modificato i file in manual/en/, chiamare il target 'commit'
-nella directory superiore per bonificare i file ed aggiornare i file di
-traduzione:
+_* After editing the files in #{manual/en/}#, please call the 'commit'
+target in the top level directory to sanitize the files and update the
+translation files:
code{
@@ -229,14 +227,14 @@ $ make commit
}code
-_* Dopo la pulizia è possibile eseguire il commit delle modifiche. Si
-scrivano messaggi costituiti da frasi in inglese pienamente utili,
-inizianti con una lettera maiuscola e terminanti con un punto. Solitamente
-cominciano con la forma 'Fixing/Adding/Removing/Correcting/Translating':
+_* After sanitizing, commit the changes. Write commit messages that consist
+of full, useful sentences in English, starting with a capital letter and
+ending with a full stop. Usually, these will start with the form
+'Fixing/Adding/Removing/Correcting/Translating', e.g.
code{
-$ git commit -a
+$ git commit -a -m "Adding a section on applying patches."
}code
@@ -250,12 +248,13 @@ $ git push
3~ Traduzione
-Si raccomanda di inviare la traduzione per una nuova lingua in due passi:
+To submit a translation for a new language, follow these two steps:
-_* Tradurre i file about_manual.ssi.pot, about_project.ssi.pot e
-index.html.in.pot nella propria lingua con il proprio editor preferito (tipo
-poedit). Inviare i file tradotti alla mailing list. Saranno quindi inclusi e
-compilati automaticamente per quella lingua.
+_* Translate the about_manual.ssi.pot, about_project.ssi.pot and
+index.html.in.pot files to your language with your favourite editor (such as
+poedit). Send translated files to the mailing list. Once we have reviewed
+your submission, we will add the new language to the manual and will enable
+it in the autobuild.
_* Una volta che la nuova lingua è stata aggiunta, si può iniziare a
tradurre gli altri file pot nell'ordine che si preferisce.
diff --git a/manual/it/index.html.in b/manual/it/index.html.in
index 362f889..3debad0 100644
--- a/manual/it/index.html.in
+++ b/manual/it/index.html.in
@@ -28,7 +28,7 @@ href="html/live-manual.html">pagina unica</a></li>
<li><a href="odf/live-manual.odt">ODF</a></li>
<li>PDF: <a href="pdf/live-manual.portrait-a4.pdf">A4 verticale</a>, <a
href="pdf/live-manual.landscape-a4.pdf">A4 orizzontale</a>, <a
-href="pdf/live-manual.portrait-letter.pdf">letter verticale</a>, <a
+href="pdf/live-manual.portrait-letter.pdf">lettera verticale</a>, <a
href="pdf/live-manual.landscape-letter.pdf">lettera orizzontale</a></li>
<li><a href="txt/live-manual.txt">Testo semplice</a></li>
</ul>
@@ -41,8 +41,8 @@ href="pdf/live-manual.landscape-letter.pdf">lettera orizzontale</a></li>
<h3>Sorgente</h3>
<p>
- The sources for this manual is available in a <a
-href="http://git.or.cz/">Git</a> repository at live.debian.net.
+ I sorgenti di questo manuale sono disponibili nel repository <a
+href="http://git.or.cz/">Git</a> su live.debian.net.
</p>
<ul>
diff --git a/manual/it/user_examples.ssi b/manual/it/user_examples.ssi
index 84c482b..2032314 100644
--- a/manual/it/user_examples.ssi
+++ b/manual/it/user_examples.ssi
@@ -1,26 +1,29 @@
-:B~ Examples
+:B~ Esempi
-1~examples Examples
+1~examples Esempi
-This chapter covers example builds for specific use cases with Debian
-Live. If you are new to building your own Debian Live images, we recommend
-you first look at the three tutorials in sequence, as each one teaches new
-techniques that will help you use and understand the remaining examples.
+Questo capitolo affronta alcune costruzioni di esempio per specifici casi
+d'uso con Debian Live. Se si è nuovi nella costruzione di immagini Debian
+Live, raccomandiamo di dare innanzitutto un'occhiata ai tre tutorial in
+sequenza, dato che ciascuno insegna nuove tecniche che aiuteranno nell'uso e
+nella comprensione degli esempi rimanenti.
-2~using-the-examples Using the examples
+2~using-the-examples Usare gli esempi
-To use these examples you need a system to build them on that meets the
-requirements listed in {Requirements}#requirements and has live-build
-installed as described in {Installing live-build}#installing-live-build.
+Per usare questi esempi è necessario un sistema per costruirveli sopra che
+soddisfi i requisiti elencati in {Requirements}#requirements e avere
+live-build installato come descritto in {Installing
+live-build}#installing-live-build.
-Note that, for the sake of brevity, in these examples we do not specify a
-local mirror to use for the build. You can speed up downloads considerably
-if you use a local mirror. You may specify the options when you use #{lb
-config}#, as described in {Distribution mirrors used at build
-time}#distribution-mirrors-build-time, or for more convenience, set the
-default for your build system in #{/etc/live/build.conf}#. Simply create
-this file and in it, set the corresponding #{LB_MIRROR_*}# variables to your
-preferred mirror. For example:
+Si noti che, for the sake of brevity, in questi esempi non specifichiamo un
+mirror locale da usare per la costruzione. Si può accelerare i download
+considerevolmente se si usa un mirror locale. Si possono specificare le
+opzioni quando si usa #{lb config}#, come descritto in {Distribution mirrors
+used at build time}#distribution-mirrors-build-time, o più convenientemente
+impostare il default per il proprio sistema di generazione in
+#{/etc/live/build.conf}#. Semplicemente si crei questo file ed in esso si
+impostino le corrispondenti variabili #{LB_MIRROR_*}# per il proprio mirror
+preferito. Ad esempio:
code{
@@ -30,15 +33,15 @@ LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
}code
-2~tutorial-1 Tutorial 1: A standard image
+2~tutorial-1 Tutorial 1: Un'immagine standard
-*{Use case:}* Create a simple first image, learning the basics of live-build.
+*{Use case:}* Creazione di una semplice prima immagine, imparando le basi di live-build.
-In this tutorial, we will build a default ISO hybrid Debian Live image
-containing only base packages (no Xorg) and some Debian Live support
-packages, as a first exercise in using live-build.
+In questo tutorial genereremo un'immagine ISO ibrida Debian Live di default
+contenente solo pacchetti di base (niente Xorg) e alcuni pacchetti Debian
+Live di supporto, come primo esercizio sull'uso di live-build.
-You can't get much simpler than this:
+Non si può fare in modo molto più semplice di così:
code{
@@ -46,26 +49,28 @@ $ mkdir tutorial1 ; cd tutorial1 ; lb config
}code
-Examine the contents of the #{config/}# directory if you wish. You will see
-stored here a skeletal configuration, ready to customize or, in this case,
-use immediately to build a default image.
+Si esaminino i contenuti della directory #{config/}# se si desidera. Si
+vedrà qui immagazzinato uno scheletro di configurazione, pronto per essere
+personalizzato o, in questo caso, usato immediatamente per costruire
+un'immagine di default.
-Now, as superuser, build the image, saving a log as you build with #{tee}#.
+Ora, come super-utente, si generi l'immagine, salvando un log con #{tee}#.
code{
-# lb_build 2>&1 | tee binary.log
+# lb build 2>&1 | tee binary.log
}code
-Assuming all goes well, after a while, the current directory will contain
-#{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a
-virtual machine as described in {Testing an ISO image with
-Qemu}#testing-iso-with-qemu and {Testing an ISO image with
-virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical
-media or a USB flash device as described in {Burning an ISO image to a
-physical medium}#burning-iso-image and {Copying USB/HDD image to a USB
-stick}#copying-usb-hdd-image, respectively.
+Assumendo che tutto vada per il verso giusto, dopo un po' la directory
+corrente conterrà #{binary-hybrid.iso}#. Questa immagine ISO ibrida può
+essere avviata direttamente in una macchina virtuale come descritto in
+{Testing an ISO image with Qemu}#testing-iso-with-qemu e{Testing an ISO
+image with virtualbox-ose}#testing-iso-with-virtualbox, oppure masterizzata
+su un supporto ottico o ancora su una chiavetta USB come descritto
+rispettivamente in {Burning an ISO image to a physical
+medium}#burning-iso-image e {Copying USB/HDD image to a USB
+stick}#copying-usb-hdd-image.
2~tutorial-2 Tutorial 2: A web browser utility
diff --git a/manual/po/de/about_manual.ssi.po b/manual/po/de/about_manual.ssi.po
index ae7ecb6..3b47822 100644
--- a/manual/po/de/about_manual.ssi.po
+++ b/manual/po/de/about_manual.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-08 00:30+0100\n"
+"POT-Creation-Date: 2010-12-08 17:25-0400\n"
"PO-Revision-Date: 2010-10-22 08:36-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -61,7 +61,7 @@ msgid ""
"#examples section designed to teach you image building and customization "
"basics. Read {Using the examples}#using-the-examples first, followed by "
"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
-"utility}#tutorial-2 and finally {Tutorial 3: A personal travelling companion}"
+"utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
"#tutorial-3. By the end of these tutorials, you will have a taste of what "
"can be done with Debian Live. We encourage you to return to more in-depth "
"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
@@ -483,9 +483,9 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:116
msgid ""
-"Directly commiting to the repository is possible by anyone. However, we ask "
-"you to send bigger changes to the mailing list to discuss them first. In "
-"order to push to the repository, the following steps are required."
+"Anyone can directly commit to the repository. However, we ask you to send "
+"bigger changes to the mailing list to discuss them first. To push to the "
+"repository, you must follow this procedure:"
msgstr ""
#. type: Plain text
@@ -499,10 +499,10 @@ msgstr ""
msgid ""
"$ mkdir -p ~/.ssh/identity.d\n"
"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
-"\t-O ~/.ssh/identity.d/live.debian.net\n"
+"\t-O ~/.ssh/identity.d/gitosis at live.debian.net\n"
"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-"\t-O ~/.ssh/identity.d/live.debian.net.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/live.debian.net*\n"
+"\t-O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
+"$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
msgstr ""
#. type: Plain text
@@ -524,7 +524,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:144
-msgid "_* Checkout a clone of the manual through ssh:"
+msgid "_* Check out a clone of the manual through ssh:"
msgstr ""
#. type: Plain text
@@ -535,9 +535,9 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:152
msgid ""
-"_* After editing the files in manual/en/, please call the 'commit' target in "
-"the top level directory to sanitize the files and update the translation "
-"files:"
+"_* After editing the files in #{manual/en/}#, please call the 'commit' "
+"target in the top level directory to sanitize the files and update the "
+"translation files:"
msgstr ""
#. type: Plain text
@@ -548,15 +548,15 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:160
msgid ""
-"_* After sanitizing commit the changes. Write commit messages, that consist "
-"of full useful sentences in English, starting with a capital letter and "
-"ending with a full stop. Usually starting with the form 'Fixing/Adding/"
-"Removing/Correcting/Translating':"
+"_* After sanitizing, commit the changes. Write commit messages that consist "
+"of full, useful sentences in English, starting with a capital letter and "
+"ending with a full stop. Usually, these will start with the form 'Fixing/"
+"Adding/Removing/Correcting/Translating', e.g."
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:164
-msgid "$ git commit -a"
+msgid "$ git commit -a -m \"Adding a section on applying patches.\""
msgstr ""
#. type: Plain text
@@ -576,8 +576,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:178
-msgid ""
-"Submitting a translation for a new language is recommended in two steps:"
+msgid "To submit a translation for a new language, follow these two steps:"
msgstr ""
#. type: Plain text
@@ -585,8 +584,9 @@ msgstr ""
msgid ""
"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
"in.pot files to your language with your favourite editor (such as poedit). "
-"Send translated files to the mailing list. It will then be included and "
-"autobuild for that language enabled."
+"Send translated files to the mailing list. Once we have reviewed your "
+"submission, we will add the new language to the manual and will enable it in "
+"the autobuild."
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/index.html.in.po b/manual/po/de/index.html.in.po
index 6b8c5e8..7ac6e1d 100644
--- a/manual/po/de/index.html.in.po
+++ b/manual/po/de/index.html.in.po
@@ -106,9 +106,6 @@ msgstr "Quellen"
#. type: Content of: <html><body><p>
#: en/index.html.in:37
-#| msgid ""
-#| "The sources for this manual is available in a <a href=\"http://git.or.cz/"
-#| "\">git</a> repository at live.debian.net."
msgid ""
"The sources for this manual is available in a <a href=\"http://git.or.cz/"
"\">Git</a> repository at live.debian.net."
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index fc4c7e4..af3ce42 100644
--- a/manual/po/de/user_examples.ssi.po
+++ b/manual/po/de/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-07 20:31-0400\n"
+"POT-Creation-Date: 2010-12-08 17:25-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -255,8 +255,8 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:42
-msgid "# lb_build 2>&1 | tee binary.log"
+#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:219
+msgid "# lb build 2>&1 | tee binary.log"
msgstr ""
#. type: Plain text
@@ -314,11 +314,6 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:66 en/user_examples.ssi:219
-msgid "# lb build 2>&1 | tee binary.log"
-msgstr ""
-
-#. type: Plain text
#: en/user_examples.ssi:70
msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
diff --git a/manual/po/fr/about_manual.ssi.po b/manual/po/fr/about_manual.ssi.po
index 1a66e64..9316184 100644
--- a/manual/po/fr/about_manual.ssi.po
+++ b/manual/po/fr/about_manual.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a8\n"
-"POT-Creation-Date: 2010-12-08 00:30+0100\n"
+"POT-Creation-Date: 2010-12-08 17:25-0400\n"
"PO-Revision-Date: 2010-10-27 23:14+0200\n"
"Last-Translator: Creak <romain.failliot at foolstep.com>\n"
"Language-Team: Français <debian-live at lists.debian.org>\n"
@@ -72,7 +72,7 @@ msgid ""
"#examples section designed to teach you image building and customization "
"basics. Read {Using the examples}#using-the-examples first, followed by "
"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
-"utility}#tutorial-2 and finally {Tutorial 3: A personal travelling companion}"
+"utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
"#tutorial-3. By the end of these tutorials, you will have a taste of what "
"can be done with Debian Live. We encourage you to return to more in-depth "
"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
@@ -562,10 +562,15 @@ msgstr "3~ Appliquer des patches"
#. type: Plain text
#: en/about_manual.ssi:116
+#, fuzzy
+#| msgid ""
+#| "Directly commiting to the repository is possible by anyone. However, we "
+#| "ask you to send bigger changes to the mailing list to discuss them first. "
+#| "In order to push to the repository, the following steps are required."
msgid ""
-"Directly commiting to the repository is possible by anyone. However, we ask "
-"you to send bigger changes to the mailing list to discuss them first. In "
-"order to push to the repository, the following steps are required."
+"Anyone can directly commit to the repository. However, we ask you to send "
+"bigger changes to the mailing list to discuss them first. To push to the "
+"repository, you must follow this procedure:"
msgstr ""
"Les contributions directes au répertoire sont possibles pour tout le monde. "
"Cependant, nous vous demandons d'envoyer les changements conséquents sur la "
@@ -579,14 +584,21 @@ msgstr "_* Téléchargez la clé publique:"
#. type: Plain text
#: en/about_manual.ssi:127
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "$ mkdir -p ~/.ssh/identity.d\n"
+#| "$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
+#| "\t-O ~/.ssh/identity.d/live.debian.net\n"
+#| "$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
+#| "\t-O ~/.ssh/identity.d/live.debian.net.pub\n"
+#| "$ chmod 0600 ~/.ssh/identity.d/live.debian.net*\n"
msgid ""
"$ mkdir -p ~/.ssh/identity.d\n"
"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
-"\t-O ~/.ssh/identity.d/live.debian.net\n"
+"\t-O ~/.ssh/identity.d/gitosis at live.debian.net\n"
"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-"\t-O ~/.ssh/identity.d/live.debian.net.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/live.debian.net*\n"
+"\t-O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
+"$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
msgstr ""
"$ mkdir -p ~/.ssh/identity.d\n"
"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
@@ -620,7 +632,9 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:144
-msgid "_* Checkout a clone of the manual through ssh:"
+#, fuzzy
+#| msgid "_* Checkout a clone of the manual through ssh:"
+msgid "_* Check out a clone of the manual through ssh:"
msgstr "_* Clonez le manuel via ssh:"
#. type: Plain text
@@ -630,10 +644,15 @@ msgstr "$ git clone gitosis at live.debian.net:/live-manual.git"
#. type: Plain text
#: en/about_manual.ssi:152
+#, fuzzy
+#| msgid ""
+#| "_* After editing the files in manual/en/, please call the 'commit' target "
+#| "in the top level directory to sanitize the files and update the "
+#| "translation files:"
msgid ""
-"_* After editing the files in manual/en/, please call the 'commit' target in "
-"the top level directory to sanitize the files and update the translation "
-"files:"
+"_* After editing the files in #{manual/en/}#, please call the 'commit' "
+"target in the top level directory to sanitize the files and update the "
+"translation files:"
msgstr ""
"_* Après édition des fichiers dans manual/en/, veuillez appeler 'commit' "
"dans le dossier racine du répertoire afin de de nettoyer les fichier et de "
@@ -653,10 +672,10 @@ msgstr "$ make commit"
#| "ending with a full stop. Usually starting with the form 'Fixing/Adding/"
#| "Removing/Correcting/':"
msgid ""
-"_* After sanitizing commit the changes. Write commit messages, that consist "
-"of full useful sentences in English, starting with a capital letter and "
-"ending with a full stop. Usually starting with the form 'Fixing/Adding/"
-"Removing/Correcting/Translating':"
+"_* After sanitizing, commit the changes. Write commit messages that consist "
+"of full, useful sentences in English, starting with a capital letter and "
+"ending with a full stop. Usually, these will start with the form 'Fixing/"
+"Adding/Removing/Correcting/Translating', e.g."
msgstr ""
"_* Après nettoyage, soumettre les modifications. Veuillez écrire les "
"commentaires de commit à l'aide de phrases complètes, en commençant par une "
@@ -665,8 +684,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:164
-msgid "$ git commit -a"
-msgstr "$ git commit -a"
+msgid "$ git commit -a -m \"Adding a section on applying patches.\""
+msgstr ""
#. type: Plain text
#: en/about_manual.ssi:168
@@ -685,8 +704,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:178
-msgid ""
-"Submitting a translation for a new language is recommended in two steps:"
+msgid "To submit a translation for a new language, follow these two steps:"
msgstr ""
#. type: Plain text
@@ -694,8 +712,9 @@ msgstr ""
msgid ""
"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
"in.pot files to your language with your favourite editor (such as poedit). "
-"Send translated files to the mailing list. It will then be included and "
-"autobuild for that language enabled."
+"Send translated files to the mailing list. Once we have reviewed your "
+"submission, we will add the new language to the manual and will enable it in "
+"the autobuild."
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/index.html.in.po b/manual/po/fr/index.html.in.po
index 390c1bf..baa9dba 100644
--- a/manual/po/fr/index.html.in.po
+++ b/manual/po/fr/index.html.in.po
@@ -103,9 +103,6 @@ msgstr "Source"
#. type: Content of: <html><body><p>
#: en/index.html.in:37
-#| msgid ""
-#| "The sources for this manual is available in a <a href=\"http://git.or.cz/"
-#| "\">git</a> repository at live.debian.net."
msgid ""
"The sources for this manual is available in a <a href=\"http://git.or.cz/"
"\">Git</a> repository at live.debian.net."
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index d0fc1a8..57780de 100644
--- a/manual/po/fr/user_examples.ssi.po
+++ b/manual/po/fr/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-07 20:31-0400\n"
+"POT-Creation-Date: 2010-12-08 17:25-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -255,8 +255,8 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:42
-msgid "# lb_build 2>&1 | tee binary.log"
+#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:219
+msgid "# lb build 2>&1 | tee binary.log"
msgstr ""
#. type: Plain text
@@ -314,11 +314,6 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:66 en/user_examples.ssi:219
-msgid "# lb build 2>&1 | tee binary.log"
-msgstr ""
-
-#. type: Plain text
#: en/user_examples.ssi:70
msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
diff --git a/manual/po/it/about_manual.ssi.po b/manual/po/it/about_manual.ssi.po
index e64a98a..a7ef40f 100644
--- a/manual/po/it/about_manual.ssi.po
+++ b/manual/po/it/about_manual.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-08 00:30+0100\n"
+"POT-Creation-Date: 2010-12-08 17:25-0400\n"
"PO-Revision-Date: 2010-12-08 02:42+0100\n"
"Last-Translator: Carlo Stemberger <carlo.stemberger at gmail.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -64,6 +64,24 @@ msgstr "2~ Per gli impazienti"
#. type: Plain text
#: en/about_manual.ssi:12
+#, fuzzy
+#| msgid ""
+#| "While we believe that everything in this manual is important to at least "
+#| "some of our users, we realize it is a lot of material to cover and that "
+#| "you may wish to experience early success using the software before "
+#| "delving into the details. Therefore, we have provided three tutorials in "
+#| "the {Examples}#examples section designed to teach you image building and "
+#| "customization basics. Read {Using the examples}#using-the-examples first, "
+#| "followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web "
+#| "browser utility}#tutorial-2 and finally {Tutorial 3: A personal "
+#| "travelling companion}#tutorial-3. By the end of these tutorials, you will "
+#| "have a taste of what can be done with Debian Live. We encourage you to "
+#| "return to more in-depth study of the manual, perhaps next reading {The "
+#| "basics}#the-basics, skimming or skipping {Building a netboot image}"
+#| "#building-netboot-image, and finishing by reading the {Customization "
+#| "overview}#customization-overview and the chapters that follow it. By this "
+#| "point, we hope you are thoroughly excited by what can be done with Debian "
+#| "Live and motivated to read the rest of the manual, cover-to-cover."
msgid ""
"While we believe that everything in this manual is important to at least "
"some of our users, we realize it is a lot of material to cover and that you "
@@ -72,7 +90,7 @@ msgid ""
"#examples section designed to teach you image building and customization "
"basics. Read {Using the examples}#using-the-examples first, followed by "
"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
-"utility}#tutorial-2 and finally {Tutorial 3: A personal travelling companion}"
+"utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
"#tutorial-3. By the end of these tutorials, you will have a taste of what "
"can be done with Debian Live. We encourage you to return to more in-depth "
"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
@@ -572,10 +590,15 @@ msgstr "3~ Applicare le patch"
#. type: Plain text
#: en/about_manual.ssi:116
+#, fuzzy
+#| msgid ""
+#| "Directly commiting to the repository is possible by anyone. However, we "
+#| "ask you to send bigger changes to the mailing list to discuss them first. "
+#| "In order to push to the repository, the following steps are required."
msgid ""
-"Directly commiting to the repository is possible by anyone. However, we ask "
-"you to send bigger changes to the mailing list to discuss them first. In "
-"order to push to the repository, the following steps are required."
+"Anyone can directly commit to the repository. However, we ask you to send "
+"bigger changes to the mailing list to discuss them first. To push to the "
+"repository, you must follow this procedure:"
msgstr ""
"Chiunque può eseguire il commit direttamente sul repository; tuttavia "
"chiediamo di inviare le modifiche più corpose in mailing list, per poterne "
@@ -589,14 +612,21 @@ msgstr "_* Prelevare la chiave pubblica:"
#. type: Plain text
#: en/about_manual.ssi:127
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "$ mkdir -p ~/.ssh/identity.d\n"
+#| "$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
+#| "\t-O ~/.ssh/identity.d/live.debian.net\n"
+#| "$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
+#| "\t-O ~/.ssh/identity.d/live.debian.net.pub\n"
+#| "$ chmod 0600 ~/.ssh/identity.d/live.debian.net*\n"
msgid ""
"$ mkdir -p ~/.ssh/identity.d\n"
"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
-"\t-O ~/.ssh/identity.d/live.debian.net\n"
+"\t-O ~/.ssh/identity.d/gitosis at live.debian.net\n"
"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-"\t-O ~/.ssh/identity.d/live.debian.net.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/live.debian.net*\n"
+"\t-O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
+"$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
msgstr ""
"$ mkdir -p ~/.ssh/identity.d\n"
"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
@@ -632,7 +662,9 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:144
-msgid "_* Checkout a clone of the manual through ssh:"
+#, fuzzy
+#| msgid "_* Checkout a clone of the manual through ssh:"
+msgid "_* Check out a clone of the manual through ssh:"
msgstr "_* Scaricare tramite ssh un clone del manuale:"
#. type: Plain text
@@ -642,10 +674,15 @@ msgstr "$ git clone gitosis at live.debian.net:/live-manual.git"
#. type: Plain text
#: en/about_manual.ssi:152
+#, fuzzy
+#| msgid ""
+#| "_* After editing the files in manual/en/, please call the 'commit' target "
+#| "in the top level directory to sanitize the files and update the "
+#| "translation files:"
msgid ""
-"_* After editing the files in manual/en/, please call the 'commit' target in "
-"the top level directory to sanitize the files and update the translation "
-"files:"
+"_* After editing the files in #{manual/en/}#, please call the 'commit' "
+"target in the top level directory to sanitize the files and update the "
+"translation files:"
msgstr ""
"_* Dopo aver modificato i file in manual/en/, chiamare il target 'commit' "
"nella directory superiore per bonificare i file ed aggiornare i file di "
@@ -658,11 +695,17 @@ msgstr "$ make commit"
#. type: Plain text
#: en/about_manual.ssi:160
-msgid ""
-"_* After sanitizing commit the changes. Write commit messages, that consist "
-"of full useful sentences in English, starting with a capital letter and "
-"ending with a full stop. Usually starting with the form 'Fixing/Adding/"
-"Removing/Correcting/Translating':"
+#, fuzzy
+#| msgid ""
+#| "_* After sanitizing commit the changes. Write commit messages, that "
+#| "consist of full useful sentences in English, starting with a capital "
+#| "letter and ending with a full stop. Usually starting with the form "
+#| "'Fixing/Adding/Removing/Correcting/Translating':"
+msgid ""
+"_* After sanitizing, commit the changes. Write commit messages that consist "
+"of full, useful sentences in English, starting with a capital letter and "
+"ending with a full stop. Usually, these will start with the form 'Fixing/"
+"Adding/Removing/Correcting/Translating', e.g."
msgstr ""
"_* Dopo la pulizia è possibile eseguire il commit delle modifiche. Si "
"scrivano messaggi costituiti da frasi in inglese pienamente utili, "
@@ -671,8 +714,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:164
-msgid "$ git commit -a"
-msgstr "$ git commit -a"
+msgid "$ git commit -a -m \"Adding a section on applying patches.\""
+msgstr ""
#. type: Plain text
#: en/about_manual.ssi:168
@@ -691,18 +734,27 @@ msgstr "3~ Traduzione"
#. type: Plain text
#: en/about_manual.ssi:178
-msgid ""
-"Submitting a translation for a new language is recommended in two steps:"
+#, fuzzy
+#| msgid ""
+#| "Submitting a translation for a new language is recommended in two steps:"
+msgid "To submit a translation for a new language, follow these two steps:"
msgstr ""
"Si raccomanda di inviare la traduzione per una nuova lingua in due passi:"
#. type: Plain text
#: en/about_manual.ssi:180
+#, fuzzy
+#| msgid ""
+#| "_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index."
+#| "html.in.pot files to your language with your favourite editor (such as "
+#| "poedit). Send translated files to the mailing list. It will then be "
+#| "included and autobuild for that language enabled."
msgid ""
"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
"in.pot files to your language with your favourite editor (such as poedit). "
-"Send translated files to the mailing list. It will then be included and "
-"autobuild for that language enabled."
+"Send translated files to the mailing list. Once we have reviewed your "
+"submission, we will add the new language to the manual and will enable it in "
+"the autobuild."
msgstr ""
"_* Tradurre i file about_manual.ssi.pot, about_project.ssi.pot e index.html."
"in.pot nella propria lingua con il proprio editor preferito (tipo poedit). "
diff --git a/manual/po/it/index.html.in.po b/manual/po/it/index.html.in.po
index 118ede5..11ab10a 100644
--- a/manual/po/it/index.html.in.po
+++ b/manual/po/it/index.html.in.po
@@ -104,9 +104,6 @@ msgstr "Sorgente"
#. type: Content of: <html><body><p>
#: en/index.html.in:37
-#| msgid ""
-#| "The sources for this manual is available in a <a href=\"http://git.or.cz/"
-#| "\">git</a> repository at live.debian.net."
msgid ""
"The sources for this manual is available in a <a href=\"http://git.or.cz/"
"\">Git</a> repository at live.debian.net."
diff --git a/manual/po/it/other_faq.ssi.po b/manual/po/it/other_faq.ssi.po
index 3b604d6..6dd88a7 100644
--- a/manual/po/it/other_faq.ssi.po
+++ b/manual/po/it/other_faq.ssi.po
@@ -326,7 +326,7 @@ msgstr ""
#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/other_use-cases.ssi:26
#: en/other_use-cases.ssi:77
msgid "#!/bin/sh"
-msgstr ""
+msgstr "#!/bin/sh"
#. type: Plain text
#: en/other_faq.ssi:88
diff --git a/manual/po/it/user_basics.ssi.po b/manual/po/it/user_basics.ssi.po
index 450b174..8abd592 100644
--- a/manual/po/it/user_basics.ssi.po
+++ b/manual/po/it/user_basics.ssi.po
@@ -293,9 +293,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
#: en/user_examples.ssi:106 en/user_examples.ssi:153
-#, fuzzy
msgid "# lb build"
-msgstr "$ make build"
+msgstr "# lb build"
#. type: Plain text
#: en/user_basics.ssi:48
diff --git a/manual/po/it/user_examples.ssi.po b/manual/po/it/user_examples.ssi.po
index 375501e..31a0c8c 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 VERSION\n"
-"POT-Creation-Date: 2010-12-07 20:31-0400\n"
+"POT-Creation-Date: 2010-12-08 17:25-0400\n"
"PO-Revision-Date: 2010-12-08 17:57+0100\n"
"Last-Translator: Carlo Stemberger <carlo.stemberger at gmail.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -284,9 +284,9 @@ msgstr ""
"Ora, come super-utente, si generi l'immagine, salvando un log con #{tee}#."
#. type: Plain text
-#: en/user_examples.ssi:42
-msgid "# lb_build 2>&1 | tee binary.log"
-msgstr "# lb_build 2>&1 | tee binary.log"
+#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:219
+msgid "# lb build 2>&1 | tee binary.log"
+msgstr ""
#. type: Plain text
#: en/user_examples.ssi:46
@@ -351,11 +351,6 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:66 en/user_examples.ssi:219
-msgid "# lb build 2>&1 | tee binary.log"
-msgstr ""
-
-#. type: Plain text
#: en/user_examples.ssi:70
msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
diff --git a/manual/po/pt_BR/about_manual.ssi.po b/manual/po/pt_BR/about_manual.ssi.po
index 0b6a3a3..35fffde 100644
--- a/manual/po/pt_BR/about_manual.ssi.po
+++ b/manual/po/pt_BR/about_manual.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a8\n"
-"POT-Creation-Date: 2010-12-08 00:30+0100\n"
+"POT-Creation-Date: 2010-12-08 17:25-0400\n"
"PO-Revision-Date: 2010-10-22 18:16-0300\n"
"Last-Translator: Bruno Gurgel <bruno.gurgel at gmail.com>\n"
"Language-Team: none\n"
@@ -70,7 +70,7 @@ msgid ""
"#examples section designed to teach you image building and customization "
"basics. Read {Using the examples}#using-the-examples first, followed by "
"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
-"utility}#tutorial-2 and finally {Tutorial 3: A personal travelling companion}"
+"utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
"#tutorial-3. By the end of these tutorials, you will have a taste of what "
"can be done with Debian Live. We encourage you to return to more in-depth "
"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
@@ -546,10 +546,15 @@ msgstr "3~ Aplicando patches"
#. type: Plain text
#: en/about_manual.ssi:116
+#, fuzzy
+#| msgid ""
+#| "Directly commiting to the repository is possible by anyone. However, we "
+#| "ask you to send bigger changes to the mailing list to discuss them first. "
+#| "In order to push to the repository, the following steps are required."
msgid ""
-"Directly commiting to the repository is possible by anyone. However, we ask "
-"you to send bigger changes to the mailing list to discuss them first. In "
-"order to push to the repository, the following steps are required."
+"Anyone can directly commit to the repository. However, we ask you to send "
+"bigger changes to the mailing list to discuss them first. To push to the "
+"repository, you must follow this procedure:"
msgstr ""
"Diretamente cometer ao repoitório é possivel por qualquer um. No entanto, "
"nós pedimo que você mande maiores mudanças para a lista de e-mail para "
@@ -563,14 +568,21 @@ msgstr "_* Obter a chave publica de commit:"
#. type: Plain text
#: en/about_manual.ssi:127
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "$ mkdir -p ~/.ssh/identity.d\n"
+#| "$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
+#| "\t-O ~/.ssh/identity.d/live.debian.net\n"
+#| "$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
+#| "\t-O ~/.ssh/identity.d/live.debian.net.pub\n"
+#| "$ chmod 0600 ~/.ssh/identity.d/live.debian.net*\n"
msgid ""
"$ mkdir -p ~/.ssh/identity.d\n"
"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
-"\t-O ~/.ssh/identity.d/live.debian.net\n"
+"\t-O ~/.ssh/identity.d/gitosis at live.debian.net\n"
"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-"\t-O ~/.ssh/identity.d/live.debian.net.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/live.debian.net*\n"
+"\t-O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
+"$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
msgstr ""
"$ mkdir -p ~/.ssh/identity.d\n"
"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
@@ -604,7 +616,9 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:144
-msgid "_* Checkout a clone of the manual through ssh:"
+#, fuzzy
+#| msgid "_* Checkout a clone of the manual through ssh:"
+msgid "_* Check out a clone of the manual through ssh:"
msgstr "_* Fazer o checkout de um clone do manual por ssh:"
#. type: Plain text
@@ -614,10 +628,15 @@ msgstr "$ git clone gitosis at live.debian.net:/live-manual.git"
#. type: Plain text
#: en/about_manual.ssi:152
+#, fuzzy
+#| msgid ""
+#| "_* After editing the files in manual/en/, please call the 'commit' target "
+#| "in the top level directory to sanitize the files and update the "
+#| "translation files:"
msgid ""
-"_* After editing the files in manual/en/, please call the 'commit' target in "
-"the top level directory to sanitize the files and update the translation "
-"files:"
+"_* After editing the files in #{manual/en/}#, please call the 'commit' "
+"target in the top level directory to sanitize the files and update the "
+"translation files:"
msgstr ""
"_* Depois de editar os arquivos no manual/en/, por favor chame o alvo "
"'commit' no nível superior do diretório para higiênizar os arquivos e "
@@ -637,10 +656,10 @@ msgstr "$ make commit"
#| "ending with a full stop. Usually starting with the form 'Fixing/Adding/"
#| "Removing/Correcting/':"
msgid ""
-"_* After sanitizing commit the changes. Write commit messages, that consist "
-"of full useful sentences in English, starting with a capital letter and "
-"ending with a full stop. Usually starting with the form 'Fixing/Adding/"
-"Removing/Correcting/Translating':"
+"_* After sanitizing, commit the changes. Write commit messages that consist "
+"of full, useful sentences in English, starting with a capital letter and "
+"ending with a full stop. Usually, these will start with the form 'Fixing/"
+"Adding/Removing/Correcting/Translating', e.g."
msgstr ""
"_* Depois de higiênizar submeta as mudançãs. Escreva mensagens de submissão, "
"que consistem em sentanças completas úteis, começando por letra maiuscula e "
@@ -649,8 +668,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:164
-msgid "$ git commit -a"
-msgstr "$ git commit -a"
+msgid "$ git commit -a -m \"Adding a section on applying patches.\""
+msgstr ""
#. type: Plain text
#: en/about_manual.ssi:168
@@ -669,8 +688,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:178
-msgid ""
-"Submitting a translation for a new language is recommended in two steps:"
+msgid "To submit a translation for a new language, follow these two steps:"
msgstr ""
#. type: Plain text
@@ -678,8 +696,9 @@ msgstr ""
msgid ""
"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
"in.pot files to your language with your favourite editor (such as poedit). "
-"Send translated files to the mailing list. It will then be included and "
-"autobuild for that language enabled."
+"Send translated files to the mailing list. Once we have reviewed your "
+"submission, we will add the new language to the manual and will enable it in "
+"the autobuild."
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/index.html.in.po b/manual/po/pt_BR/index.html.in.po
index 91aa4c0..cb49bb8 100644
--- a/manual/po/pt_BR/index.html.in.po
+++ b/manual/po/pt_BR/index.html.in.po
@@ -103,9 +103,6 @@ msgstr "Fonte"
#. type: Content of: <html><body><p>
#: en/index.html.in:37
-#| msgid ""
-#| "The sources for this manual is available in a <a href=\"http://git.or.cz/"
-#| "\">git</a> repository at live.debian.net."
msgid ""
"The sources for this manual is available in a <a href=\"http://git.or.cz/"
"\">Git</a> repository at live.debian.net."
diff --git a/manual/po/pt_BR/user_examples.ssi.po b/manual/po/pt_BR/user_examples.ssi.po
index b32d2e9..57b1fb7 100644
--- a/manual/po/pt_BR/user_examples.ssi.po
+++ b/manual/po/pt_BR/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-07 20:31-0400\n"
+"POT-Creation-Date: 2010-12-08 17:25-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -255,8 +255,8 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:42
-msgid "# lb_build 2>&1 | tee binary.log"
+#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:219
+msgid "# lb build 2>&1 | tee binary.log"
msgstr ""
#. type: Plain text
@@ -314,11 +314,6 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:66 en/user_examples.ssi:219
-msgid "# lb build 2>&1 | tee binary.log"
-msgstr ""
-
-#. type: Plain text
#: en/user_examples.ssi:70
msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
diff --git a/manual/po/ro/about_manual.ssi.po b/manual/po/ro/about_manual.ssi.po
index 2b1abab..0cf9a96 100644
--- a/manual/po/ro/about_manual.ssi.po
+++ b/manual/po/ro/about_manual.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a8\n"
-"POT-Creation-Date: 2010-12-08 00:30+0100\n"
+"POT-Creation-Date: 2010-12-08 17:25-0400\n"
"PO-Revision-Date: 2010-10-23 10:34-0200\n"
"Last-Translator: Eugen Paiuc <linux51 at bluewin.ch>\n"
"Language-Team: none\n"
@@ -67,7 +67,7 @@ msgid ""
"#examples section designed to teach you image building and customization "
"basics. Read {Using the examples}#using-the-examples first, followed by "
"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
-"utility}#tutorial-2 and finally {Tutorial 3: A personal travelling companion}"
+"utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
"#tutorial-3. By the end of these tutorials, you will have a taste of what "
"can be done with Debian Live. We encourage you to return to more in-depth "
"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
@@ -552,10 +552,15 @@ msgstr "3~ Aplicarea de patch-uri"
#. type: Plain text
#: en/about_manual.ssi:116
+#, fuzzy
+#| msgid ""
+#| "Directly commiting to the repository is possible by anyone. However, we "
+#| "ask you to send bigger changes to the mailing list to discuss them first. "
+#| "In order to push to the repository, the following steps are required."
msgid ""
-"Directly commiting to the repository is possible by anyone. However, we ask "
-"you to send bigger changes to the mailing list to discuss them first. In "
-"order to push to the repository, the following steps are required."
+"Anyone can directly commit to the repository. However, we ask you to send "
+"bigger changes to the mailing list to discuss them first. To push to the "
+"repository, you must follow this procedure:"
msgstr ""
"Commiterea in direct este la indemana oricui. Totusi, va rugam sa trimeteti "
"schimbarile mai mari , spre discutie , la mailing list. Pentru a fi trimise "
@@ -568,14 +573,21 @@ msgstr "_* Fetch the public commit key:"
#. type: Plain text
#: en/about_manual.ssi:127
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "$ mkdir -p ~/.ssh/identity.d\n"
+#| "$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
+#| "\t-O ~/.ssh/identity.d/live.debian.net\n"
+#| "$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
+#| "\t-O ~/.ssh/identity.d/live.debian.net.pub\n"
+#| "$ chmod 0600 ~/.ssh/identity.d/live.debian.net*\n"
msgid ""
"$ mkdir -p ~/.ssh/identity.d\n"
"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
-"\t-O ~/.ssh/identity.d/live.debian.net\n"
+"\t-O ~/.ssh/identity.d/gitosis at live.debian.net\n"
"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-"\t-O ~/.ssh/identity.d/live.debian.net.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/live.debian.net*\n"
+"\t-O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
+"$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
msgstr ""
"$ mkdir -p ~/.ssh/identity.d\n"
"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
@@ -609,7 +621,9 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:144
-msgid "_* Checkout a clone of the manual through ssh:"
+#, fuzzy
+#| msgid "_* Checkout a clone of the manual through ssh:"
+msgid "_* Check out a clone of the manual through ssh:"
msgstr "_* Checkout un clon al manualului prin ssh:"
#. type: Plain text
@@ -619,10 +633,15 @@ msgstr "$ git clone gitosis at live.debian.net:/live-manual.git"
#. type: Plain text
#: en/about_manual.ssi:152
+#, fuzzy
+#| msgid ""
+#| "_* After editing the files in manual/en/, please call the 'commit' target "
+#| "in the top level directory to sanitize the files and update the "
+#| "translation files:"
msgid ""
-"_* After editing the files in manual/en/, please call the 'commit' target in "
-"the top level directory to sanitize the files and update the translation "
-"files:"
+"_* After editing the files in #{manual/en/}#, please call the 'commit' "
+"target in the top level directory to sanitize the files and update the "
+"translation files:"
msgstr ""
"_* Dupa editarea de fisiere in manual/en/, va rugam folositi 'commit' in the "
"top level directory to sanitize the files and update the translation files:"
@@ -641,10 +660,10 @@ msgstr "$ make commit"
#| "ending with a full stop. Usually starting with the form 'Fixing/Adding/"
#| "Removing/Correcting/':"
msgid ""
-"_* After sanitizing commit the changes. Write commit messages, that consist "
-"of full useful sentences in English, starting with a capital letter and "
-"ending with a full stop. Usually starting with the form 'Fixing/Adding/"
-"Removing/Correcting/Translating':"
+"_* After sanitizing, commit the changes. Write commit messages that consist "
+"of full, useful sentences in English, starting with a capital letter and "
+"ending with a full stop. Usually, these will start with the form 'Fixing/"
+"Adding/Removing/Correcting/Translating', e.g."
msgstr ""
"_* Dupa 'sanitizare' 'commit' schimbarile. Scrieti mesajele de commit, care "
"constau in propozitii clare, care incep cu litere Mari, si se incheie cu "
@@ -653,8 +672,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:164
-msgid "$ git commit -a"
-msgstr "$ git commit -a"
+msgid "$ git commit -a -m \"Adding a section on applying patches.\""
+msgstr ""
#. type: Plain text
#: en/about_manual.ssi:168
@@ -673,8 +692,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:178
-msgid ""
-"Submitting a translation for a new language is recommended in two steps:"
+msgid "To submit a translation for a new language, follow these two steps:"
msgstr ""
#. type: Plain text
@@ -682,8 +700,9 @@ msgstr ""
msgid ""
"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
"in.pot files to your language with your favourite editor (such as poedit). "
-"Send translated files to the mailing list. It will then be included and "
-"autobuild for that language enabled."
+"Send translated files to the mailing list. Once we have reviewed your "
+"submission, we will add the new language to the manual and will enable it in "
+"the autobuild."
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index faf4118..067621f 100644
--- a/manual/po/ro/user_examples.ssi.po
+++ b/manual/po/ro/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-07 20:31-0400\n"
+"POT-Creation-Date: 2010-12-08 17:25-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -256,8 +256,8 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:42
-msgid "# lb_build 2>&1 | tee binary.log"
+#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:219
+msgid "# lb build 2>&1 | tee binary.log"
msgstr ""
#. type: Plain text
@@ -315,11 +315,6 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:66 en/user_examples.ssi:219
-msgid "# lb build 2>&1 | tee binary.log"
-msgstr ""
-
-#. type: Plain text
#: en/user_examples.ssi:70
msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
diff --git a/manual/pot/about_manual.ssi.pot b/manual/pot/about_manual.ssi.pot
index d17a130..ce097fe 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: 2010-12-08 00:30+0100\n"
+"POT-Creation-Date: 2010-12-08 17:25-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -61,7 +61,7 @@ msgid ""
"#examples section designed to teach you image building and customization "
"basics. Read {Using the examples}#using-the-examples first, followed by "
"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
-"utility}#tutorial-2 and finally {Tutorial 3: A personal travelling companion}"
+"utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
"#tutorial-3. By the end of these tutorials, you will have a taste of what "
"can be done with Debian Live. We encourage you to return to more in-depth "
"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
@@ -483,9 +483,9 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:116
msgid ""
-"Directly commiting to the repository is possible by anyone. However, we ask "
-"you to send bigger changes to the mailing list to discuss them first. In "
-"order to push to the repository, the following steps are required."
+"Anyone can directly commit to the repository. However, we ask you to send "
+"bigger changes to the mailing list to discuss them first. To push to the "
+"repository, you must follow this procedure:"
msgstr ""
#. type: Plain text
@@ -499,10 +499,10 @@ msgstr ""
msgid ""
"$ mkdir -p ~/.ssh/identity.d\n"
"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
-"\t-O ~/.ssh/identity.d/live.debian.net\n"
+"\t-O ~/.ssh/identity.d/gitosis at live.debian.net\n"
"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-"\t-O ~/.ssh/identity.d/live.debian.net.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/live.debian.net*\n"
+"\t-O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
+"$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
msgstr ""
#. type: Plain text
@@ -524,7 +524,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:144
-msgid "_* Checkout a clone of the manual through ssh:"
+msgid "_* Check out a clone of the manual through ssh:"
msgstr ""
#. type: Plain text
@@ -535,9 +535,9 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:152
msgid ""
-"_* After editing the files in manual/en/, please call the 'commit' target in "
-"the top level directory to sanitize the files and update the translation "
-"files:"
+"_* After editing the files in #{manual/en/}#, please call the 'commit' "
+"target in the top level directory to sanitize the files and update the "
+"translation files:"
msgstr ""
#. type: Plain text
@@ -548,15 +548,15 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:160
msgid ""
-"_* After sanitizing commit the changes. Write commit messages, that consist "
-"of full useful sentences in English, starting with a capital letter and "
-"ending with a full stop. Usually starting with the form 'Fixing/Adding/"
-"Removing/Correcting/Translating':"
+"_* After sanitizing, commit the changes. Write commit messages that consist "
+"of full, useful sentences in English, starting with a capital letter and "
+"ending with a full stop. Usually, these will start with the form 'Fixing/"
+"Adding/Removing/Correcting/Translating', e.g."
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:164
-msgid "$ git commit -a"
+msgid "$ git commit -a -m \"Adding a section on applying patches.\""
msgstr ""
#. type: Plain text
@@ -576,8 +576,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:178
-msgid ""
-"Submitting a translation for a new language is recommended in two steps:"
+msgid "To submit a translation for a new language, follow these two steps:"
msgstr ""
#. type: Plain text
@@ -585,8 +584,9 @@ msgstr ""
msgid ""
"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
"in.pot files to your language with your favourite editor (such as poedit). "
-"Send translated files to the mailing list. It will then be included and "
-"autobuild for that language enabled."
+"Send translated files to the mailing list. Once we have reviewed your "
+"submission, we will add the new language to the manual and will enable it in "
+"the autobuild."
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index 5c6d64d..44809dd 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: 2010-12-07 20:31-0400\n"
+"POT-Creation-Date: 2010-12-08 17:25-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -255,8 +255,8 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:42
-msgid "# lb_build 2>&1 | tee binary.log"
+#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:219
+msgid "# lb build 2>&1 | tee binary.log"
msgstr ""
#. type: Plain text
@@ -314,11 +314,6 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:66 en/user_examples.ssi:219
-msgid "# lb build 2>&1 | tee binary.log"
-msgstr ""
-
-#. type: Plain text
#: en/user_examples.ssi:70
msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
diff --git a/manual/pt_BR/about_manual.ssi b/manual/pt_BR/about_manual.ssi
index 1289e4d..cc16c7e 100644
--- a/manual/pt_BR/about_manual.ssi
+++ b/manual/pt_BR/about_manual.ssi
@@ -23,9 +23,9 @@ the details. Therefore, we have provided three tutorials in the
{Examples}#examples section designed to teach you image building and
customization basics. Read {Using the examples}#using-the-examples first,
followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web
-browser utility}#tutorial-2 and finally {Tutorial 3: A personal travelling
-companion}#tutorial-3. By the end of these tutorials, you will have a taste
-of what can be done with Debian Live. We encourage you to return to more
+browser utility}#tutorial-2 and finally {Tutorial 3: A personalized
+image}#tutorial-3. By the end of these tutorials, you will have a taste of
+what can be done with Debian Live. We encourage you to return to more
in-depth study of the manual, perhaps next reading {The basics}#the-basics,
skimming or skipping {Building a netboot image}#building-netboot-image, and
finishing by reading the {Customization overview}#customization-overview and
@@ -180,10 +180,9 @@ $ make build LANGUAGES=en
3~ Aplicando patches
-Diretamente cometer ao repoitório é possivel por qualquer um. No entanto,
-nós pedimo que você mande maiores mudanças para a lista de e-mail para
-discuti-las primeiro. Para enviar ao repositório, os seguintes passos são
-necessários:
+Anyone can directly commit to the repository. However, we ask you to send
+bigger changes to the mailing list to discuss them first. To push to the
+repository, you must follow this procedure:
_* Obter a chave publica de commit:
@@ -211,7 +210,7 @@ EOF
}code
-_* Fazer o checkout de um clone do manual por ssh:
+_* Check out a clone of the manual through ssh:
code{
@@ -219,9 +218,9 @@ $ git clone gitosis at live.debian.net:/live-manual.git
}code
-_* Depois de editar os arquivos no manual/en/, por favor chame o alvo
-'commit' no nível superior do diretório para higiênizar os arquivos e
-atualizar os arquivos de tradução.
+_* After editing the files in #{manual/en/}#, please call the 'commit'
+target in the top level directory to sanitize the files and update the
+translation files:
code{
@@ -229,14 +228,14 @@ $ make commit
}code
-_* After sanitizing commit the changes. Write commit messages, that consist
-of full useful sentences in English, starting with a capital letter and
-ending with a full stop. Usually starting with the form
-'Fixing/Adding/Removing/Correcting/Translating':
+_* After sanitizing, commit the changes. Write commit messages that consist
+of full, useful sentences in English, starting with a capital letter and
+ending with a full stop. Usually, these will start with the form
+'Fixing/Adding/Removing/Correcting/Translating', e.g.
code{
-$ git commit -a
+$ git commit -a -m "Adding a section on applying patches."
}code
@@ -250,12 +249,13 @@ $ git push
3~ Translation
-Submitting a translation for a new language is recommended in two steps:
+To submit a translation for a new language, follow these two steps:
_* Translate the about_manual.ssi.pot, about_project.ssi.pot and
index.html.in.pot files to your language with your favourite editor (such as
-poedit). Send translated files to the mailing list. It will then be included
-and autobuild for that language enabled.
+poedit). Send translated files to the mailing list. Once we have reviewed
+your submission, we will add the new language to the manual and will enable
+it in the autobuild.
_* Once the new language is added, you can randomly start translating all
other pot files.
diff --git a/manual/pt_BR/index.html.in b/manual/pt_BR/index.html.in
index fd24c55..cbecbc4 100644
--- a/manual/pt_BR/index.html.in
+++ b/manual/pt_BR/index.html.in
@@ -41,8 +41,8 @@ href="pdf/live-manual.landscape-letter.pdf">US paisagem</a></li>
<h3>Fonte</h3>
<p>
- The sources for this manual is available in a <a
-href="http://git.or.cz/">Git</a> repository at live.debian.net.
+ O fonte desse manual está diponível em um repositório <a
+href="http://git.or.cz/">Git</a> em live.debian.net.
</p>
<ul>
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
index 84c482b..3d68a35 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/pt_BR/user_examples.ssi
@@ -54,7 +54,7 @@ Now, as superuser, build the image, saving a log as you build with #{tee}#.
code{
-# lb_build 2>&1 | tee binary.log
+# lb build 2>&1 | tee binary.log
}code
diff --git a/manual/ro/about_manual.ssi b/manual/ro/about_manual.ssi
index 0a6b7c9..b7dfba3 100644
--- a/manual/ro/about_manual.ssi
+++ b/manual/ro/about_manual.ssi
@@ -21,9 +21,9 @@ the details. Therefore, we have provided three tutorials in the
{Examples}#examples section designed to teach you image building and
customization basics. Read {Using the examples}#using-the-examples first,
followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web
-browser utility}#tutorial-2 and finally {Tutorial 3: A personal travelling
-companion}#tutorial-3. By the end of these tutorials, you will have a taste
-of what can be done with Debian Live. We encourage you to return to more
+browser utility}#tutorial-2 and finally {Tutorial 3: A personalized
+image}#tutorial-3. By the end of these tutorials, you will have a taste of
+what can be done with Debian Live. We encourage you to return to more
in-depth study of the manual, perhaps next reading {The basics}#the-basics,
skimming or skipping {Building a netboot image}#building-netboot-image, and
finishing by reading the {Customization overview}#customization-overview and
@@ -176,9 +176,9 @@ $ make build LANGUAGES=en
3~ Aplicarea de patch-uri
-Commiterea in direct este la indemana oricui. Totusi, va rugam sa trimeteti
-schimbarile mai mari , spre discutie , la mailing list. Pentru a fi trimise
-contibutiile la repository, pasii urmatori sunt necesari:
+Anyone can directly commit to the repository. However, we ask you to send
+bigger changes to the mailing list to discuss them first. To push to the
+repository, you must follow this procedure:
_* Fetch the public commit key:
@@ -206,7 +206,7 @@ EOF
}code
-_* Checkout un clon al manualului prin ssh:
+_* Check out a clone of the manual through ssh:
code{
@@ -214,8 +214,9 @@ $ git clone gitosis at live.debian.net:/live-manual.git
}code
-_* Dupa editarea de fisiere in manual/en/, va rugam folositi 'commit' in the
-top level directory to sanitize the files and update the translation files:
+_* After editing the files in #{manual/en/}#, please call the 'commit'
+target in the top level directory to sanitize the files and update the
+translation files:
code{
@@ -223,14 +224,14 @@ $ make commit
}code
-_* After sanitizing commit the changes. Write commit messages, that consist
-of full useful sentences in English, starting with a capital letter and
-ending with a full stop. Usually starting with the form
-'Fixing/Adding/Removing/Correcting/Translating':
+_* After sanitizing, commit the changes. Write commit messages that consist
+of full, useful sentences in English, starting with a capital letter and
+ending with a full stop. Usually, these will start with the form
+'Fixing/Adding/Removing/Correcting/Translating', e.g.
code{
-$ git commit -a
+$ git commit -a -m "Adding a section on applying patches."
}code
@@ -244,12 +245,13 @@ $ git push
3~ Translation
-Submitting a translation for a new language is recommended in two steps:
+To submit a translation for a new language, follow these two steps:
_* Translate the about_manual.ssi.pot, about_project.ssi.pot and
index.html.in.pot files to your language with your favourite editor (such as
-poedit). Send translated files to the mailing list. It will then be included
-and autobuild for that language enabled.
+poedit). Send translated files to the mailing list. Once we have reviewed
+your submission, we will add the new language to the manual and will enable
+it in the autobuild.
_* Once the new language is added, you can randomly start translating all
other pot files.
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
index 84c482b..3d68a35 100644
--- a/manual/ro/user_examples.ssi
+++ b/manual/ro/user_examples.ssi
@@ -54,7 +54,7 @@ Now, as superuser, build the image, saving a log as you build with #{tee}#.
code{
-# lb_build 2>&1 | tee binary.log
+# lb build 2>&1 | tee binary.log
}code
--
live-manual
More information about the debian-live-changes
mailing list