[SCM] live-manual branch, debian, updated. debian/2.0_a12-1-15-gc0bdf26
Ben Armstrong
synrg at debian.org
Wed Dec 8 00:47:21 UTC 2010
The following commit has been merged in the debian branch:
commit c0bdf26ab3ccccc07461d9882beaa0e990197761
Author: Ben Armstrong <synrg at debian.org>
Date: Tue Dec 7 20:47:14 2010 -0400
Fixing two typos that broke build: one internal link, one encoding in .po file.
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
index d3f44f8..84c482b 100644
--- a/manual/de/user_examples.ssi
+++ b/manual/de/user_examples.ssi
@@ -354,7 +354,7 @@ Description: Brazilian Portuguese KDE desktop
We will use the experimental #{--language}# option, as live-build happens to
include #{syslinux}# templates for pt_BR (see {Desktop and language
-tasks}#destkop-and-language-tasks for details). And at boot time we will
+tasks}#desktop-and-language-tasks for details). And at boot time we will
generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard
layout. Now let's put the pieces together:
diff --git a/manual/en/user_examples.ssi b/manual/en/user_examples.ssi
index 0863469..3bf33f8 100644
--- a/manual/en/user_examples.ssi
+++ b/manual/en/user_examples.ssi
@@ -265,7 +265,7 @@ Description: Brazilian Portuguese KDE desktop
}code
-We will use the experimental #{--language}# option, as live-build happens to include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}#destkop-and-language-tasks for details). And at boot time we will generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's put the pieces together:
+We will use the experimental #{--language}# option, as live-build happens to include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}#desktop-and-language-tasks for details). And at boot time we will generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's put the pieces together:
code{
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index d3f44f8..84c482b 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -354,7 +354,7 @@ Description: Brazilian Portuguese KDE desktop
We will use the experimental #{--language}# option, as live-build happens to
include #{syslinux}# templates for pt_BR (see {Desktop and language
-tasks}#destkop-and-language-tasks for details). And at boot time we will
+tasks}#desktop-and-language-tasks for details). And at boot time we will
generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard
layout. Now let's put the pieces together:
diff --git a/manual/it/about_manual.ssi b/manual/it/about_manual.ssi
index c23700c..3cf4c49 100644
--- a/manual/it/about_manual.ssi
+++ b/manual/it/about_manual.ssi
@@ -129,10 +129,10 @@ _* Trent W. Buck
2~ Contribuire a questo documento
-This manual is intended as a community project and all proposals for
-improvements and contributions are extremely welcome. The preferred way to
-submit a contribution is to send it to the mailing list. Please see the
-section {Contact}#contact for more information.
+Questo manuale è pensato come un progetto comunitario e ogni suggerimento e
+contributo è benvenuto. Il modo migliore per apportare un contributo è di
+inviarlo alla mailing list. Per maggiori informazioni si veda la sezione
+{Contact}#contact.
Quando si sottopone un contributo, si prega di indicare chiaramente il
detentore del copyright e di includere la licenza. Si noti che, per essere
@@ -158,8 +158,8 @@ code{
}code
-You may build the live-manual from the top level directory of your Git
-checkout by executing:
+Si può compilare il live-manual dalla directory superiore del checkout di
+Git eseguendo:
code{
@@ -229,10 +229,10 @@ $ 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':
+_* 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':
code{
@@ -250,12 +250,12 @@ $ git push
3~ Traduzione
-Submitting a translation for a new language is recommended in two steps:
+Si raccomanda di inviare la traduzione per una nuova lingua in due passi:
-_* 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.
+_* 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.
-_* Once the new language is added, you can randomly start translating all
-other pot files.
+_* 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/user_examples.ssi b/manual/it/user_examples.ssi
index d3f44f8..84c482b 100644
--- a/manual/it/user_examples.ssi
+++ b/manual/it/user_examples.ssi
@@ -354,7 +354,7 @@ Description: Brazilian Portuguese KDE desktop
We will use the experimental #{--language}# option, as live-build happens to
include #{syslinux}# templates for pt_BR (see {Desktop and language
-tasks}#destkop-and-language-tasks for details). And at boot time we will
+tasks}#desktop-and-language-tasks for details). And at boot time we will
generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard
layout. Now let's put the pieces together:
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index e7ad468..fc4c7e4 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 18:11-0400\n"
+"POT-Creation-Date: 2010-12-07 20:31-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -703,7 +703,7 @@ msgstr ""
msgid ""
"We will use the experimental #{--language}# option, as live-build happens to "
"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
-"#destkop-and-language-tasks for details). And at boot time we will generate "
+"#desktop-and-language-tasks for details). And at boot time we will generate "
"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
"put the pieces together:"
msgstr ""
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index 7f961fe..d0fc1a8 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 18:11-0400\n"
+"POT-Creation-Date: 2010-12-07 20:31-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -703,7 +703,7 @@ msgstr ""
msgid ""
"We will use the experimental #{--language}# option, as live-build happens to "
"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
-"#destkop-and-language-tasks for details). And at boot time we will generate "
+"#desktop-and-language-tasks for details). And at boot time we will generate "
"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
"put the pieces together:"
msgstr ""
diff --git a/manual/po/it/about_manual.ssi.po b/manual/po/it/about_manual.ssi.po
index 4877ecf..83a0b1b 100644
--- a/manual/po/it/about_manual.ssi.po
+++ b/manual/po/it/about_manual.ssi.po
@@ -13,7 +13,7 @@ msgstr ""
"Language-Team: Italian <Tp at lists.linux.it>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=uft-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2: plural=(n !=1)\n"
@@ -91,11 +91,11 @@ msgstr ""
"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 "
+"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."
@@ -114,12 +114,12 @@ msgid ""
"Live systems are typically booted from media such as CDs, DVDs or USB "
"sticks. Some may also boot over the network."
msgstr ""
-"_* *{Live system}*: Un sistema operativo che può partire senza "
-"installazione su disco rigido. I sistemi live non alterano né il sistema "
-"operativo locale (o i sistemi operativi locali) né i file già installati "
-"sul disco rigido del computer a meno che lo si faccia volontariamente. I "
-"sistemi live vengono solitamente avviati da supporti quali CD, DVD o penne "
-"USB; alcuni possono anche avviarsi via rete."
+"_* *{Live system}*: Un sistema operativo che può partire senza installazione "
+"su disco rigido. I sistemi live non alterano né il sistema operativo locale "
+"(o i sistemi operativi locali) né i file già installati sul disco rigido del "
+"computer a meno che lo si faccia volontariamente. I sistemi live vengono "
+"solitamente avviati da supporti quali CD, DVD o penne USB; alcuni possono "
+"anche avviarsi via rete."
#. type: Plain text
#: en/about_manual.ssi:18
@@ -139,9 +139,9 @@ msgid ""
"{fetch=URL}#)."
msgstr ""
"_* *{Debian Live system}*: Un sistema live che usa software proveniente dal "
-"sistema operativo Debian e che può essere lanciato da CD, DVD, supporti "
-"USB, via rete (tramite immagini netboot) e via internet (tramite il "
-"parametro di boot #{fetch=URL}#)."
+"sistema operativo Debian e che può essere lanciato da CD, DVD, supporti USB, "
+"via rete (tramite immagini netboot) e via internet (tramite il parametro di "
+"boot #{fetch=URL}#)."
#. type: Plain text
#: en/about_manual.ssi:22
@@ -250,10 +250,10 @@ msgid ""
"themselves."
msgstr ""
"* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Nomi in codice per i "
-"rilasci Debian; al momento Squeeze è l'attuale *{stable}* e Wheezy "
-"l'attuale *{testing}*. Sid sarà sempre il sinonimo della *{unstable}*. In "
-"tutto il manuale si tende ad usare i nomi in codice dei rilasci, in quanto "
-"questo è ciò che è previsto dagli strumenti stessi."
+"rilasci Debian; al momento Squeeze è l'attuale *{stable}* e Wheezy l'attuale "
+"*{testing}*. Sid sarà sempre il sinonimo della *{unstable}*. In tutto il "
+"manuale si tende ad usare i nomi in codice dei rilasci, in quanto questo è "
+"ciò che è previsto dagli strumenti stessi."
#. type: Plain text
#: en/about_manual.ssi:46
@@ -350,11 +350,6 @@ msgstr "2~ Contribuire a questo documento"
#. type: Plain text
#: en/about_manual.ssi:78
-#| msgid ""
-#| "This manual is intended as a community project and all proposals for "
-#| "improvements and contributions are extremely welcome. The preferred way "
-#| "to submit a contribution is to send it to the mailing list. Please see "
-#| "{Contact}#contact for more information."
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -542,9 +537,6 @@ msgstr "# apt-get install make po4a sisu-complete"
#. type: Plain text
#: en/about_manual.ssi:98
-#| msgid ""
-#| "You may build the live-manual from the top level directory of your git "
-#| "checkout by executing:"
msgid ""
"You may build the live-manual from the top level directory of your Git "
"checkout by executing:"
@@ -666,11 +658,6 @@ 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, starting with a capital letter and "
-#| "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 "
@@ -704,8 +691,6 @@ msgstr "3~ Traduzione"
#. type: Plain text
#: en/about_manual.ssi:178
-#| msgid ""
-#| "Submiting a translation for a new language is recommended in two steps:"
msgid ""
"Submitting a translation for a new language is recommended in two steps:"
msgstr ""
@@ -713,11 +698,6 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:180
-#| msgid ""
-#| "_* Translate the about_manual.ssi.pot about_project.ssi.pot index.html.in."
-#| "pot files to your language with your favourite editor (such as poedit). "
-#| "Send translated files to the mailinglist. 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). "
@@ -731,9 +711,6 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:181
-#| msgid ""
-#| "_* Now that the new language was added, you can randomly start "
-#| "translating all other pot files."
msgid ""
"_* Once the new language is added, you can randomly start translating all "
"other pot files."
diff --git a/manual/po/it/user_examples.ssi.po b/manual/po/it/user_examples.ssi.po
index 20c9d06..cb59ab3 100644
--- a/manual/po/it/user_examples.ssi.po
+++ b/manual/po/it/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-07 18:11-0400\n"
+"POT-Creation-Date: 2010-12-07 20:31-0400\n"
"PO-Revision-Date: 2010-11-28 07:51-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -706,7 +706,7 @@ msgstr ""
msgid ""
"We will use the experimental #{--language}# option, as live-build happens to "
"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
-"#destkop-and-language-tasks for details). And at boot time we will generate "
+"#desktop-and-language-tasks for details). And at boot time we will generate "
"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
"put the pieces together:"
msgstr ""
diff --git a/manual/po/pt_BR/user_examples.ssi.po b/manual/po/pt_BR/user_examples.ssi.po
index f0d1df7..b32d2e9 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 18:11-0400\n"
+"POT-Creation-Date: 2010-12-07 20:31-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -703,7 +703,7 @@ msgstr ""
msgid ""
"We will use the experimental #{--language}# option, as live-build happens to "
"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
-"#destkop-and-language-tasks for details). And at boot time we will generate "
+"#desktop-and-language-tasks for details). And at boot time we will generate "
"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
"put the pieces together:"
msgstr ""
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index 89eae31..faf4118 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 18:11-0400\n"
+"POT-Creation-Date: 2010-12-07 20:31-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -704,7 +704,7 @@ msgstr ""
msgid ""
"We will use the experimental #{--language}# option, as live-build happens to "
"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
-"#destkop-and-language-tasks for details). And at boot time we will generate "
+"#desktop-and-language-tasks for details). And at boot time we will generate "
"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
"put the pieces together:"
msgstr ""
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index 124678b..5c6d64d 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 18:11-0400\n"
+"POT-Creation-Date: 2010-12-07 20:31-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"
@@ -703,7 +703,7 @@ msgstr ""
msgid ""
"We will use the experimental #{--language}# option, as live-build happens to "
"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
-"#destkop-and-language-tasks for details). And at boot time we will generate "
+"#desktop-and-language-tasks for details). And at boot time we will generate "
"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
"put the pieces together:"
msgstr ""
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
index d3f44f8..84c482b 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/pt_BR/user_examples.ssi
@@ -354,7 +354,7 @@ Description: Brazilian Portuguese KDE desktop
We will use the experimental #{--language}# option, as live-build happens to
include #{syslinux}# templates for pt_BR (see {Desktop and language
-tasks}#destkop-and-language-tasks for details). And at boot time we will
+tasks}#desktop-and-language-tasks for details). And at boot time we will
generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard
layout. Now let's put the pieces together:
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
index d3f44f8..84c482b 100644
--- a/manual/ro/user_examples.ssi
+++ b/manual/ro/user_examples.ssi
@@ -354,7 +354,7 @@ Description: Brazilian Portuguese KDE desktop
We will use the experimental #{--language}# option, as live-build happens to
include #{syslinux}# templates for pt_BR (see {Desktop and language
-tasks}#destkop-and-language-tasks for details). And at boot time we will
+tasks}#desktop-and-language-tasks for details). And at boot time we will
generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard
layout. Now let's put the pieces together:
--
live-manual
More information about the debian-live-changes
mailing list