[SCM] live-manual branch, debian, updated. debian/2.0_a12-1-48-g84fddc5

Daniel Baumann daniel at debian.org
Sat Dec 11 15:43:10 UTC 2010


The following commit has been merged in the debian branch:
commit 84fddc5bd4b78327f5812ce9eff8fcc77fb8353d
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Dec 11 16:43:02 2010 +0100

    Fixing up fuzzy strings in French.

diff --git a/manual/fr/about_manual.ssi b/manual/fr/about_manual.ssi
index 895b966..b53704a 100644
--- a/manual/fr/about_manual.ssi
+++ b/manual/fr/about_manual.ssi
@@ -132,18 +132,18 @@ _* Trent W. Buck
 
 2~ Contribuer à ce document
 
-This manual is intended as a community project and all proposals for
-improvements and contributions are extremely welcome. The preferred way to
-submit a contribution is to send it to the mailing list. Please see the
-section {Contact}#contact for more information.
+Ce manuel est conçu comme un projet communautaire et toutes les propositions
+d'améliorations et de contributions sont les bienvenues. La meilleure façon
+de soumettre une contribution est de l'envoyer à la liste de diffusion. S'il
+vous plaît voir {Contact}#contact pour plus d'informations.
 
 Lorsque vous soumettez une contribution, veuillez indiquer clairement le
 copyright et inclure la mention légale relative à la licence. Notez que pour
 être acceptée, la contribution doit être déposée sous la même licence que le
 reste du document, c'est-à-dire la GPL version 3 ou ultérieure.
 
