[SCM] live-manual branch, debian-next, updated. debian/3.0_a11-1-38-ge452e94
chals
chals at altorricon.com
Sat Apr 14 20:38:01 UTC 2012
The following commit has been merged in the debian-next branch:
commit e452e940f5afaa875692e9055dc2a1aa7f241100
Author: chals <chals at altorricon.com>
Date: Sat Apr 14 22:35:25 2012 +0200
Updating 'es' and 'fr' translations and fixing one fuzzy string in 'pt_BR' and one in 'ro'.
diff --git a/manual/de/about_manual.ssi b/manual/de/about_manual.ssi
index c3776e1..3cee250 100644
--- a/manual/de/about_manual.ssi
+++ b/manual/de/about_manual.ssi
@@ -246,28 +246,15 @@ code{
_* Note that you should commit any changes on the debian-next branch, not on
the debian branch.
-_* 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{
-
- $ make commit
-
-}code
-
-_* Then
-
-code{
-
- $ git add .
-
-}code
-
-_* After sanitizing and adding the files, commit the changes. Write commit
-messages that consist of full, useful sentences in English, starting with a
-capital letter and ending with a full stop. Usually, these will start with
-the form 'Fixing/Adding/Removing/Correcting/Translating', e.g.
+_* Do not use #{make commit}# unless you are updating translations in this
+commit, and in that case, do not mix changes to the English manual and
+translations in the same commit, but use separate commits for each. See the
+{Translation}#translation section for more details.
+
+_* 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{
diff --git a/manual/es/about_manual.ssi b/manual/es/about_manual.ssi
index 5d6a851..ab98ec5 100644
--- a/manual/es/about_manual.ssi
+++ b/manual/es/about_manual.ssi
@@ -271,32 +271,16 @@ code{
_* Asegurarse de enviar los cambios a la rama debian-next y no a la rama
Debian.
-_* Después de editar los ficheros que se deseen en #{manual/en/}#, ejecutar
-«make commit» en el directorio superior para sanear los ficheros y
-actualizar los ficheros de traducciones:
-
-
-code{
-
- $ make commit
-
-}code
-
-_* Entonces
-
-code{
-
- $ git add .
-
-}code
-
-_* Una vez se han saneado y se han añadido los ficheros, se deberán entregar
-los cambios. Hay que escribir un mensaje de entrega que consistirá en una o
-varias frases en ingles, comenzando con una letra mayúscula y acabando con
-un punto final. Es habitual comenzar estas frases con la forma
+_* No ejecutar #{make commit}# a menos de que se actualicen las traducciones
+al mismo tiempo, y en ese caso, no mezclar los cambios del manual en inglés
+con las traducciones en el mismo commit, sino en commits separados. Ver la
+sección {Tranducción}#translation para más detalles.
+
+_* Hay que escribir un mensaje de entrega que consistirá en una o varias
+frases en ingles, comenzando con una letra mayúscula y acabando con un punto
+final. Es habitual comenzar estas frases con la forma
'Fixing/Adding/Removing/Correcting/Translating', por ejemplo:
-
code{
$ git commit -a -m "Adding a section on applying patches."
diff --git a/manual/fr/about_manual.ssi b/manual/fr/about_manual.ssi
index 80119bd..f622ae8 100644
--- a/manual/fr/about_manual.ssi
+++ b/manual/fr/about_manual.ssi
@@ -255,29 +255,15 @@ code{
_* Notez que vous devez livrer des changements sur la branche debian-next,
pas sur la branche debian.
-_* Après édition des fichiers dans #{manual/en/}#, veuillez appeler 'commit'
-dans le répertoire de niveau supérieur du dépôt afin de nettoyer les fichier
-et de mettre à jour les fichiers de traduction:
-
-code{
-
- $ make commit
-
-}code
-
-_* Alors
-
-code{
-
- $ git add .
-
-}code
-
-_* Après le nettoyage et d'ajouter les fichiers, soumettre les
-modifications. Veuillez écrire les commentaires de commit à l'aide de
-phrases complètes, en commençant par une majuscule et en terminant par un
-point, et avec la forme 'Fixing/Adding/Removing/Correcting/Translating', par
-exemple
+_* Ne pas utiliser #{make commit}# à moins que vous mettez à jour les
+traductions dans le commit, et dans ce cas, ne pas mélanger les
+modifications apportées au manuel en anglais et les traductions dans la même
+livraison, mais utiliser commits séparées. Voir la section
+{Traduction}#translation pour plus de détails.
+
+_* Veuillez écrire les commentaires du commit à l'aide de phrases complètes,
+en commençant par une majuscule et en terminant par un point, et avec la
+forme 'Fixing/Adding/Removing/Correcting/Translating', par exemple
code{
diff --git a/manual/it/about_manual.ssi b/manual/it/about_manual.ssi
index 8fe2a5b..3483ce4 100644
--- a/manual/it/about_manual.ssi
+++ b/manual/it/about_manual.ssi
@@ -247,29 +247,15 @@ code{
_* Si noti che tutte le modifiche vanno eseguite sul ramo debian-next e non
su quello debian.
-_* 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:
-
-code{
-
- $ make commit
-
-}code
-
-_* quindi
-
-code{
-
- $ git add .
-
-}code
-
-_* Dopo aver pulito e aggiunto i file è possibile eseguire il commit delle
-modifiche. Si scrivano messaggi costituiti da frasi in inglese esaurienti e
-utili, inizianti con una lettera maiuscola e terminanti con un
-punto. Solitamente cominceranno con la forma
-"Fixing/Adding/Removing/Correcting/Translating", ad esempio:
+_* Do not use #{make commit}# unless you are updating translations in this
+commit, and in that case, do not mix changes to the English manual and
+translations in the same commit, but use separate commits for each. See the
+{Translation}#translation section for more details.
+
+_* 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{
diff --git a/manual/po/de/about_manual.ssi.po b/manual/po/de/about_manual.ssi.po
index cdf3f3f..e6b8631 100644
--- a/manual/po/de/about_manual.ssi.po
+++ b/manual/po/de/about_manual.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-04-14 22:13+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -343,8 +343,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -419,8 +418,7 @@ msgstr ""
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -619,66 +617,50 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:175
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:"
+"_* Do not use #{make commit}# unless you are updating translations in this "
+"commit, and in that case, do not mix changes to the English manual and "
+"translations in the same commit, but use separate commits for each. See the "
+"{Translation}#translation section for more details."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:179
-#, no-wrap
-msgid " $ make commit\n"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:183
-msgid "_* Then"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:187
-#, no-wrap
-msgid " $ git add .\n"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:191
+#: en/about_manual.ssi:177
msgid ""
-"_* After sanitizing and adding the files, commit the changes. Write commit "
-"messages that consist of full, useful sentences in English, starting with a "
-"capital letter and ending with a full stop. Usually, these will start with "
-"the form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
+"_* 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:195
+#: en/about_manual.ssi:181
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:199
+#: en/about_manual.ssi:185
msgid "_* Push the commit to the server:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:203
+#: en/about_manual.ssi:189
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:207
+#: en/about_manual.ssi:193
msgid "3~translation Translation"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:209
+#: en/about_manual.ssi:195
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:211
+#: en/about_manual.ssi:197
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 /"
@@ -688,14 +670,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:213
+#: en/about_manual.ssi:199
msgid ""
"_* Once the new language is added, you can randomly start translating all po "
"files in #{manual/po/}#."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:215
+#: en/about_manual.ssi:201
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
"are updated from the po files and then you can review your changes launching "
@@ -704,7 +686,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:216
+#: en/about_manual.ssi:202
#, no-wrap
msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
msgstr ""
diff --git a/manual/po/es/about_manual.ssi.po b/manual/po/es/about_manual.ssi.po
index 0fba76e..2cc15c0 100644
--- a/manual/po/es/about_manual.ssi.po
+++ b/manual/po/es/about_manual.ssi.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
-"PO-Revision-Date: 2012-04-14 12:49+0100\n"
+"POT-Creation-Date: 2012-04-14 22:13+0300\n"
+"PO-Revision-Date: 2012-04-14 22:20+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -441,8 +441,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -517,8 +516,7 @@ msgstr ""
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -734,78 +732,62 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:175
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:"
+"_* Do not use #{make commit}# unless you are updating translations in this "
+"commit, and in that case, do not mix changes to the English manual and "
+"translations in the same commit, but use separate commits for each. See the "
+"{Translation}#translation section for more details."
msgstr ""
-"_* Después de editar los ficheros que se deseen en #{manual/en/}#, ejecutar "
-"«make commit» en el directorio superior para sanear los ficheros y "
-"actualizar los ficheros de traducciones:\n"
+"_* No ejecutar #{make commit}# a menos de que se actualicen las traducciones "
+"al mismo tiempo, y en ese caso, no mezclar los cambios del manual en inglés "
+"con las traducciones en el mismo commit, sino en commits separados. Ver la "
+"sección {Tranducción}#translation para más detalles."
#. type: Plain text
-#: en/about_manual.ssi:179
-#, no-wrap
-msgid " $ make commit\n"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:183
-msgid "_* Then"
-msgstr "_* Entonces"
-
-#. type: Plain text
-#: en/about_manual.ssi:187
-#, no-wrap
-msgid " $ git add .\n"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:191
+#: en/about_manual.ssi:177
msgid ""
-"_* After sanitizing and adding the files, commit the changes. Write commit "
-"messages that consist of full, useful sentences in English, starting with a "
-"capital letter and ending with a full stop. Usually, these will start with "
-"the form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
+"_* Write commit messages that consist of full, useful sentences in English, "
+"starting with a capital letter and ending with a full stop. Usually, these "
+"will start with the form 'Fixing/Adding/Removing/Correcting/Translating', e."
+"g."
msgstr ""
-"_* Una vez se han saneado y se han añadido los ficheros, se deberán entregar "
-"los cambios. Hay que escribir un mensaje de entrega que consistirá en una o "
-"varias frases en ingles, comenzando con una letra mayúscula y acabando con "
-"un punto final. Es habitual comenzar estas frases con la forma 'Fixing/"
-"Adding/Removing/Correcting/Translating', por ejemplo:\n"
+"_* Hay que escribir un mensaje de entrega que consistirá en una o varias "
+"frases en ingles, comenzando con una letra mayúscula y acabando con un punto "
+"final. Es habitual comenzar estas frases con la forma 'Fixing/Adding/"
+"Removing/Correcting/Translating', por ejemplo:"
#. type: Plain text
-#: en/about_manual.ssi:195
+#: en/about_manual.ssi:181
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:199
+#: en/about_manual.ssi:185
msgid "_* Push the commit to the server:"
msgstr ""
"_* Para finalizar se realizará la entrega al servidor utilizando el "
"siguiente comando:"
#. type: Plain text
-#: en/about_manual.ssi:203
+#: en/about_manual.ssi:189
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:207
+#: en/about_manual.ssi:193
msgid "3~translation Translation"
msgstr "3~translation Traducción"
#. type: Plain text
-#: en/about_manual.ssi:209
+#: en/about_manual.ssi:195
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
"Para enviar una traducción para un nuevo idioma, se deben seguir los "
"siguientes pasos:"
#. type: Plain text
-#: en/about_manual.ssi:211
+#: en/about_manual.ssi:197
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 /"
@@ -820,7 +802,7 @@ msgstr ""
"en el autobuild."
#. type: Plain text
-#: en/about_manual.ssi:213
+#: en/about_manual.ssi:199
msgid ""
"_* Once the new language is added, you can randomly start translating all po "
"files in #{manual/po/}#."
@@ -830,7 +812,7 @@ msgstr ""
"aleatoria."
#. type: Plain text
-#: en/about_manual.ssi:215
+#: en/about_manual.ssi:201
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
"are updated from the po files and then you can review your changes launching "
@@ -844,7 +826,7 @@ msgstr ""
"\"Translating...\"}# y #{git push}#."
#. type: Plain text
-#: en/about_manual.ssi:216
+#: en/about_manual.ssi:202
#, no-wrap
msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
msgstr "*{Nota:}* Tener en cuenta que a pesar de que tanto #{make commit}# como #{make build}# borran el directorio «build», si se crea el manual para revisar los cambios tal y como se recomienda, es posible que se desee limpiar el árbol git antes de enviar los cambios. Para hacer esto, se puede usar #{make clean}#. Este último paso no es obligatorio, gracias al fichero .gitignore, pero es una buena práctica para evitar enviar ficheros involuntariamente.\n"
diff --git a/manual/po/fr/about_manual.ssi.po b/manual/po/fr/about_manual.ssi.po
index 65d4100..e9b676b 100644
--- a/manual/po/fr/about_manual.ssi.po
+++ b/manual/po/fr/about_manual.ssi.po
@@ -7,15 +7,15 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
-"PO-Revision-Date: 2012-04-14 12:53+0200\n"
+"POT-Creation-Date: 2012-04-14 22:13+0300\n"
+"PO-Revision-Date: 2012-04-14 22:27+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
#. type: Plain text
#: en/about_manual.ssi:2
@@ -419,8 +419,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -495,8 +494,7 @@ msgstr ""
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -710,76 +708,60 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:175
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:"
+"_* Do not use #{make commit}# unless you are updating translations in this "
+"commit, and in that case, do not mix changes to the English manual and "
+"translations in the same commit, but use separate commits for each. See the "
+"{Translation}#translation section for more details."
msgstr ""
-"_* Après édition des fichiers dans #{manual/en/}#, veuillez appeler 'commit' "
-"dans le répertoire de niveau supérieur du dépôt afin de nettoyer les fichier "
-"et de mettre à jour les fichiers de traduction:"
+"_* Ne pas utiliser #{make commit}# à moins que vous mettez à jour les "
+"traductions dans le commit, et dans ce cas, ne pas mélanger les "
+"modifications apportées au manuel en anglais et les traductions dans la même "
+"livraison, mais utiliser commits séparées. Voir la section {Traduction}"
+"#translation pour plus de détails."
#. type: Plain text
-#: en/about_manual.ssi:179
-#, no-wrap
-msgid " $ make commit\n"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:183
-msgid "_* Then"
-msgstr "_* Alors"
-
-#. type: Plain text
-#: en/about_manual.ssi:187
-#, no-wrap
-msgid " $ git add .\n"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:191
+#: en/about_manual.ssi:177
msgid ""
-"_* After sanitizing and adding the files, commit the changes. Write commit "
-"messages that consist of full, useful sentences in English, starting with a "
-"capital letter and ending with a full stop. Usually, these will start with "
-"the form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
+"_* 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 le nettoyage et d'ajouter les fichiers, soumettre les "
-"modifications. Veuillez écrire les commentaires de commit à l'aide de "
-"phrases complètes, en commençant par une majuscule et en terminant par un "
-"point, et avec la forme 'Fixing/Adding/Removing/Correcting/Translating', par "
-"exemple"
+"_* Veuillez écrire les commentaires du commit à l'aide de phrases complètes, "
+"en commençant par une majuscule et en terminant par un point, et avec la "
+"forme 'Fixing/Adding/Removing/Correcting/Translating', par exemple"
#. type: Plain text
-#: en/about_manual.ssi:195
+#: en/about_manual.ssi:181
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:199
+#: en/about_manual.ssi:185
msgid "_* Push the commit to the server:"
msgstr "_* Envoyez votre commit au serveur:"
#. type: Plain text
-#: en/about_manual.ssi:203
+#: en/about_manual.ssi:189
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:207
+#: en/about_manual.ssi:193
msgid "3~translation Translation"
msgstr "3~translation Traduction"
#. type: Plain text
-#: en/about_manual.ssi:209
+#: en/about_manual.ssi:195
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
"Pour soumettre une traduction pour une nouvelle langue, suivez ces trois "
"étapes:"
#. type: Plain text
-#: en/about_manual.ssi:211
+#: en/about_manual.ssi:197
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 /"
@@ -794,7 +776,7 @@ msgstr ""
"langue au manuel (avec les fichiers po) et l'activer dans l'autobuild."
#. type: Plain text
-#: en/about_manual.ssi:213
+#: en/about_manual.ssi:199
msgid ""
"_* Once the new language is added, you can randomly start translating all po "
"files in #{manual/po/}#."
@@ -803,7 +785,7 @@ msgstr ""
"de façon aléatoire tous les fichiers po dans #{manual/po/}#."
#. type: Plain text
-#: en/about_manual.ssi:215
+#: en/about_manual.ssi:201
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
"are updated from the po files and then you can review your changes launching "
@@ -816,7 +798,7 @@ msgstr ""
"{git commit -a -m \"Translating...\"}# et #{git push}#."
#. type: Plain text
-#: en/about_manual.ssi:216
+#: en/about_manual.ssi:202
#, no-wrap
msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
msgstr "*{Remarque:}* S'il vous plaît soyez conscient que même si les deux #{make commit}# et #{make build}# suppriment votre répertoire de construction, si vous construisez le manuel pour examiner vos modifications comme il est recommandé, et vous voulez nettoyer votre arbre git avant de les envoyer, vous pouvez utiliser #{make clean}#. Cette dernière étape n'est pas obligatoire grâce au fichier .gitignore mais il est une bonne pratique pour éviter d'envoyer certains fichiers involontairement.\n"
diff --git a/manual/po/it/about_manual.ssi.po b/manual/po/it/about_manual.ssi.po
index efee33e..f029eb8 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.0\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-04-14 22:13+0300\n"
"PO-Revision-Date: 2012-04-03 20:21+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -397,8 +397,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -473,8 +472,7 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -691,38 +689,26 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:175
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:"
+"_* Do not use #{make commit}# unless you are updating translations in this "
+"commit, and in that case, do not mix changes to the English manual and "
+"translations in the same commit, but use separate commits for each. See the "
+"{Translation}#translation section for more details."
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 "
-"traduzione:"
#. type: Plain text
-#: en/about_manual.ssi:179
-#, no-wrap
-msgid " $ make commit\n"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:183
-msgid "_* Then"
-msgstr "_* quindi"
-
-#. type: Plain text
-#: en/about_manual.ssi:187
-#, no-wrap
-msgid " $ git add .\n"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:191
+#: en/about_manual.ssi:177
+#, fuzzy
+#| msgid ""
+#| "_* After sanitizing and adding the files, commit the changes. Write "
+#| "commit messages that consist of full, useful sentences in English, "
+#| "starting with a capital letter and ending with a full stop. Usually, "
+#| "these will start with the form 'Fixing/Adding/Removing/Correcting/"
+#| "Translating', e.g."
msgid ""
-"_* After sanitizing and adding the files, commit the changes. Write commit "
-"messages that consist of full, useful sentences in English, starting with a "
-"capital letter and ending with a full stop. Usually, these will start with "
-"the form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
+"_* 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 aver pulito e aggiunto i file è possibile eseguire il commit delle "
"modifiche. Si scrivano messaggi costituiti da frasi in inglese esaurienti e "
@@ -731,35 +717,35 @@ msgstr ""
"Translating\", ad esempio:"
#. type: Plain text
-#: en/about_manual.ssi:195
+#: en/about_manual.ssi:181
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:199
+#: en/about_manual.ssi:185
msgid "_* Push the commit to the server:"
msgstr "_* Inviare il commit al server:"
#. type: Plain text
-#: en/about_manual.ssi:203
+#: en/about_manual.ssi:189
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:207
+#: en/about_manual.ssi:193
msgid "3~translation Translation"
msgstr "3~translation Traduzione"
#. type: Plain text
-#: en/about_manual.ssi:209
+#: en/about_manual.ssi:195
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
"Per inviare una traduzione per una nuova lingua, seguire questi tre passi:"
#. type: Plain text
-#: en/about_manual.ssi:211
+#: en/about_manual.ssi:197
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 /"
@@ -774,7 +760,7 @@ msgstr ""
"file po) e la attiveremo per la procedura di compilazione automatica."
#. type: Plain text
-#: en/about_manual.ssi:213
+#: en/about_manual.ssi:199
msgid ""
"_* Once the new language is added, you can randomly start translating all po "
"files in #{manual/po/}#."
@@ -784,7 +770,7 @@ msgstr ""
"preferisce."
#. type: Plain text
-#: en/about_manual.ssi:215
+#: en/about_manual.ssi:201
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
"are updated from the po files and then you can review your changes launching "
@@ -797,7 +783,7 @@ msgstr ""
"{git commit -a -m \"Translating...\"}# e #{git push}#."
#. type: Plain text
-#: en/about_manual.ssi:216
+#: en/about_manual.ssi:202
#, no-wrap
msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
msgstr "*{Nota:}* anche se #{make commit}# e #{make build}# rimuovono entrambi la directory di compilazione, se si compila il manuale per rivedere le modifiche come consigliato, si consiglia di pulire l'albero git prima del push; per fare ciò si puà usare il comando #{make clean}#. Grazie al file .gitignore, quest'ultimo passaggio non è obbligatorio ma è una buona abitudine che evita di fare involontariamente il commit di certi file.\n"
diff --git a/manual/po/pt_BR/about_manual.ssi.po b/manual/po/pt_BR/about_manual.ssi.po
index 09fc8d0..941f0d1 100644
--- a/manual/po/pt_BR/about_manual.ssi.po
+++ b/manual/po/pt_BR/about_manual.ssi.po
@@ -1,19 +1,20 @@
# Brazilian Portuguese translations for live-manual package
# 2010 Bruno Gurgel <bruno.gurgel at gmail.com>
# This file is distributed under the same license as the live-config package.
+# Carlos Zuferri «chals» <chals at altorricon.com>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\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"
+"POT-Creation-Date: 2012-04-14 22:13+0300\n"
+"PO-Revision-Date: 2012-04-14 22:31+0200\n"
+"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
+"Language-Team: <debian-live at lists.debian.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
#. type: Plain text
#: en/about_manual.ssi:2
@@ -381,8 +382,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -457,8 +457,7 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -670,79 +669,54 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:175
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:"
+"_* Do not use #{make commit}# unless you are updating translations in this "
+"commit, and in that case, do not mix changes to the English manual and "
+"translations in the same commit, but use separate commits for each. See the "
+"{Translation}#translation section for more details."
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 "
-"atualizar os arquivos de tradução. "
#. type: Plain text
-#: en/about_manual.ssi:179
-#, no-wrap
-msgid " $ make commit\n"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:183
-msgid "_* Then"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:187
-#, no-wrap
-msgid " $ git add .\n"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:191
-#, fuzzy
-#| msgid ""
-#| "_* After sanitizing, commit the changes. Write commit messages that "
-#| "consist of full, useful sentences in English, starting with a capital "
-#| "letter and ending with a full stop. Usually, these will start with the "
-#| "form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
+#: en/about_manual.ssi:177
msgid ""
-"_* After sanitizing and adding the files, commit the changes. Write commit "
-"messages that consist of full, useful sentences in English, starting with a "
-"capital letter and ending with a full stop. Usually, these will start with "
-"the form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
+"_* 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 "
-"acabando com uma parada total. Normalmente iniciando com as formas 'Fixing/"
-"Adding/Removing/Correcting/Translating'."
+"_* Escreva mensagens de submissão, que consistem em sentanças completas "
+"úteis, começando por letra maiuscula e acabando com uma parada total. "
+"Normalmente iniciando com as formas 'Fixing/Adding/Removing/Correcting/"
+"Translating'."
#. type: Plain text
-#: en/about_manual.ssi:195
+#: en/about_manual.ssi:181
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:199
+#: en/about_manual.ssi:185
msgid "_* Push the commit to the server:"
msgstr "_* Enviar as submissões para os servidor."
#. type: Plain text
-#: en/about_manual.ssi:203
+#: en/about_manual.ssi:189
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:207
+#: en/about_manual.ssi:193
msgid "3~translation Translation"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:209
+#: en/about_manual.ssi:195
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:211
+#: en/about_manual.ssi:197
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 /"
@@ -752,14 +726,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:213
+#: en/about_manual.ssi:199
msgid ""
"_* Once the new language is added, you can randomly start translating all po "
"files in #{manual/po/}#."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:215
+#: en/about_manual.ssi:201
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
"are updated from the po files and then you can review your changes launching "
@@ -768,7 +742,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:216
+#: en/about_manual.ssi:202
#, no-wrap
msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
msgstr ""
diff --git a/manual/po/ro/about_manual.ssi.po b/manual/po/ro/about_manual.ssi.po
index c893b7e..e560a18 100644
--- a/manual/po/ro/about_manual.ssi.po
+++ b/manual/po/ro/about_manual.ssi.po
@@ -1,18 +1,20 @@
# Romanian translations for live-manual package
# 2010 Eugen Paiuc <linux51 at bluewin.ch>
# This file is distributed under the same license as the live-manual package.
+# Carlos Zuferri «chals» <chals at altorricon.com>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
-"PO-Revision-Date: 2010-10-23 10:34-0200\n"
-"Last-Translator: Eugen Paiuc <linux51 at bluewin.ch>\n"
-"Language-Team: none\n"
+"POT-Creation-Date: 2012-04-14 22:13+0300\n"
+"PO-Revision-Date: 2012-04-14 22:32+0200\n"
+"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
+"Language-Team: <debian-live at lists.debian.org>\n"
"Language: ro\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
#. type: Plain text
#: en/about_manual.ssi:2
@@ -381,8 +383,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -457,8 +458,7 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -669,76 +669,53 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:175
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:"
+"_* Do not use #{make commit}# unless you are updating translations in this "
+"commit, and in that case, do not mix changes to the English manual and "
+"translations in the same commit, but use separate commits for each. See the "
+"{Translation}#translation section for more details."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:179
-#, no-wrap
-msgid " $ make commit\n"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:183
-msgid "_* Then"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:187
-#, no-wrap
-msgid " $ git add .\n"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:191
-#, fuzzy
-#| msgid ""
-#| "_* After sanitizing, commit the changes. Write commit messages that "
-#| "consist of full, useful sentences in English, starting with a capital "
-#| "letter and ending with a full stop. Usually, these will start with the "
-#| "form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
+#: en/about_manual.ssi:177
msgid ""
-"_* After sanitizing and adding the files, commit the changes. Write commit "
-"messages that consist of full, useful sentences in English, starting with a "
-"capital letter and ending with a full stop. Usually, these will start with "
-"the form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
+"_* 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 "
-"punct si sens. Inceputul poate fii de forma 'Fixing/Adding/Removing/"
-"Correcting/Translating':"
+"_* Scrieti mesajele de commit, care constau in propozitii clare, care incep "
+"cu litere Mari, si se incheie cu punct si sens. Inceputul poate fii de forma "
+"'Fixing/Adding/Removing/Correcting/Translating':"
#. type: Plain text
-#: en/about_manual.ssi:195
+#: en/about_manual.ssi:181
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:199
+#: en/about_manual.ssi:185
msgid "_* Push the commit to the server:"
msgstr "_* Primite commit-ul la server:"
#. type: Plain text
-#: en/about_manual.ssi:203
+#: en/about_manual.ssi:189
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:207
+#: en/about_manual.ssi:193
msgid "3~translation Translation"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:209
+#: en/about_manual.ssi:195
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:211
+#: en/about_manual.ssi:197
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 /"
@@ -748,14 +725,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:213
+#: en/about_manual.ssi:199
msgid ""
"_* Once the new language is added, you can randomly start translating all po "
"files in #{manual/po/}#."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:215
+#: en/about_manual.ssi:201
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
"are updated from the po files and then you can review your changes launching "
@@ -764,7 +741,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:216
+#: en/about_manual.ssi:202
#, no-wrap
msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
msgstr ""
diff --git a/manual/pot/about_manual.ssi.pot b/manual/pot/about_manual.ssi.pot
index 319e444..6748379 100644
--- a/manual/pot/about_manual.ssi.pot
+++ b/manual/pot/about_manual.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-04-14 22:13+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -321,8 +321,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -397,8 +396,7 @@ msgstr ""
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -597,66 +595,50 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:175
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:"
+"_* Do not use #{make commit}# unless you are updating translations in this "
+"commit, and in that case, do not mix changes to the English manual and "
+"translations in the same commit, but use separate commits for each. See the "
+"{Translation}#translation section for more details."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:179
-#, no-wrap
-msgid " $ make commit\n"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:183
-msgid "_* Then"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:187
-#, no-wrap
-msgid " $ git add .\n"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:191
+#: en/about_manual.ssi:177
msgid ""
-"_* After sanitizing and adding the files, commit the changes. Write commit "
-"messages that consist of full, useful sentences in English, starting with a "
-"capital letter and ending with a full stop. Usually, these will start with "
-"the form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
+"_* 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:195
+#: en/about_manual.ssi:181
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:199
+#: en/about_manual.ssi:185
msgid "_* Push the commit to the server:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:203
+#: en/about_manual.ssi:189
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:207
+#: en/about_manual.ssi:193
msgid "3~translation Translation"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:209
+#: en/about_manual.ssi:195
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:211
+#: en/about_manual.ssi:197
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 /"
@@ -666,14 +648,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:213
+#: en/about_manual.ssi:199
msgid ""
"_* Once the new language is added, you can randomly start translating all po "
"files in #{manual/po/}#."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:215
+#: en/about_manual.ssi:201
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
"are updated from the po files and then you can review your changes launching "
@@ -682,7 +664,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:216
+#: en/about_manual.ssi:202
#, no-wrap
msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
msgstr ""
diff --git a/manual/pt_BR/about_manual.ssi b/manual/pt_BR/about_manual.ssi
index 1976fd7..5a10260 100644
--- a/manual/pt_BR/about_manual.ssi
+++ b/manual/pt_BR/about_manual.ssi
@@ -246,28 +246,15 @@ code{
_* Note that you should commit any changes on the debian-next branch, not on
the debian branch.
-_* 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.
-
-code{
-
- $ make commit
-
-}code
-
-_* Then
-
-code{
-
- $ git add .
-
-}code
-
-_* After sanitizing and adding the files, commit the changes. Write commit
-messages that consist of full, useful sentences in English, starting with a
-capital letter and ending with a full stop. Usually, these will start with
-the form 'Fixing/Adding/Removing/Correcting/Translating', e.g.
+_* Do not use #{make commit}# unless you are updating translations in this
+commit, and in that case, do not mix changes to the English manual and
+translations in the same commit, but use separate commits for each. See the
+{Translation}#translation section for more details.
+
+_* Escreva mensagens de submissão, que consistem em sentanças completas
+úteis, começando por letra maiuscula e acabando com uma parada
+total. Normalmente iniciando com as formas
+'Fixing/Adding/Removing/Correcting/Translating'.
code{
diff --git a/manual/ro/about_manual.ssi b/manual/ro/about_manual.ssi
index ddb73f7..b97ac64 100644
--- a/manual/ro/about_manual.ssi
+++ b/manual/ro/about_manual.ssi
@@ -242,28 +242,14 @@ code{
_* Note that you should commit any changes on the debian-next branch, not on
the debian branch.
-_* 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{
-
- $ make commit
-
-}code
-
-_* Then
-
-code{
-
- $ git add .
-
-}code
-
-_* After sanitizing and adding the files, commit the changes. Write commit
-messages that consist of full, useful sentences in English, starting with a
-capital letter and ending with a full stop. Usually, these will start with
-the form 'Fixing/Adding/Removing/Correcting/Translating', e.g.
+_* Do not use #{make commit}# unless you are updating translations in this
+commit, and in that case, do not mix changes to the English manual and
+translations in the same commit, but use separate commits for each. See the
+{Translation}#translation section for more details.
+
+_* Scrieti mesajele de commit, care constau in propozitii clare, care incep
+cu litere Mari, si se incheie cu punct si sens. Inceputul poate fii de forma
+'Fixing/Adding/Removing/Correcting/Translating':
code{
--
live-manual
More information about the debian-live-changes
mailing list