Skip to content
Snippets Groups Projects
Commit 0df9aedf authored by Adrien Ollier's avatar Adrien Ollier
Browse files

fr: correct translation of "fuzzy" entries

parent 2ed05093
No related branches found
No related tags found
No related merge requests found
...@@ -6,7 +6,7 @@ msgid "" ...@@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: git documentation\n" "Project-Id-Version: git documentation\n"
"POT-Creation-Date: 2019-02-13 20:53+0100\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" "Last-Translator: Adrien Ollier <adr.ollier@hotmail.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" "Language: fr\n"
...@@ -44851,10 +44851,8 @@ msgstr "--whitespace" ...@@ -44851,10 +44851,8 @@ msgstr "--whitespace"
   
#. type: Plain text #. type: Plain text
#: en/git-rebase.txt:521 #: en/git-rebase.txt:521
#, fuzzy
#| msgid "Ignored items have the following format:"
msgid "are incompatible with the following options:" 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 #. type: Plain text
#: en/git-rebase.txt:524 #: en/git-rebase.txt:524
...@@ -54335,9 +54333,9 @@ msgstr "" ...@@ -54335,9 +54333,9 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-status.txt:109 #: en/git-status.txt:109
#, fuzzy
msgid "'traditional' - Shows ignored files and directories, unless" 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 #. type: Plain text
#: en/git-status.txt:112 #: en/git-status.txt:112
...@@ -54362,10 +54360,9 @@ msgstr "'normal' - Montrer les fichiers et les dossiers non-suivis\n" ...@@ -54362,10 +54360,9 @@ msgstr "'normal' - Montrer les fichiers et les dossiers non-suivis\n"
   
#. type: Plain text #. type: Plain text
#: en/git-status.txt:115 #: en/git-status.txt:115
#, fuzzy, no-wrap #, no-wrap
#| msgid "--ignore-date"
msgid "ignore pattern.\n" msgid "ignore pattern.\n"
msgstr "--ignore-date" msgstr "ignore le motif.\n"
   
#. type: Plain text #. type: Plain text
#: en/git-status.txt:121 #: en/git-status.txt:121
...@@ -55103,9 +55100,10 @@ msgstr "" ...@@ -55103,9 +55100,10 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-submodule.txt:28 #: en/git-submodule.txt:28
#, fuzzy
msgid "For more information about submodules, see linkgit:gitsubmodules[7]." 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 #. type: Labeled list
#: en/git-submodule.txt:31 #: en/git-submodule.txt:31
...@@ -56898,16 +56896,12 @@ msgstr "" ...@@ -56898,16 +56896,12 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:472 #: en/git-svn.txt:472
#, fuzzy
msgid "" msgid ""
"Use the given `msg` as the commit message. This option disables the `--edit`" "Use the given `msg` as the commit message. This option disables the `--edit`"
" option." " option."
msgstr "" msgstr ""
"-m <msg>::\n" "Utiliser le <msg> fourni comme message de validation. Cette option invalide "
"--message=<msg>::\n" "l'option '--edit'."
"\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"
   
#. type: Labeled list #. type: Labeled list
#: en/git-svn.txt:473 #: en/git-svn.txt:473
...@@ -56925,15 +56919,12 @@ msgstr "--file=<fichier>" ...@@ -56925,15 +56919,12 @@ msgstr "--file=<fichier>"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:477 #: en/git-svn.txt:477
#, fuzzy
msgid "" msgid ""
"Take the commit message from the given file. This option disables the " "Take the commit message from the given file. This option disables the "
"`--edit` option." "`--edit` option."
msgstr "" msgstr ""
"-F <fichier>::\n" "Prendre le message de validation depuis le fichier indiqué. Cette option "
"--file=<fichier>::\n" "invalide l'option '--edit'."
"\tPrendre le message de validation depuis le fichier indiqué.\n"
"\tUtilisez '-' pour lire le message depuis l'entrée standard.\n"
   
#. type: Labeled list #. type: Labeled list
#: en/git-svn.txt:478 #: en/git-svn.txt:478
...@@ -61737,10 +61728,9 @@ msgstr "" ...@@ -61737,10 +61728,9 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-update-index.txt:473 #: en/git-update-index.txt:473
#, fuzzy, no-wrap #, no-wrap
#| msgid "core.untrackedCache"
msgid "$ git -c core.untrackedCache=false status\n" msgid "$ git -c core.untrackedCache=false status\n"
msgstr "core.untrackedCache" msgstr "$ git -c core.untrackedCache=false status\n"
   
#. type: Plain text #. type: Plain text
#: en/git-update-index.txt:479 #: en/git-update-index.txt:479
...@@ -63081,10 +63071,9 @@ msgstr "" ...@@ -63081,10 +63071,9 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-worktree.txt:47 #: en/git-worktree.txt:47
#, fuzzy, no-wrap #, no-wrap
#| msgid "<commit-ish>"
msgid "add <path> [<commit-ish>]" msgid "add <path> [<commit-ish>]"
msgstr "<commit-esque>" msgstr "ajouter <chemin> [<commit-esque>]"
   
#. type: Plain text #. type: Plain text
#: en/git-worktree.txt:53 #: en/git-worktree.txt:53
...@@ -63097,26 +63086,23 @@ msgstr "" ...@@ -63097,26 +63086,23 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-worktree.txt:58 #: 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 "" msgid ""
"If <commit-ish> is a branch name (call it `<branch>`) and is not found, and " "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 " "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 " "tracking branch in exactly one remote (call it `<remote>`) with a matching "
"name, treat as equivalent to:" "name, treat as equivalent to:"
msgstr "" msgstr ""
"Si la <branche> n'est pas trouvée mais qu'il existe une branche de suivi " "Si le <commit-esque> est un nom de branche (appelons-le '<branche>') et "
"pour un dépôt distant unique (appelé <distant>) avec un nom correspondant, " "n'est pas trouvé, et ni '-b' ni '-B' ni '--detach' ne sont utilisés, mais "
"le traiter comme équivalent à" "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 - #. type: delimited block -
#: en/git-worktree.txt:61 #: en/git-worktree.txt:61
#, fuzzy, no-wrap #, no-wrap
#| msgid "$ git checkout -b <branch> --track <remote>/<branch>\n"
msgid "$ git worktree add --track -b <branch> <path> <remote>/<branch>\n" 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 #. type: Plain text
#: en/git-worktree.txt:80 #: en/git-worktree.txt:80
...@@ -63156,10 +63142,9 @@ msgstr "" ...@@ -63156,10 +63142,9 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-worktree.txt:96 #: en/git-worktree.txt:96
#, fuzzy, no-wrap #, no-wrap
#| msgid "--move"
msgid "move" msgid "move"
msgstr "--move" msgstr "déplacer"
   
#. type: Plain text #. type: Plain text
#: en/git-worktree.txt:100 #: en/git-worktree.txt:100
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