Skip to content
Snippets Groups Projects
Unverified Commit 87fd2ab5 authored by Hosted Weblate's avatar Hosted Weblate
Browse files

Merge branch 'origin/master' into Weblate.

parents 70471db9 cb254839
No related branches found
No related tags found
No related merge requests found
......@@ -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-11-02 14:34+0000\n"
"PO-Revision-Date: 2019-11-21 13:26+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"
......@@ -59851,6 +59851,9 @@ msgstr ""
#, priority:260
msgid "This option can be used along with `--bisect-vars`, in this case, after all the sorted commit objects, there will be the same text as if `--bisect-vars` had been used alone."
msgstr ""
"Cette option peut être utilisée avec `--bisect-vars', dans ce cas, après "
"tous les objets commit triés, le texte sera le même que si `--bisect-vars' "
"avait été utilisé seul."
 
#. type: Title ~
#: en/rev-list-options.txt:640
......@@ -59863,12 +59866,15 @@ msgstr "Ordre des commits"
#, priority:260
msgid "By default, the commits are shown in reverse chronological order."
msgstr ""
"Par défaut, les commits sont affichés dans l'ordre chronologique inverse."
 
#. type: Plain text
#: en/rev-list-options.txt:647
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order."
msgstr ""
"N'afficher aucun parent avant que tous ses enfants ne soient affichés, mais "
"sinon montrer les commits dans l'ordre de l'horodatage des commits."
 
#. type: Labeled list
#: en/rev-list-options.txt:648
......@@ -59881,18 +59887,22 @@ msgstr "--author-date-order"
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order."
msgstr ""
"N'afficher aucun parent avant que tous ses enfants ne soient affichés, mais "
"autrement afficher les commits dans l'ordre d'horodatage de l'auteur."
 
#. type: Plain text
#: en/rev-list-options.txt:656
#, priority:260
msgid "Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed."
msgstr ""
"N'afficher aucun parent avant que tous ses enfants ne soient affichés, et "
"éviter d'afficher des commits entremêlés sur plusieurs lignes d'historique."
 
#. type: Plain text
#: en/rev-list-options.txt:658
#, priority:260
msgid "For example, in a commit history like this:"
msgstr ""
msgstr "Par exemple, dans un historique de commit comme celui-ci :"
 
#. type: delimited block -
#: en/rev-list-options.txt:664
......@@ -59902,36 +59912,50 @@ msgid ""
"\t\\\t \\\n"
"\t 3----5----6----8---\n"
msgstr ""
" ---1----2----4----7\n"
"\t\\\t \\\n"
"\t 3----5----6----8---\n"
 
#. type: Plain text
#: en/rev-list-options.txt:670
#, priority:260
msgid "where the numbers denote the order of commit timestamps, `git rev-list` and friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 4 3 2 1."
msgstr ""
"où les nombres indiquent l'ordre des horodatages de commit, `git rev-list` "
"et consorts avec `--date-order` affichent les commits dans l'ordre "
"d'horodatage : 8 7 6 5 4 3 2 1."
 
#. type: Plain text
#: en/rev-list-options.txt:675
#, priority:260
msgid "With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together."
msgstr ""
"Avec `--topo-order', ils afficheraient 8 6 5 5 3 3 7 4 7 4 2 1 (ou 8 7 4 2 2 "
"6 5 5 3 1) ; certains commits plus anciens sont affichés avant les plus "
"récents afin d'éviter de montrer mélangés ensemble les commits de deux "
"pistes de développement parallèles."
 
#. type: Plain text
#: en/rev-list-options.txt:680
#, priority:260
msgid "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
"Sortir les commits choisis pour être affichés (voir la section Limitation "
"des commits ci-dessus) dans l'ordre inverse. Ne peut pas être combiné avec "
"`--walk-reflogs`."
 
#. type: Title ~
#: en/rev-list-options.txt:682
#, no-wrap, priority:260
msgid "Object Traversal"
msgstr ""
msgstr "Traversée d'objets"
 
#. type: Plain text
#: en/rev-list-options.txt:685
#, priority:260
msgid "These options are mostly targeted for packing of Git repositories."
msgstr ""
"Ces options sont principalement destinées à l'empaquetage des dépôts Git."
 
#. type: Labeled list
#: en/rev-list-options.txt:687
......@@ -59944,6 +59968,9 @@ msgstr "--objects"
#, priority:260
msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
msgstr ""
"Imprimer les ID d'objet de tout objet référencé par les commits listés. `--"
"objets foo foo ^bar` signifie donc ``envoie-moi tous les ID d'objets que je "
"dois télécharger si j'ai l'objet commit _bar_ mais pas _foo_''."
 
#. type: Labeled list
#: en/rev-list-options.txt:693
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