[SCM] live-manual branch, debian-next, updated. debian/3.0_a9-1-38-g1bb3664

chals chals at altorricon.com
Sun Feb 5 16:25:01 UTC 2012 

The following commit has been merged in the debian-next branch:
commit 1bb366430afe94494eae1099a98e8f2455c517c3
Author: chals <chals at altorricon.com>
Date:   Sun Feb 5 17:24:44 2012 +0100

    Clarifying section 1.4.2 Translation.

diff --git a/manual/de/about_manual.ssi b/manual/de/about_manual.ssi
index df05cbc..d01ce5b 100644
--- a/manual/de/about_manual.ssi
+++ b/manual/de/about_manual.ssi
@@ -293,4 +293,8 @@ _* Once the new language is added, you can randomly start translating all po
 files in #{manual/po/}#.
 
 _* Don't forget you need #{make commit}# to ensure the translated manuals
-are updated from the po files, before #{git commit -a}# and #{git push}#.
+are updated from the po files and then you can review your changes launching
+#{make build}# before #{git add .}#, #{git commit -a -m "Translating..."}#
+and #{git push}#.
+
+*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.
diff --git a/manual/en/about_manual.ssi b/manual/en/about_manual.ssi
index 0618ddf..966b3f3 100644
--- a/manual/en/about_manual.ssi
+++ b/manual/en/about_manual.ssi
@@ -207,4 +207,6 @@ _* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html.in.p
 
 _* Once the new language is added, you can randomly start translating all po files in #{manual/po/}#.
 
-_* Don't forget you need #{make commit}# to ensure the translated manuals are updated from the po files, before #{git commit -a}# and #{git push}#.
+_* Don't forget you need #{make commit}# to ensure the translated manuals are updated from the po files and then you can review your changes launching #{make build}# before #{git add .}#, #{git commit -a -m "Translating..."}# and #{git push}#.
+
+*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.
diff --git a/manual/es/about_manual.ssi b/manual/es/about_manual.ssi
index 4f1ce65..c965ef3 100644
--- a/manual/es/about_manual.ssi
+++ b/manual/es/about_manual.ssi
@@ -327,6 +327,9 @@ _* Una vez que el nuevo idioma haya sido añadido, se puede comenzar la
 traducción de todos los ficheros .po exisitentes en #{manual/po/}# de manera
 aleatoria.
 
-_* No se debe olvidar la ejecución del comando #{make commit}# para asegurar
-que los manuales traducidos son actualizados desde los ficheros .po, antes
-de realizar la entrega mediante #{git commit -a}# y #{git push}#.
+_* Don't forget you need #{make commit}# to ensure the translated manuals
+are updated from the po files and then you can review your changes launching
+#{make build}# before #{git add .}#, #{git commit -a -m "Translating..."}#
+and #{git push}#.
+
+*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.
diff --git a/manual/fr/about_manual.ssi b/manual/fr/about_manual.ssi
index a3325f7..9f7596a 100644
--- a/manual/fr/about_manual.ssi
+++ b/manual/fr/about_manual.ssi
@@ -304,6 +304,9 @@ au manuel (avec les fichiers po) et l'activer dans l'autobuild.
 _* Une fois la nouvelle langue est ajoutée, vous pouvez commencer à traduire
 de façon aléatoire tous les fichiers po dans #{manual/po/}#.
 
-_* N'oubliez pas que vous devez faire un #{make commit}# pour assurer que la
-traduction des manuels sont mis à jour à partir des fichiers po, avant #{git
-commit -a}# et #{git push}#.
+_* Don't forget you need #{make commit}# to ensure the translated manuals
+are updated from the po files and then you can review your changes launching
+#{make build}# before #{git add .}#, #{git commit -a -m "Translating..."}#
+and #{git push}#.
+
+*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.
diff --git a/manual/it/about_manual.ssi b/manual/it/about_manual.ssi
index 67550a6..f2d6ca5 100644
--- a/manual/it/about_manual.ssi
+++ b/manual/it/about_manual.ssi
@@ -300,6 +300,9 @@ _* Una volta che la nuova lingua è stata aggiunta, si può iniziare a
 tradurre tutti i file po situati in #{manual/po/}#, nell'ordine che si
 preferisce.
 