-The sources for this manual are maintained using the Git version control
-system. You can check out the latest copy by executing:
+Les sources de ce manuel sont maintenues à l'aide du logiciel de gestion de
+versions Git. Vous pouvez obtenir la dernière copie en exécutant:
 
 code{
 
@@ -161,8 +161,8 @@ code{
 
 }code
 
-You may build the live-manual from the top level directory of your Git
-checkout by executing:
+Vous pouvez compiler live-manual depuis le répertoire racine de votre
+checkout git en exécutant:
 
 code{
 
@@ -182,9 +182,10 @@ $ make build LANGUAGES=en
 
 3~ Appliquer des patches
 
-Anyone can directly commit to the repository. However, we ask you to send
-bigger changes to the mailing list to discuss them first. To push to the
-repository, you must follow this procedure:
+Les contributions directes au répertoire sont possibles pour tout le
+monde. Cependant, nous vous demandons d'envoyer les changements conséquents
+sur la liste de discussion au préalable. Afin de de faire un push sur le
+répertoire, les étapes suivantes sont nécessaires.
 
 _* Téléchargez la clé publique:
 
@@ -212,7 +213,7 @@ EOF
 
 }code
 
-_* Check out a clone of the manual through ssh:
+_* Clonez le manuel via ssh:
 
 code{
 
@@ -220,9 +221,9 @@ $ git clone gitosis at live.debian.net:/live-manual.git
 
 }code
 
-_* After editing the files in #{manual/en/}#, please call the 'commit'
-target in the top level directory to sanitize the files and update the
-translation files:
+_* 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:
 
 code{
 
@@ -230,10 +231,10 @@ $ make commit
 
 }code
 
-_* After sanitizing, commit the changes. Write commit messages that consist
-of full, useful sentences in English, starting with a capital letter and
-ending with a full stop. Usually, these will start with the form
-'Fixing/Adding/Removing/Correcting/Translating', e.g.
+_* Après nettoyage, 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 en commençant par
+'Fixing/Adding/Removing/Correcting/Translating':
 
 code{
 
diff --git a/manual/po/fr/about_manual.ssi.po b/manual/po/fr/about_manual.ssi.po
index 32a04ce..b6a5de7 100644
--- a/manual/po/fr/about_manual.ssi.po
+++ b/manual/po/fr/about_manual.ssi.po
@@ -333,12 +333,6 @@ msgstr "2~ Contribuer à ce document"
 
 #. type: Plain text
 #: en/about_manual.ssi:78
-#, fuzzy
-#| msgid ""
-#| "This manual is intended as a community project and all proposals for "
-#| "improvements and contributions are extremely welcome. The preferred way "
-#| "to submit a contribution is to send it to the mailing list. Please see "
-#| "{Contact}#contact for more information."
 msgid ""
 "This manual is intended as a community project and all proposals for "
 "improvements and contributions are extremely welcome. The preferred way to "
@@ -365,10 +359,6 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:82
-#, fuzzy
-#| msgid ""
-#| "The sources for this manual are maintained using the Git version control "
-#| "system. You can checkout the latest copy by executing:"
 msgid ""
 "The sources for this manual are maintained using the Git version control "
 "system. You can check out the latest copy by executing:"
@@ -530,10 +520,6 @@ msgstr "# apt-get install make po4a sisu-complete"
 
 #. type: Plain text
 #: en/about_manual.ssi:98
-#, fuzzy
-#| msgid ""
-#| "You may build the live-manual from the top level directory of your git "
-#| "checkout by executing:"
 msgid ""
 "You may build the live-manual from the top level directory of your Git "
 "checkout by executing:"
@@ -566,11 +552,6 @@ msgstr "3~ Appliquer des patches"
 
 #. type: Plain text
 #: en/about_manual.ssi:116
-#, fuzzy
-#| msgid ""
-#| "Directly commiting to the repository is possible by anyone. However, we "
-#| "ask you to send bigger changes to the mailing list to discuss them first. "
-#| "In order to push to the repository, the following steps are required."
 msgid ""
 "Anyone can directly commit to the repository. However, we ask you to send "
 "bigger changes to the mailing list to discuss them first. To push to the "
@@ -588,14 +569,7 @@ msgstr "_* Téléchargez la clé publique:"
 
 #. type: Plain text
 #: en/about_manual.ssi:127
-#, fuzzy, no-wrap
-#| msgid ""
-#| "$ mkdir -p ~/.ssh/identity.d\n"
-#| "$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
-#| "\t-O ~/.ssh/identity.d/live.debian.net\n"
-#| "$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-#| "\t-O ~/.ssh/identity.d/live.debian.net.pub\n"
-#| "$ chmod 0600 ~/.ssh/identity.d/live.debian.net*\n"
+#, no-wrap
 msgid ""
 "$ mkdir -p ~/.ssh/identity.d\n"
 "$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
@@ -636,8 +610,6 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:144
-#, fuzzy
-#| msgid "_* Checkout a clone of the manual through ssh:"
 msgid "_* Check out a clone of the manual through ssh:"
 msgstr "_* Clonez le manuel via ssh:"
 
@@ -648,11 +620,6 @@ msgstr "$ git clone gitosis at live.debian.net:/live-manual.git"
 
 #. type: Plain text
 #: en/about_manual.ssi:152
-#, fuzzy
-#| msgid ""
-#| "_* After editing the files in manual/en/, please call the 'commit' target "
-#| "in the top level directory to sanitize the files and update the "
-#| "translation files:"
 msgid ""
 "_* After editing the files in #{manual/en/}#, please call the 'commit' "
 "target in the top level directory to sanitize the files and update the "
@@ -669,12 +636,6 @@ msgstr "$ make commit"
 
 #. type: Plain text
 #: en/about_manual.ssi:160
-#, fuzzy
-#| msgid ""
-#| "_* After sanitizing commit the changes. Write commit messages, that "
-#| "consist of full useful sentences, starting with a capital letter and "
-#| "ending with a full stop. Usually starting with the form 'Fixing/Adding/"
-#| "Removing/Correcting/':"
 msgid ""
 "_* After sanitizing, commit the changes. Write commit messages that consist "
 "of full, useful sentences in English, starting with a capital letter and "
@@ -684,12 +645,12 @@ msgstr ""
 "_* Après nettoyage, 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 en commençant par 'Fixing/Adding/"
-"Removing/Correcting/':"
+"Removing/Correcting/Translating':"
 
 #. type: Plain text
 #: en/about_manual.ssi:164
 msgid "$ git commit -a -m \"Adding a section on applying patches.\""
-msgstr ""
+msgstr "$ git commit -a -m \"Adding a section on applying patches.\""
 
 #. type: Plain text
 #: en/about_manual.ssi:168

-- 
live-manual



More information about the debian-live-changes mailing list