diff --git a/po/documentation.fr.po b/po/documentation.fr.po index 46adbce2e22051f6edaadf659fb542ee43646a05..99590b2a7bc311686a60103dcfe9547201116f58 100644 --- a/po/documentation.fr.po +++ b/po/documentation.fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: git documentation\n" "POT-Creation-Date: 2018-12-22 17:08+0100\n" -"PO-Revision-Date: 2019-01-04 05:24+0000\n" +"PO-Revision-Date: 2019-01-06 20:26+0000\n" "Last-Translator: Jean-No챘l Avila <jn.avila@free.fr>\n" "Language-Team: French <https://hosted.weblate.org/projects/git-manpages/" "translations/fr/>\n" @@ -1522,10 +1522,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:798 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "<commit-ish>" -msgstr "git-commit(1)" +msgstr "<commit-ou-equivalent>" #. type: Plain text #: en/git.txt:803 @@ -1821,10 +1820,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:928 -#, fuzzy, no-wrap -#| msgid "`$GIT_DIR/COMMIT_EDITMSG`" +#, no-wrap msgid "`GIT_COMMON_DIR`" -msgstr "`$GIT_DIR/COMMIT_EDITMSG`" +msgstr "`GIT_COMMON_DIR`" #. type: Plain text #: en/git.txt:936 @@ -1839,52 +1837,45 @@ msgstr "" #. type: Title ~ #: en/git.txt:938 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "Git Commits" -msgstr "$ git commit\n" +msgstr "Commits Git" #. type: Labeled list #: en/git.txt:939 -#, fuzzy, no-wrap -#| msgid "`$GIT_DIR/COMMIT_EDITMSG`" +#, no-wrap msgid "`GIT_AUTHOR_NAME`" -msgstr "`$GIT_DIR/COMMIT_EDITMSG`" +msgstr "`GIT_AUTHOR_NAME`" #. type: Labeled list #: en/git.txt:940 -#, fuzzy, no-wrap -#| msgid "`$GIT_DIR/COMMIT_EDITMSG`" +#, no-wrap msgid "`GIT_AUTHOR_EMAIL`" -msgstr "`$GIT_DIR/COMMIT_EDITMSG`" +msgstr "`GIT_AUTHOR_EMAIL`" #. type: Labeled list #: en/git.txt:941 -#, fuzzy, no-wrap -#| msgid "`$GIT_DIR/COMMIT_EDITMSG`" +#, no-wrap msgid "`GIT_AUTHOR_DATE`" -msgstr "`$GIT_DIR/COMMIT_EDITMSG`" +msgstr "`GIT_AUTHOR_DATE`" #. type: Labeled list #: en/git.txt:942 -#, fuzzy, no-wrap -#| msgid "`$GIT_DIR/COMMIT_EDITMSG`" +#, no-wrap msgid "`GIT_COMMITTER_NAME`" -msgstr "`$GIT_DIR/COMMIT_EDITMSG`" +msgstr "`GIT_COMMITTER_NAME`" #. type: Labeled list #: en/git.txt:943 -#, fuzzy, no-wrap -#| msgid "`$GIT_DIR/COMMIT_EDITMSG`" +#, no-wrap msgid "`GIT_COMMITTER_EMAIL`" -msgstr "`$GIT_DIR/COMMIT_EDITMSG`" +msgstr "`GIT_COMMITTER_EMAIL`" #. type: Labeled list #: en/git.txt:944 -#, fuzzy, no-wrap -#| msgid "`$GIT_DIR/COMMIT_EDITMSG`" +#, no-wrap msgid "`GIT_COMMITTER_DATE`" -msgstr "`$GIT_DIR/COMMIT_EDITMSG`" +msgstr "`GIT_COMMITTER_DATE`" #. type: Labeled list #: en/git.txt:945 @@ -1894,17 +1885,14 @@ msgstr "" #. type: Plain text #: en/git.txt:947 -#, fuzzy -#| msgid "git-commit(1)" msgid "see linkgit:git-commit-tree[1]" -msgstr "git-commit(1)" +msgstr "voir linkgit:git-commit-tree[1]" #. type: Title ~ #: en/git.txt:949 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "Git Diffs" -msgstr "$ git commit\n" +msgstr "Diff챕rences Git" #. type: Labeled list #: en/git.txt:950 @@ -2066,10 +2054,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:1002 -#, fuzzy, no-wrap -#| msgid "`$GIT_DIR/COMMIT_EDITMSG`" +#, no-wrap msgid "`GIT_EDITOR`" -msgstr "`$GIT_DIR/COMMIT_EDITMSG`" +msgstr "`GIT_EDITOR`" #. type: Plain text #: en/git.txt:1007 @@ -2088,10 +2075,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:1009 -#, fuzzy, no-wrap -#| msgid "`$GIT_DIR/COMMIT_EDITMSG`" +#, no-wrap msgid "`GIT_SSH_COMMAND`" -msgstr "`$GIT_DIR/COMMIT_EDITMSG`" +msgstr "`GIT_SSH_COMMAND`" #. type: Plain text #: en/git.txt:1018 @@ -2206,10 +2192,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:1065 -#, fuzzy, no-wrap -#| msgid "`$GIT_DIR/COMMIT_EDITMSG`" +#, no-wrap msgid "`GIT_TRACE`" -msgstr "`$GIT_DIR/COMMIT_EDITMSG`" +msgstr "`GIT_TRACE`" #. type: Plain text #: en/git.txt:1068 @@ -2360,10 +2345,9 @@ msgstr "" #. type: Labeled list #: en/git.txt:1134 -#, fuzzy, no-wrap -#| msgid "`$GIT_DIR/COMMIT_EDITMSG`" +#, no-wrap msgid "`GIT_LITERAL_PATHSPECS`" -msgstr "`$GIT_DIR/COMMIT_EDITMSG`" +msgstr "`GIT_LITERAL_PATHSPECS`" #. type: Plain text #: en/git.txt:1142 @@ -2686,18 +2670,16 @@ msgstr "VOIR AUSSI" # #. type: Plain text #: en/git.txt:1293 -#, fuzzy -#| msgid "" -#| "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-" -#| "mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]" msgid "" "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], " "linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-" "tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's " "Manual], linkgit:gitworkflows[7]" msgstr "" -"linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-" -"mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]" +"linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], " +"linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-" +"tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual]" +", linkgit:gitworkflows[7]" #. type: Title - #: en/git.txt:1295 en/git-add.txt:415 en/git-am.txt:232 en/git-annotate.txt:33 @@ -3079,7 +3061,7 @@ msgstr "-i" #. type: Labeled list #: en/git-add.txt:79 en/git-am.txt:124 en/git-clean.txt:43 #: en/git-rebase.txt:374 en/git-svn.txt:281 -#, fuzzy, no-wrap +#, no-wrap msgid "--interactive" msgstr "--interactive" @@ -3104,15 +3086,14 @@ msgstr "--patch" #. type: Plain text #: en/git-add.txt:91 -#, fuzzy msgid "" "Interactively choose hunks of patch between the index and the work tree and " "add them to the index. This gives the user a chance to review the difference " "before adding modified contents to the index." msgstr "" -"Choisir de mani챔re interactive les sections de patch entre l'index et la " -"copie de travail et les ajouter 횪 l'index. Cela permet 횪 l'utilisateur de " -"r챕viser les diff챕rences avec d'ajouter le contenu modifi챕 횪 l'index.\n" +"Choisir de mani챔re interactive les sections de rustine entre l'index et " +"l'arbre de travail et les ajouter 횪 l'index. Cela permet 횪 l'utilisateur de " +"r챕viser les diff챕rences avant d'ajouter le contenu modifi챕 횪 l'index." #. type: Plain text #: en/git-add.txt:95 @@ -3454,7 +3435,7 @@ msgid "" "subdirectories:" msgstr "" "Ajouter le contenu de tous les fichiers `*.txt` sous le r챕pertoire " -"`Documentation` et ses sous r챕pertoires." +"`Documentation` et ses sous r챕pertoires혻:" #. type: delimited block - #: en/git-add.txt:196 @@ -3669,7 +3650,6 @@ msgstr "Update>> -2\n" # #. type: Plain text #: en/git-add.txt:287 -#, fuzzy msgid "" "After making the selection, answer with an empty line to stage the contents " "of working tree files for selected paths in the index." @@ -3679,8 +3659,7 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:288 -#, fuzzy, no-wrap -#| msgid "revert" +#, no-wrap msgid "revert" msgstr "revert" @@ -4007,10 +3986,6 @@ msgstr "modification de contenu de contexte ou de lignes supprim챕es" # #. type: Plain text #: en/git-add.txt:413 -#, fuzzy -#| msgid "" -#| "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-" -#| "mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]" msgid "" "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-" "mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]" @@ -4148,10 +4123,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:55 en/git-mailinfo.txt:74 -#, fuzzy, no-wrap -#| msgid "scissors" +#, no-wrap msgid "--scissors" -msgstr "scissors" +msgstr "--scissors" #. type: Plain text #: en/git-am.txt:59 @@ -4163,17 +4137,14 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:60 en/git-mailinfo.txt:90 -#, fuzzy, no-wrap -#| msgid "scissors" +#, no-wrap msgid "--no-scissors" -msgstr "scissors" +msgstr "--no-scissors" #. type: Plain text #: en/git-am.txt:62 -#, fuzzy -#| msgid "git-commit(1)" msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])." -msgstr "git-commit(1)" +msgstr "Ignorer les lignes ciseaux (voir linkgit:git-mailinfo[1])." #. type: Labeled list #: en/git-am.txt:63 en/git-branch.txt:107 en/git-checkout.txt:216 @@ -4321,17 +4292,15 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:104 en/git-apply.txt:173 en/git-rebase.txt:361 -#, fuzzy, no-wrap -#| msgid "whitespace" +#, no-wrap msgid "--ignore-whitespace" -msgstr "whitespace" +msgstr "--ignore-whitespace" #. type: Labeled list #: en/git-am.txt:105 en/git-rebase.txt:362 -#, fuzzy, no-wrap -#| msgid "whitespace" +#, no-wrap msgid "--whitespace=<option>" -msgstr "whitespace" +msgstr "--whitespace=<option>" #. type: Labeled list #: en/git-am.txt:106 en/git-apply.txt:119 en/git-rebase.txt:329 @@ -4365,10 +4334,9 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:111 en/git-apply.txt:100 -#, fuzzy, no-wrap -#| msgid "removed content" +#, no-wrap msgid "--reject" -msgstr "contenu supprim챕" +msgstr "--reject" #. type: Plain text #: en/git-am.txt:115 @@ -4394,10 +4362,8 @@ msgstr "" #. type: Plain text #: en/git-am.txt:126 -#, fuzzy -#| msgid "Interactive mode" msgid "Run interactively." -msgstr "Mode interactif" +msgstr "Mode interactif." #. type: Labeled list #: en/git-am.txt:127 en/git-rebase.txt:367 @@ -4636,31 +4602,23 @@ msgstr "CROCHETS" #. type: Plain text #: en/git-am.txt:226 -#, fuzzy -#| msgid "" -#| "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, " -#| "and `post-commit` hooks. See linkgit:githooks[5] for more information." msgid "" "This command can run `applypatch-msg`, `pre-applypatch`, and `post-" "applypatch` hooks. See linkgit:githooks[5] for more information." msgstr "" -"Cette commande peut lancer les crochets `commit-msg`, `prepare-commit-msg`, " -"`pre-commit` et `post-commit`. Voir linkgit:githooks[5] pour de plus amples " -"informations." +"Cette commande peut lancer `applypatch-msg`, `applypatch` et `post-" +"applypatch`. Voir linkgit:githooks[5] pour de plus amples informations." #. type: Plain text #: en/git-am.txt:230 -#, fuzzy -#| msgid "git-commit(1)" msgid "linkgit:git-apply[1]." -msgstr "git-commit(1)" +msgstr "linkgit:git-apply[1]." #. type: Title = #: en/git-annotate.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-annotate(1)" -msgstr "git-commit(1)" +msgstr "git-annotate(1)" #. type: Plain text #: en/git-annotate.txt:7 @@ -4704,10 +4662,8 @@ msgstr "git-apply(1)" # #. type: Plain text #: en/git-apply.txt:7 -#, fuzzy -#| msgid "git-add - Add file contents to the index" msgid "git-apply - Apply a patch to files and/or to the index" -msgstr "git-add - Ajoute le contenu de fichiers 횪 l'index" +msgstr "git-apply - Applique une rustine 횪 des fichiers et/ou 횪 l'index" #. type: Plain text #: en/git-apply.txt:20 @@ -4744,10 +4700,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:37 -#, fuzzy, no-wrap -#| msgid "patch" +#, no-wrap msgid "<patch>..." -msgstr "patch" +msgstr "<rustine>..." #. type: Plain text #: en/git-apply.txt:40 @@ -4758,10 +4713,9 @@ msgstr "Prendre le message de validation depuis le fichier indiqu챕. Utilisez '- #. type: Labeled list #: en/git-apply.txt:41 en/git-rebase.txt:314 en/merge-options.txt:55 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "--stat" -msgstr "status" +msgstr "--stat" #. type: Plain text #: en/git-apply.txt:44 @@ -4886,23 +4840,14 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:97 en/rev-list-options.txt:659 -#, fuzzy, no-wrap -#| msgid "revert" +#, no-wrap msgid "--reverse" -msgstr "revert" +msgstr "--reverse" #. type: Plain text #: en/git-apply.txt:99 -#, fuzzy -#| msgid "" -#| "-v::\n" -#| "--verbose::\n" -#| " Be verbose.\n" msgid "Apply the patch in reverse." -msgstr "" -"-v::\n" -"--verbose::\n" -" Mode bavard.\n" +msgstr "Applique une rustine 횪 rebours." #. type: Plain text #: en/git-apply.txt:106 @@ -4976,10 +4921,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:135 -#, fuzzy, no-wrap -#| msgid "git-apply(1)" +#, no-wrap msgid "--apply" -msgstr "git-apply(1)" +msgstr "--apply" #. type: Plain text #: en/git-apply.txt:141 @@ -5073,10 +5017,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:180 -#, fuzzy, no-wrap -#| msgid "whitespace" +#, no-wrap msgid "--whitespace=<action>" -msgstr "whitespace" +msgstr "--whitespace=<action>" #. type: Plain text #: en/git-apply.txt:188 @@ -5218,10 +5161,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:246 en/config.txt:908 -#, fuzzy, no-wrap -#| msgid "whitespace" +#, no-wrap msgid "apply.ignoreWhitespace" -msgstr "whitespace" +msgstr "apply.ignoreWhitespace" #. type: Plain text #: en/git-apply.txt:250 @@ -5233,10 +5175,9 @@ msgstr "" #. type: Labeled list #: en/git-apply.txt:250 en/config.txt:916 -#, fuzzy, no-wrap -#| msgid "whitespace" +#, no-wrap msgid "apply.whitespace" -msgstr "whitespace" +msgstr "apply.whitespace" #. type: Plain text #: en/git-apply.txt:253 @@ -5247,10 +5188,9 @@ msgstr "" #. type: Title - #: en/git-apply.txt:255 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "Submodules" -msgstr "git-add(1)" +msgstr "Sous-modules" #. type: Plain text #: en/git-apply.txt:258 @@ -5278,17 +5218,14 @@ msgstr "" #. type: Plain text #: en/git-apply.txt:272 -#, fuzzy -#| msgid "git-commit(1)" msgid "linkgit:git-am[1]." -msgstr "git-commit(1)" +msgstr "linkgit:git-am[1]." #. type: Title = #: en/git-archimport.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-archimport(1)" -msgstr "git-commit(1)" +msgstr "git-archimport(1)" #. type: Plain text #: en/git-archimport.txt:7 @@ -5500,21 +5437,14 @@ msgstr "" #. type: Title = #: en/git-archive.txt:2 -#, fuzzy, no-wrap -#| msgid "git-add(1)" +#, no-wrap msgid "git-archive(1)" -msgstr "git-add(1)" +msgstr "git-archive(1)" #. type: Plain text #: en/git-archive.txt:7 -#, fuzzy -#| msgid "" -#| "by using 'git rm' to remove files from the working tree and the index, " -#| "again before using the 'commit' command;" msgid "git-archive - Create an archive of files from a named tree" -msgstr "" -"en utilisant 'git rm' pour supprimer des fichiers de l'arbre de travail et " -"de l'index, encore une fois, avant d'utiliser la commande 'commit'," +msgstr "git-archive - Cr챕er une archive des fichiers d'un arbre nomm챕" #. type: Plain text #: en/git-archive.txt:16 @@ -5548,10 +5478,9 @@ msgstr "" #. type: Labeled list #: en/git-archive.txt:36 -#, fuzzy, no-wrap -#| msgid "Configuration" +#, no-wrap msgid "--format=<fmt>" -msgstr "Configuration" +msgstr "--format=<fmt>" #. type: Plain text #: en/git-archive.txt:42 @@ -5585,16 +5514,8 @@ msgstr "" #. type: Plain text #: en/git-archive.txt:50 -#, fuzzy -#| msgid "" -#| "-v::\n" -#| "--verbose::\n" -#| " Be verbose.\n" msgid "Report progress to stderr." -msgstr "" -"-v::\n" -"--verbose::\n" -" Mode bavard.\n" +msgstr "Afficher la progression sur stderr." #. type: Labeled list #: en/git-archive.txt:51 en/git-read-tree.txt:84 en/git-write-tree.txt:35 @@ -5667,10 +5588,9 @@ msgstr "" #. type: Labeled list #: en/git-archive.txt:73 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "--exec=<git-upload-archive>" -msgstr "git-commit(1)" +msgstr "--exec=<git-upload-archive>" #. type: Plain text #: en/git-archive.txt:76 @@ -5947,17 +5867,14 @@ msgstr "" #. type: Plain text #: en/git-archive.txt:194 -#, fuzzy -#| msgid "git-commit(1)" msgid "linkgit:gitattributes[5]" -msgstr "git-commit(1)" +msgstr "linkgit:gitattributes[5]" #. type: Title = #: en/git-bisect.txt:2 -#, fuzzy, no-wrap -#| msgid "git-commit(1)" +#, no-wrap msgid "git-bisect(1)" -msgstr "git-commit(1)" +msgstr "git-bisect(1)" #. type: Plain text #: en/git-bisect.txt:7 @@ -6064,10 +5981,9 @@ msgstr "" #. type: delimited block - #: en/git-bisect.txt:74 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "$ git bisect good\n" -msgstr "$ git commit\n" +msgstr "$ git bisect good\n" #. type: Plain text #: en/git-bisect.txt:77 @@ -6076,10 +5992,9 @@ msgstr "" #. type: delimited block - #: en/git-bisect.txt:80 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "$ git bisect bad\n" -msgstr "$ git commit\n" +msgstr "$ git bisect bad\n" #. type: Plain text #: en/git-bisect.txt:83 @@ -6110,10 +6025,9 @@ msgstr "" #. type: Title ~ #: en/git-bisect.txt:98 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "Bisect reset" -msgstr "$ git commit\n" +msgstr "Bisect reset" #. type: Plain text #: en/git-bisect.txt:102 @@ -6124,10 +6038,9 @@ msgstr "" #. type: delimited block - #: en/git-bisect.txt:105 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "$ git bisect reset\n" -msgstr "$ git commit\n" +msgstr "$ git bisect reset\n" #. type: Plain text #: en/git-bisect.txt:110 @@ -6145,10 +6058,9 @@ msgstr "" #. type: delimited block - #: en/git-bisect.txt:116 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "$ git bisect reset <commit>\n" -msgstr "$ git commit\n" +msgstr "$ git bisect reset <commit>\n" #. type: Plain text #: en/git-bisect.txt:121 @@ -6206,10 +6118,9 @@ msgstr "" #. type: delimited block - #: en/git-bisect.txt:152 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "git bisect old [<rev>]\n" -msgstr "$ git commit\n" +msgstr "git bisect old [<rev>]\n" #. type: Plain text #: en/git-bisect.txt:155 @@ -6218,10 +6129,9 @@ msgstr "" #. type: delimited block - #: en/git-bisect.txt:158 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "git bisect new [<rev>...]\n" -msgstr "$ git commit\n" +msgstr "git bisect new [<rev>...]\n" #. type: Plain text #: en/git-bisect.txt:161 @@ -6235,10 +6145,9 @@ msgstr "" #. type: delimited block - #: en/git-bisect.txt:166 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "git bisect terms\n" -msgstr "$ git commit\n" +msgstr "git bisect terms\n" #. type: Plain text #: en/git-bisect.txt:170 @@ -6294,10 +6203,9 @@ msgstr "" #. type: Title ~ #: en/git-bisect.txt:197 -#, fuzzy, no-wrap -#| msgid "$ git commit\n" +#, no-wrap msgid "Bisect visualize" -msgstr "$ git commit\n" +msgstr "Bisect visualize" #. type: Plain text #: en/git-bisect.txt:201