diff --git a/po/documentation.fr.po b/po/documentation.fr.po index c312f70d24416cfdc8d83005974c648541454ff4..ba594fb9a266ab1b75354d5410258565af9bef20 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: 2021-02-27 18:16+0100\n" -"PO-Revision-Date: 2021-02-23 20:50+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.5\n" +msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-02-27 18:16+0100\nPO-Revision-Date: 2021-02-27 18:15+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.5\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:738 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31 @@ -5784,10 +5772,9 @@ msgstr "--atomic" #. type: Plain text #: en/fetch-options.txt:13 -#, fuzzy, priority:220 -#| msgid "Use an atomic transaction on the remote side if available. Either all refs are updated, or on error, no refs are updated. If the server does not support atomic pushes the push will fail." +#, priority:220 msgid "Use an atomic transaction to update local refs. Either all refs are updated, or on error, no refs are updated." -msgstr "Utiliser une transaction atomique 횪 distance, si possible. Soit toutes les r챕f챕rences sont mises 횪 jour, soit, en cas d'erreur, aucune r챕f챕rence n'est mise 횪 jour. Si le serveur ne prend pas en charge les pouss챕es atomiques, la pouss챕e 챕chouera." +msgstr "Utiliser une transaction atomique pour mettre 횪 jour les r챕f챕rences locales. Soit toutes les r챕f챕rences sont mises 횪 jour, soit, en cas d'erreur, aucune r챕f챕rence n'est mise 횪 jour." #. type: Labeled list #: en/fetch-options.txt:14 @@ -39437,16 +39424,9 @@ msgstr "" #. type: delimited block - #: en/git-range-diff.txt:208 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| " B D\n" -#| " / /\n" -#| " ---X---A\n" +#, no-wrap, priority:100 msgid " 1 A\n" -msgstr "" -" B D\n" -" / /\n" -" ---X---A\n" +msgstr " 1 A\n" #. type: delimited block - #: en/git-range-diff.txt:210 @@ -39456,10 +39436,7 @@ msgstr "" #| " / /\n" #| " ---X---A\n" msgid " 2 B\n" -msgstr "" -" B D\n" -" / /\n" -" ---X---A\n" +msgstr " 2 B\n" #. type: delimited block - #: en/git-range-diff.txt:212 en/git-range-diff.txt:224 @@ -39475,19 +39452,12 @@ msgstr "" #. type: delimited block - #: en/git-range-diff.txt:222 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| " .----W\n" -#| " / /\n" -#| " -----H----I\n" +#, no-wrap, priority:100 msgid "" " 1 A\n" "\t /\n" " 2 --------' B\n" -msgstr "" -" .----W\n" -" / /\n" -" -----H----I\n" +msgstr " 1 A\n\t /\n 2 --------' B\n" #. type: Plain text #: en/git-range-diff.txt:229 @@ -39497,11 +39467,7 @@ msgstr "" #. type: delimited block - #: en/git-range-diff.txt:237 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| " .----W\n" -#| " / /\n" -#| " -----H----I\n" +#, no-wrap, priority:100 msgid "" " 1 ----. A\n" "\t | /\n" @@ -39509,10 +39475,7 @@ msgid "" "\t |\n" "\t `----- C\n" "\t c>0\n" -msgstr "" -" .----W\n" -" / /\n" -" -----H----I\n" +msgstr " 1 ----. A\n\t | /\n 2 ----+---' B\n\t |\n\t `----- C\n\t c>0\n" #. type: Plain text #: en/git-range-diff.txt:245 @@ -39522,14 +39485,7 @@ msgstr "" #. type: delimited block - #: en/git-range-diff.txt:254 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| "\t .-A---M--. N\n" -#| "\t / / \\ /\n" -#| "\tI B R\n" -#| "\t \\ / /\n" -#| "\t \\ / /\n" -#| "\t `---X--'\n" +#, no-wrap, priority:100 msgid "" " 1 ----. A\n" "\t | /\n" @@ -39538,26 +39494,13 @@ msgid "" " o `----- C\n" "\t c>0\n" " o o\n" -msgstr "" -"\t .-A---M--. N\n" -"\t / / \\ /\n" -"\tI B R\n" -"\t \\ / /\n" -"\t \\ / /\n" -"\t `---X--'\n" +msgstr " 1 ----. A\n\t | /\n 2 ----+---' B\n\t |\n o `----- C\n\t c>0\n o o\n" #. type: delimited block - #: en/git-range-diff.txt:256 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| " B D\n" -#| " / /\n" -#| " ---X---A\n" +#, no-wrap, priority:100 msgid " o o\n" -msgstr "" -" B D\n" -" / /\n" -" ---X---A\n" +msgstr " o o\n" #. type: Plain text #: en/git-range-diff.txt:266 @@ -39573,13 +39516,7 @@ msgstr "" #. type: delimited block - #: en/git-range-diff.txt:282 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| " o---o---o---o---o\n" -#| " / \\\n" -#| " / o---o---o---o---M\n" -#| " / /\n" -#| "---2---1---o---o---o---A\n" +#, no-wrap, priority:100 msgid "" " 1 ----. A\n" "\t | /\n" @@ -39588,12 +39525,7 @@ msgid "" " o -' `----- C\n" "\t c>0\n" " o ---------- o\n" -msgstr "" -" o---o---o---o---o\n" -" / \\\n" -" / o---o---o---o---M\n" -" / /\n" -"---2---1---o---o---o---A\n" +msgstr " 1 ----. A\n\t | /\n 2 ----+---' B\n .--+-----'\n o -' `----- C\n\t c>0\n o ---------- o\n" #. type: delimited block - #: en/git-range-diff.txt:284 @@ -45653,10 +45585,9 @@ msgstr "Appliquer un patchset quilt sur la branche courante." #. type: delimited block - #: en/git-rev-list.txt:41 -#, fuzzy, no-wrap, priority:100 -#| msgid "git-rev-list(1)" +#, no-wrap, priority:100 msgid "git rev-list HEAD\n" -msgstr "git-rev-list(1)" +msgstr "git rev-list HEAD\n" #. type: Plain text #: en/git-rev-list.txt:45 @@ -59070,20 +59001,13 @@ msgstr "Les noms de chemin avec des caract챔res 짬혻inhabituels혻쨩 sont cit챕s #. type: delimited block - #: en/git-worktree.txt:462 -#, fuzzy, ignore-ellipsis, no-wrap, priority:240 -#| msgid "" -#| "$ git worktree list --porcelain\n" -#| "worktree /path/to/bare-source\n" -#| "bare\n" +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "$ git worktree list --porcelain\n" "...\n" "locked \"reason\\nwhy is locked\"\n" "...\n" -msgstr "" -"$ git worktree list --porcelain\n" -"worktree /chemin/vers/source-nu\n" -"bare\n" +msgstr "$ git worktree list --porcelain\n...\nlocked \"reason\\nwhy is locked\"\n...\n" #. type: Plain text #: en/git-worktree.txt:474