From 266608f2a84ee7bf0d531cb5f7422e31d051d9c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr> Date: Fri, 10 Apr 2020 20:27:30 +0000 Subject: [PATCH] Translated using Weblate (French) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 39.3% (4032 of 10245 strings) Translation: Git Manpages/Translations Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/fr/ Signed-off-by: Jean-No챘l Avila <jn.avila@free.fr> --- po/documentation.fr.po | 60 +++++++++++++++++++++++++++++++++++------- 1 file changed, 51 insertions(+), 9 deletions(-) diff --git a/po/documentation.fr.po b/po/documentation.fr.po index 5fc4d3c..d68b17c 100644 --- a/po/documentation.fr.po +++ b/po/documentation.fr.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: git documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" "POT-Creation-Date: 2020-04-04 19:51+0200\n" -"PO-Revision-Date: 2020-04-09 10:09+0000\n" +"PO-Revision-Date: 2020-04-10 21:38+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" @@ -9865,55 +9865,74 @@ msgstr "" #: en/git-branch.txt:349 #, priority:240 msgid "Patterns will normally need quoting." -msgstr "" +msgstr "Les motifs devront normalement 챗tre cit챕s." #. type: Title - #: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553 #, no-wrap, priority:240 msgid "NOTES" -msgstr "" +msgstr "NOTES" #. type: Plain text #: en/git-branch.txt:356 #, priority:240 msgid "If you are creating a branch that you want to switch to immediately, it is easier to use the \"git switch\" command with its `-c` option to do the same thing with a single command." msgstr "" +"Si vous cr챕ez une branche sur laquelle vous voulez passer imm챕diatement, il " +"est plus facile d'utiliser la commande \"git switch\" avec son option `-c` " +"pour faire la m챗me chose avec une seule commande." #. type: Plain text #: en/git-branch.txt:359 #, priority:240 msgid "The options `--contains`, `--no-contains`, `--merged` and `--no-merged` serve four related but different purposes:" msgstr "" +"Les options `--contains`, `--no-contains`, `--merged` et `--no-merged` " +"servent quatre objectifs connexes mais diff챕rents :" #. type: Plain text #: en/git-branch.txt:363 #, priority:240 msgid "`--contains <commit>` is used to find all branches which will need special attention if <commit> were to be rebased or amended, since those branches contain the specified <commit>." msgstr "" +"`--contains <commit>` est utilis챕 pour trouver toutes les branches qui " +"devront faire l'objet d'une attention particuli챔re si <commit> devait 챗tre " +"rebas챕 ou modifi챕, puisque ces branches contiennent le <commit> sp챕cifi챕." #. type: Plain text #: en/git-branch.txt:366 #, priority:240 msgid "`--no-contains <commit>` is the inverse of that, i.e. branches that don't contain the specified <commit>." msgstr "" +"`--no-contains <commit>` est l'inverse de cela, c'est-횪-dire les branches " +"qui ne contiennent pas le <commit> sp챕cifi챕." #. type: Plain text #: en/git-branch.txt:369 #, priority:240 msgid "`--merged` is used to find all branches which can be safely deleted, since those branches are fully contained by HEAD." msgstr "" +"`--merged` est utilis챕 pour trouver toutes les branches qui peuvent 챗tre " +"supprim챕es en toute s챕curit챕, puisque ces branches sont enti챔rement " +"contenues par HEAD." #. type: Plain text #: en/git-branch.txt:372 #, priority:240 msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD." msgstr "" +"`--no-merged` est utilis챕 pour trouver les branches qui sont candidates 횪 la " +"fusion avec HEAD, puisque ces branches ne sont pas enti챔rement contenues par " +"HEAD." #. type: Plain text #: en/git-branch.txt:380 #, priority:240 msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual." msgstr "" +"linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1]" +", link:user-manual.html#what-is-a-branch [``Comprendre l'historique : Qu'est-" +"ce qu'une branche ?''] dans le manuel d'utilisateur Git." #. type: Title = #: en/git-bundle.txt:2 @@ -11692,12 +11711,19 @@ msgstr "'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<arbre-esque> #, no-wrap, priority:240 msgid "'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] --pathspec-from-file=<file> [--pathspec-file-nul]" msgstr "" +"'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<arbre-esque>] " +"--pathspec-from-file=<fichier> [--pathspec-file-nul]" #. type: Plain text #: en/git-checkout.txt:90 #, priority:240 msgid "Overwrite the contents of the files that match the pathspec. When the `<tree-ish>` (most often a commit) is not given, overwrite working tree with the contents in the index. When the `<tree-ish>` is given, overwrite both the index and the working tree with the contents at the `<tree-ish>`." msgstr "" +"횋craser le contenu des fichiers qui correspondent au sp챕cificateur-de-" +"chemin. Lorsque le `<arbre-esque>` (le plus souvent un commit) n'est pas " +"donn챕, 챕craser l'arbre de travail avec le contenu de l'index. Lorsque le " +"`<arbre-esque>` est donn챕, 챕craser 횪 la fois l'index et l'arbre de travail " +"avec le contenu du `<arbre-esque>`." #. type: Plain text #: en/git-checkout.txt:98 @@ -11847,7 +11873,7 @@ msgstr "Si la branche existe dans plus d'un distant et que l'un d'entre eux est #: en/git-checkout.txt:196 #, priority:240 msgid "Use `--no-guess` to disable this." -msgstr "" +msgstr "Utilisez `--no-guess` pour d챕sactiver ceci." #. type: Plain text #: en/git-checkout.txt:200 @@ -11938,6 +11964,8 @@ msgstr "Lors de l'extraction de chemins depuis l'index, cette option vous permet #, priority:240 msgid "When switching branches with `--merge`, staged changes may be lost." msgstr "" +"Lors du basculement de branche avec '--merge', les modifications index챕es " +"peuvent 챗tre perdues." #. type: Labeled list #: en/git-checkout.txt:260 en/git-restore.txt:90 en/git-switch.txt:133 @@ -11968,6 +11996,8 @@ msgstr "Ceci signifie que vous pouvez utiliser `git checkout -p` pour supprimer #, priority:240 msgid "Note that this option uses the no overlay mode by default (see also `--overlay`), and currently doesn't support overlay mode." msgstr "" +"Notez que cette option utilise par d챕faut le mode sans superposition (voir " +"aussi `--overlay`), et ne supporte pas actuellement le mode superposition." #. type: Labeled list #: en/git-checkout.txt:281 en/git-switch.txt:175 @@ -11998,6 +12028,10 @@ msgstr "--no-overwrite-ignore" #, priority:240 msgid "Silently overwrite ignored files when switching branches. This is the default behavior. Use `--no-overwrite-ignore` to abort the operation when the new branch contains ignored files." msgstr "" +"횋craser silencieusement les fichiers ignor챕s lors du basculement de branche. " +"C'est le comportement par d챕faut. Utilisez `--no overwrite-ignore` pour " +"annuler l'op챕ration lorsque la nouvelle branche contient des fichiers " +"ignor챕s." #. type: Labeled list #: en/git-checkout.txt:293 en/git-grep.txt:95 en/git-ls-files.txt:150 en/git-switch.txt:181 @@ -12028,6 +12062,11 @@ msgstr "--no-overlay" #, priority:240 msgid "In the default overlay mode, `git checkout` never removes files from the index or the working tree. When specifying `--no-overlay`, files that appear in the index and working tree, but not in `<tree-ish>` are removed, to make them match `<tree-ish>` exactly." msgstr "" +"Dans le mode de superposition par d챕faut, `git checkout` ne supprime jamais " +"les fichiers de l�셢ndex ou de l�셙rbre de travail. Lorsque vous sp챕cifiez " +"`--no-overlay`, les fichiers qui apparaissent dans l�셢ndex et l�셙rbre de " +"travail, mais pas dans 짬<arbre-esque>쨩 sont supprim챕s, pour les faire " +"correspondre 횪 `<arbre-esque>` exactement." #. type: Labeled list #: en/git-checkout.txt:324 en/git-rebase.txt:243 en/git-switch.txt:36 @@ -12926,7 +12965,7 @@ msgstr "" #: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:329 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117 #, no-wrap, priority:240 msgid "--strategy=<strategy>" -msgstr "" +msgstr "--strategy=<strategie>" #. type: Plain text #: en/git-cherry-pick.txt:150 en/git-revert.txt:106 @@ -19342,7 +19381,7 @@ msgstr "" #: en/git-difftool.txt:37 en/git-mergetool.txt:27 #, no-wrap, priority:240 msgid "-t <tool>" -msgstr "" +msgstr "-t<outil>" #. type: Labeled list #: en/git-difftool.txt:38 en/git-mergetool.txt:28 @@ -24311,7 +24350,7 @@ msgstr "" #: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:68 #, no-wrap, priority:240 msgid "--log[=<n>]" -msgstr "" +msgstr "--log[=<n>]" #. type: Plain text #: en/git-fmt-merge-msg.txt:33 @@ -24469,6 +24508,9 @@ msgstr "" #, priority:240 msgid "Respect any colors specified in the `--format` option. The `<when>` field must be one of `always`, `never`, or `auto` (if `<when>` is absent, behave as if `always` was given)." msgstr "" +"Respecter toutes les couleurs sp챕cifi챕es dans l'option `--format`. Le champ " +"`<quand>` doit 챗tre un des valeur `always`, `never`, ou `auto` (si `<quand>` " +"est absent, se comporter comme si `always` 챕tait donn챕)." #. type: Labeled list #: en/git-for-each-ref.txt:65 @@ -27525,7 +27567,7 @@ msgstr "" #: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46 #, no-wrap, priority:240 msgid "COMMANDS" -msgstr "" +msgstr "COMMANDES" #. type: Labeled list #: en/git-gui.txt:32 @@ -32498,7 +32540,7 @@ msgstr "git-mergetool - Lancer les outils de r챕solution de conflit de fusion po #: en/git-mergetool.txt:12 #, ignore-ellipsis, no-wrap, priority:240 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n" -msgstr "" +msgstr "'git mergetool' [--tool=<outil>] [-y | --[no-]prompt] [<fichier>...]\n" #. type: Plain text #: en/git-mergetool.txt:18 -- GitLab