-_* Non si dimentichi che è necessario dare un #{make commit}# per
-assicurarsi che i manuali tradotti siano aggiornati partendo dai file po,
-prima di #{git commit -a}# e #{git push}#.
+_* Don't forget you need #{make commit}# to ensure the translated manuals
+are updated from the po files and then you can review your changes launching
+#{make build}# before #{git add .}#, #{git commit -a -m "Translating..."}#
+and #{git push}#.
+
+*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.
diff --git a/manual/po/de/about_manual.ssi.po b/manual/po/de/about_manual.ssi.po
index a212f03..11139d2 100644
--- a/manual/po/de/about_manual.ssi.po
+++ b/manual/po/de/about_manual.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-01-20 23:56+0100\n"
+"POT-Creation-Date: 2012-02-05 17:13+0100\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -655,8 +655,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:210
+#: en/about_manual.ssi:211
 msgid ""
 "_* Don't forget you need #{make commit}# to ensure the translated manuals "
-"are updated from the po files, before #{git commit -a}# and #{git push}#."
+"are updated from the po files and then you can review your changes launching "
+"#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
+"and #{git push}#."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:212
+#, no-wrap
+msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
 msgstr ""
diff --git a/manual/po/es/about_manual.ssi.po b/manual/po/es/about_manual.ssi.po
index 353ab3d..eddff20 100644
--- a/manual/po/es/about_manual.ssi.po
+++ b/manual/po/es/about_manual.ssi.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-20 23:56+0100\n"
+"POT-Creation-Date: 2012-02-05 17:13+0100\n"
 "PO-Revision-Date: 2012-01-20 23:49+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -832,11 +832,23 @@ msgstr ""
 "aleatoria."
 
 #. type: Plain text
-#: en/about_manual.ssi:210
+#: en/about_manual.ssi:211
+#, fuzzy
+#| msgid ""
+#| "_* Don't forget you need #{make commit}# to ensure the translated manuals "
+#| "are updated from the po files, before #{git commit -a}# and #{git push}#."
 msgid ""
 "_* Don't forget you need #{make commit}# to ensure the translated manuals "
-"are updated from the po files, before #{git commit -a}# and #{git push}#."
+"are updated from the po files and then you can review your changes launching "
+"#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
+"and #{git push}#."
 msgstr ""
 "_* No se debe olvidar la ejecución del comando #{make commit}# para asegurar "
 "que los manuales traducidos son actualizados desde los ficheros .po, antes "
 "de realizar la entrega mediante #{git commit -a}# y #{git push}#."
+
+#. type: Plain text
+#: en/about_manual.ssi:212
+#, no-wrap
+msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
+msgstr ""
diff --git a/manual/po/fr/about_manual.ssi.po b/manual/po/fr/about_manual.ssi.po
index 224b1de..e0c17ed 100644
--- a/manual/po/fr/about_manual.ssi.po
+++ b/manual/po/fr/about_manual.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-20 23:56+0100\n"
+"POT-Creation-Date: 2012-02-05 17:13+0100\n"
 "PO-Revision-Date: 2012-01-20 23:52+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -786,11 +786,23 @@ msgstr ""
 "de façon aléatoire tous les fichiers po dans #{manual/po/}#."
 
 #. type: Plain text
-#: en/about_manual.ssi:210
+#: en/about_manual.ssi:211
+#, fuzzy
+#| msgid ""
+#| "_* Don't forget you need #{make commit}# to ensure the translated manuals "
+#| "are updated from the po files, before #{git commit -a}# and #{git push}#."
 msgid ""
 "_* Don't forget you need #{make commit}# to ensure the translated manuals "
-"are updated from the po files, before #{git commit -a}# and #{git push}#."
+"are updated from the po files and then you can review your changes launching "
+"#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
+"and #{git push}#."
 msgstr ""
 "_* N'oubliez pas que vous devez faire un #{make commit}# pour assurer que la "
 "traduction des manuels sont mis à jour à partir des fichiers po, avant #{git "
 "commit -a}# et #{git push}#."
+
+#. type: Plain text
+#: en/about_manual.ssi:212
+#, no-wrap
+msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
+msgstr ""
diff --git a/manual/po/it/about_manual.ssi.po b/manual/po/it/about_manual.ssi.po
index 655875d..1bee4d9 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-01-20 23:56+0100\n"
+"POT-Creation-Date: 2012-02-05 17:13+0100\n"
 "PO-Revision-Date: 2012-01-07 17:23+0100\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -782,11 +782,23 @@ msgstr ""
 "preferisce."
 
 #. type: Plain text
-#: en/about_manual.ssi:210
+#: en/about_manual.ssi:211
+#, fuzzy
+#| msgid ""
+#| "_* Don't forget you need #{make commit}# to ensure the translated manuals "
+#| "are updated from the po files, before #{git commit -a}# and #{git push}#."
 msgid ""
 "_* Don't forget you need #{make commit}# to ensure the translated manuals "
