diff --git a/po/documentation.fr.po b/po/documentation.fr.po index 247f77f12be5946bef5734af345ca2dbf580d1a1..a3f7dfb47e670a1e4cc3d3c77567368a5574110f 100644 --- a/po/documentation.fr.po +++ b/po/documentation.fr.po @@ -3,19 +3,7 @@ # This file is distributed under the same license as the Git package. # Jean-No챘l Avila <jn.avila@free.fr>, 2019. msgid "" -msgstr "" -"Project-Id-Version: git documentation\n" -"Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2022-04-09 23:15+0200\n" -"PO-Revision-Date: 2022-04-03 06:47+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" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 4.12-dev\n" +msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2022-04-09 23:15+0200\nPO-Revision-Date: 2022-04-12 17:07+0000\nLast-Translator: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage-Team: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage: fr\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n > 1;\nX-Generator: Weblate 4.12-dev\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:763 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:129 en/git-status.txt:31 @@ -4113,10 +4101,9 @@ msgstr "Supprimer la sortie diff. Utile pour les commandes telles que `git show` #. type: Labeled list #: en/diff-options.txt:37 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc)" +#, no-wrap, priority:280 msgid "--diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc|remerge|r)" -msgstr "--diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc)" +msgstr "--diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc|remerge|r)" #. type: Labeled list #: en/diff-options.txt:38 en/diff-options.txt:44 @@ -4198,17 +4185,15 @@ msgstr "Cela fait que les commits de fusion montrent la diff챕rence compl챔te pa #. type: Labeled list #: en/diff-options.txt:67 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=m" +#, no-wrap, priority:280 msgid "--diff-merges=remerge" -msgstr "--diff-merges=m" +msgstr "--diff-merges=remerge" #. type: Labeled list #: en/diff-options.txt:68 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=m" +#, no-wrap, priority:280 msgid "--diff-merges=r" -msgstr "--diff-merges=m" +msgstr "--diff-merges=r" #. type: Labeled list #: en/diff-options.txt:69 @@ -5394,10 +5379,9 @@ msgstr "Aussi, ces lettres majuscules peuvent 챗tre sp챕cifi챕es en minuscules p #. type: Plain text #: en/diff-options.txt:633 -#, fuzzy, priority:280 -#| msgid "Note that not all diffs can feature all types. For instance, diffs from the index to the working tree can never have Added entries (because the set of paths included in the diff is limited by what is in the index). Similarly, copied and renamed entries cannot appear if detection for those types is disabled." +#, priority:280 msgid "Note that not all diffs can feature all types. For instance, copied and renamed entries cannot appear if detection for those types is disabled." -msgstr "Notez que toutes les diffs ne peuvent pas pr챕senter tous les types. Par exemple, les diffs de l'index par rapport 횪 l'arbre de travail ne peuvent jamais avoir des entr챕es Ajout챕es (parce que l'ensemble des chemins inclus dans le diff est limit챕 par ce qui est pr챕sent dans l'index). Similairement, les entr챕es copi챕es et renomm챕es ne peuvent pas appara챤tre si la d챕tection de ces types est d챕sactiv챕e." +msgstr "Notez que toutes les diffs ne peuvent pas pr챕senter tous les types. Par exemple, les entr챕es copi챕es et renomm챕es ne peuvent pas appara챤tre si la d챕tection de ces types est d챕sactiv챕e." #. type: Labeled list #: en/diff-options.txt:634 @@ -10212,23 +10196,7 @@ msgstr "git-branch - Liste, cr챕e, ou supprime des branches" #. type: Plain text #: en/git-branch.txt:27 -#, fuzzy, ignore-ellipsis, no-wrap, priority:260 -#| msgid "" -#| "'git branch' [--color[=<when>] | --no-color] [--show-current]\n" -#| "\t[-v [--abbrev=<n> | --no-abbrev]]\n" -#| "\t[--column[=<options>] | --no-column] [--sort=<key>]\n" -#| "\t[--merged [<commit>]] [--no-merged [<commit>]]\n" -#| "\t[--contains [<commit>]] [--no-contains [<commit>]]\n" -#| "\t[--points-at <object>] [--format=<format>]\n" -#| "\t[(-r | --remotes) | (-a | --all)]\n" -#| "\t[--list] [<pattern>...]\n" -#| "'git branch' [--track [direct|inherit] | --no-track] [-f] <branchname> [<start-point>]\n" -#| "'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]\n" -#| "'git branch' --unset-upstream [<branchname>]\n" -#| "'git branch' (-m | -M) [<oldbranch>] <newbranch>\n" -#| "'git branch' (-c | -C) [<oldbranch>] <newbranch>\n" -#| "'git branch' (-d | -D) [-r] <branchname>...\n" -#| "'git branch' --edit-description [<branchname>]\n" +#, ignore-ellipsis, no-wrap, priority:260 msgid "" "'git branch' [--color[=<when>] | --no-color] [--show-current]\n" "\t[-v [--abbrev=<n> | --no-abbrev]]\n" @@ -10246,22 +10214,7 @@ msgid "" "'git branch' (-c | -C) [<oldbranch>] <newbranch>\n" "'git branch' (-d | -D) [-r] <branchname>...\n" "'git branch' --edit-description [<branchname>]\n" -msgstr "" -"'git branch' [--color[=<when>] | --no-color] [--show-current]\n" -"\t[-v [--abbrev=<n> | --no-abbrev]]\n" -"\t[--column[=<options>] | --no-column] [--sort=<key>]\n" -"\t[--merged [<commit>]] [--no-merged) [<commit>]]\n" -"\t[--contains [<commit>]] [--no-contains [<commit>]]\n" -"\t[--points-at <objet>] [--format=<format>]\n" -"\t[(-r | --remotes) | (-a | --all)]\n" -"\t[--list] [<motif>...]\n" -"'git branch' [--track [direct|inherit] | --no-track] [-f] <nom-de-branche> [<start-point>]\n" -"'git branch' (--set-upstream-to=<amont> | -u <amont>) [<nom-de-branche>]\n" -"'git branch' --unset-upstream [<nom-de-branche>]\n" -"'git branch' (-m | -M) [<anciennebranche>] <nouvellebranche>\n" -"'git branch' (-c | -C) [<anciennebranche>] <nouvellebranche>\n" -"'git branch' (-d | -D) [-r] <nom-de-branche>...\n" -"'git branch' --edit-description [<nom-de-branche>]\n" +msgstr "'git branch' [--color[=<when>] | --no-color] [--show-current]\n\t[-v [--abbrev=<n> | --no-abbrev]]\n\t[--column[=<options>] | --no-column] [--sort=<key>]\n\t[--merged [<commit>]] [--no-merged) [<commit>]]\n\t[--contains [<commit>]] [--no-contains [<commit>]]\n\t[--points-at <objet>] [--format=<format>]\n\t[(-r | --remotes) | (-a | --all)]\n\t[--list] [<motif>...]\n'git branch' [--track [direct|inherit] | --no-track] [-f]\n\t[--recurse-submodules] <nom-de-branche> [<point-de-d챕part>]\n'git branch' (--set-upstream-to=<amont> | -u <amont>) [<nom-de-branche>]\n'git branch' --unset-upstream [<nom-de-branche>]\n'git branch' (-m | -M) [<anciennebranche>] <nouvellebranche>\n'git branch' (-c | -C) [<anciennebranche>] <nouvellebranche>\n'git branch' (-d | -D) [-r] <nom-de-branche>...\n'git branch' --edit-description [<nom-de-branche>]\n" #. type: Plain text #: en/git-branch.txt:37 @@ -10541,10 +10494,9 @@ msgstr "Afficher les sha1s complets dans la liste des r챕sultats plut척t que de #. type: Labeled list #: en/git-branch.txt:210 en/git-checkout.txt:159 -#, fuzzy, no-wrap, priority:260 -#| msgid "--track [direct|inherit]" +#, no-wrap, priority:260 msgid "--track[=(direct|inherit)]" -msgstr "--track [direct|inherit]" +msgstr "--track[=(direct|inherit)]" #. type: Plain text #: en/git-branch.txt:218 @@ -10554,17 +10506,15 @@ msgstr "Lors de la cr챕ation d'une nouvelle branche, configurer les entr챕es de #. type: Plain text #: en/git-branch.txt:223 -#, fuzzy, priority:260 -#| msgid "The exact upstream branch is chosen depending on the optional argument: `--track` or `--track direct` means to use the start-point branch itself as the upstream; `--track inherit` means to copy the upstream configuration of the start-point branch." +#, priority:260 msgid "The exact upstream branch is chosen depending on the optional argument: `-t`, `--track`, or `--track=direct` means to use the start-point branch itself as the upstream; `--track=inherit` means to copy the upstream configuration of the start-point branch." -msgstr "La branche amont exacte est choisie en fonction de l'argument optionnel : `--track` ou `--track direct` signifie utiliser la branche du point de d챕part elle-m챗me comme amont ; `--track inherit` signifie copier la configuration amont de la branche du point de d챕part." +msgstr "La branche amont exacte est choisie en fonction de l'argument optionnel : `t`, `--track` ou `--track direct` signifie utiliser la branche du point de d챕part elle-m챗me comme amont ; `--track=inherit` signifie copier la configuration amont de la branche du point de d챕part." #. type: Plain text #: en/git-branch.txt:231 -#, fuzzy, priority:260 -#| msgid "`--track direct` is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch. Set it to `inherit` if you want to copy the tracking configuration from the branch point." +#, priority:260 msgid "`--track=direct` is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch. Set it to `inherit` if you want to copy the tracking configuration from the branch point." -msgstr "`--track direct` est le d챕faut lorsque le point de d챕part est une branche de suivi 횪 distance. D챕finissez la variable de configuration branch.autoSetupMerge 횪 `false` si vous voulez `git switch`, `git checkout` et `git branch` pour toujours se comporter comme si `--no-track` a 챕t챕 donn챕. R챕glez-le `always` si vous voulez ce comportement lorsque le point de d챕part est soit une branche locale ou de suivi 횪 distance. Mettez-le 횪 `inherit` si vous voulez copier la configuration du suivi depuis le point de branchement." +msgstr "`--track=direct` est le d챕faut lorsque le point de d챕part est une branche de suivi 횪 distance. D챕finissez la variable de configuration branch.autoSetupMerge 횪 `false` si vous voulez `git switch`, `git checkout` et `git branch` pour toujours se comporter comme si `--no-track` a 챕t챕 donn챕. R챕glez-le `always` si vous voulez ce comportement lorsque le point de d챕part est soit une branche locale ou de suivi 횪 distance. Mettez-le 횪 `inherit` si vous voulez copier la configuration du suivi depuis le point de branchement." #. type: Plain text #: en/git-branch.txt:234 @@ -15070,17 +15020,7 @@ msgstr "git-clone - Clone un d챕p척t dans un nouveau r챕pertoire" #. type: Plain text #: en/git-clone.txt:21 -#, fuzzy, 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>] [--sparse] [--[no-]reject-shallow]\n" -#| "\t [--filter=<filter>] [--] <repository>\n" -#| "\t [<directory>]\n" +#, no-wrap, priority:300 msgid "" "'git clone' [--template=<template-directory>]\n" "\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n" @@ -15091,16 +15031,7 @@ msgid "" "\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n" "\t [--filter=<filter> [--also-filter-submodules]] [--] <repository>\n" "\t [<directory>]\n" -msgstr "" -"'git clone' [--template=<r챕pertoire_de_mod챔les>]\n" -"\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n" -"\t [-o <nom>] [-b <nom>] [-u <upload-pack>] [--reference <d챕p척t>]\n" -"\t [--dissociate] [--separate-git-dir <r챕pertoire git>]\n" -"\t [--depth <profondeur>] [--[no-]single-branch] [--no-tags]\n" -"\t [--recurse-submodules[=<sp챕c.de chemin>]] [--[no-]shallow-submodules]\n" -"\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n" -"\t [--filter=<filter>] [--] <d챕p척t>\n" -"\t [<r챕pertoire>]\n" +msgstr "'git clone' [--template=<r챕pertoire-de-mod챔les>]\n\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n\t [-o <nom>] [-b <nom>] [-u <upload-pack>] [--reference <d챕p척t>]\n\t [--dissociate] [--separate-git-dir <r챕pertoire-git>]\n\t [--depth <profondeur>] [--[no-]single-branch] [--no-tags]\n\t [--recurse-submodules[=<sp챕c-de-chemin>]] [--[no-]shallow-submodules]\n\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n\t [--filter=<filtre> [--also-filter-submodules]] [--] <d챕p척t>\n\t [<r챕pertoire>]\n" #. type: Plain text #: en/git-clone.txt:30 @@ -46077,10 +46008,9 @@ msgstr "Voir 짬혻Reset, restore et revert혻쨩 dans linkgit:git[1] pour les diff #. type: Plain text #: en/git-reset.txt:109 -#, fuzzy, priority:280 -#| msgid "Be quiet. Only print error messages." +#, priority:280 msgid "Be quiet, only report errors." -msgstr "N'afficher que les messages d'erreur." +msgstr "mode silencieux, n'afficher que les messages d'erreur." #. type: Labeled list #: en/git-reset.txt:111 @@ -60115,16 +60045,7 @@ msgstr "git-worktree - G챕rer plusieurs arbres de travail" #. type: Plain text #: en/git-worktree.txt:20 -#, fuzzy, ignore-ellipsis, no-wrap, priority:240 -#| msgid "" -#| "'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n" -#| "'git worktree list' [-v | --porcelain]\n" -#| "'git worktree lock' [--reason <string>] <worktree>\n" -#| "'git worktree move' <worktree> <new-path>\n" -#| "'git worktree prune' [-n] [-v] [--expire <expire>]\n" -#| "'git worktree remove' [-f] <worktree>\n" -#| "'git worktree repair' [<path>...]\n" -#| "'git worktree unlock' <worktree>\n" +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n" "'git worktree list' [-v | --porcelain [-z]]\n" @@ -60134,15 +60055,7 @@ msgid "" "'git worktree remove' [-f] <worktree>\n" "'git worktree repair' [<path>...]\n" "'git worktree unlock' <worktree>\n" -msgstr "" -"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <cha챤ne>]] [-b <nouvelle-branche>] <chemin> [<commit-esque>]\n" -"'git worktree list' [-v | --porcelain]\n" -"'git worktree lock' [--reason <cha챤ne>] <arbre-de-travail>\n" -"'git worktree move' <arbre-de-travail> <nouveau-chemin>\n" -"'git worktree prune' [-n] [-v] [--expire <expire>]\n" -"'git worktree remove' [-f] <arbre-de-travail>\n" -"'git worktree repair' [<path>...]\n" -"'git worktree unlock' <arbre-de-travail>\n" +msgstr "'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <cha챤ne>]] [-b <nouvelle-branche>] <chemin> [<commit-esque>]\n'git worktree list' [-v | --porcelain [-z]]\n'git worktree lock' [--reason <cha챤ne>] <arbre-de-travail>\n'git worktree move' <arbre-de-travail> <nouveau-chemin>\n'git worktree prune' [-n] [-v] [--expire <expire>]\n'git worktree remove' [-f] <arbre-de-travail>\n'git worktree repair' [<path>...]\n'git worktree unlock' <arbre-de-travail>\n" #. type: Plain text #: en/git-worktree.txt:25 @@ -60152,10 +60065,9 @@ msgstr "G챔re plusieurs arbres de travail rattach챕s au m챗me d챕p척t." #. type: Plain text #: en/git-worktree.txt:31 -#, fuzzy, priority:240 -#| msgid "A git repository can support multiple working trees, allowing you to check out more than one branch at a time. With `git worktree add` a new working tree is associated with the repository. This new working tree is called a \"linked working tree\" as opposed to the \"main working tree\" prepared by linkgit:git-init[1] or linkgit:git-clone[1]. A repository has one main working tree (if it's not a bare repository) and zero or more linked working trees. When you are done with a linked working tree, remove it with `git worktree remove`." +#, priority:240 msgid "A git repository can support multiple working trees, allowing you to check out more than one branch at a time. With `git worktree add` a new working tree is associated with the repository, along with additional metadata that differentiates that working tree from others in the same repository. The working tree, along with this metadata, is called a \"worktree\"." -msgstr "Un d챕p척t git peut prendre en charge plusieurs arbres de travail, ce qui vous permet de consulter plus d'une branche 횪 la fois. Avec `git worktree add`, un nouvel arbre de travail est associ챕 au d챕p척t. Ce nouvel arbre de travail est appel챕 \"arbre de travail li챕\" par opposition 횪 l'\"arbre de travail principal\" pr챕par챕 par linkgit:git-init[1] ou linkgit:git-clone[1]. Un d챕p척t a un arbre de travail principal (s'il ne s'agit pas d'un d챕p척t nu) et z챕ro ou plusieurs arbres de travail li챕s. Lorsque vous avez termin챕 avec un arbre de travail li챕, supprimez-le avec `git worktree remove`." +msgstr "Un d챕p척t git peut prendre en charge plusieurs arbres de travail, ce qui vous permet de consulter plus d'une branche 횪 la fois. Avec `git worktree add`, un nouvel arbre de travail est associ챕 au d챕p척t, avec des m챕tadonn챕es suppl챕mentaires qui diff챕rencient cet arbre de travail des autres dans le m챗me d챕p척t. L'arbre de travail, ainsi que ces m챕tadonn챕es, est appel챕 un \"worktree\"." #. type: Plain text #: en/git-worktree.txt:37 @@ -65615,10 +65527,9 @@ msgstr "`--no-min-parents` et `--no-max-parents` r챕initialisent ces limites (횪 #. type: Plain text #: en/rev-list-options.txt:133 -#, fuzzy, priority:260 -#| msgid "Follow only the first parent commit upon seeing a merge commit. This option can give a better overview when viewing the evolution of a particular topic branch, because merges into a topic branch tend to be only about adjusting to updated upstream from time to time, and this option allows you to ignore the individual commits brought in to your history by such a merge." +#, priority:260 msgid "When finding commits to include, follow only the first parent commit upon seeing a merge commit. This option can give a better overview when viewing the evolution of a particular topic branch, because merges into a topic branch tend to be only about adjusting to updated upstream from time to time, and this option allows you to ignore the individual commits brought in to your history by such a merge." -msgstr "Ne suivre que le premier commit parent lors d'un commit de fusion. Cette option peut donner une meilleure vue d'ensemble lors de l'affichage de l'챕volution d'une branche de sujet particuli챔re, parce que la fusion dans une branche de sujet a tendance 횪 n'챗tre que des mises 횪 jour avec l'amont de temps en temps, et cette option permet d'ignorer les commits individuels apport챕s dans votre historique par de telles fusions." +msgstr "Lors de la recherche de commits 횪 inclure, ne suivre que le premier commit parent lors d'un commit de fusion. Cette option peut donner une meilleure vue d'ensemble lors de l'affichage de l'챕volution d'une branche de sujet particuli챔re, parce que la fusion dans une branche de sujet a tendance 횪 n'챗tre que des mises 횪 jour avec l'amont de temps en temps, et cette option permet d'ignorer les commits individuels apport챕s dans votre historique par de telles fusions." #. type: Plain text #: en/rev-list-options.txt:137