Skip to content
Snippets Groups Projects
Commit 807beebe authored by Jean-Noël Avila's avatar Jean-Noël Avila Committed by Hosted Weblate
Browse files

Translated using Weblate (French)

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: default avatarJean-Noël Avila <jn.avila@free.fr>
parent f2bdca01
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ msgstr "" ...@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: git documentation\n" "Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
"POT-Creation-Date: 2019-08-26 23:13+0200\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" "Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language: fr\n" "Language: fr\n"
...@@ -57610,7 +57610,7 @@ msgstr "empreinte du commit" ...@@ -57610,7 +57610,7 @@ msgstr "empreinte du commit"
   
#. type: Labeled list #. type: Labeled list
#: en/pretty-formats.txt:155 #: en/pretty-formats.txt:155
#, 260, fuzzy, no-wrap, priority #, 260, no-wrap, priority
msgid "'%h'" msgid "'%h'"
msgstr "'%h'" msgstr "'%h'"
   
...@@ -57863,7 +57863,7 @@ msgstr "date de validation (le format respecte l'option --date=)" ...@@ -57863,7 +57863,7 @@ msgstr "date de validation (le format respecte l'option --date=)"
   
#. type: Labeled list #. type: Labeled list
#: en/pretty-formats.txt:179 #: en/pretty-formats.txt:179
#, 260, fuzzy, no-wrap, priority #, 260, no-wrap, priority
msgid "'%cD'" msgid "'%cD'"
msgstr "'%cD'" msgstr "'%cD'"
   
...@@ -60237,6 +60237,9 @@ msgstr "" ...@@ -60237,6 +60237,9 @@ msgstr ""
#, priority:260 #, 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:" 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 "" 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 - #. type: delimited block -
#: en/rev-list-options.txt:380 #: en/rev-list-options.txt:380
...@@ -60248,72 +60251,103 @@ msgid "" ...@@ -60248,72 +60251,103 @@ msgid ""
"\t \\ / / / / /\n" "\t \\ / / / / /\n"
"\t `-------------' X\n" "\t `-------------' X\n"
msgstr "" 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 #. type: Plain text
#: en/rev-list-options.txt:383 #: en/rev-list-options.txt:383
#, priority:260 #, priority:260
msgid "The horizontal line of history A---Q is taken to be the first parent of each merge. The commits are:" msgid "The horizontal line of history A---Q is taken to be the first parent of each merge. The commits are:"
msgstr "" 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 #. type: Plain text
#: en/rev-list-options.txt:387 #: en/rev-list-options.txt:387
#, priority:260 #, 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." 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 "" 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 #. type: Plain text
#: en/rev-list-options.txt:389 #: en/rev-list-options.txt:389
#, priority:260 #, priority:260
msgid "In `A`, `foo` contains just ``foo''." msgid "In `A`, `foo` contains just ``foo''."
msgstr "" msgstr "Dans `A`, `foo` ne contient que ``foo''."
   
#. type: Plain text #. type: Plain text
#: en/rev-list-options.txt:392 #: en/rev-list-options.txt:392
#, priority:260 #, priority:260
msgid "`B` contains the same change as `A`. Its merge `M` is trivial and hence TREESAME to all parents." msgid "`B` contains the same change as `A`. Its merge `M` is trivial and hence TREESAME to all parents."
msgstr "" msgstr ""
"`B` contient le même changement que `A`. Sa fusion `M` est triviale et donc "
"MEMEARBRE pour tous les parents."
   
#. type: Plain text #. type: Plain text
#: en/rev-list-options.txt:395 #: en/rev-list-options.txt:395
#, priority:260 #, priority:260
msgid "`C` does not change `foo`, but its merge `N` changes it to ``foobar'', so it is not TREESAME to any parent." msgid "`C` does not change `foo`, but its merge `N` changes it to ``foobar'', so it is not TREESAME to any parent."
msgstr "" 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 #. type: Plain text
#: en/rev-list-options.txt:398 #: en/rev-list-options.txt:398
#, priority:260 #, 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." 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 "" 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 #. type: Plain text
#: en/rev-list-options.txt:401 #: en/rev-list-options.txt:401
#, priority:260 #, 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`." 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 "" 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 #. type: Plain text
#: en/rev-list-options.txt:405 #: en/rev-list-options.txt:405
#, priority:260 #, 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`." 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 "" 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 #. type: Plain text
#: en/rev-list-options.txt:410 #: en/rev-list-options.txt:410
#, priority:260 #, 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." 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 "" 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 #. type: Plain text
#: en/rev-list-options.txt:418 #: en/rev-list-options.txt:418
#, priority:260 #, 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." 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 "" 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 #. type: Plain text
#: en/rev-list-options.txt:420 #: en/rev-list-options.txt:420
#, priority:260 #, priority:260
msgid "This results in:" msgid "This results in:"
msgstr "" msgstr "Il en résulte :"
   
#. type: delimited block - #. type: delimited block -
#: en/rev-list-options.txt:425 #: en/rev-list-options.txt:425
...@@ -60323,36 +60357,50 @@ msgid "" ...@@ -60323,36 +60357,50 @@ msgid ""
"\t / / /\n" "\t / / /\n"
"\tI---------D\n" "\tI---------D\n"
msgstr "" msgstr ""
"\t .-A---N---O\n"
"\t / / /\n"
"\tI---------D\n"
   
#. type: Plain text #. type: Plain text
#: en/rev-list-options.txt:431 #: en/rev-list-options.txt:431
#, priority:260 #, 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." 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 "" 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 #. type: Plain text
#: en/rev-list-options.txt:435 #: en/rev-list-options.txt:435
#, priority:260 #, 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." 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 "" 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 #. type: Labeled list
#: en/rev-list-options.txt:436 #: en/rev-list-options.txt:436
#, no-wrap, priority:260 #, no-wrap, priority:260
msgid "--full-history without parent rewriting" msgid "--full-history without parent rewriting"
msgstr "" msgstr "--full-history sans réécriture des parents"
   
#. type: Plain text #. type: Plain text
#: en/rev-list-options.txt:442 #: en/rev-list-options.txt:442
#, priority:260 #, 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" 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 "" 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 - #. type: delimited block -
#: en/rev-list-options.txt:445 #: en/rev-list-options.txt:445
#, no-wrap, priority:260 #, no-wrap, priority:260
msgid "\tI A B N D O P Q\n" msgid "\tI A B N D O P Q\n"
msgstr "" msgstr "\tI A B N D O P Q\n"
   
#. type: Plain text #. type: Plain text
#: en/rev-list-options.txt:450 #: en/rev-list-options.txt:450
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment