From 807beebe435a2f09cfc22f4d2a55b00b785b52b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr> Date: Fri, 11 Oct 2019 19:29:09 +0000 Subject: [PATCH] Translated using Weblate (French) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 33.7% (3216 of 9554 strings) Translation: Git Manpages/Translations Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/fr/ Signed-off-by: Jean-No챘l Avila <jn.avila@free.fr> --- po/documentation.fr.po | 62 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 55 insertions(+), 7 deletions(-) diff --git a/po/documentation.fr.po b/po/documentation.fr.po index 4d2dec3..a3746df 100644 --- a/po/documentation.fr.po +++ b/po/documentation.fr.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: git documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" "POT-Creation-Date: 2019-08-26 23:13+0200\n" -"PO-Revision-Date: 2019-10-08 19:00+0000\n" +"PO-Revision-Date: 2019-10-14 11:52+0000\n" "Last-Translator: Jean-No챘l Avila <jn.avila@free.fr>\n" "Language-Team: Jean-No챘l Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -57610,7 +57610,7 @@ msgstr "empreinte du commit" #. type: Labeled list #: en/pretty-formats.txt:155 -#, 260, fuzzy, no-wrap, priority +#, 260, no-wrap, priority msgid "'%h'" msgstr "'%h'" @@ -57863,7 +57863,7 @@ msgstr "date de validation (le format respecte l'option --date=)" #. type: Labeled list #: en/pretty-formats.txt:179 -#, 260, fuzzy, no-wrap, priority +#, 260, no-wrap, priority msgid "'%cD'" msgstr "'%cD'" @@ -60237,6 +60237,9 @@ msgstr "" #, priority:260 msgid "In the following, we will always refer to the same example history to illustrate the differences between simplification settings. We assume that you are filtering for a file `foo` in this commit graph:" msgstr "" +"Dans ce qui suit, nous nous r챕f챕rerons toujours au m챗me exemple d'historique " +"pour illustrer les diff챕rences entre les param챔tres de simplification. Nous " +"supposons que vous filtrez pour un fichier `foo` dans ce graphe de commits :" #. type: delimited block - #: en/rev-list-options.txt:380 @@ -60248,72 +60251,103 @@ msgid "" "\t \\ / / / / /\n" "\t `-------------' X\n" msgstr "" +"\t .-A---M---N---O---P---Q\n" +"\t / / / / / /\n" +"\tI B C D E Y\n" +"\t \\ / / / / /\n" +"\t `-------------' X\n" #. type: Plain text #: en/rev-list-options.txt:383 #, priority:260 msgid "The horizontal line of history A---Q is taken to be the first parent of each merge. The commits are:" msgstr "" +"La ligne horizontale de l'histoire A---Q est prise pour 챗tre le premier " +"parent de chaque fusion. Les commits sont :" #. type: Plain text #: en/rev-list-options.txt:387 #, priority:260 msgid "`I` is the initial commit, in which `foo` exists with contents ``asdf'', and a file `quux` exists with contents ``quux''. Initial commits are compared to an empty tree, so `I` is !TREESAME." msgstr "" +"`I` est le commit initial, dans lequel 'foo` existe avec le contenu " +"''asdf'', et un fichier `quux` existe avec le contenu ''quux''. Les commits " +"initiaux sont compar챕s 횪 un arbre vide, donc `I` est !MEMEARBRE." #. type: Plain text #: en/rev-list-options.txt:389 #, priority:260 msgid "In `A`, `foo` contains just ``foo''." -msgstr "" +msgstr "Dans `A`, `foo` ne contient que ``foo''." #. type: Plain text #: en/rev-list-options.txt:392 #, priority:260 msgid "`B` contains the same change as `A`. Its merge `M` is trivial and hence TREESAME to all parents." msgstr "" +"`B` contient le m챗me changement que `A`. Sa fusion `M` est triviale et donc " +"MEMEARBRE pour tous les parents." #. type: Plain text #: en/rev-list-options.txt:395 #, priority:260 msgid "`C` does not change `foo`, but its merge `N` changes it to ``foobar'', so it is not TREESAME to any parent." msgstr "" +"`C` ne change pas `foo`, mais sa fusion `N` le change en ``foobar'', donc ce " +"n'est pas MEMEARBRE 횪 aucun parent." #. type: Plain text #: en/rev-list-options.txt:398 #, priority:260 msgid "`D` sets `foo` to ``baz''. Its merge `O` combines the strings from `N` and `D` to ``foobarbaz''; i.e., it is not TREESAME to any parent." msgstr "" +"`D` met `foo` sur `baz`. Sa fusion `O` combine les cha챤nes de caract챔res de " +"`N` et `D` 횪 ``foobarbaz'' ; c'est-횪-dire qu'elle n'est pas MEMEARBRE 횪 " +"aucun parent." #. type: Plain text #: en/rev-list-options.txt:401 #, priority:260 msgid "`E` changes `quux` to ``xyzzy'', and its merge `P` combines the strings to ``quux xyzzy''. `P` is TREESAME to `O`, but not to `E`." msgstr "" +"`E` change `quux` en ``xyzzy'', et sa fusion `P` combine les cha챤nes en ``" +"quux xyzzy''. `P` est MEMEARBRE 횪 `O`, mais pas 횪 `E`." #. type: Plain text #: en/rev-list-options.txt:405 #, priority:260 msgid "`X` is an independent root commit that added a new file `side`, and `Y` modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and `Q` is TREESAME to `P`, but not to `Y`." msgstr "" +"`X` est un commit racine ind챕pendant qui a ajout챕 un nouveau fichier `side`, " +"et `Y` l'a modifi챕. `Y` est MEMEARBRE 횪 `X`. Sa fusion `Q` a ajout챕 `side` 횪 " +"`P`, et `Q` est MEMEARBRE 횪 `P`, mais pas 횪 `Y`." #. type: Plain text #: en/rev-list-options.txt:410 #, priority:260 msgid "`rev-list` walks backwards through history, including or excluding commits based on whether `--full-history` and/or parent rewriting (via `--parents` or `--children`) are used. The following settings are available." msgstr "" +"`rev-list` traverse en arri챔re l'historique, y compris ou en excluant les " +"commits en fonction de si '--full-history' et / ou la r챕챕criture des parents " +"(par l'interm챕diaire de `--parents` ou `--children`) sont utilis챕s. Les " +"param챔tres suivants sont disponibles." #. type: Plain text #: en/rev-list-options.txt:418 #, priority:260 msgid "Commits are included if they are not TREESAME to any parent (though this can be changed, see `--sparse` below). If the commit was a merge, and it was TREESAME to one parent, follow only that parent. (Even if there are several TREESAME parents, follow only one of them.) Otherwise, follow all parents." msgstr "" +"Les commits sont inclus s'ils ne sont pas MEMEARBRE 횪 un parent (bien que " +"ceci puisse 챗tre chang챕, voir `--sparse` ci-dessous). Si le commit 챕tait " +"une fusion, et que c'챕tait MEMEARBRE 횪 un des parents, ne suivez que ce " +"parent. (M챗me s'il y a plusieurs parents MEMEARBRE, ne suivez qu'un seul " +"d'entre eux.) Sinon, suivez tous les parents." #. type: Plain text #: en/rev-list-options.txt:420 #, priority:260 msgid "This results in:" -msgstr "" +msgstr "Il en r챕sulte :" #. type: delimited block - #: en/rev-list-options.txt:425 @@ -60323,36 +60357,50 @@ msgid "" "\t / / /\n" "\tI---------D\n" msgstr "" +"\t .-A---N---O\n" +"\t / / /\n" +"\tI---------D\n" #. type: Plain text #: en/rev-list-options.txt:431 #, priority:260 msgid "Note how the rule to only follow the TREESAME parent, if one is available, removed `B` from consideration entirely. `C` was considered via `N`, but is TREESAME. Root commits are compared to an empty tree, so `I` is !TREESAME." msgstr "" +"Notez que la r챔gle de ne suivre que le parent MEMEARBRE, s'il y en a un " +"disponible, a enti챔rement supprim챕 `B` de la consid챕ration. `C` a 챕t챕 pris " +"en compte via `N`, mais il est MEMEARBRE. Les commits racines sont compar챕s " +"횪 un arbre vide, donc `I` est !MEMEARBRE." #. type: Plain text #: en/rev-list-options.txt:435 #, priority:260 msgid "Parent/child relations are only visible with `--parents`, but that does not affect the commits selected in default mode, so we have shown the parent lines." msgstr "" +"Les relations parents/enfants ne sont visibles qu'avec `--parents', mais " +"cela n'affecte pas les commits s챕lectionn챕s en mode par d챕faut, nous avons " +"donc montr챕 les lignes parentales." #. type: Labeled list #: en/rev-list-options.txt:436 #, no-wrap, priority:260 msgid "--full-history without parent rewriting" -msgstr "" +msgstr "--full-history sans r챕챕criture des parents" #. type: Plain text #: en/rev-list-options.txt:442 #, priority:260 msgid "This mode differs from the default in one point: always follow all parents of a merge, even if it is TREESAME to one of them. Even if more than one side of the merge has commits that are included, this does not imply that the merge itself is! In the example, we get" msgstr "" +"Ce mode diff챔re du mode par d챕faut en un point : toujours suivre tous les " +"parents d'une fusion, m챗me si c'est MEMEARBRE 횪 l'un d'eux. M챗me si plus " +"d'un c척t챕 de la fusion a des commits qui sont inclus, cela ne signifie pas " +"que la fusion elle-m챗me l'est ! Dans l'exemple, nous obtenons" #. type: delimited block - #: en/rev-list-options.txt:445 #, no-wrap, priority:260 msgid "\tI A B N D O P Q\n" -msgstr "" +msgstr "\tI A B N D O P Q\n" #. type: Plain text #: en/rev-list-options.txt:450 -- GitLab