From 0df9aedf86f74f5a35f82a018fd66d1b34942004 Mon Sep 17 00:00:00 2001 From: Adrien Ollier <adr.ollier@hotmail.fr> Date: Wed, 13 Mar 2019 13:28:52 +0100 Subject: [PATCH] fr: correct translation of "fuzzy" entries Signed-off-by: Adrien Ollier <adr.ollier@hotmail.fr> --- po/documentation.fr.po | 67 ++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 41 deletions(-) diff --git a/po/documentation.fr.po b/po/documentation.fr.po index 50a2e5b..38a26af 100644 --- a/po/documentation.fr.po +++ b/po/documentation.fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: git documentation\n" "POT-Creation-Date: 2019-02-13 20:53+0100\n" -"PO-Revision-Date: 2019-03-09 16:34+0100\n" +"PO-Revision-Date: 2019-03-13 13:07+0100\n" "Last-Translator: Adrien Ollier <adr.ollier@hotmail.fr>\n" "Language-Team: Jean-No챘l Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -44851,10 +44851,8 @@ msgstr "--whitespace" #. type: Plain text #: en/git-rebase.txt:521 -#, fuzzy -#| msgid "Ignored items have the following format:" msgid "are incompatible with the following options:" -msgstr "Les entr챕es ignor챕es ont le format suivant혻:" +msgstr "sont incompatibles avec les options suivantes혻:" #. type: Plain text #: en/git-rebase.txt:524 @@ -54335,9 +54333,9 @@ msgstr "" #. type: Plain text #: en/git-status.txt:109 -#, fuzzy msgid "'traditional' - Shows ignored files and directories, unless" -msgstr "'normal' - Montrer les fichiers et les dossiers non-suivis\n" +msgstr "" +"'normal' - Montrer les fichiers et les dossiers non-suivis, 횪 moins que" #. type: Plain text #: en/git-status.txt:112 @@ -54362,10 +54360,9 @@ msgstr "'normal' - Montrer les fichiers et les dossiers non-suivis\n" #. type: Plain text #: en/git-status.txt:115 -#, fuzzy, no-wrap -#| msgid "--ignore-date" +#, no-wrap msgid "ignore pattern.\n" -msgstr "--ignore-date" +msgstr "ignore le motif.\n" #. type: Plain text #: en/git-status.txt:121 @@ -55103,9 +55100,10 @@ msgstr "" #. type: Plain text #: en/git-submodule.txt:28 -#, fuzzy msgid "For more information about submodules, see linkgit:gitsubmodules[7]." -msgstr "git-add(1)" +msgstr "" +"Pour plus d'informations sur les sous-modules, voir " +"linkgit:gitsubmodules[7]." #. type: Labeled list #: en/git-submodule.txt:31 @@ -56898,16 +56896,12 @@ msgstr "" #. type: Plain text #: en/git-svn.txt:472 -#, fuzzy msgid "" "Use the given `msg` as the commit message. This option disables the `--edit`" " option." msgstr "" -"-m <msg>::\n" -"--message=<msg>::\n" -"\tUtiliser le <msg> fourni comme message de validation\n" -"\tSi plusieurs options `-m` sont fournies, leurs valeurs\n" -"\tsont concat챕n챕es comme paragraphes s챕par챕s.\n" +"Utiliser le <msg> fourni comme message de validation. Cette option invalide " +"l'option '--edit'." #. type: Labeled list #: en/git-svn.txt:473 @@ -56925,15 +56919,12 @@ msgstr "--file=<fichier>" #. type: Plain text #: en/git-svn.txt:477 -#, fuzzy msgid "" "Take the commit message from the given file. This option disables the " "`--edit` option." msgstr "" -"-F <fichier>::\n" -"--file=<fichier>::\n" -"\tPrendre le message de validation depuis le fichier indiqu챕.\n" -"\tUtilisez '-' pour lire le message depuis l'entr챕e standard.\n" +"Prendre le message de validation depuis le fichier indiqu챕. Cette option " +"invalide l'option '--edit'." #. type: Labeled list #: en/git-svn.txt:478 @@ -61737,10 +61728,9 @@ msgstr "" #. type: delimited block - #: en/git-update-index.txt:473 -#, fuzzy, no-wrap -#| msgid "core.untrackedCache" +#, no-wrap msgid "$ git -c core.untrackedCache=false status\n" -msgstr "core.untrackedCache" +msgstr "$ git -c core.untrackedCache=false status\n" #. type: Plain text #: en/git-update-index.txt:479 @@ -63081,10 +63071,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:47 -#, fuzzy, no-wrap -#| msgid "<commit-ish>" +#, no-wrap msgid "add <path> [<commit-ish>]" -msgstr "<commit-esque>" +msgstr "ajouter <chemin> [<commit-esque>]" #. type: Plain text #: en/git-worktree.txt:53 @@ -63097,26 +63086,23 @@ msgstr "" #. type: Plain text #: en/git-worktree.txt:58 -#, fuzzy -#| msgid "" -#| "If <branch> is not found but there does exist a tracking branch in exactly " -#| "one remote (call it <remote>) with a matching name, treat as equivalent to" msgid "" "If <commit-ish> is a branch name (call it `<branch>`) and is not found, and " "neither `-b` nor `-B` nor `--detach` are used, but there does exist a " "tracking branch in exactly one remote (call it `<remote>`) with a matching " "name, treat as equivalent to:" msgstr "" -"Si la <branche> n'est pas trouv챕e mais qu'il existe une branche de suivi " -"pour un d챕p척t distant unique (appel챕 <distant>) avec un nom correspondant, " -"le traiter comme 챕quivalent 횪" +"Si le <commit-esque> est un nom de branche (appelons-le '<branche>') et " +"n'est pas trouv챕, et ni '-b' ni '-B' ni '--detach' ne sont utilis챕s, mais " +"qu'il existe une branche de suivi dans exactement un d챕p척t distant " +"(appelons-le '<distant>') avec un nom correspondant, le traiter comme " +"챕quivalent 횪혻:" #. type: delimited block - #: en/git-worktree.txt:61 -#, fuzzy, no-wrap -#| msgid "$ git checkout -b <branch> --track <remote>/<branch>\n" +#, no-wrap msgid "$ git worktree add --track -b <branch> <path> <remote>/<branch>\n" -msgstr "$ git checkout -b <branche> --track <distant>/<branche>\n" +msgstr "$ git worktree add --track -b <branche> <chemin> <distant>/<branche>\n" #. type: Plain text #: en/git-worktree.txt:80 @@ -63156,10 +63142,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:96 -#, fuzzy, no-wrap -#| msgid "--move" +#, no-wrap msgid "move" -msgstr "--move" +msgstr "d챕placer" #. type: Plain text #: en/git-worktree.txt:100 -- GitLab