From fd43a58ddde2f23c6951965407a11209613425fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr> Date: Fri, 27 Sep 2019 21:04:13 +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 31.6% (3022 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 | 397 ++++++++++++++++++++++++++--------------- 1 file changed, 253 insertions(+), 144 deletions(-) diff --git a/po/documentation.fr.po b/po/documentation.fr.po index 6d759f4..c2f4067 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-09-20 14:27+0000\n" +"PO-Revision-Date: 2019-09-30 12:56+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" @@ -46837,108 +46837,125 @@ msgstr "Affiche un ou plusieurs objets (blobs, arbres, 챕tiquettes et commits)." #, priority:260 msgid "For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by 'git diff-tree --cc'." msgstr "" +"Pour les commits, il affiche le message de log et la diff챕rence textuelle. " +"Il pr챕sente 챕galement le commit de fusion dans un format sp챕cial comme " +"produit par'git diff-tree --cc'." #. type: Plain text #: en/git-show.txt:23 #, priority:260 msgid "For tags, it shows the tag message and the referenced objects." msgstr "" +"Pour les 챕tiquettes, il affiche le message de l'챕tiquette et les objets " +"r챕f챕renc챕s." #. type: Plain text #: en/git-show.txt:26 #, priority:260 msgid "For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)." msgstr "" +"Pour les arbres, il affiche les noms (챕quivalent 횪'git ls-tree' avec --name " +"only)." #. type: Plain text #: en/git-show.txt:28 #, priority:260 msgid "For plain blobs, it shows the plain contents." -msgstr "" +msgstr "Pour les blobs simples, il affiche le contenu simple." #. type: Plain text #: en/git-show.txt:31 #, priority:260 msgid "The command takes options applicable to the 'git diff-tree' command to control how the changes the commit introduces are shown." msgstr "" +"La commande prend les options applicables 횪 la commande'git diff-tree' pour " +"contr척ler comment les changements introduits par le commit sont affich챕s." #. type: Plain text #: en/git-show.txt:33 #, priority:260 msgid "This manual page describes only the most frequently used options." msgstr "" +"Cette page manuelle d챕crit uniquement les options les plus fr챕quemment " +"utilis챕es." #. type: Labeled list #: en/git-show.txt:37 #, ignore-ellipsis, no-wrap, priority:260 msgid "<object>..." -msgstr "" +msgstr "<objet>..." #. type: Plain text #: en/git-show.txt:41 #, priority:260 msgid "The names of objects to show (defaults to 'HEAD'). For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]." msgstr "" +"Les noms des objets 횪 afficher (par d챕faut:'HEAD'). Pour une liste plus " +"compl챔te des fa챌ons d'챕peler les noms d'objets, voir la section \"SP횋CIFIER " +"LES R횋VISIONS\" dans linkgit:gitrevisions[7]." #. type: Labeled list #: en/git-show.txt:60 #, no-wrap, priority:260 msgid "`git show v1.0.0`" -msgstr "" +msgstr "`git show v1.0.0`" #. type: Plain text #: en/git-show.txt:63 #, priority:260 msgid "Shows the tag `v1.0.0`, along with the object the tags points at." -msgstr "" +msgstr "Affiche l'챕tiquette `v1.0.0`, ainsi que l'objet sur lequel elle pointe." #. type: Labeled list #: en/git-show.txt:64 #, no-wrap, priority:260 msgid "`git show v1.0.0^{tree}`" -msgstr "" +msgstr "`git show v1.0.0^{tree}`" #. type: Plain text #: en/git-show.txt:66 #, priority:260 msgid "Shows the tree pointed to by the tag `v1.0.0`." -msgstr "" +msgstr "Affiche l'arbre point챕 par l'챕tiquette `v1.0.0`." #. type: Labeled list #: en/git-show.txt:67 #, no-wrap, priority:260 msgid "`git show -s --format=%s v1.0.0^{commit}`" -msgstr "" +msgstr "`git show -s --format=%s v1.0.0^{commit}`" #. type: Plain text #: en/git-show.txt:70 #, priority:260 msgid "Shows the subject of the commit pointed to by the tag `v1.0.0`." -msgstr "" +msgstr "Affiche le titre du commit point챕 par le tag 'v1.0.0'." #. type: Labeled list #: en/git-show.txt:71 #, no-wrap, priority:260 msgid "`git show next~10:Documentation/README`" -msgstr "" +msgstr "`git show next~10:Documentation/README`" #. type: Plain text #: en/git-show.txt:75 #, priority:260 msgid "Shows the contents of the file `Documentation/README` as they were current in the 10th last commit of the branch `next`." msgstr "" +"Affiche le contenu du fichier 'Documentation/README' tel qu'il 챕tait dans le " +"10챔me dernier commit de la branche 'next'." #. type: Labeled list #: en/git-show.txt:76 #, no-wrap, priority:260 msgid "`git show master:Makefile master:t/Makefile`" -msgstr "" +msgstr "`git show master:Makefile master:t/Makefile`" #. type: Plain text #: en/git-show.txt:79 #, priority:260 msgid "Concatenates the contents of said Makefiles in the head of the branch `master`." msgstr "" +"Concat챔ne le contenu desdits Makefiles dans l'en-t챗te de la branche `master'." #. type: Title = #: en/git-sh-setup.txt:2 @@ -56335,18 +56352,26 @@ msgstr "" #, priority:260 msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses." msgstr "" +"Si le fichier '.mailmap' existe au niveau sup챕rieur du d챕p척t, ou 횪 " +"l'emplacement indiqu챕 par les options de configuration mailmap.file ou " +"mailmap.blob, il est utilis챕 pour faire correspondre les noms des auteurs et " +"des validateurs et les adresses e-mail avec les vrais noms canoniques et " +"adresses e-mail." #. type: Plain text #: en/mailmap.txt:10 #, priority:260 msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:" msgstr "" +"Dans la forme simple, chaque ligne dans le fichier se compose du nom r챕el " +"canonique d'un auteur, une espace, et une adresse e-mail utilis챕e dans le " +"commit (entour챕 par '<' et '>') en correspondance ue nom. Par exemple��:" #. type: Plain text #: en/mailmap.txt:12 #, no-wrap, priority:260 msgid "\tProper Name <commit@email.xx>\n" -msgstr "" +msgstr "\tNom <commit@email.xx>\n" #. type: Plain text #: en/mailmap.txt:15 @@ -56358,43 +56383,51 @@ msgstr "Les formes plus complexes sont혻:" #: en/mailmap.txt:17 #, no-wrap, priority:260 msgid "\t<proper@email.xx> <commit@email.xx>\n" -msgstr "" +msgstr "\t<nom@email.xx> <commit@email.xx>\n" #. type: Plain text #: en/mailmap.txt:19 #, priority:260 msgid "which allows mailmap to replace only the email part of a commit, and:" msgstr "" +"qui permet 횪 mailmap de remplacer uniquement la partie e-mail d'un commit, " +"et :" #. type: Plain text #: en/mailmap.txt:21 #, no-wrap, priority:260 msgid "\tProper Name <proper@email.xx> <commit@email.xx>\n" -msgstr "" +msgstr "\tNom <propre@email.xx> <commit@email.xx>\n" #. type: Plain text #: en/mailmap.txt:24 #, priority:260 msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:" msgstr "" +"qui permet 횪 mailmap de remplacer 횪 la fois le nom et l'e-mail d'un commit " +"correspondant 횪 l'adresse e-mail de commit sp챕cifi챕e, et혻:" #. type: Plain text #: en/mailmap.txt:26 #, no-wrap, priority:260 msgid "\tProper Name <proper@email.xx> Commit Name <commit@email.xx>\n" -msgstr "" +msgstr "\tNom Propre <propre@email.xx> Nom dans le Commit <commit@email.xx>\n" #. type: Plain text #: en/mailmap.txt:29 #, priority:260 msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address." msgstr "" +"qui permet 횪 mailmap de remplacer 횪 la fois le nom et l'e-mail d'un commit " +"correspondant 횪 la fois au nom et 횪 l'adresse e-mail du commit sp챕cifi챕." #. type: Plain text #: en/mailmap.txt:32 #, priority:260 msgid "Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms:" msgstr "" +"Exemple 1 : Votre historique contient des commits de deux auteurs, Jane et " +"Joe, dont les noms apparaissent dans le d챕p척t sous plusieurs formes :" #. type: delimited block - #: en/mailmap.txt:39 @@ -56406,12 +56439,20 @@ msgid "" "Jane Doe <jane@laptop.(none)>\n" "Jane D. <jane@desktop.(none)>\n" msgstr "" +"Joe Developer <joe@example.com>\n" +"Joe R. Developer <joe@example.com>\n" +"Jane Doe <jane@example.com>\n" +"Jane Doe <jane@laptop.(none)>\n" +"Jane D. <jane@desktop.(none)>\n" #. type: Plain text #: en/mailmap.txt:44 #, priority:260 msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:" msgstr "" +"Supposons maintenant que Joe veuille que son deuxi챔me pr챕nom soit utilis챕, " +"et que Jane pr챕f챔re que son nom de famille soit enti챔rement 챕pel챕. Un " +"fichier `.mailmap' appropri챕 ressemblerait 횪 :" #. type: delimited block - #: en/mailmap.txt:48 @@ -56420,18 +56461,22 @@ msgid "" "Jane Doe <jane@desktop.(none)>\n" "Joe R. Developer <joe@example.com>\n" msgstr "" +"Jane Doe <jane@desktop.(none)>\n" +"Joe R. Developer <joe@example.com>\n" #. type: Plain text #: en/mailmap.txt:52 #, priority:260 msgid "Note how there is no need for an entry for `<jane@laptop.(none)>`, because the real name of that author is already correct." msgstr "" +"Notez qu'il n'y a pas besoin d'une entr챕e pour ''jane'laptop.(none)', parce " +"que le vrai nom de cet auteur est d챕j횪 correct." #. type: Plain text #: en/mailmap.txt:55 #, priority:260 msgid "Example 2: Your repository contains commits from the following authors:" -msgstr "" +msgstr "Exemple 2 : Votre d챕p척t contient des commits des auteurs suivants :" #. type: delimited block - #: en/mailmap.txt:63 @@ -56444,12 +56489,18 @@ msgid "" "claus <me@company.xx>\n" "CTO <cto@coompany.xx>\n" msgstr "" +"nick1 <bugs@compagnie.xx>\n" +"nick2 <bugs@compagnie.xx>\n" +"nick2 <nick2@compagnie.xx>\n" +"santa <me@compagnie.xx>\n" +"claus <me@compagnie.xx>\n" +"CTO <cto@coompagnie.xx>\n" #. type: Plain text #: en/mailmap.txt:66 #, priority:260 msgid "Then you might want a `.mailmap` file that looks like:" -msgstr "" +msgstr "Donc, vous voudrez peut-챗tre un fichier '.mailmap' qui ressemble 횪혻:" #. type: delimited block - #: en/mailmap.txt:72 @@ -56461,12 +56512,19 @@ msgid "" "Other Author <other@author.xx> <nick2@company.xx>\n" "Santa Claus <santa.claus@northpole.xx> <me@company.xx>\n" msgstr "" +"<cto@company.xx> <cto@coompany.xx>\n" +"Some Dude <some@dude.xx> nick1 <bugs@company.xx>\n" +"Other Author <other@author.xx> nick2 <bugs@company.xx>\n" +"Other Author <other@author.xx> <nick2@company.xx>\n" +"Santa Claus <santa.claus@northpole.xx> <me@company.xx>\n" #. type: Plain text #: en/mailmap.txt:75 #, priority:260 msgid "Use hash '#' for comments that are either on their own line, or after the email address." msgstr "" +"Utilisez un di챔se '#' pour les commentaires qui sont soit sur leur propre " +"ligne, soit apr챔s l'adresse e-mail." #. type: Plain text #: en/merge-options.txt:5 @@ -57079,36 +57137,47 @@ msgstr "FORMATS AUTOMATIQUES" #, priority:260 msgid "If the commit is a merge, and if the pretty-format is not 'oneline', 'email' or 'raw', an additional line is inserted before the 'Author:' line. This line begins with \"Merge: \" and the sha1s of ancestral commits are printed, separated by spaces. Note that the listed commits may not necessarily be the list of the *direct* parent commits if you have limited your view of history: for example, if you are only interested in changes related to a certain directory or file." msgstr "" +"Si le commit est une fusion, et si la mise en forme n'est pas 'oneline', " +"'email' ou 'raw', une ligne suppl챕mentaire est ins챕r챕e avant la ligne " +"'Author:'. Cette ligne commence par \"Merge:\" et les sha1s des commits " +"anc챗tres sont affich챕s, s챕par챕s par des espaces. Notez que les commits " +"챕num챕r챕s ne sont pas n챕cessairement la liste des commits parents *directs* " +"si vous avez limit챕 votre vue de l'histoire : par exemple, si vous n'챗tes " +"int챕ress챕 que par les modifications li챕es 횪 un certain r챕pertoire ou fichier." #. type: Plain text #: en/pretty-formats.txt:20 #, priority:260 msgid "There are several built-in formats, and you can define additional formats by setting a pretty.<name> config option to either another format name, or a 'format:' string, as described below (see linkgit:git-config[1]). Here are the details of the built-in formats:" msgstr "" +"Il existe plusieurs formats int챕gr챕s, et vous pouvez d챕finir des formats " +"suppl챕mentaires en d챕finissant une option pretty.<nom> config 횪 soit un " +"nouveau nom de format, soit une cha챤ne'format:', comme d챕crit ci-dessous (" +"voir linkgit:git-config[1]). Voici le d챕tail des formats int챕gr챕s :" #. type: Plain text #: en/pretty-formats.txt:22 #, priority:260 msgid "'oneline'" -msgstr "" +msgstr "'oneline'" #. type: Plain text #: en/pretty-formats.txt:24 #, no-wrap, priority:260 msgid "<sha1> <title line>\n" -msgstr "" +msgstr "<sha1> <ligne de titre>\n" #. type: Plain text #: en/pretty-formats.txt:26 #, priority:260 msgid "This is designed to be as compact as possible." -msgstr "" +msgstr "C'est con챌u pour 챗tre aussi compact que possible." #. type: Plain text #: en/pretty-formats.txt:28 #, priority:260 msgid "'short'" -msgstr "" +msgstr "'short'" #. type: Plain text #: en/pretty-formats.txt:31 @@ -57117,18 +57186,20 @@ msgid "" "commit <sha1>\n" "Author: <author>\n" msgstr "" +"commit <sha1>\n" +"Author: <auteur>\n" #. type: Plain text #: en/pretty-formats.txt:33 en/pretty-formats.txt:41 en/pretty-formats.txt:51 en/pretty-formats.txt:63 #, no-wrap, priority:260 msgid "<title line>\n" -msgstr "" +msgstr "<ligne de titre>\n" #. type: Plain text #: en/pretty-formats.txt:35 #, priority:260 msgid "'medium'" -msgstr "" +msgstr "'medium'" #. type: Plain text #: en/pretty-formats.txt:39 @@ -57138,18 +57209,21 @@ msgid "" "Author: <author>\n" "Date: <author date>\n" msgstr "" +"commit <sha1>\n" +"Author: <auteur>\n" +"Date: <date d'auteur>\n" #. type: Plain text #: en/pretty-formats.txt:43 en/pretty-formats.txt:53 en/pretty-formats.txt:65 en/pretty-formats.txt:74 #, priority:260 msgid "<full commit message>" -msgstr "" +msgstr "<message de validation complet>" #. type: Plain text #: en/pretty-formats.txt:45 #, priority:260 msgid "'full'" -msgstr "" +msgstr "'full'" #. type: Plain text #: en/pretty-formats.txt:49 @@ -57159,12 +57233,15 @@ msgid "" "Author: <author>\n" "Commit: <committer>\n" msgstr "" +"commit <sha1>\n" +"Author: <auteur>\n" +"Commit: <validateur>\n" #. type: Plain text #: en/pretty-formats.txt:55 #, priority:260 msgid "'fuller'" -msgstr "" +msgstr "'fuller'" #. type: Plain text #: en/pretty-formats.txt:61 @@ -57176,12 +57253,17 @@ msgid "" "Commit: <committer>\n" "CommitDate: <committer date>\n" msgstr "" +"commit <sha1>\n" +"Author: <auteur>\n" +"AuthorDate: <date d'auteur>\n" +"Commit: <validateur>\n" +"CommitDate: <date de validation>\n" #. type: Plain text #: en/pretty-formats.txt:67 #, priority:260 msgid "'email'" -msgstr "" +msgstr "'email'" #. type: Plain text #: en/pretty-formats.txt:72 @@ -57192,18 +57274,30 @@ msgid "" "Date: <author date>\n" "Subject: [PATCH] <title line>\n" msgstr "" +"From <sha1> <date>\n" +"From: <auteur>\n" +"Date: <date d'auteur>\n" +"Subject: [PATCH] <ligne de titre>\n" #. type: Plain text #: en/pretty-formats.txt:76 #, priority:260 msgid "'raw'" -msgstr "" +msgstr "'raw'" #. type: Plain text #: en/pretty-formats.txt:86 #, priority:260 msgid "The 'raw' format shows the entire commit exactly as stored in the commit object. Notably, the SHA-1s are displayed in full, regardless of whether --abbrev or --no-abbrev are used, and 'parents' information show the true parent commits, without taking grafts or history simplification into account. Note that this format affects the way commits are displayed, but not the way the diff is shown e.g. with `git log --raw`. To get full object names in a raw diff format, use `--no-abbrev`." msgstr "" +"Le format'raw' montre le commit entier telle qu'elle est stock챕e dans " +"l'objet commit. Notamment, les SHA-1 sont affich챕s dans leur int챕gralit챕, " +"que --abbrev ou --no-abbrev soient utilis챕s ou non, et l'information " +"'parents' indiquent le v챕ritable commit parent, sans tenir compte des " +"greffes ou de la simplification d'historique. Notez que ce format affecte la " +"fa챌on dont les commits sont affich챕s, mais pas la fa챌on dont la diff챕rence " +"est affich챕e, par exemple avec `git log --raw`. Pour obtenir les noms " +"complets des objets dans un format de diff brut, utilisez `--no-abbrev`." #. type: Plain text #: en/pretty-formats.txt:88 @@ -57216,12 +57310,19 @@ msgstr "'format:<cha챤ne>'" #, priority:260 msgid "The 'format:<string>' format allows you to specify which information you want to show. It works a little bit like printf format, with the notable exception that you get a newline with '%n' instead of '\\n'." msgstr "" +"Le format'format:<cha챤ne>' vous permet de sp챕cifier quelles informations " +"vous voulez afficher. Cela fonctionne un peu comme le format printf, 횪 " +"l'exception notable que vous obtenez une nouvelle ligne avec'%n' au lieu de'" +"\\n" +"'." #. type: Plain text #: en/pretty-formats.txt:96 #, priority:260 msgid "E.g, 'format:\"The author of %h was %an, %ar%nThe title was >>%s<<%n\"' would show something like this:" msgstr "" +"Par exemple,'format : \"L'auteur de %h 챕tait %an, %ar%nL'ent챗te 챕tait " +">>%s<<<%n\"' afficherait quelque chose comme ceci :" #. type: delimited block - #: en/pretty-formats.txt:100 @@ -57230,6 +57331,9 @@ msgid "" "The author of fe6e0ee was Junio C Hamano, 23 hours ago\n" "The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<\n" msgstr "" +"L'auteur de fe6e0ee 챕tait Junio C Hamano, 23 hours ago\n" +"L'ent챗te 챕tait >>t4119: test autocomputing -p<n> for traditional diff " +"input.<<\n" #. type: Plain text #: en/pretty-formats.txt:104 @@ -57241,540 +57345,545 @@ msgstr "Les espaces r챕serv챕s sont혻:" #: en/pretty-formats.txt:106 #, priority:260 msgid "Placeholders that expand to a single literal character:" -msgstr "" +msgstr "Les places qui s'챕tendent 횪 un seul caract챔re litt챕ral :" #. type: Labeled list #: en/pretty-formats.txt:106 #, no-wrap, priority:260 msgid "'%n'" -msgstr "" +msgstr "'%n'" #. type: Plain text #: en/pretty-formats.txt:107 -#, fuzzy, priority:260 -#| msgid "a newline." +#, 260, priority msgid "newline" -msgstr "une retour 횪 la ligne." +msgstr "retour 횪 la ligne" #. type: Plain text #: en/pretty-formats.txt:108 #, priority:260 msgid "a raw '%'" -msgstr "" +msgstr "un '%' brut" #. type: Labeled list #: en/pretty-formats.txt:108 #, no-wrap, priority:260 msgid "'%x00'" -msgstr "" +msgstr "'%x00'" #. type: Plain text #: en/pretty-formats.txt:109 #, priority:260 msgid "print a byte from a hex code" -msgstr "" +msgstr "afficher un octet 횪 partir d'un code hexagonal" #. type: Plain text #: en/pretty-formats.txt:111 #, priority:260 msgid "Placeholders that affect formatting of later placeholders:" msgstr "" +"Espaces r챕serv챕s qui affectent le formatage des espaces r챕serv챕s ult챕rieurs��:" #. type: Labeled list #: en/pretty-formats.txt:111 #, no-wrap, priority:260 msgid "'%Cred'" -msgstr "" +msgstr "'%Cred'" #. type: Plain text #: en/pretty-formats.txt:112 #, priority:260 msgid "switch color to red" -msgstr "" +msgstr "passe la couleur au rouge" #. type: Labeled list #: en/pretty-formats.txt:112 #, no-wrap, priority:260 msgid "'%Cgreen'" -msgstr "" +msgstr "'%Cgreen'" #. type: Plain text #: en/pretty-formats.txt:113 #, priority:260 msgid "switch color to green" -msgstr "" +msgstr "passe la couleur au vert" #. type: Labeled list #: en/pretty-formats.txt:113 #, no-wrap, priority:260 msgid "'%Cblue'" -msgstr "" +msgstr "'%Cblue'" #. type: Plain text #: en/pretty-formats.txt:114 #, priority:260 msgid "switch color to blue" -msgstr "" +msgstr "passe la couleur au bleu" #. type: Labeled list #: en/pretty-formats.txt:114 -#, fuzzy, no-wrap, priority:260 -#| msgid "`reset`" +#, 260, no-wrap, priority msgid "'%Creset'" -msgstr "`reset`" +msgstr "'%Creset'" #. type: Plain text #: en/pretty-formats.txt:115 -#, fuzzy, priority:260 -#| msgid "color" +#, 260, priority msgid "reset color" -msgstr "color" +msgstr "r챕initialise la couleur" #. type: Labeled list #: en/pretty-formats.txt:115 #, ignore-ellipsis, no-wrap, priority:260 msgid "'%C(...)'" -msgstr "" +msgstr "'%C(...)'" #. type: Plain text #: en/pretty-formats.txt:116 #, priority:260 msgid "color specification, as described under Values in the" msgstr "" +"la sp챕cification de la couleur, comme d챕crit sous Valeurs dans la section" #. type: Plain text #: en/pretty-formats.txt:129 #, ignore-ellipsis, priority:260 msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again." msgstr "" +"section \"FICHIER DE CONFIGURATION\" de linkgit:git-config[1]. Par d챕faut, " +"les couleurs ne sont affich챕es que lorsqu'elles sont activ챕es pour la sortie " +"des journaux (par `color.diff`, `color.ui`, ou `--color`, et en respectant " +"les param챔tres `auto` du premier si nous allons sur un terminal). " +"`%C(auto,...)` est accept챕 comme synonyme historique de la valeur par d챕faut " +"(par exemple, `%C(auto,red)`). Sp챕cifier `%C(always,...)` affichera les " +"couleurs m챗me si la couleur n'est pas activ챕e autrement (bien qu'il faille " +"toujours utiliser `--color=always` pour activer la couleur pour toute la " +"sortie, y compris ce format et tout ce que git peut colorier). `auto` seul " +"(c'est-횪-dire `%C(auto)`) activera la coloration automatique sur les places " +"suivantes jusqu'횪 ce que la couleur soit 횪 nouveau chang챕e." #. type: Labeled list #: en/pretty-formats.txt:129 #, no-wrap, priority:260 msgid "'%m'" -msgstr "" +msgstr "'%m'" #. type: Plain text #: en/pretty-formats.txt:130 #, priority:260 msgid "left (`<`), right (`>`) or boundary (`-`) mark" -msgstr "" +msgstr "marque 횪 gauche (`<`), 횪 droite (`>`) ou de limite (`-`)" #. type: Labeled list #: en/pretty-formats.txt:130 #, no-wrap, priority:260 msgid "'%w([<w>[,<i1>[,<i2>]]])'" -msgstr "" +msgstr "'%w([<w>[,<i1>[,<i2>]]])'" #. type: Plain text #: en/pretty-formats.txt:131 #, priority:260 msgid "switch line wrapping, like the -w option of" -msgstr "" +msgstr "basculer les retours 횪 la ligne, 횪 l'instar de l'option-w de" #. type: Plain text #: en/pretty-formats.txt:132 -#, fuzzy, priority:260 -#| msgid "linkgit:git-shortlog[1]" +#, 260, priority msgid "linkgit:git-shortlog[1]." -msgstr "linkgit:git-shortlog[1]" +msgstr "linkgit:git-shortlog[1]." #. type: Labeled list #: en/pretty-formats.txt:132 #, no-wrap, priority:260 msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'" -msgstr "" +msgstr "'%<(<N>[,tronq|tronqg|tronqm])'" #. type: Plain text #: en/pretty-formats.txt:133 -#, fuzzy, priority:260 -#| msgid "The placeholders are:" +#, 260, priority msgid "make the next placeholder take at" -msgstr "Les espaces r챕serv챕s sont혻:" +msgstr "faire le prochain espace r챕serv챕 prendre" #. type: Plain text #: en/pretty-formats.txt:140 #, priority:260 msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2." msgstr "" +"au moins N colonnes, en remplissant les espaces 횪 droite si n챕cessaire. Au " +"choix, tronquer au d챕but (tronqg), au milieu (tronqm) ou 횪 la fin (tronq) si " +"la sortie est plus longue que N colonnes. Notez que la troncation ne " +"fonctionne correctement qu'avec N >= 2." #. type: Labeled list #: en/pretty-formats.txt:140 #, no-wrap, priority:260 msgid "'%<|(<N>)'" -msgstr "" +msgstr "'%<|(<N>)'" #. type: Plain text #: en/pretty-formats.txt:141 #, priority:260 msgid "make the next placeholder take at least until Nth" -msgstr "" +msgstr "faire le prochain espace r챕serv챕 prendre au moins jusqu'au Ni챔me" #. type: Plain text #: en/pretty-formats.txt:142 #, priority:260 msgid "columns, padding spaces on the right if necessary" -msgstr "" +msgstr "colonnes, en ins챕rant des espaces 횪 droite si n챕cessaire" #. type: Labeled list #: en/pretty-formats.txt:142 #, no-wrap, priority:260 msgid "'%>(<N>)', '%>|(<N>)'" -msgstr "" +msgstr "'%>(<N>)', '%>|(<N>)'" #. type: Plain text #: en/pretty-formats.txt:143 #, priority:260 msgid "similar to '%<(<N>)', '%<|(<N>)' respectively," -msgstr "" +msgstr "similaire 횪 '%<(<N>)', '%<|(<N>)' respectivement," #. type: Plain text #: en/pretty-formats.txt:144 #, priority:260 msgid "but padding spaces on the left" -msgstr "" +msgstr "mais en ins챕rant des espaces 횪 gauche" #. type: Labeled list #: en/pretty-formats.txt:144 #, no-wrap, priority:260 msgid "'%>>(<N>)', '%>>|(<N>)'" -msgstr "" +msgstr "'%>>(<N>)', '%>>|(<N>)'" #. type: Plain text #: en/pretty-formats.txt:145 #, priority:260 msgid "similar to '%>(<N>)', '%>|(<N>)'" -msgstr "" +msgstr "similaire 횪 '%>(<N>)', '%>|(<N>)'" #. type: Plain text #: en/pretty-formats.txt:149 #, priority:260 msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces" msgstr "" +"respectivement, sauf que si le prochain espace r챕serv챕 prend plus d'espaces " +"que pr챕vu et qu'il y a des espaces 횪 sa gauche, utiliser ces espaces" #. type: Labeled list #: en/pretty-formats.txt:149 #, no-wrap, priority:260 msgid "'%><(<N>)', '%><|(<N>)'" -msgstr "" +msgstr "'%><(<N>)', '%><|(<N>)'" #. type: Plain text #: en/pretty-formats.txt:150 #, priority:260 msgid "similar to '%<(<N>)', '%<|(<N>)'" -msgstr "" +msgstr "similaire 횪 '%<(<N>)', '%<|(<N>)'" #. type: Plain text #: en/pretty-formats.txt:152 #, priority:260 msgid "respectively, but padding both sides (i.e. the text is centered)" msgstr "" +"respectivement, mais en calant des deux c척t챕s (c'est-횪-dire que le texte est " +"centr챕)" #. type: Plain text #: en/pretty-formats.txt:154 #, priority:260 msgid "Placeholders that expand to information extracted from the commit:" -msgstr "" +msgstr "Espaces r챕serv챕s d챕veloppant les informations extraites du commit혻:" #. type: Labeled list #: en/pretty-formats.txt:154 #, no-wrap, priority:260 msgid "'%H'" -msgstr "" +msgstr "'%H'" #. type: Plain text #: en/pretty-formats.txt:155 -#, fuzzy, priority:260 -#| msgid "commit" +#, 260, priority msgid "commit hash" -msgstr "valider" +msgstr "empreinte du commit" #. type: Labeled list #: en/pretty-formats.txt:155 -#, no-wrap, priority:260 +#, 260, fuzzy, no-wrap, priority msgid "'%h'" -msgstr "" +msgstr "'%h'" #. type: Plain text #: en/pretty-formats.txt:156 -#, fuzzy, priority:260 -#| msgid "--abbrev-commit" +#, 260, priority msgid "abbreviated commit hash" -msgstr "--abbrev-commit" +msgstr "empreinte abr챕g챕e du commit" #. type: Labeled list #: en/pretty-formats.txt:156 #, no-wrap, priority:260 msgid "'%T'" -msgstr "" +msgstr "'%T'" #. type: Plain text #: en/pretty-formats.txt:157 -#, fuzzy, priority:260 -#| msgid "<tree-ish>" +#, 260, priority msgid "tree hash" -msgstr "<arbre-esque>" +msgstr "empreinte de l'arbre" #. type: Labeled list #: en/pretty-formats.txt:157 #, no-wrap, priority:260 msgid "'%t'" -msgstr "" +msgstr "'%t'" #. type: Plain text #: en/pretty-formats.txt:158 #, priority:260 msgid "abbreviated tree hash" -msgstr "" +msgstr "empreinte abr챕g챕e de l'arbre" #. type: Labeled list #: en/pretty-formats.txt:158 #, no-wrap, priority:260 msgid "'%P'" -msgstr "" +msgstr "'%P'" #. type: Plain text #: en/pretty-formats.txt:159 -#, fuzzy, priority:260 -#| msgid "--parents" +#, 260, priority msgid "parent hashes" -msgstr "--parents" +msgstr "empreintes des parents" #. type: Labeled list #: en/pretty-formats.txt:159 #, no-wrap, priority:260 msgid "'%p'" -msgstr "" +msgstr "'%p'" #. type: Plain text #: en/pretty-formats.txt:160 #, priority:260 msgid "abbreviated parent hashes" -msgstr "" +msgstr "empreintes abr챕g챕s des parents" #. type: Labeled list #: en/pretty-formats.txt:160 #, no-wrap, priority:260 msgid "'%an'" -msgstr "" +msgstr "'%an'" #. type: Plain text #: en/pretty-formats.txt:161 -#, fuzzy, priority:260 -#| msgid "`author`" +#, 260, priority msgid "author name" -msgstr "`author`" +msgstr "nom de l'auteur" #. type: Labeled list #: en/pretty-formats.txt:161 #, no-wrap, priority:260 msgid "'%aN'" -msgstr "" +msgstr "'%aN'" #. type: Plain text #: en/pretty-formats.txt:162 #, priority:260 msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]" -msgstr "" +msgstr "nom de l'auteur (en respectant .mailmap, voir linkgit:git-shortlog[1]" #. type: Plain text #: en/pretty-formats.txt:163 en/pretty-formats.txt:166 -#, fuzzy, priority:260 -#| msgid "linkgit:git-blame[1]" +#, 260, priority msgid "or linkgit:git-blame[1])" -msgstr "linkgit:git-blame[1]" +msgstr "ou linkgit:git-blame[1])" #. type: Labeled list #: en/pretty-formats.txt:163 #, no-wrap, priority:260 msgid "'%ae'" -msgstr "" +msgstr "'%ae'" #. type: Plain text #: en/pretty-formats.txt:164 -#, fuzzy, priority:260 -#| msgid "`author`" +#, 260, priority msgid "author email" -msgstr "`author`" +msgstr "e-mail de l'auteur" #. type: Labeled list #: en/pretty-formats.txt:164 #, no-wrap, priority:260 msgid "'%aE'" -msgstr "" +msgstr "'%aE'" #. type: Plain text #: en/pretty-formats.txt:165 #, priority:260 msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]" msgstr "" +"e-mail de l'auteur (en respectant .mailmap, voir linkgit:git-shortlog[1]" #. type: Labeled list #: en/pretty-formats.txt:166 #, no-wrap, priority:260 msgid "'%ad'" -msgstr "" +msgstr "'%ad'" #. type: Plain text #: en/pretty-formats.txt:167 #, priority:260 msgid "author date (format respects --date= option)" -msgstr "" +msgstr "date de l'auteur (le format respecte l'option --date=)" #. type: Labeled list #: en/pretty-formats.txt:167 #, no-wrap, priority:260 msgid "'%aD'" -msgstr "" +msgstr "'%aD'" #. type: Plain text #: en/pretty-formats.txt:168 #, priority:260 msgid "author date, RFC2822 style" -msgstr "" +msgstr "date d'auteur, style RFC2822" #. type: Labeled list #: en/pretty-formats.txt:168 #, no-wrap, priority:260 msgid "'%ar'" -msgstr "" +msgstr "'%ar'" #. type: Plain text #: en/pretty-formats.txt:169 -#, fuzzy, priority:260 -#| msgid "--author-date-order" +#, 260, priority msgid "author date, relative" -msgstr "--author-date-order" +msgstr "date de l'auteur, date relative" #. type: Labeled list #: en/pretty-formats.txt:169 #, no-wrap, priority:260 msgid "'%at'" -msgstr "" +msgstr "'%at'" #. type: Plain text #: en/pretty-formats.txt:170 #, priority:260 msgid "author date, UNIX timestamp" -msgstr "" +msgstr "date de l'auteur, horodatage UNIX" #. type: Labeled list #: en/pretty-formats.txt:170 #, no-wrap, priority:260 msgid "'%ai'" -msgstr "" +msgstr "'%ai'" #. type: Plain text #: en/pretty-formats.txt:171 #, priority:260 msgid "author date, ISO 8601-like format" -msgstr "" +msgstr "date de cr챕ation, format de type ISO 8601" #. type: Labeled list #: en/pretty-formats.txt:171 #, no-wrap, priority:260 msgid "'%aI'" -msgstr "" +msgstr "'%aI'" #. type: Plain text #: en/pretty-formats.txt:172 #, priority:260 msgid "author date, strict ISO 8601 format" -msgstr "" +msgstr "date d'auteur, format strict ISO 8601" #. type: Labeled list #: en/pretty-formats.txt:172 #, no-wrap, priority:260 msgid "'%cn'" -msgstr "" +msgstr "'%cn'" #. type: Plain text #: en/pretty-formats.txt:173 -#, fuzzy, priority:260 -#| msgid "`committer`" +#, 260, priority msgid "committer name" -msgstr "`committer`" +msgstr "nom du validateur" #. type: Labeled list #: en/pretty-formats.txt:173 #, no-wrap, priority:260 msgid "'%cN'" -msgstr "" +msgstr "'%cN'" #. type: Plain text #: en/pretty-formats.txt:174 #, priority:260 msgid "committer name (respecting .mailmap, see" -msgstr "" +msgstr "nom du validateur (en respectant .mailmap, voir" #. type: Plain text #: en/pretty-formats.txt:175 en/pretty-formats.txt:178 en/pretty-formats.txt:221 en/pretty-formats.txt:224 -#, fuzzy, priority:260 -#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]" +#, 260, priority msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])" -msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]" +msgstr "linkgit:git-shortlog[1] ou linkgit:git-blame[1])" #. type: Labeled list #: en/pretty-formats.txt:175 #, no-wrap, priority:260 msgid "'%ce'" -msgstr "" +msgstr "'%ce'" #. type: Plain text #: en/pretty-formats.txt:176 -#, fuzzy, priority:260 -#| msgid "`committer`" +#, 260, priority msgid "committer email" -msgstr "`committer`" +msgstr "e-mail du validateur" #. type: Labeled list #: en/pretty-formats.txt:176 #, no-wrap, priority:260 msgid "'%cE'" -msgstr "" +msgstr "'%cE'" #. type: Plain text #: en/pretty-formats.txt:177 #, priority:260 msgid "committer email (respecting .mailmap, see" -msgstr "" +msgstr "e-mail du validateur (en respectant .mailmap, voir" #. type: Labeled list #: en/pretty-formats.txt:178 #, no-wrap, priority:260 msgid "'%cd'" -msgstr "" +msgstr "'%cd'" #. type: Plain text #: en/pretty-formats.txt:179 #, priority:260 msgid "committer date (format respects --date= option)" -msgstr "" +msgstr "date de validation (le format respecte l'option --date=)" #. type: Labeled list #: en/pretty-formats.txt:179 -#, no-wrap, priority:260 +#, 260, fuzzy, no-wrap, priority msgid "'%cD'" -msgstr "" +msgstr "'%cD'" #. type: Plain text #: en/pretty-formats.txt:180 #, priority:260 msgid "committer date, RFC2822 style" -msgstr "" +msgstr "date de validation, style RFC2822" #. type: Labeled list #: en/pretty-formats.txt:180 #, no-wrap, priority:260 msgid "'%cr'" -msgstr "" +msgstr "'%cr'" #. type: Plain text #: en/pretty-formats.txt:181 -#, fuzzy, priority:260 -#| msgid "--committer-date-is-author-date" +#, 260, priority msgid "committer date, relative" -msgstr "--committer-date-is-author-date" +msgstr "date de validation, date relative" #. type: Labeled list #: en/pretty-formats.txt:181 -- GitLab