[SCM] live-manual branch, debian, updated. debian/3.0_a2-1-1-g5e42d35
Daniel Baumann
daniel at debian.org
Fri Mar 11 04:52:58 UTC 2011
The following commit has been merged in the debian branch:
commit 5e42d35704e07b198e01b88d4dd35c7912a7d889
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Mar 11 05:52:55 2011 +0100
Adding note about debian-next branch in git instructions.
diff --git a/manual/de/about_manual.ssi b/manual/de/about_manual.ssi
index e830b46..f069639 100644
--- a/manual/de/about_manual.ssi
+++ b/manual/de/about_manual.ssi
@@ -217,9 +217,13 @@ _* Check out a clone of the manual through ssh:
code{
$ git clone gitosis at live.debian.net:/live-manual.git
+ $ git checkout debian-next
}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:
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index 314a1aa..55f4edf 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-03-10
+ :published: 2011-03-11
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/en/about_manual.ssi b/manual/en/about_manual.ssi
index fed1390..2edd634 100644
--- a/manual/en/about_manual.ssi
+++ b/manual/en/about_manual.ssi
@@ -145,9 +145,12 @@ _* Check out a clone of the manual through ssh:
code{
$ git clone gitosis at live.debian.net:/live-manual.git
+ $ git checkout debian-next
}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{
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 478f01a..316f6d5 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-03-10
+ :published: 2011-03-11
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/es/about_manual.ssi b/manual/es/about_manual.ssi
index 234f8b6..329abd9 100644
--- a/manual/es/about_manual.ssi
+++ b/manual/es/about_manual.ssi
@@ -244,9 +244,13 @@ _* Obtener un clon del manual mediante git mediante ssh:
code{
$ git clone gitosis at live.debian.net:/live-manual.git
+ $ git checkout debian-next
}code
+_* Note that you should commit any changes on the debian-next branch, not on
+the debian branch.
+
_* Después de editar los ficheros que se deseen en #{manual/en/}#, llamar al
objetivo make "commit" en el directorio superior para sanear los ficheros y
actualizar los ficheros de traducciones:
diff --git a/manual/es/live-manual.ssm b/manual/es/live-manual.ssm
index 994f5b7..028351f 100644
--- a/manual/es/live-manual.ssm
+++ b/manual/es/live-manual.ssm
@@ -9,7 +9,7 @@
:licencia: Este programa es software libre: puede ser redistribuido y / o modificado bajo los términos de la GNU General Public License publicada por la Free Software Foundation, bien de la versión 3 de la Licencia, o (a su elección) cualquier versión posterior. <br><br> Este programa se distribuye con la esperanza de que sea útil, pero SIN NINGUNA GARANTÍA, incluso sin la garantía implícita de COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la GNU General Public License para más detalles. <br><br> Debería haber recibido una copia de la General Public License GNU junto con este programa. Si no, vea http://www.gnu.org/licenses/. <br><br> En los sistemas Debian, el texto completo de la GNU Licencia Pública General se pueden encontrar en / usr/share/common-licenses/GPL-3
@date:
- :published: 2011-03-10
+ :published: 2011-03-11
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/fr/about_manual.ssi b/manual/fr/about_manual.ssi
index 3b42297..0ace176 100644
--- a/manual/fr/about_manual.ssi
+++ b/manual/fr/about_manual.ssi
@@ -223,9 +223,13 @@ _* Clonez le manuel via ssh:
code{
$ git clone gitosis at live.debian.net:/live-manual.git
+ $ git checkout debian-next
}code
+_* Note that you should commit any changes on the debian-next branch, not on
+the debian branch.
+
_* Après édition des fichiers dans manual/en/, veuillez appeler 'commit'
dans le dossier racine du répertoire afin de de nettoyer les fichier et de
mettre à jour les fichiers de traduction:
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index 478f01a..316f6d5 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-03-10
+ :published: 2011-03-11
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/it/about_manual.ssi b/manual/it/about_manual.ssi
index 7c280a0..8fd4d71 100644
--- a/manual/it/about_manual.ssi
+++ b/manual/it/about_manual.ssi
@@ -223,9 +223,13 @@ _* Scaricare tramite ssh un clone del manuale:
code{
$ git clone gitosis at live.debian.net:/live-manual.git
+ $ git checkout debian-next
}code
+_* Note that you should commit any changes on the debian-next branch, not on
+the debian branch.
+
_* 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:
diff --git a/manual/it/live-manual.ssm b/manual/it/live-manual.ssm
index 832670e..74ae43e 100644
--- a/manual/it/live-manual.ssm
+++ b/manual/it/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Questo programma è software libero: è possibile ridistribuirlo e modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, sia la versione 3 della licenza o (a scelta) una versione successiva.<br><br>Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori dettagli.<br><br>Si dovrebbe aver ricevuto una copia della GNU General Public License con questo programma. In caso contrario, vedere http://www.gnu.org/licenses/. <br><br>Sui sistemi Debian, il testo completo della GNU General Public License può essere trovato nel file /usr/share/common-licenses/GPL-3.
@date:
- :published: 2011-03-10
+ :published: 2011-03-11
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/po/de/about_manual.ssi.po b/manual/po/de/about_manual.ssi.po
index 39e11b6..fb5ab7e 100644
--- a/manual/po/de/about_manual.ssi.po
+++ b/manual/po/de/about_manual.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-02-17 17:32-0400\n"
+"POT-Creation-Date: 2011-03-11 05:48+0100\n"
"PO-Revision-Date: 2010-10-22 08:36-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -308,8 +308,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -377,8 +377,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -532,13 +532,22 @@ msgid "_* Check out a clone of the manual through ssh:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:148
+#: en/about_manual.ssi:149
#, no-wrap
-msgid " $ git clone gitosis at live.debian.net:/live-manual.git\n"
+msgid ""
+" $ git clone gitosis at live.debian.net:/live-manual.git\n"
+" $ git checkout debian-next\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:152
+#: en/about_manual.ssi:153
+msgid ""
+"_* Note that you should commit any changes on the debian-next branch, not on "
+"the debian branch."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:155
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 "
@@ -546,13 +555,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:159
#, no-wrap
msgid " $ make commit\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:163
msgid ""
"_* After sanitizing, commit the changes. Write commit messages that consist "
"of full, useful sentences in English, starting with a capital letter and "
@@ -561,34 +570,34 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:164
+#: en/about_manual.ssi:167
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:168
+#: en/about_manual.ssi:171
msgid "_* Push the commit to the server:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:172
+#: en/about_manual.ssi:175
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:176
+#: en/about_manual.ssi:179
msgid "3~ Translation"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:178
+#: en/about_manual.ssi:181
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:180
+#: en/about_manual.ssi:183
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). "
@@ -598,14 +607,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:182
+#: en/about_manual.ssi:185
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:183
+#: en/about_manual.ssi:186
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}#."
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index b8f0ae3..64985b9 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-03-10 06:26+0100\n"
+"POT-Creation-Date: 2011-03-11 05:48+0100\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-03-10\n"
+" :published: 2011-03-11\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/es/about_manual.ssi.po b/manual/po/es/about_manual.ssi.po
index a75b9b4..830d950 100644
--- a/manual/po/es/about_manual.ssi.po
+++ b/manual/po/es/about_manual.ssi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-17 17:32-0400\n"
+"POT-Creation-Date: 2011-03-11 05:48+0100\n"
"PO-Revision-Date: 2011-03-02 04:53-0000\n"
"Last-Translator: José Luis Zabalza <jlz.3008 at gmail.com>\n"
"Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -423,8 +423,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -492,8 +492,8 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -675,13 +675,24 @@ msgid "_* Check out a clone of the manual through ssh:"
msgstr "_* Obtener un clon del manual mediante git mediante ssh:\n"
#. type: Plain text
-#: en/about_manual.ssi:148
+#: en/about_manual.ssi:149
#, no-wrap
-msgid " $ git clone gitosis at live.debian.net:/live-manual.git\n"
-msgstr " $ git clone gitosis at live.debian.net:/live-manual.git\n"
+msgid ""
+" $ git clone gitosis at live.debian.net:/live-manual.git\n"
+" $ git checkout debian-next\n"
+msgstr ""
+" $ git clone gitosis at live.debian.net:/live-manual.git\n"
+" $ git checkout debian-next\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:153
+msgid ""
+"_* Note that you should commit any changes on the debian-next branch, not on "
+"the debian branch."
+msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:152
+#: en/about_manual.ssi:155
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 "
@@ -692,13 +703,13 @@ msgstr ""
"y actualizar los ficheros de traducciones:\n"
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:159
#, no-wrap
msgid " $ make commit\n"
msgstr " $ make commit\n"
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:163
msgid ""
"_* After sanitizing, commit the changes. Write commit messages that consist "
"of full, useful sentences in English, starting with a capital letter and "
@@ -712,38 +723,38 @@ msgstr ""
"Correcting/Translating', por ejemplo:\n"
#. type: Plain text
-#: en/about_manual.ssi:164
+#: en/about_manual.ssi:167
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr "$ git commit -a -m \"Adding a section on applying patches.\"\n"
#. type: Plain text
-#: en/about_manual.ssi:168
+#: en/about_manual.ssi:171
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:172
+#: en/about_manual.ssi:175
#, no-wrap
msgid " $ git push\n"
msgstr " $ git push\n"
#. type: Plain text
-#: en/about_manual.ssi:176
+#: en/about_manual.ssi:179
msgid "3~ Translation"
msgstr "3~ Traducciones"
#. type: Plain text
-#: en/about_manual.ssi:178
+#: en/about_manual.ssi:181
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:180
+#: en/about_manual.ssi:183
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). "
@@ -758,7 +769,7 @@ msgstr ""
"autobuild."
#. type: Plain text
-#: en/about_manual.ssi:182
+#: en/about_manual.ssi:185
msgid ""
"_* Once the new language is added, you can randomly start translating all po "
"files in #{manual/po/}#."
@@ -768,7 +779,7 @@ msgstr ""
"aleatoria."
#. type: Plain text
-#: en/about_manual.ssi:183
+#: en/about_manual.ssi:186
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}#."
diff --git a/manual/po/es/live-manual.ssm.po b/manual/po/es/live-manual.ssm.po
index 5d1af37..fc2233f 100644
--- a/manual/po/es/live-manual.ssm.po
+++ b/manual/po/es/live-manual.ssm.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-03-10 06:26+0100\n"
+"POT-Creation-Date: 2011-03-11 05:48+0100\n"
"PO-Revision-Date: 2011-03-04 05:26-0000\n"
"Last-Translator: José Luis Zabalza <jlz.3008 at gmail.com>\n"
"Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -50,7 +50,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-03-10\n"
+" :published: 2011-03-11\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/about_manual.ssi.po b/manual/po/fr/about_manual.ssi.po
index 31504c4..d6aee79 100644
--- a/manual/po/fr/about_manual.ssi.po
+++ b/manual/po/fr/about_manual.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-02-17 17:32-0400\n"
+"POT-Creation-Date: 2011-03-11 05:48+0100\n"
"PO-Revision-Date: 2010-10-27 23:14+0200\n"
"Last-Translator: Creak <romain.failliot at foolstep.com>\n"
"Language-Team: Français <debian-live at lists.debian.org>\n"
@@ -369,8 +369,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -438,8 +438,8 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -602,13 +602,24 @@ msgid "_* Check out a clone of the manual through ssh:"
msgstr "_* Clonez le manuel via ssh:"
#. type: Plain text
-#: en/about_manual.ssi:148
+#: en/about_manual.ssi:149
#, no-wrap
-msgid " $ git clone gitosis at live.debian.net:/live-manual.git\n"
+msgid ""
+" $ git clone gitosis at live.debian.net:/live-manual.git\n"
+" $ git checkout debian-next\n"
msgstr ""
+" $ git clone gitosis at live.debian.net:/live-manual.git\n"
+" $ git checkout debian-next\n"
#. type: Plain text
-#: en/about_manual.ssi:152
+#: en/about_manual.ssi:153
+msgid ""
+"_* Note that you should commit any changes on the debian-next branch, not on "
+"the debian branch."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:155
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 "
@@ -619,13 +630,13 @@ msgstr ""
"mettre à jour les fichiers de traduction:"
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:159
#, no-wrap
msgid " $ make commit\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:163
msgid ""
"_* After sanitizing, commit the changes. Write commit messages that consist "
"of full, useful sentences in English, starting with a capital letter and "
@@ -638,34 +649,34 @@ msgstr ""
"Removing/Correcting/Translating':"
#. type: Plain text
-#: en/about_manual.ssi:164
+#: en/about_manual.ssi:167
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:168
+#: en/about_manual.ssi:171
msgid "_* Push the commit to the server:"
msgstr "_* Envoyez votre commit au serveur:"
#. type: Plain text
-#: en/about_manual.ssi:172
+#: en/about_manual.ssi:175
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:176
+#: en/about_manual.ssi:179
msgid "3~ Translation"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:178
+#: en/about_manual.ssi:181
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:180
+#: en/about_manual.ssi:183
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). "
@@ -675,14 +686,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:182
+#: en/about_manual.ssi:185
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:183
+#: en/about_manual.ssi:186
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}#."
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index 4a53e6f..cf715bc 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-03-10 06:26+0100\n"
+"POT-Creation-Date: 2011-03-11 05:48+0100\n"
"PO-Revision-Date: 2010-10-21 07:06-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-03-10\n"
+" :published: 2011-03-11\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/it/about_manual.ssi.po b/manual/po/it/about_manual.ssi.po
index 82a3018..060f5e7 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: 2011-02-17 17:32-0400\n"
+"POT-Creation-Date: 2011-03-11 05:48+0100\n"
"PO-Revision-Date: 2010-12-11 02:34+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -396,8 +396,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -465,8 +465,8 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -634,13 +634,24 @@ msgid "_* Check out a clone of the manual through ssh:"
msgstr "_* Scaricare tramite ssh un clone del manuale:"
#. type: Plain text
-#: en/about_manual.ssi:148
+#: en/about_manual.ssi:149
#, no-wrap
-msgid " $ git clone gitosis at live.debian.net:/live-manual.git\n"
+msgid ""
+" $ git clone gitosis at live.debian.net:/live-manual.git\n"
+" $ git checkout debian-next\n"
msgstr ""
+" $ git clone gitosis at live.debian.net:/live-manual.git\n"
+" $ git checkout debian-next\n"
#. type: Plain text
-#: en/about_manual.ssi:152
+#: en/about_manual.ssi:153
+msgid ""
+"_* Note that you should commit any changes on the debian-next branch, not on "
+"the debian branch."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:155
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 "
@@ -651,13 +662,13 @@ msgstr ""
"traduzione:"
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:159
#, no-wrap
msgid " $ make commit\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:163
msgid ""
"_* After sanitizing, commit the changes. Write commit messages that consist "
"of full, useful sentences in English, starting with a capital letter and "
@@ -671,35 +682,35 @@ msgstr ""
"ad esempio."
#. type: Plain text
-#: en/about_manual.ssi:164
+#: en/about_manual.ssi:167
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:168
+#: en/about_manual.ssi:171
msgid "_* Push the commit to the server:"
msgstr "_* Inviare il commit al server:"
#. type: Plain text
-#: en/about_manual.ssi:172
+#: en/about_manual.ssi:175
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:176
+#: en/about_manual.ssi:179
msgid "3~ Translation"
msgstr "3~ Traduzione"
#. type: Plain text
-#: en/about_manual.ssi:178
+#: en/about_manual.ssi:181
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:180
+#: en/about_manual.ssi:183
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). "
@@ -714,7 +725,7 @@ msgstr ""
"la attiveremo per la procedura di compilazione automatica."
#. type: Plain text
-#: en/about_manual.ssi:182
+#: en/about_manual.ssi:185
msgid ""
"_* Once the new language is added, you can randomly start translating all po "
"files in #{manual/po/}#."
@@ -724,7 +735,7 @@ msgstr ""
"preferisce."
#. type: Plain text
-#: en/about_manual.ssi:183
+#: en/about_manual.ssi:186
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}#."
diff --git a/manual/po/it/live-manual.ssm.po b/manual/po/it/live-manual.ssm.po
index 8d6a387..e32a75c 100644
--- a/manual/po/it/live-manual.ssm.po
+++ b/manual/po/it/live-manual.ssm.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-03-10 06:26+0100\n"
+"POT-Creation-Date: 2011-03-11 05:48+0100\n"
"PO-Revision-Date: 2011-01-03 16:23+0100\n"
"Last-Translator: Carlo Stemberger <carlo.stemberger at gmail.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -49,7 +49,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-03-10\n"
+" :published: 2011-03-11\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/about_manual.ssi.po b/manual/po/pt_BR/about_manual.ssi.po
index cfaf206..4775a9f 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: 2011-02-17 17:32-0400\n"
+"POT-Creation-Date: 2011-03-11 05:48+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"
@@ -359,8 +359,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -428,8 +428,8 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -592,13 +592,24 @@ msgid "_* Check out a clone of the manual through ssh:"
msgstr "_* Fazer o checkout de um clone do manual por ssh:"
#. type: Plain text
-#: en/about_manual.ssi:148
+#: en/about_manual.ssi:149
#, no-wrap
-msgid " $ git clone gitosis at live.debian.net:/live-manual.git\n"
+msgid ""
+" $ git clone gitosis at live.debian.net:/live-manual.git\n"
+" $ git checkout debian-next\n"
msgstr ""
+" $ git clone gitosis at live.debian.net:/live-manual.git\n"
+" $ git checkout debian-next\n"
#. type: Plain text
-#: en/about_manual.ssi:152
+#: en/about_manual.ssi:153
+msgid ""
+"_* Note that you should commit any changes on the debian-next branch, not on "
+"the debian branch."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:155
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 "
@@ -609,13 +620,13 @@ msgstr ""
"atualizar os arquivos de tradução. "
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:159
#, no-wrap
msgid " $ make commit\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:163
msgid ""
"_* After sanitizing, commit the changes. Write commit messages that consist "
"of full, useful sentences in English, starting with a capital letter and "
@@ -628,34 +639,34 @@ msgstr ""
"Adding/Removing/Correcting/Translating'."
#. type: Plain text
-#: en/about_manual.ssi:164
+#: en/about_manual.ssi:167
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:168
+#: en/about_manual.ssi:171
msgid "_* Push the commit to the server:"
msgstr "_* Enviar as submissões para os servidor."
#. type: Plain text
-#: en/about_manual.ssi:172
+#: en/about_manual.ssi:175
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:176
+#: en/about_manual.ssi:179
msgid "3~ Translation"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:178
+#: en/about_manual.ssi:181
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:180
+#: en/about_manual.ssi:183
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). "
@@ -665,14 +676,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:182
+#: en/about_manual.ssi:185
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:183
+#: en/about_manual.ssi:186
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}#."
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index 02f7002..7430353 100644
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-03-10 06:26+0100\n"
+"POT-Creation-Date: 2011-03-11 05:48+0100\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-03-10\n"
+" :published: 2011-03-11\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/about_manual.ssi.po b/manual/po/ro/about_manual.ssi.po
index fcd3449..196d0d2 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: 2011-02-17 17:32-0400\n"
+"POT-Creation-Date: 2011-03-11 05:48+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"
@@ -359,8 +359,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -428,8 +428,8 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -591,13 +591,24 @@ msgid "_* Check out a clone of the manual through ssh:"
msgstr "_* Checkout un clon al manualului prin ssh:"
#. type: Plain text
-#: en/about_manual.ssi:148
+#: en/about_manual.ssi:149
#, no-wrap
-msgid " $ git clone gitosis at live.debian.net:/live-manual.git\n"
+msgid ""
+" $ git clone gitosis at live.debian.net:/live-manual.git\n"
+" $ git checkout debian-next\n"
msgstr ""
+" $ git clone gitosis at live.debian.net:/live-manual.git\n"
+" $ git checkout debian-next\n"
#. type: Plain text
-#: en/about_manual.ssi:152
+#: en/about_manual.ssi:153
+msgid ""
+"_* Note that you should commit any changes on the debian-next branch, not on "
+"the debian branch."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:155
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 "
@@ -605,13 +616,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:159
#, no-wrap
msgid " $ make commit\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:163
msgid ""
"_* After sanitizing, commit the changes. Write commit messages that consist "
"of full, useful sentences in English, starting with a capital letter and "
@@ -624,34 +635,34 @@ msgstr ""
"Correcting/Translating':"
#. type: Plain text
-#: en/about_manual.ssi:164
+#: en/about_manual.ssi:167
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:168
+#: en/about_manual.ssi:171
msgid "_* Push the commit to the server:"
msgstr "_* Primite commit-ul la server:"
#. type: Plain text
-#: en/about_manual.ssi:172
+#: en/about_manual.ssi:175
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:176
+#: en/about_manual.ssi:179
msgid "3~ Translation"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:178
+#: en/about_manual.ssi:181
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:180
+#: en/about_manual.ssi:183
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). "
@@ -661,14 +672,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:182
+#: en/about_manual.ssi:185
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:183
+#: en/about_manual.ssi:186
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}#."
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index d42b3d7..9783981 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-03-10 06:26+0100\n"
+"POT-Creation-Date: 2011-03-11 05:48+0100\n"
"PO-Revision-Date: 2010-10-23 00:04+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -46,7 +46,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-03-10\n"
+" :published: 2011-03-11\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/about_manual.ssi.pot b/manual/pot/about_manual.ssi.pot
index 29757a2..c96a221 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: 2011-02-17 17:32-0400\n"
+"POT-Creation-Date: 2011-03-11 05:48+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"
@@ -308,8 +308,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -377,8 +377,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -532,13 +532,22 @@ msgid "_* Check out a clone of the manual through ssh:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:148
+#: en/about_manual.ssi:149
#, no-wrap
-msgid " $ git clone gitosis at live.debian.net:/live-manual.git\n"
+msgid ""
+" $ git clone gitosis at live.debian.net:/live-manual.git\n"
+" $ git checkout debian-next\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:152
+#: en/about_manual.ssi:153
+msgid ""
+"_* Note that you should commit any changes on the debian-next branch, not on "
+"the debian branch."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:155
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 "
@@ -546,13 +555,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:159
#, no-wrap
msgid " $ make commit\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:163
msgid ""
"_* After sanitizing, commit the changes. Write commit messages that consist "
"of full, useful sentences in English, starting with a capital letter and "
@@ -561,34 +570,34 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:164
+#: en/about_manual.ssi:167
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:168
+#: en/about_manual.ssi:171
msgid "_* Push the commit to the server:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:172
+#: en/about_manual.ssi:175
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:176
+#: en/about_manual.ssi:179
msgid "3~ Translation"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:178
+#: en/about_manual.ssi:181
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:180
+#: en/about_manual.ssi:183
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). "
@@ -598,14 +607,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:182
+#: en/about_manual.ssi:185
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:183
+#: en/about_manual.ssi:186
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}#."
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index d2ef75c..ecebcde 100644
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-03-10 06:26+0100\n"
+"POT-Creation-Date: 2011-03-11 05:48+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"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-03-10\n"
+" :published: 2011-03-11\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pt_BR/about_manual.ssi b/manual/pt_BR/about_manual.ssi
index 45fcba4..51d53b9 100644
--- a/manual/pt_BR/about_manual.ssi
+++ b/manual/pt_BR/about_manual.ssi
@@ -221,9 +221,13 @@ _* Fazer o checkout de um clone do manual por ssh:
code{
$ git clone gitosis at live.debian.net:/live-manual.git
+ $ git checkout debian-next
}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.
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index 478f01a..316f6d5 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-03-10
+ :published: 2011-03-11
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/ro/about_manual.ssi b/manual/ro/about_manual.ssi
index 908fecb..9514a3a 100644
--- a/manual/ro/about_manual.ssi
+++ b/manual/ro/about_manual.ssi
@@ -216,9 +216,13 @@ _* Checkout un clon al manualului prin ssh:
code{
$ git clone gitosis at live.debian.net:/live-manual.git
+ $ git checkout debian-next
}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:
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index 478f01a..316f6d5 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-03-10
+ :published: 2011-03-11
@publisher: Debian Live Project <debian-live at lists.debian.org>
--
live-manual
More information about the debian-live-changes
mailing list