[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[RFR] wml://devel/website/examples.wml

Bonjour,

cette page vient d’être modifiée.

Voici une proposition de traduction.

Le fichier en français est téléchargeable ici :
https://salsa.debian.org/webmaster-team/webwml/raw/master/french/devel/website/examples.wml

Merci d’avance pour vos relectures.

Amicalement.


--
Jean-Paul

diff --git a/english/devel/website/examples.wml b/english/devel/website/examples.wml
index 11b64ab2631..b658ab995fd 100644
--- a/english/devel/website/examples.wml
+++ b/english/devel/website/examples.wml
@@ -5,18 +5,17 @@
 <p>French will be used for the example:
 
 <pre>
-   cvs checkout webwml/Makefile.common webwml/english
+   git pull
    cd webwml
    mkdir french
-   cvs add french
    cd french
    cp ../english/.wmlrc ../english/Make.* .
    echo '<protect>include $(subst webwml/french,webwml/english,$(CURDIR))/Makefile</protect>' &gt; Makefile
    mkdir po
-   cvs add Make* .wmlrc po
+   git add Make* .wmlrc
    cp Makefile po
    make -C po init-po
-   cvs add po/Makefile po/*.fr.po
+   git add po/Makefile po/*.fr.po
 </pre>
 
 <p>Edit the <tt>.wmlrc</tt> file and change:
@@ -45,7 +44,8 @@ the .wml files into HTML, and <code>make</code> uses Makefiles.
 
 <p>When you are done adding and editing pages, do a
 <pre>
-   cvs commit
+   git commit -m "Add your commit message here"
+   git push
 </pre>
 from the webwml directory. You can now start translating the pages.
 
@@ -57,7 +57,6 @@ from the webwml directory. You can now start translating the pages.
    cd webwml
    ./copypage.pl english/social_contract.wml
    cd french
-   cvs add social_contract.wml
 </pre>
 
 <p>This will automatically add the translation-check header, pointing to the 
@@ -69,7 +68,9 @@ any links or change them in any way - if you want to change anything,
 request it on the debian-www list. When done, type
 
 <pre>
-   cvs commit -m "short description of the changes you made" social_contract.wml
+   git add social_contract.wml
+   git commit -m "Translated social contract to french"
+   git push
 </pre>
 
 <H3>Example of Adding a New Directory</H3>
@@ -79,35 +80,34 @@ request it on the debian-www list. When done, type
 <pre>
    cd webwml/french
    mkdir intro
-   cvs add intro
    cd intro
    cp ../Makefile .
+   git add Makefile
+   git commit -m "added the intro dir to git"
+   git push
 </pre>
 
-Make sure a new directory has the Makefile and that it's committed in CVS.
+Make sure a new directory has the Makefile and that it's committed in git.
 Otherwise, running make will give an error to everyone else trying it.
 
-<pre>
-   cvs add Makefile
-   cd ..
-   cvs commit -m "added the intro dir to CVS" intro
-</pre>
-
 #example not finished
 # <H3>Example of a Conflict</H3>
 #
 # <p>This example shows a commit that won't work because the copy in the
-# repository has been modified since your last <kbd>cvs update -d</kbd>.
+# repository has been modified since your last <kbd>git pull</kbd>.
 #
 # <pre>
-#    cvs commit -m"fixed a broken link" foo.wml
+#    git foo.wml
+#    cvs commit -m "fixed a broken link"
+#    git push
 # </pre>
 #
 # will output:
 #
 # <pre>
-# cvs: Up-to-date check failed for foo.wml!
-# cvs: fix the above errors first
+#To salsa.debian.org:webmaster-team/webwml.git
+# ! [rejected]                master -> master (fetch first)
+#error: failed to push some refs to 'git@salsa.debian.org:webmaster-team/webwml.git'
 # </pre>
 #
 # or something like that :)

--- orig_examples.wml	2018-06-17 23:59:59.675581335 +0200
+++ examples.wml	2018-06-18 00:20:36.148712671 +0200
@@ -1,22 +1,23 @@
 #use wml::debian::template title="Exemples"
-#use wml::debian::translation-check translation="d1c06014aabc068656f3ebd20a38c574c7553f7a" maintainer="Frédéric Bothamy"
+#use wml::debian::translation-check translation="93f96e5508d963eef6dee47f4ac2360e27d7939b" maintainer="Jean-Paul Guillonneau"
+
+# Previous translator : Frédéric Bothamy
 
 <h3>Exemple d'un commencement de traduction</h3>
 <p>Le français sera utilisé pour cet exemple.
 
 <pre>
-   cvs checkout webwml/Makefile.common webwml/english
+   git pull
    cd webwml
    mkdir french
-   cvs add french
    cd french
-   cp ../english/.wmlrc ../english/Make.*
+   cp ../english/.wmlrc ../english/Make.* .
    echo '<protect>include $(subst webwml/french,webwml/english,$(CURDIR))/Makefile</protect>' &gt; Makefile
    mkdir po
-   cvs add Make* .wmlrc po
+   git add Make* .wmlrc
    cp Makefile po
    make -C po init-po
-   cvs add po/Makefile po/*.fr.po
+   git add po/Makefile po/*.fr.po
 </pre>
 
 <p>Ã?ditez le fichier <tt>.wmlrc</tt> et changez&nbsp;:
@@ -48,7 +49,8 @@
 
 <p>Quand vous aurez fini d'ajouter des pages, faites un
 <pre>
-   cvs commit
+   git commit -m "Ajouter ici votre message de commit"
+   git push
 </pre>
 à partir du répertoire webwml.
 Vous pouvez maintenant commencer à traduire des pages.
@@ -61,9 +63,8 @@
    cd webwml
    ./copypage.pl english/social_contract.wml
    cd french
-    cvs add social_contract.wml
 </pre>
- 
+
 <p>
 Cela ajoutera automatiquement l'en-tête translation-check,
 indiquant la version du fichier original qui a été copié.
@@ -73,11 +74,14 @@
 </p>
 
 <p>Ã?ditez social_contract.wml et traduisez le texte. N'essayez pas de
-traduire les liens ni d'en modifier en aucune façon. Quand c'est fini,
-tapez
+traduire les liens ni d'en modifier en aucune façon. Si vous voulez changer
+quelque chose, demandez-le sur la liste debian-www. Quand c'est fini, tapez
 
 <pre>
-   cvs commit -m "short description of the changes you made" social_contract.wml
+  git add social_contract.wml
+  git commit -m "Translated social contract to french"
+  git push
+
 </pre>
 (les commentaires doivent être en anglais, car ils sont susceptibles
 d'être lus par tout le monde).
@@ -89,18 +93,35 @@
 <pre>
    cd webwml/french
    mkdir intro
-   cvs add intro
    cd intro
    cp ../Makefile .
-</pre> 
+   git add Makefile
+   git commit -m "added the intro dir to git"
+   git push
+</pre>
 
 Vérifiez toujours qu'un Makefile se trouve dans le répertoire ajouté, et
-que ce Makefile a été enregistré dans le CVS. Sinon il sera impossible
-de générer les pages.
-
-<pre>
-   cvs add Makefile
-   cd ..
-   cvs commit -m "added the intro dir to CVS" intro
-</pre>
+que ce Makefile a été enregistré dans Git. Sinon, lâ??exécution de make générera
+une erreur pour tout ceux lâ??essayant.
 
+#example not finished
+# <H3>Example of a Conflict</H3>
+#
+# <p>This example shows a commit that won't work because the copy in the
+# repository has been modified since your last <kbd>git pull</kbd>.
+#
+# <pre>
+#    git foo.wml
+#    cvs commit -m "fixed a broken link"
+#    git push
+# </pre>
+#
+# will output:
+#
+# <pre>
+#To salsa.debian.org:webmaster-team/webwml.git
+# ! [rejected]                master -> master (fetch first)
+#error: failed to push some refs to 'git@salsa.debian.org:webmaster-team/webwml.git'
+# </pre>
+#
+# or something like that :)
Reply to: