Skip to content
Snippets Groups Projects
Unverified Commit c0808f7d 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 35.5% (3432 of 9658 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 1d2deef6
No related branches found
No related tags found
No related merge requests found
...@@ -7,13 +7,13 @@ msgstr "" ...@@ -7,13 +7,13 @@ 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: 2020-01-28 19:39+0100\n" "POT-Creation-Date: 2020-01-28 19:39+0100\n"
"PO-Revision-Date: 2020-01-25 16:21+0000\n" "PO-Revision-Date: 2020-01-30 16:50+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"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n" "Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n" "Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 3.11-dev\n" "X-Generator: Weblate 3.11-dev\n"
   
...@@ -2608,6 +2608,14 @@ msgstr "merge.renormalize" ...@@ -2608,6 +2608,14 @@ msgstr "merge.renormalize"
#, priority:240 #, priority:240
msgid "Tell Git that canonical representation of files in the repository has changed over time (e.g. earlier commits record text files with CRLF line endings, but recent ones use LF line endings). In such a repository, Git can convert the data recorded in commits to a canonical form before performing a merge to reduce unnecessary conflicts. For more information, see section \"Merging branches with differing checkin/checkout attributes\" in linkgit:gitattributes[5]." msgid "Tell Git that canonical representation of files in the repository has changed over time (e.g. earlier commits record text files with CRLF line endings, but recent ones use LF line endings). In such a repository, Git can convert the data recorded in commits to a canonical form before performing a merge to reduce unnecessary conflicts. For more information, see section \"Merging branches with differing checkin/checkout attributes\" in linkgit:gitattributes[5]."
msgstr "" msgstr ""
"Indiquer à Git que la représentation canonique des fichiers dans le dépôt a "
"changé au fil du temps (par exemple, les premiers commits enregistrent les "
"fichiers avec des fins de ligne CRLF, mais les plus récents utilisent des "
"fins de ligne LF). Dans un tel dépôt, Git peut convertir les données "
"enregistrées dans les commits en une forme canonique avant d'effectuer une "
"fusion pour réduire les conflits inutiles. Pour plus d'informations, voir "
"la section \"Fusionner des branches avec des attributs d'entrée/de sortie "
"différents\" dans linkgit:gitattributes[5]."
   
#. type: Labeled list #. type: Labeled list
#: en/config/merge.txt:69 #: en/config/merge.txt:69
...@@ -2620,6 +2628,8 @@ msgstr "merge.stat" ...@@ -2620,6 +2628,8 @@ msgstr "merge.stat"
#, priority:240 #, priority:240
msgid "Whether to print the diffstat between ORIG_HEAD and the merge result at the end of the merge. True by default." msgid "Whether to print the diffstat between ORIG_HEAD and the merge result at the end of the merge. True by default."
msgstr "" msgstr ""
"Indiquer s'il faut afficher le diffstat entre ORIG_HEAD et le résultat de la "
"fusion à la fin de la fusion. Vrai par défaut."
   
#. type: Labeled list #. type: Labeled list
#: en/config/merge.txt:73 #: en/config/merge.txt:73
...@@ -2632,6 +2642,10 @@ msgstr "merge.tool" ...@@ -2632,6 +2642,10 @@ msgstr "merge.tool"
#, priority:240 #, priority:240
msgid "Controls which merge tool is used by linkgit:git-mergetool[1]. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<tool>.cmd variable is defined." msgid "Controls which merge tool is used by linkgit:git-mergetool[1]. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<tool>.cmd variable is defined."
msgstr "" msgstr ""
"Contrôle quel outil de fusion est utilisé par linkgit:git-mergetool[1]. La "
"liste ci-dessous indique les valeurs pré-intégrées valides. Toute autre "
"valeur est traitée comme un outil de fusion personnalisé et nécessite qu'une "
"variable mergetool.<outil>.cmd correspondante soit définie."
   
#. type: Labeled list #. type: Labeled list
#: en/config/merge.txt:79 #: en/config/merge.txt:79
...@@ -2644,6 +2658,11 @@ msgstr "merge.guitool" ...@@ -2644,6 +2658,11 @@ msgstr "merge.guitool"
#, priority:240 #, priority:240
msgid "Controls which merge tool is used by linkgit:git-mergetool[1] when the -g/--gui flag is specified. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<guitool>.cmd variable is defined." msgid "Controls which merge tool is used by linkgit:git-mergetool[1] when the -g/--gui flag is specified. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<guitool>.cmd variable is defined."
msgstr "" msgstr ""
"Contrôle quel outil de fusion est utilisé par linkgit:git-mergetool[1] "
"lorsque le drapeau -g/--gui est spécifié. La liste ci-dessous indique les "
"valeurs pré-intégrées valides. Toute autre valeur est traitée comme un "
"outil de fusion personnalisé et nécessite qu'une variable "
"mergetool.<outilgraphique>.cmd correspondante soit définie."
   
#. type: Labeled list #. type: Labeled list
#: en/config/merge.txt:87 #: en/config/merge.txt:87
...@@ -2656,42 +2675,56 @@ msgstr "merge.verbosity" ...@@ -2656,42 +2675,56 @@ msgstr "merge.verbosity"
#, priority:240 #, priority:240
msgid "Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. Can be overridden by the `GIT_MERGE_VERBOSITY` environment variable." msgid "Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. Can be overridden by the `GIT_MERGE_VERBOSITY` environment variable."
msgstr "" msgstr ""
"Contrôle la quantité de production affichée par la stratégie de fusion "
"récursive. Le niveau 0 ne produit rien, sauf un message d'erreur final si "
"des conflits ont été détectés. Le niveau 1 ne produit que des conflits, le "
"niveau 2 produit des conflits et des changements de fichiers. Les niveaux 5 "
"et plus produisent des informations de débogage. La valeur par défaut est "
"le niveau 2. Peut être écrasée par la variable d'environnement "
"`GIT_MERGE_VERBOSITY`."
   
#. type: Labeled list #. type: Labeled list
#: en/config/merge.txt:95 #: en/config/merge.txt:95
#, no-wrap, priority:240 #, no-wrap, priority:240
msgid "merge.<driver>.name" msgid "merge.<driver>.name"
msgstr "" msgstr "merge.<pilote>.name"
   
#. type: Plain text #. type: Plain text
#: en/config/merge.txt:98 #: en/config/merge.txt:98
#, priority:240 #, priority:240
msgid "Defines a human-readable name for a custom low-level merge driver. See linkgit:gitattributes[5] for details." msgid "Defines a human-readable name for a custom low-level merge driver. See linkgit:gitattributes[5] for details."
msgstr "" msgstr ""
"Définit un nom lisible par l'homme pour un pilote de fusion personnalisé de "
"bas niveau. Voir linkgit:gitattributes[5] pour plus de détails."
   
#. type: Labeled list #. type: Labeled list
#: en/config/merge.txt:99 #: en/config/merge.txt:99
#, no-wrap, priority:240 #, no-wrap, priority:240
msgid "merge.<driver>.driver" msgid "merge.<driver>.driver"
msgstr "" msgstr "merge.<pilote>.driver"
   
#. type: Plain text #. type: Plain text
#: en/config/merge.txt:102 #: en/config/merge.txt:102
#, priority:240 #, priority:240
msgid "Defines the command that implements a custom low-level merge driver. See linkgit:gitattributes[5] for details." msgid "Defines the command that implements a custom low-level merge driver. See linkgit:gitattributes[5] for details."
msgstr "" msgstr ""
"Définit la commande qui met en œuvre un pilote de fusion de bas niveau "
"personnalisé. Voir linkgit:gitattributes[5] pour plus de détails."
   
#. type: Labeled list #. type: Labeled list
#: en/config/merge.txt:103 #: en/config/merge.txt:103
#, no-wrap, priority:240 #, no-wrap, priority:240
msgid "merge.<driver>.recursive" msgid "merge.<driver>.recursive"
msgstr "" msgstr "merge.<pilote>.recursive"
   
#. type: Plain text #. type: Plain text
#: en/config/merge.txt:106 #: en/config/merge.txt:106
#, priority:240 #, priority:240
msgid "Names a low-level merge driver to be used when performing an internal merge between common ancestors. See linkgit:gitattributes[5] for details." msgid "Names a low-level merge driver to be used when performing an internal merge between common ancestors. See linkgit:gitattributes[5] for details."
msgstr "" msgstr ""
"Nomme un pilote de fusion de bas niveau à utiliser lors d'une fusion interne "
"entre des ancêtres communs. Voir linkgit:gitattributes[5] pour plus de "
"détails."
   
#. type: Labeled list #. type: Labeled list
#: en/config/fmt-merge-msg.txt:1 #: en/config/fmt-merge-msg.txt:1
...@@ -2704,6 +2737,9 @@ msgstr "merge.branchdesc" ...@@ -2704,6 +2737,9 @@ msgstr "merge.branchdesc"
#, priority:240 #, priority:240
msgid "In addition to branch names, populate the log message with the branch description text associated with them. Defaults to false." msgid "In addition to branch names, populate the log message with the branch description text associated with them. Defaults to false."
msgstr "" msgstr ""
"En plus des noms des branches, remplir le message de validation avec le "
"texte de description des branches qui leur est associé. Désactivé par "
"défaut (valeur false)."
   
#. type: Labeled list #. type: Labeled list
#: en/config/fmt-merge-msg.txt:6 #: en/config/fmt-merge-msg.txt:6
...@@ -2716,6 +2752,9 @@ msgstr "merge.log" ...@@ -2716,6 +2752,9 @@ msgstr "merge.log"
#, priority:240 #, priority:240
msgid "In addition to branch names, populate the log message with at most the specified number of one-line descriptions from the actual commits that are being merged. Defaults to false, and true is a synonym for 20." msgid "In addition to branch names, populate the log message with at most the specified number of one-line descriptions from the actual commits that are being merged. Defaults to false, and true is a synonym for 20."
msgstr "" msgstr ""
"En plus des noms de branches, remplir le message de validation avec au "
"maximum le nombre spécifié de descriptions d'une ligne des commits réels "
"fusionnés. Désactivé par défaut (valeur false), et vaut 20 si `true`."
   
#. type: Title - #. type: Title -
#: en/date-formats.txt:2 #: en/date-formats.txt:2
...@@ -4607,10 +4646,19 @@ msgstr "Casser les modifications de réécriture complète en paires de suppress ...@@ -4607,10 +4646,19 @@ msgstr "Casser les modifications de réécriture complète en paires de suppress
   
#. type: Plain text #. type: Plain text
#: en/diff-options.txt:463 #: en/diff-options.txt:463
#, fuzzy, priority:280 #, priority:280
#| msgid "It affects the way a change that amounts to a total rewrite of a file does not appear as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)." msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
msgstr "Cela affecte la façon dont un changement qui équivaut à une réécriture totale d'un fichier apparaît non pas comme une série de suppressions et d'insertions mélangées avec quelques lignes qui (par hasard) correspondent entre les deux versions comme contexte, mais comme une simple suppression de tout ce qui est ancien suivi d'une simple insertion de tout ce qui est nouveau, et le nombre `m` contrôle cet aspect de l'option -B (par défaut 60 %). `-B/70%` spécifie que moins de 30 % de l'original doit rester dans le résultat pour que Git le considère comme une réécriture totale (autrement, la rustine résultante sera une série de suppressions et d'insertions mélangées avec des lignes de contexte)." msgstr ""
"Cela affecte la façon dont un changement qui équivaut à une réécriture "
"totale d'un fichier apparaît non pas comme une série de suppressions et "
"d'insertions mélangées avec quelques lignes qui (par hasard) correspondent "
"entre les deux versions comme contexte, mais comme une simple suppression de "
"tout ce qui est ancien suivi d'une simple insertion de tout ce qui est "
"nouveau, et le nombre `m` contrôle cet aspect de l'option -B (par défaut 60 "
"%). `-B/70%` spécifie que moins de 30 % de l'original doit rester dans le "
"résultat pour que Git le considère comme une réécriture totale (autrement, "
"la rustine résultante sera une série de suppressions et d'insertions "
"mélangées avec des lignes de contexte)."
   
#. type: Plain text #. type: Plain text
#: en/diff-options.txt:471 #: en/diff-options.txt:471
...@@ -5768,12 +5816,7 @@ msgstr "SYNOPSIS" ...@@ -5768,12 +5816,7 @@ msgstr "SYNOPSIS"
   
#. type: Plain text #. type: Plain text
#: en/git-add.txt:16 #: en/git-add.txt:16
#, fuzzy, ignore-ellipsis, no-wrap, priority:300 #, ignore-ellipsis, no-wrap, priority:300
#| msgid ""
#| "'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n"
#| "\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]\n"
#| "\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n"
#| "\t [--chmod=(+|-)x] [--] [<pathspec>...]\n"
msgid "" msgid ""
"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n" "'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n"
"\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]\n" "\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]\n"
...@@ -5781,10 +5824,13 @@ msgid "" ...@@ -5781,10 +5824,13 @@ msgid ""
"\t [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" "\t [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]\n" "\t [--] [<pathspec>...]\n"
msgstr "" msgstr ""
"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n" "'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | "
"-i] [--patch | -p]\n"
"\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]\n" "\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]\n"
"\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n" "\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] "
"\t [--chmod=(+|-)x] [--] [<spécificateur de chemin>...]\n" "[--renormalize]\n"
"\t [--chmod=(+|-)x] [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n"
"\t [--] [<spécificateur de chemin>...]\n"
   
#. type: Title - #. type: Title -
#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 #: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
...@@ -6085,6 +6131,13 @@ msgstr "--pathspec-from-file=<fichier>" ...@@ -6085,6 +6131,13 @@ msgstr "--pathspec-from-file=<fichier>"
#, priority:300 #, priority:300
msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`." msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
msgstr "" msgstr ""
"Le spécificateur de chemin est passé dans `<fichier>` au lieu des arguments "
"de la ligne de commande. Si `<fichier>` vaut `-` alors l'entrée standard est "
"utilisée. Les éléments du spécificateur de chemin sont séparés par LF ou CR/"
"LF. Les éléments du spécificateur de chemin peuvent être cités comme "
"expliqué pour la variable de configuration `core.quotePath` (voir linkgit"
":git-config[1]). Voir aussi l'option `--pathspec-file-nul` et l'option "
"globale `--literal-pathspecs`."
   
#. type: Labeled list #. type: Labeled list
#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125 #: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125
...@@ -6097,6 +6150,10 @@ msgstr "--pathspec-file-nul" ...@@ -6097,6 +6150,10 @@ msgstr "--pathspec-file-nul"
#, priority:300 #, priority:300
msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)." msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
msgstr "" msgstr ""
"Uniquement significatif avec `--pathspec-from-file`. Les éléments du "
"spécificateur de chemin sont séparés par le caractère NUL et tous les autres "
"caractères sont utilisés littéralement (y compris les retours à la ligne et "
"les guillemets)."
   
#. type: Labeled list #. type: Labeled list
#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:53 en/git-update-index.txt:227 en/git-verify-pack.txt:36 #: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:321 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:53 en/git-update-index.txt:227 en/git-verify-pack.txt:36
...@@ -6747,6 +6804,8 @@ msgstr "--no-rerere-autoupdate" ...@@ -6747,6 +6804,8 @@ msgstr "--no-rerere-autoupdate"
#, priority:240 #, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible." msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr "" msgstr ""
"Permettre au mécanisme rerere de mettre à jour l'index avec le résultat de "
"la résolution automatique des conflits si possible."
   
#. type: Plain text #. type: Plain text
#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546 #: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:395 en/git-rebase.txt:546
...@@ -8427,7 +8486,7 @@ msgstr "" ...@@ -8427,7 +8486,7 @@ msgstr ""
#: en/git-bisect.txt:245 en/git-tag.txt:373 #: en/git-bisect.txt:245 en/git-tag.txt:373
#, priority:240 #, priority:240
msgid "For example:" msgid "For example:"
msgstr "" msgstr "Par exemple :"
   
#. type: delimited block - #. type: delimited block -
#: en/git-bisect.txt:252 #: en/git-bisect.txt:252
...@@ -12082,14 +12141,15 @@ msgstr "Arbre depuis lequel extraire (quand des chemins sont indiqués). Si non ...@@ -12082,14 +12141,15 @@ msgstr "Arbre depuis lequel extraire (quand des chemins sont indiqués). Si non
#: en/git-checkout.txt:359 en/git-reset.txt:124 en/git-restore.txt:135 #: en/git-checkout.txt:359 en/git-reset.txt:124 en/git-restore.txt:135
#, priority:280 #, priority:280
msgid "Limits the paths affected by the operation." msgid "Limits the paths affected by the operation."
msgstr "" msgstr "Limite les chemins affectés par l'opération."
   
#. type: Plain text #. type: Plain text
#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137 #: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137
#, fuzzy, priority:280 #, priority:280
#| msgid "See the 'pathspec' entry in linkgit:gitglossary[7]."
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]." msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr "Voir l'entrée 'spécificateur de chemin' dans linkgit:gitglossary[7]." msgstr ""
"Pour plus de détail, voir l'entrée 'spécificateur de chemin' dans "
"linkgit:gitglossary[7]."
   
#. type: Title - #. type: Title -
#: en/git-checkout.txt:363 #: en/git-checkout.txt:363
...@@ -13568,16 +13628,7 @@ msgstr "git-clone - Clone un dépôt dans un nouveau répertoire" ...@@ -13568,16 +13628,7 @@ msgstr "git-clone - Clone un dépôt dans un nouveau répertoire"
   
#. type: Plain text #. type: Plain text
#: en/git-clone.txt:20 #: en/git-clone.txt:20
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
#| msgid ""
#| "'git clone' [--template=<template_directory>]\n"
#| "\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n"
#| "\t [-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]\n"
#| "\t [--dissociate] [--separate-git-dir <git dir>]\n"
#| "\t [--depth <depth>] [--[no-]single-branch] [--no-tags]\n"
#| "\t [--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]\n"
#| "\t [--[no-]remote-submodules] [--jobs <n>] [--] <repository>\n"
#| "\t [<directory>]\n"
msgid "" msgid ""
"'git clone' [--template=<template_directory>]\n" "'git clone' [--template=<template_directory>]\n"
"\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n" "\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n"
...@@ -13594,7 +13645,7 @@ msgstr "" ...@@ -13594,7 +13645,7 @@ msgstr ""
"\t [--dissociate] [--separate-git-dir <répertoire git>]\n" "\t [--dissociate] [--separate-git-dir <répertoire git>]\n"
"\t [--depth <profondeur>] [--[no-]single-branch] [--no-tags]\n" "\t [--depth <profondeur>] [--[no-]single-branch] [--no-tags]\n"
"\t [--recurse-submodules[=<spéc.de chemin>]] [--[no-]shallow-submodules]\n" "\t [--recurse-submodules[=<spéc.de chemin>]] [--[no-]shallow-submodules]\n"
"\t [--[no-]remote-submodules] [--jobs <n>] [--] <dépôt>\n" "\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--] <dépôt>\n"
"\t [<répertoire>]\n" "\t [<répertoire>]\n"
   
#. type: Plain text #. type: Plain text
...@@ -13774,6 +13825,10 @@ msgstr "--sparse" ...@@ -13774,6 +13825,10 @@ msgstr "--sparse"
#, priority:300 #, priority:300
msgid "Initialize the sparse-checkout file so the working directory starts with only the files in the root of the repository. The sparse-checkout file can be modified to grow the working directory as needed." msgid "Initialize the sparse-checkout file so the working directory starts with only the files in the root of the repository. The sparse-checkout file can be modified to grow the working directory as needed."
msgstr "" msgstr ""
"Initialiser le fichier d'extraction partielle pour que le répertoire de "
"travail ne commence qu'avec les fichiers de la racine du dépôt. Le fichier "
"d'extraction partielle peut être modifié pour agrandir le répertoire de "
"travail selon les besoins."
   
#. type: Labeled list #. type: Labeled list
#: en/git-clone.txt:165 en/git-push.txt:161 #: en/git-clone.txt:165 en/git-push.txt:161
...@@ -14458,14 +14513,7 @@ msgstr "git-commit - Enregistrer les modifications dans le dépôt" ...@@ -14458,14 +14513,7 @@ msgstr "git-commit - Enregistrer les modifications dans le dépôt"
   
#. type: Plain text #. type: Plain text
#: en/git-commit.txt:18 #: en/git-commit.txt:18
#, fuzzy, ignore-ellipsis, no-wrap, priority:280 #, ignore-ellipsis, no-wrap, priority:280
#| msgid ""
#| "'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n"
#| "\t [--dry-run] [(-c | -C | --fixup | --squash) <commit>]\n"
#| "\t [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n"
#| "\t [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n"
#| "\t [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n"
#| "\t [-i | -o] [-S[<keyid>]] [--] [<file>...]\n"
msgid "" msgid ""
"'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n" "'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n"
"\t [--dry-run] [(-c | -C | --fixup | --squash) <commit>]\n" "\t [--dry-run] [(-c | -C | --fixup | --squash) <commit>]\n"
...@@ -14480,7 +14528,8 @@ msgstr "" ...@@ -14480,7 +14528,8 @@ msgstr ""
"\t [-F <fichier> | -m <msg>] [--reset-author] [--allow-empty]\n" "\t [-F <fichier> | -m <msg>] [--reset-author] [--allow-empty]\n"
"\t [--allow-empty-message] [--no-verify] [-e] [--author=<auteur>]\n" "\t [--allow-empty-message] [--no-verify] [-e] [--author=<auteur>]\n"
"\t [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" "\t [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n"
"\t [-i | -o] [-S[<idclé>]] [--] [<fichier>...]\n" "\t [-i | -o] [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n"
"\t [-S[<idclé>]] [--] [<spec-de-chemin>...]\n"
   
#. type: Plain text #. type: Plain text
#: en/git-commit.txt:27 #: en/git-commit.txt:27
...@@ -15060,10 +15109,13 @@ msgstr "Annuler la variable de configuration `commit.gpgSign` qui force tous les ...@@ -15060,10 +15109,13 @@ msgstr "Annuler la variable de configuration `commit.gpgSign` qui force tous les
   
#. type: Plain text #. type: Plain text
#: en/git-commit.txt:367 #: en/git-commit.txt:367
#, fuzzy, priority:280 #, priority:280
#| msgid "When files are given on the command line, the command commits the contents of the named files, without recording the changes already staged. The contents of these files are also staged for the next commit on top of what have been staged before."
msgid "When pathspec is given on the command line, commit the contents of the files that match the pathspec without recording the changes already added to the index. The contents of these files are also staged for the next commit on top of what have been staged before." msgid "When pathspec is given on the command line, commit the contents of the files that match the pathspec without recording the changes already added to the index. The contents of these files are also staged for the next commit on top of what have been staged before."
msgstr "Quand des chemins sont fournis sur la ligne de commande, la commande valide le contenu des fichiers spécifiés, sans enregistrer les modifications déjà indexées. Le contenu de ces fichiers est aussi indexé pour le commit suivant par-dessus ce qui a été indexé auparavant." msgstr ""
"Quand un spécifcateur de chemins est fourni sur la ligne de commande, "
"valider le contenu des fichiers correspondants, sans enregistrer les "
"modifications déjà indexées. Le contenu de ces fichiers est aussi indexé "
"pour le commit suivant par-dessus ce qui a été indexé auparavant."
   
#. type: Plain text #. type: Plain text
#: en/git-commit.txt:386 #: en/git-commit.txt:386
...@@ -19743,10 +19795,14 @@ msgstr "'git diff' [<options>] --no-index [--] <chemin> <chemin>" ...@@ -19743,10 +19795,14 @@ msgstr "'git diff' [<options>] --no-index [--] <chemin> <chemin>"
   
#. type: Plain text #. type: Plain text
#: en/git-diff.txt:40 #: en/git-diff.txt:40
#, fuzzy, priority:280 #, priority:280
#| msgid "This form is to compare the given two paths on the filesystem. You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git."
msgid "This form is to compare the given two paths on the filesystem. You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`." msgid "This form is to compare the given two paths on the filesystem. You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`."
msgstr "Cette forme sert à comparer les deux chemins indiqués sur le système de fichiers. Vous pouvez omettre l'option `--no-index` si la commande est lancée dans un arbre de travail contrôlé par Git et qu'au moins un des chemins pointe hors de l'arbre de travail ou si la commande est lancée hors d'un arbre de travail contrôlé par Git." msgstr ""
"Cette forme sert à comparer les deux chemins indiqués sur le système de "
"fichiers. Vous pouvez omettre l'option `--no-index` si la commande est "
"lancée dans un arbre de travail contrôlé par Git et qu'au moins un des "
"chemins pointe hors de l'arbre de travail ou si la commande est lancée hors "
"d'un arbre de travail contrôlé par Git. Cette forme implique `--exit-code`."
   
#. type: Labeled list #. type: Labeled list
#: en/git-diff.txt:41 #: en/git-diff.txt:41
...@@ -25416,7 +25472,7 @@ msgstr "" ...@@ -25416,7 +25472,7 @@ msgstr ""
#: en/git-format-patch.txt:288 en/pretty-options.txt:60 #: en/git-format-patch.txt:288 en/pretty-options.txt:60
#, no-wrap, priority:260 #, no-wrap, priority:260
msgid "--notes[=<ref>]" msgid "--notes[=<ref>]"
msgstr "" msgstr "--notes[=<ref>]"
   
#. type: Labeled list #. type: Labeled list
#: en/git-format-patch.txt:289 en/pretty-options.txt:81 #: en/git-format-patch.txt:289 en/pretty-options.txt:81
...@@ -30374,10 +30430,20 @@ msgstr "-L :<nom-de-fonction>:<fichier>" ...@@ -30374,10 +30430,20 @@ msgstr "-L :<nom-de-fonction>:<fichier>"
   
#. type: Plain text #. type: Plain text
#: en/git-log.txt:85 #: en/git-log.txt:85
#, fuzzy, priority:260 #, priority:260
#| msgid "Trace the evolution of the line range given by \"<start>,<end>\" (or the function name regex <funcname>) within the <file>. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments. You can specify this option more than once."
msgid "Trace the evolution of the line range given by \"<start>,<end>\" (or the function name regex <funcname>) within the <file>. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and <start> and <end> (or <funcname>) must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented." msgid "Trace the evolution of the line range given by \"<start>,<end>\" (or the function name regex <funcname>) within the <file>. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and <start> and <end> (or <funcname>) must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented."
msgstr "Tracer l'évolution de la plage de lignes donnée par \"<début>,<fin>\" (ou la regex de nom de la fonction <nom-de-fonction>) dans le fichier <fichier>. Vous ne pouvez pas donner de limiteurs de spécificateur de chemin. Ceci est actuellement limité à une marche à partir d'une seule révision, c'est-à-dire que vous ne pouvez donner qu'aucun ou un seul argument de révision. Vous pouvez spécifier cette option plusieurs fois." msgstr ""
"Tracer l'évolution de la plage de lignes donnée par \"<début>,<fin>\" (ou la "
"regex de nom de la fonction <nom-de-fonction>) dans le fichier <fichier>. "
"Vous ne pouvez pas donner de limiteurs de spécificateur de chemin. Ceci est "
"actuellement limité à une marche à partir d'une seule révision, c'est-à-dire "
"que vous ne pouvez donner qu'aucun ou un seul argument de révision, <début> "
"et <fin> (ou <nom-de-fonction>) doivent exister dans la révision de départ. "
"Vous pouvez spécifier cette option plusieurs fois. Cette option implique "
"`--patch`. L'affichage de la rustine peut être supprimé en utilisant `--no-"
"patch`, mai les autres formats de diff (`--raw`, `--numstat`, `--shortstat`, "
"`--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) ne sont "
"pas implantés actuellement."
   
#. type: Labeled list #. type: Labeled list
#: en/git-log.txt:88 en/git-shortlog.txt:63 #: en/git-log.txt:88 en/git-shortlog.txt:63
...@@ -42247,68 +42313,80 @@ msgstr "git-reset - Réinitialise la HEAD actuelle à l'état spécifié" ...@@ -42247,68 +42313,80 @@ msgstr "git-reset - Réinitialise la HEAD actuelle à l'état spécifié"
   
#. type: Plain text #. type: Plain text
#: en/git-reset.txt:15 #: en/git-reset.txt:15
#, fuzzy, ignore-ellipsis, no-wrap, priority:280 #, ignore-ellipsis, no-wrap, priority:280
#| msgid ""
#| "'git reset' [-q] [<tree-ish>] [--] <paths>...\n"
#| "'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...]\n"
#| "'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [<commit>]\n"
msgid "" msgid ""
"'git reset' [-q] [<tree-ish>] [--] <pathspec>...\n" "'git reset' [-q] [<tree-ish>] [--] <pathspec>...\n"
"'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>]\n" "'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>]\n"
"'git reset' (--patch | -p) [<tree-ish>] [--] [<pathspec>...]\n" "'git reset' (--patch | -p) [<tree-ish>] [--] [<pathspec>...]\n"
"'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [<commit>]\n" "'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [<commit>]\n"
msgstr "" msgstr ""
"'git reset' [-q] [<arbre-esque>] [--] <chemins>...\n" "'git reset' [-q] [<arbre-esque>] [--] <spec-de-chemin>...\n"
"'git reset' (--patch | -p) [<arbre-esque>] [--] [<chemins>...]\n" "'git reset' [-q] [--pathspec-from-file=<fichier> [--pathspec-file-nul]] "
"'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [<commit>]\n" "[<arbre-esque>]\n"
"'git reset' (--patch | -p) [<arbre-esque>] [--] [<spec-de-chemin>...]\n"
"'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] "
"[<commit>]\n"
   
#. type: Plain text #. type: Plain text
#: en/git-reset.txt:22 #: en/git-reset.txt:22
#, fuzzy, priority:280 #, priority:280
#| msgid "In the first and second form, copy entries from `<tree-ish>` to the index. In the third form, set the current branch head (`HEAD`) to `<commit>`, optionally modifying index and working tree to match. The `<tree-ish>`/`<commit>` defaults to `HEAD` in all forms."
msgid "In the first three forms, copy entries from `<tree-ish>` to the index. In the last form, set the current branch head (`HEAD`) to `<commit>`, optionally modifying index and working tree to match. The `<tree-ish>`/`<commit>` defaults to `HEAD` in all forms." msgid "In the first three forms, copy entries from `<tree-ish>` to the index. In the last form, set the current branch head (`HEAD`) to `<commit>`, optionally modifying index and working tree to match. The `<tree-ish>`/`<commit>` defaults to `HEAD` in all forms."
msgstr "Dans la première et la deuxième forme, cette commande copie les entrées depuis `<arbre-esque>` vers l'index. Dans la troisième forme, elle amène le sommet de la branche actuelle (`HEAD`) à `<commit>`, optionnellement en modifiant l'index et l'arbre de travail en correspondance. L'`<arbre-esque>`/`<commit>` vaut par défaut `HEAD` dans toutes les formes." msgstr ""
"Dans la première et la troisième forme, cette commande copie les entrées "
"depuis `<arbre-esque>` vers l'index. Dans la dernière forme, elle amène le "
"sommet de la branche actuelle (`HEAD`) à `<commit>`, optionnellement en "
"modifiant l'index et l'arbre de travail en correspondance. L'`<arbre-"
"esque>`/`<commit>` vaut par défaut `HEAD` dans toutes les formes."
   
#. type: Labeled list #. type: Labeled list
#: en/git-reset.txt:23 #: en/git-reset.txt:23
#, fuzzy, ignore-ellipsis, no-wrap, priority:280 #, ignore-ellipsis, no-wrap, priority:280
#| msgid "'git reset' [-q] [<tree-ish>] [--] <paths>..."
msgid "'git reset' [-q] [<tree-ish>] [--] <pathspec>..." msgid "'git reset' [-q] [<tree-ish>] [--] <pathspec>..."
msgstr "'git reset' [-q] [<arbre-esque>] [--] <chemins>..." msgstr "'git reset' [-q] [<arbre-esque>] [--] <spec-de-chemin>..."
   
#. type: Labeled list #. type: Labeled list
#: en/git-reset.txt:24 #: en/git-reset.txt:24
#, no-wrap, priority:280 #, no-wrap, priority:280
msgid "'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>]" msgid "'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>]"
msgstr "" msgstr ""
"'git reset' [-q] [--pathspec-from-file=<fichier> [--pathspec-file-nul]] "
"[<arbre-esque>]"
   
#. type: Plain text #. type: Plain text
#: en/git-reset.txt:28 #: en/git-reset.txt:28
#, fuzzy, priority:280 #, priority:280
#| msgid "This form resets the index entries for all `<paths>` to their state at `<tree-ish>`. (It does not affect the working tree or the current branch.)"
msgid "These forms reset the index entries for all paths that match the `<pathspec>` to their state at `<tree-ish>`. (It does not affect the working tree or the current branch.)" msgid "These forms reset the index entries for all paths that match the `<pathspec>` to their state at `<tree-ish>`. (It does not affect the working tree or the current branch.)"
msgstr "Cette forme réinitialise les entrées d'index pour tous les `<chemins>` à leur état de `<arbre-esque>` (ceci n'affecte pas l'arbre de travail ou la branche actuelle.)" msgstr ""
"Ces formes réinitialisent les entrées d'index pour tous fichiers "
"correspondant à <spec-de-chemin> à leur état de `<arbre-esque>` (ceci "
"n'affecte pas l'arbre de travail ou la branche actuelle.)"
   
#. type: Plain text #. type: Plain text
#: en/git-reset.txt:32 #: en/git-reset.txt:32
#, fuzzy, ignore-ellipsis, priority:280 #, ignore-ellipsis, priority:280
#| msgid "This means that `git reset <paths>` is the opposite of `git add <paths>`. This command is equivalent to `git restore [--source=<tree-ish>] --staged <paths>...`."
msgid "This means that `git reset <pathspec>` is the opposite of `git add <pathspec>`. This command is equivalent to `git restore [--source=<tree-ish>] --staged <pathspec>...`." msgid "This means that `git reset <pathspec>` is the opposite of `git add <pathspec>`. This command is equivalent to `git restore [--source=<tree-ish>] --staged <pathspec>...`."
msgstr "Cela signifie que `git reset <chemins>` est l'opposé de `git add <chemins>`. Cette commande est équivalent à `git restore [--source=<arbre-esque>] --staged <chemins>...`." msgstr ""
"Cela signifie que `git reset <spec-de-chemin>` est l'opposé de `git add "
"<spec-de-chemin>`. Cette commande est équivalent à `git restore [--source"
"=<arbre-esque>] --staged <spec-de-chemin>...`."
   
#. type: Plain text #. type: Plain text
#: en/git-reset.txt:39 #: en/git-reset.txt:39
#, fuzzy, priority:280 #, priority:280
#| msgid "After running `git reset <paths>` to update the index entry, you can use linkgit:git-restore[1] to check the contents out of the index to the working tree. Alternatively, using linkgit:git-restore[1] and specifying a commit with `--source`, you can copy the contents of a path out of a commit to the index and to the working tree in one go."
msgid "After running `git reset <pathspec>` to update the index entry, you can use linkgit:git-restore[1] to check the contents out of the index to the working tree. Alternatively, using linkgit:git-restore[1] and specifying a commit with `--source`, you can copy the contents of a path out of a commit to the index and to the working tree in one go." msgid "After running `git reset <pathspec>` to update the index entry, you can use linkgit:git-restore[1] to check the contents out of the index to the working tree. Alternatively, using linkgit:git-restore[1] and specifying a commit with `--source`, you can copy the contents of a path out of a commit to the index and to the working tree in one go."
msgstr "Après avoir lancé `git reset <chemins>` pour mettre à jour l'entrée d'index, vous pouvez linkgit:git-restore[1] pour extraire le contenu de l'index dans l'arbre de travail. Alternativement, en utilisant linkgit:git-restore[1] et en spécifiant un commit avec `--source`, vous pouvez copier le contenu d'un chemin d'un commit vers l'index et l'arbre de travail d'une seule traite." msgstr ""
"Après avoir lancé `git reset <spec-de-chemin>` pour mettre à jour l'entrée "
"d'index, vous pouvez linkgit:git-restore[1] pour extraire le contenu de "
"l'index dans l'arbre de travail. Alternativement, en utilisant linkgit:git-"
"restore[1] et en spécifiant un commit avec `--source`, vous pouvez copier le "
"contenu d'un chemin d'un commit vers l'index et l'arbre de travail d'une "
"seule traite."
   
#. type: Labeled list #. type: Labeled list
#: en/git-reset.txt:40 #: en/git-reset.txt:40
#, fuzzy, ignore-ellipsis, no-wrap, priority:280 #, ignore-ellipsis, no-wrap, priority:280
#| msgid "'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...]"
msgid "'git reset' (--patch | -p) [<tree-ish>] [--] [<pathspec>...]" msgid "'git reset' (--patch | -p) [<tree-ish>] [--] [<pathspec>...]"
msgstr "'git reset' (--patch | -p) [<arbre-esque>] [--] [<chemins>...]" msgstr "'git reset' (--patch | -p) [<arbre-esque>] [--] [<spec-de-chemin>...]"
   
#. type: Plain text #. type: Plain text
#: en/git-reset.txt:44 #: en/git-reset.txt:44
...@@ -57265,10 +57343,9 @@ msgstr "'oneline'" ...@@ -57265,10 +57343,9 @@ msgstr "'oneline'"
   
#. type: Plain text #. type: Plain text
#: en/pretty-formats.txt:24 #: en/pretty-formats.txt:24
#, fuzzy, no-wrap, priority:260 #, no-wrap, priority:260
#| msgid "<sha1> <title line>\n"
msgid "<hash> <title line>\n" msgid "<hash> <title line>\n"
msgstr "<sha1> <ligne de titre>\n" msgstr "<empreinte> <ligne de titre>\n"
   
#. type: Plain text #. type: Plain text
#: en/pretty-formats.txt:26 #: en/pretty-formats.txt:26
...@@ -57284,15 +57361,12 @@ msgstr "'short'" ...@@ -57284,15 +57361,12 @@ msgstr "'short'"
   
#. type: Plain text #. type: Plain text
#: en/pretty-formats.txt:31 #: en/pretty-formats.txt:31
#, fuzzy, no-wrap, priority:260 #, no-wrap, priority:260
#| msgid ""
#| "commit <sha1>\n"
#| "Author: <author>\n"
msgid "" msgid ""
"commit <hash>\n" "commit <hash>\n"
"Author: <author>\n" "Author: <author>\n"
msgstr "" msgstr ""
"commit <sha1>\n" "commit <empreinte>\n"
"Author: <auteur>\n" "Author: <auteur>\n"
   
#. type: Plain text #. type: Plain text
...@@ -57309,17 +57383,13 @@ msgstr "'medium'" ...@@ -57309,17 +57383,13 @@ msgstr "'medium'"
   
#. type: Plain text #. type: Plain text
#: en/pretty-formats.txt:39 #: en/pretty-formats.txt:39
#, fuzzy, no-wrap, priority:260 #, no-wrap, priority:260
#| msgid ""
#| "commit <sha1>\n"
#| "Author: <author>\n"
#| "Date: <author date>\n"
msgid "" msgid ""
"commit <hash>\n" "commit <hash>\n"
"Author: <author>\n" "Author: <author>\n"
"Date: <author date>\n" "Date: <author date>\n"
msgstr "" msgstr ""
"commit <sha1>\n" "commit <empreinte>\n"
"Author: <auteur>\n" "Author: <auteur>\n"
"Date: <date d'auteur>\n" "Date: <date d'auteur>\n"
   
...@@ -57337,17 +57407,13 @@ msgstr "'full'" ...@@ -57337,17 +57407,13 @@ msgstr "'full'"
   
#. type: Plain text #. type: Plain text
#: en/pretty-formats.txt:49 #: en/pretty-formats.txt:49
#, fuzzy, no-wrap, priority:260 #, no-wrap, priority:260
#| msgid ""
#| "commit <sha1>\n"
#| "Author: <author>\n"
#| "Commit: <committer>\n"
msgid "" msgid ""
"commit <hash>\n" "commit <hash>\n"
"Author: <author>\n" "Author: <author>\n"
"Commit: <committer>\n" "Commit: <committer>\n"
msgstr "" msgstr ""
"commit <sha1>\n" "commit <empreinte>\n"
"Author: <auteur>\n" "Author: <auteur>\n"
"Commit: <validateur>\n" "Commit: <validateur>\n"
   
...@@ -57359,13 +57425,7 @@ msgstr "'fuller'" ...@@ -57359,13 +57425,7 @@ msgstr "'fuller'"
   
#. type: Plain text #. type: Plain text
#: en/pretty-formats.txt:61 #: en/pretty-formats.txt:61
#, fuzzy, no-wrap, priority:260 #, no-wrap, priority:260
#| msgid ""
#| "commit <sha1>\n"
#| "Author: <author>\n"
#| "AuthorDate: <author date>\n"
#| "Commit: <committer>\n"
#| "CommitDate: <committer date>\n"
msgid "" msgid ""
"commit <hash>\n" "commit <hash>\n"
"Author: <author>\n" "Author: <author>\n"
...@@ -57373,7 +57433,7 @@ msgid "" ...@@ -57373,7 +57433,7 @@ msgid ""
"Commit: <committer>\n" "Commit: <committer>\n"
"CommitDate: <committer date>\n" "CommitDate: <committer date>\n"
msgstr "" msgstr ""
"commit <sha1>\n" "commit <epreinte>\n"
"Author: <auteur>\n" "Author: <auteur>\n"
"AuthorDate: <date d'auteur>\n" "AuthorDate: <date d'auteur>\n"
"Commit: <validateur>\n" "Commit: <validateur>\n"
...@@ -57381,22 +57441,27 @@ msgstr "" ...@@ -57381,22 +57441,27 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/pretty-formats.txt:67 #: en/pretty-formats.txt:67
#, fuzzy, priority:260 #, priority:260
#| msgid "--dereference"
msgid "'reference'" msgid "'reference'"
msgstr "--dereference" msgstr "'reference'"
   
#. type: Plain text #. type: Plain text
#: en/pretty-formats.txt:69 #: en/pretty-formats.txt:69
#, no-wrap, priority:260 #, no-wrap, priority:260
msgid "<abbrev hash> (<title line>, <short author date>)\n" msgid "<abbrev hash> (<title line>, <short author date>)\n"
msgstr "" msgstr "<empreinte abrégée> (<ligne de titre>, <courte date d'auteur>)\n"
   
#. type: Plain text #. type: Plain text
#: en/pretty-formats.txt:76 #: en/pretty-formats.txt:76
#, priority:260 #, priority:260
msgid "This format is used to refer to another commit in a commit message and is the same as `--pretty='format:%C(auto)%h (%s, %ad)'`. By default, the date is formatted with `--date=short` unless another `--date` option is explicitly specified. As with any `format:` with format placeholders, its output is not affected by other options like `--decorate` and `--walk-reflogs`." msgid "This format is used to refer to another commit in a commit message and is the same as `--pretty='format:%C(auto)%h (%s, %ad)'`. By default, the date is formatted with `--date=short` unless another `--date` option is explicitly specified. As with any `format:` with format placeholders, its output is not affected by other options like `--decorate` and `--walk-reflogs`."
msgstr "" msgstr ""
"Ce format est utilisé pour faire référence à un autre commit dans un message "
"de validation et est le même que `--pretty='format:%C(auto)%h (%s, %ad)'`. "
"Par défaut, la date est formatée avec `--date=short` à moins qu'une autre "
"option `--date` ne soit explicitement spécifiée. Comme pour tout `format:` "
"avec des espaces réservés de format, sa sortie n'est pas affectée par "
"d'autres options comme `--decorate` et `--walk-reflogs`."
   
#. type: Plain text #. type: Plain text
#: en/pretty-formats.txt:78 #: en/pretty-formats.txt:78
...@@ -57406,19 +57471,14 @@ msgstr "'email'" ...@@ -57406,19 +57471,14 @@ msgstr "'email'"
   
#. type: Plain text #. type: Plain text
#: en/pretty-formats.txt:83 #: en/pretty-formats.txt:83
#, fuzzy, no-wrap, priority:260 #, no-wrap, priority:260
#| msgid ""
#| "From <sha1> <date>\n"
#| "From: <author>\n"
#| "Date: <author date>\n"
#| "Subject: [PATCH] <title line>\n"
msgid "" msgid ""
"From <hash> <date>\n" "From <hash> <date>\n"
"From: <author>\n" "From: <author>\n"
"Date: <author date>\n" "Date: <author date>\n"
"Subject: [PATCH] <title line>\n" "Subject: [PATCH] <title line>\n"
msgstr "" msgstr ""
"From <sha1> <date>\n" "From <empreinte> <date>\n"
"From: <auteur>\n" "From: <auteur>\n"
"Date: <date d'auteur>\n" "Date: <date d'auteur>\n"
"Subject: [PATCH] <ligne de titre>\n" "Subject: [PATCH] <ligne de titre>\n"
...@@ -57431,10 +57491,17 @@ msgstr "'raw'" ...@@ -57431,10 +57491,17 @@ msgstr "'raw'"
   
#. type: Plain text #. type: Plain text
#: en/pretty-formats.txt:97 #: en/pretty-formats.txt:97
#, fuzzy, priority:260 #, 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`."
msgid "The 'raw' format shows the entire commit exactly as stored in the commit object. Notably, the hashes 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`." msgid "The 'raw' format shows the entire commit exactly as stored in the commit object. Notably, the hashes 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`." msgstr ""
"Le format'raw' montre le commit entier telle qu'elle est stockée dans "
"l'objet commit. Notamment, les empreintes sont affichées 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 #. type: Plain text
#: en/pretty-formats.txt:99 #: en/pretty-formats.txt:99
...@@ -57840,7 +57907,7 @@ msgstr "'%al'" ...@@ -57840,7 +57907,7 @@ msgstr "'%al'"
#: en/pretty-formats.txt:178 en/pretty-formats.txt:194 #: en/pretty-formats.txt:178 en/pretty-formats.txt:194
#, priority:260 #, priority:260
msgid "author email local-part (the part before the '@' sign)" msgid "author email local-part (the part before the '@' sign)"
msgstr "" msgstr "partie locale de l'e-mail de l'auteur (la partie avant le signe \"@\")"
   
#. type: Labeled list #. type: Labeled list
#: en/pretty-formats.txt:178 #: en/pretty-formats.txt:178
...@@ -57850,10 +57917,11 @@ msgstr "'%aL'" ...@@ -57850,10 +57917,11 @@ msgstr "'%aL'"
   
#. type: Plain text #. type: Plain text
#: en/pretty-formats.txt:179 #: en/pretty-formats.txt:179
#, fuzzy, priority:260 #, priority:260
#| msgid "reflog identity email (respecting .mailmap, see"
msgid "author local-part (see '%al') respecting .mailmap, see" msgid "author local-part (see '%al') respecting .mailmap, see"
msgstr "adresse de courriel de l'identité reflog (en respectant le fichier .mailmap, voir" msgstr ""
"partie locale de l'auteur (voir '%al') en respectant le fichier .mailmap, "
"voir"
   
#. type: Plain text #. type: Plain text
#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:240 en/pretty-formats.txt:243 #: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:240 en/pretty-formats.txt:243
...@@ -57941,10 +58009,9 @@ msgstr "'%as'" ...@@ -57941,10 +58009,9 @@ msgstr "'%as'"
   
#. type: Plain text #. type: Plain text
#: en/pretty-formats.txt:187 #: en/pretty-formats.txt:187
#, fuzzy, priority:260 #, priority:260
#| msgid "author date, strict ISO 8601 format"
msgid "author date, short format (`YYYY-MM-DD`)" msgid "author date, short format (`YYYY-MM-DD`)"
msgstr "date d'auteur, format strict ISO 8601" msgstr "date d'auteur, format court (`AAAA-MM-JJ`)"
   
#. type: Labeled list #. type: Labeled list
#: en/pretty-formats.txt:187 #: en/pretty-formats.txt:187
...@@ -58008,10 +58075,9 @@ msgstr "'%cL'" ...@@ -58008,10 +58075,9 @@ msgstr "'%cL'"
   
#. type: Plain text #. type: Plain text
#: en/pretty-formats.txt:195 #: en/pretty-formats.txt:195
#, fuzzy, priority:260 #, priority:260
#| msgid "committer email (respecting .mailmap, see"
msgid "author local-part (see '%cl') respecting .mailmap, see" msgid "author local-part (see '%cl') respecting .mailmap, see"
msgstr "e-mail du validateur (en respectant .mailmap, voir" msgstr "partie locale de l'auteur (voir '%cl') en respectant .mailmap, voir"
   
#. type: Labeled list #. type: Labeled list
#: en/pretty-formats.txt:196 #: en/pretty-formats.txt:196
...@@ -58093,10 +58159,9 @@ msgstr "'%cs'" ...@@ -58093,10 +58159,9 @@ msgstr "'%cs'"
   
#. type: Plain text #. type: Plain text
#: en/pretty-formats.txt:203 #: en/pretty-formats.txt:203
#, fuzzy, priority:260 #, priority:260
#| msgid "committer date, strict ISO 8601 format"
msgid "committer date, short format (`YYYY-MM-DD`)" msgid "committer date, short format (`YYYY-MM-DD`)"
msgstr "date de validation, format ISO 8601 strict" msgstr "date de validation, format court (`AAAA-MM-JJ`)"
   
#. type: Labeled list #. type: Labeled list
#: en/pretty-formats.txt:203 #: en/pretty-formats.txt:203
...@@ -58516,10 +58581,14 @@ msgstr "--pretty[=<format>]" ...@@ -58516,10 +58581,14 @@ msgstr "--pretty[=<format>]"
   
#. type: Plain text #. type: Plain text
#: en/pretty-options.txt:10 #: en/pretty-options.txt:10
#, fuzzy, priority:260 #, priority:260
#| msgid "Pretty-print the contents of the commit logs in a given format, where '<format>' can be one of 'oneline', 'short', 'medium', 'full', 'fuller', 'email', 'raw', 'format:<string>' and 'tformat:<string>'. When '<format>' is none of the above, and has '%placeholder' in it, it acts as if '--pretty=tformat:<format>' were given."
msgid "Pretty-print the contents of the commit logs in a given format, where '<format>' can be one of 'oneline', 'short', 'medium', 'full', 'fuller', 'reference', 'email', 'raw', 'format:<string>' and 'tformat:<string>'. When '<format>' is none of the above, and has '%placeholder' in it, it acts as if '--pretty=tformat:<format>' were given." msgid "Pretty-print the contents of the commit logs in a given format, where '<format>' can be one of 'oneline', 'short', 'medium', 'full', 'fuller', 'reference', 'email', 'raw', 'format:<string>' and 'tformat:<string>'. When '<format>' is none of the above, and has '%placeholder' in it, it acts as if '--pretty=tformat:<format>' were given."
msgstr "Formater le contenu des journaux de commits dans un format donné, où '<format>' peut être au choix parmi 'oneline', 'short', 'medium', 'full', 'fuller', 'email', 'raw', 'format:<chaîne>' et 'tformat:<chaîne>'. Lorsque '<format>' n'est rien de ce qui précède, et qu'il contient'%format', il agit comme si '--pretty=tformat:<format>' était donné." msgstr ""
"Formater le contenu des journaux de commits dans un format donné, où "
"'<format>' peut être au choix parmi 'oneline', 'short', 'medium', 'full', "
"'fuller', 'reference', 'email', 'raw', 'format:<chaîne>' et 'tformat:<chaîne>"
"'. Lorsque '<format>' n'est rien de ce qui précède, et qu'il contient'%"
"format', il agit comme si '--pretty=tformat:<format>' était donné."
   
#. type: Plain text #. type: Plain text
#: en/pretty-options.txt:13 #: en/pretty-options.txt:13
...@@ -58619,10 +58688,14 @@ msgstr "Par défaut, les notes affichées proviennent des références de notes ...@@ -58619,10 +58688,14 @@ msgstr "Par défaut, les notes affichées proviennent des références de notes
   
#. type: Plain text #. type: Plain text
#: en/pretty-options.txt:75 #: en/pretty-options.txt:75
#, fuzzy, priority:260 #, priority:260
#| msgid "With an optional '<treeish>' argument, use the treeish to find the notes to display. The treeish can specify the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgid "With an optional '<ref>' argument, use the ref to find the notes to display. The ref can specify the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref." msgid "With an optional '<ref>' argument, use the ref to find the notes to display. The ref can specify the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr "Avec un argument optionnel'<arbre-esque>', utiliser l'arbre-esque pour trouver les notes à afficher. L'arbre-esque peut spécifier le nom complet du ref quand il commence par `refs/notes/` ; quand il commence par `notes/`, `refs/` et sinon `refs/notes/` est préfixé pour former un nom complet de la référence." msgstr ""
"Avec un argument optionnel'<ref>', utiliser la référence pour trouver les "
"notes à afficher. La référence peut spécifier le nom complet de référence "
"quand elle commence par `refs/notes/` ; quand elle commence par `notes/`, `"
"refs/` et sinon `refs/notes/` est préfixé pour former un nom complet de la "
"référence."
   
#. type: Plain text #. type: Plain text
#: en/pretty-options.txt:80 #: en/pretty-options.txt:80
...@@ -58638,10 +58711,9 @@ msgstr "Ne pas afficher les notes. Ceci annule l'option `--notes` ci-dessus, en ...@@ -58638,10 +58711,9 @@ msgstr "Ne pas afficher les notes. Ceci annule l'option `--notes` ci-dessus, en
   
#. type: Labeled list #. type: Labeled list
#: en/pretty-options.txt:88 #: en/pretty-options.txt:88
#, fuzzy, no-wrap, priority:260 #, no-wrap, priority:260
#| msgid "--show-notes[=<treeish>]"
msgid "--show-notes[=<ref>]" msgid "--show-notes[=<ref>]"
msgstr "--show-notes[=<arbre-esque>]" msgstr "--show-notes[=<reférence>]"
   
#. type: Labeled list #. type: Labeled list
#: en/pretty-options.txt:89 #: en/pretty-options.txt:89
...@@ -59534,10 +59606,11 @@ msgstr "Limiter la sortie des commits à ceux dont le message de validation corr ...@@ -59534,10 +59606,11 @@ msgstr "Limiter la sortie des commits à ceux dont le message de validation corr
   
#. type: Plain text #. type: Plain text
#: en/rev-list-options.txt:63 #: en/rev-list-options.txt:63
#, fuzzy, priority:260 #, priority:260
#| msgid "When `--show-notes` is in effect, the message from the notes is matched as if it were part of the log message."
msgid "When `--notes` is in effect, the message from the notes is matched as if it were part of the log message." msgid "When `--notes` is in effect, the message from the notes is matched as if it were part of the log message."
msgstr "Lorsque `--show-notes' est en vigueur, le message des notes est vérifié comme s'il faisait partie du message du journal." msgstr ""
"Lorsque `notes' est en vigueur, le message des notes est vérifié comme s'il "
"faisait partie du message du journal."
   
#. type: Plain text #. type: Plain text
#: en/rev-list-options.txt:68 #: en/rev-list-options.txt:68
...@@ -59871,10 +59944,15 @@ msgstr "Au lieu de marcher dans la chaîne des commits ancêtres, parcourir les ...@@ -59871,10 +59944,15 @@ msgstr "Au lieu de marcher dans la chaîne des commits ancêtres, parcourir les
   
#. type: Plain text #. type: Plain text
#: en/rev-list-options.txt:278 #: en/rev-list-options.txt:278
#, fuzzy, priority:260 #, priority:260
#| msgid "With `--pretty` format other than `oneline` (for obvious reasons), this causes the output to have two extra lines of information taken from the reflog. The reflog designator in the output may be shown as `ref@{Nth}` (where `Nth` is the reverse-chronological index in the reflog) or as `ref@{timestamp}` (with the timestamp for that entry), depending on a few rules:"
msgid "With `--pretty` format other than `oneline` and `reference` (for obvious reasons), this causes the output to have two extra lines of information taken from the reflog. The reflog designator in the output may be shown as `ref@{Nth}` (where `Nth` is the reverse-chronological index in the reflog) or as `ref@{timestamp}` (with the timestamp for that entry), depending on a few rules:" msgid "With `--pretty` format other than `oneline` and `reference` (for obvious reasons), this causes the output to have two extra lines of information taken from the reflog. The reflog designator in the output may be shown as `ref@{Nth}` (where `Nth` is the reverse-chronological index in the reflog) or as `ref@{timestamp}` (with the timestamp for that entry), depending on a few rules:"
msgstr "Avec le format `--pretty` autre que `online` (pour des raisons évidentes), cela fait que la sortie a deux lignes supplémentaires d'informations tirées du reflog. L'indicateur de reflog dans la sortie peut être affiché comme `ref@{Nième}` (où `Nième` est l'index chronologique inverse dans le reflog) ou comme `ref@{horodatage}` (avec l'horodatage pour cette entrée), selon quelques règles :" msgstr ""
"Avec le format `--pretty` autre que `online` et `reference` (pour des "
"raisons évidentes), cela fait que la sortie a deux lignes supplémentaires "
"d'informations tirées du reflog. L'indicateur de reflog dans la sortie peut "
"être affiché comme `ref@{Nième}` (où `Nième` est l'index chronologique "
"inverse dans le reflog) ou comme `ref@{horodatage}` (avec l'horodatage pour "
"cette entrée), selon quelques règles :"
   
#. type: Plain text #. type: Plain text
#: en/rev-list-options.txt:282 #: en/rev-list-options.txt:282
...@@ -59911,6 +59989,8 @@ msgstr "Sous `--pretty=oneline`, le message de commit est préfixé avec cette i ...@@ -59911,6 +59989,8 @@ msgstr "Sous `--pretty=oneline`, le message de commit est préfixé avec cette i
#, priority:260 #, priority:260
msgid "Under `--pretty=reference`, this information will not be shown at all." msgid "Under `--pretty=reference`, this information will not be shown at all."
msgstr "" msgstr ""
"Sous l'option `--pretty = reference`, ces informations ne seront pas "
"affichées du tout."
   
#. type: Plain text #. type: Plain text
#: en/rev-list-options.txt:302 #: en/rev-list-options.txt:302
...@@ -61453,6 +61533,8 @@ msgstr "Ces deux syntaxes sont à peu près équivalentes, à part que la premi ...@@ -61453,6 +61533,8 @@ msgstr "Ces deux syntaxes sont à peu près équivalentes, à part que la premi
#, priority:300 #, priority:300
msgid "'git clone', 'git fetch' and 'git pull', but not 'git push', will also accept a suitable bundle file. See linkgit:git-bundle[1]." msgid "'git clone', 'git fetch' and 'git pull', but not 'git push', will also accept a suitable bundle file. See linkgit:git-bundle[1]."
msgstr "" msgstr ""
"« git clone », « git fetch » et « git pull », mais pas « git push », "
"acceptent également un fichier paquet approprié. Voir linkgit:git-bundle[1]."
   
#. type: Plain text #. type: Plain text
#: en/urls.txt:63 #: en/urls.txt:63
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