-"are updated from the po files, before #{git commit -a}# and #{git push}#."
+"are updated from the po files and then you can review your changes launching "
+"#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
+"and #{git push}#."
 msgstr ""
 "_* Non si dimentichi che è necessario dare un #{make commit}# per "
 "assicurarsi che i manuali tradotti siano aggiornati partendo dai file po, "
 "prima di #{git commit -a}# e #{git push}#."
+
+#. type: Plain text
+#: en/about_manual.ssi:212
+#, no-wrap
+msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
+msgstr ""
diff --git a/manual/po/pt_BR/about_manual.ssi.po b/manual/po/pt_BR/about_manual.ssi.po
index e628e7d..a95f572 100644
--- a/manual/po/pt_BR/about_manual.ssi.po
+++ b/manual/po/pt_BR/about_manual.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-20 23:56+0100\n"
+"POT-Creation-Date: 2012-02-05 17:13+0100\n"
 "PO-Revision-Date: 2010-10-22 18:16-0300\n"
 "Last-Translator: Bruno Gurgel <bruno.gurgel at gmail.com>\n"
 "Language-Team: none\n"
@@ -732,8 +732,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:210
+#: en/about_manual.ssi:211
 msgid ""
 "_* Don't forget you need #{make commit}# to ensure the translated manuals "
-"are updated from the po files, before #{git commit -a}# and #{git push}#."
+"are updated from the po files and then you can review your changes launching "
+"#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
+"and #{git push}#."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:212
+#, no-wrap
+msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
 msgstr ""
diff --git a/manual/po/ro/about_manual.ssi.po b/manual/po/ro/about_manual.ssi.po
index b945fea..26b3a1c 100644
--- a/manual/po/ro/about_manual.ssi.po
+++ b/manual/po/ro/about_manual.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-20 23:56+0100\n"
+"POT-Creation-Date: 2012-02-05 17:13+0100\n"
 "PO-Revision-Date: 2010-10-23 10:34-0200\n"
 "Last-Translator: Eugen Paiuc <linux51 at bluewin.ch>\n"
 "Language-Team: none\n"
@@ -728,8 +728,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:210
+#: en/about_manual.ssi:211
 msgid ""
 "_* Don't forget you need #{make commit}# to ensure the translated manuals "
-"are updated from the po files, before #{git commit -a}# and #{git push}#."
+"are updated from the po files and then you can review your changes launching "
+"#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
+"and #{git push}#."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:212
+#, no-wrap
+msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
 msgstr ""
diff --git a/manual/pot/about_manual.ssi.pot b/manual/pot/about_manual.ssi.pot
index d300969..3168cab 100644
--- a/manual/pot/about_manual.ssi.pot
+++ b/manual/pot/about_manual.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-01-20 23:56+0100\n"
+"POT-Creation-Date: 2012-02-05 17:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -655,8 +655,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:210
+#: en/about_manual.ssi:211
 msgid ""
 "_* Don't forget you need #{make commit}# to ensure the translated manuals "
-"are updated from the po files, before #{git commit -a}# and #{git push}#."
+"are updated from the po files and then you can review your changes launching "
+"#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
+"and #{git push}#."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:212
+#, no-wrap
+msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
 msgstr ""
diff --git a/manual/pt_BR/about_manual.ssi b/manual/pt_BR/about_manual.ssi
index 74ca9bd..bff4e4c 100644
--- a/manual/pt_BR/about_manual.ssi
+++ b/manual/pt_BR/about_manual.ssi
@@ -297,4 +297,8 @@ _* Once the new language is added, you can randomly start translating all po
 files in #{manual/po/}#.
 
 _* Don't forget you need #{make commit}# to ensure the translated manuals
-are updated from the po files, before #{git commit -a}# and #{git push}#.
+are updated from the po files and then you can review your changes launching
+#{make build}# before #{git add .}#, #{git commit -a -m "Translating..."}#
+and #{git push}#.
+
+*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.
diff --git a/manual/ro/about_manual.ssi b/manual/ro/about_manual.ssi
index 25604b4..a4bbbda 100644
--- a/manual/ro/about_manual.ssi
+++ b/manual/ro/about_manual.ssi
@@ -292,4 +292,8 @@ _* Once the new language is added, you can randomly start translating all po
 files in #{manual/po/}#.
 
 _* Don't forget you need #{make commit}# to ensure the translated manuals
-are updated from the po files, before #{git commit -a}# and #{git push}#.
+are updated from the po files and then you can review your changes launching
+#{make build}# before #{git add .}#, #{git commit -a -m "Translating..."}#
+and #{git push}#.
+
+*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.

-- 
live-manual

More information about the debian-live-changes mailing list