diff --git a/po/documentation.fr.po b/po/documentation.fr.po index 2567eedbc6296dca76934913f2a76b38b5f6ce92..0c01b8b5fd3fa6cdc666da9f7c5f361df4f5c9cf 100644 --- a/po/documentation.fr.po +++ b/po/documentation.fr.po @@ -1,6 +1,6 @@ # msgid "" -msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-08-05 19:25+0200\nPO-Revision-Date: 2023-08-07 03:19+0000\nLast-Translator: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage-Team: LANGUAGE <LL@li.org>\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 5.0-dev\n" +msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-08-05 19:25+0200\nPO-Revision-Date: 2023-08-10 14:52+0000\nLast-Translator: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage-Team: LANGUAGE <LL@li.org>\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 5.0-dev\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:772 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:146 en/git-status.txt:31 @@ -36158,25 +36158,25 @@ msgstr "'git merge-tree' [--write-tree] [<options>] <branche1> <branche2>\n'git #: en/git-merge-tree.txt:23 #, priority:100 msgid "This command has a modern `--write-tree` mode and a deprecated `--trivial-merge` mode. With the exception of the <<DEPMERGE,DEPRECATED DESCRIPTION>> section at the end, the rest of this documentation describes modern `--write-tree` mode." -msgstr "" +msgstr "Cette commande a un mode moderne `--write-tree` et un mode `---trivial-merge`. � l'exception de la section <<DEPMERGE,DESCRIPTION OBSOL 횊TE>> 횪 la fin, le reste de cette documentation d챕crit le mode moderne `--write-tree`." #. type: Plain text #: en/git-merge-tree.txt:26 #, priority:100 msgid "Performs a merge, but does not make any new commits and does not read from or write to either the working tree or index." -msgstr "" +msgstr "Ex챕cute une fusion, mais ne fait pas de nouveaux commits et ne lit ni n'챕crit ni l'arbre de travail ni l'index." #. type: Plain text #: en/git-merge-tree.txt:29 #, priority:100 msgid "The performed merge will use the same feature as the \"real\" linkgit:git-merge[1], including:" -msgstr "" +msgstr "La fusion effectu챕e utilisera la m챗me caract챕ristique que le linkgit:git-merge[1] 짬 r챕el 쨩, y compris혻:" #. type: Plain text #: en/git-merge-tree.txt:31 #, priority:100 msgid "three way content merges of individual files" -msgstr "" +msgstr "fusion de contenu 횪 trois branches des fichiers individuels" #. type: Plain text #: en/git-merge-tree.txt:32 @@ -36425,25 +36425,25 @@ msgstr "\"Fusion automatique\"" #: en/git-merge-tree.txt:162 #, priority:100 msgid "\"CONFLICT (rename/delete)\"" -msgstr "" +msgstr "\"CONFLIT (renommage/suppression)\"" #. type: Plain text #: en/git-merge-tree.txt:163 #, priority:100 msgid "\"CONFLICT (submodule lacks merge base)\"" -msgstr "" +msgstr "\"CONFLIT (le sous-module manque d'une base de fusion)\"" #. type: Plain text #: en/git-merge-tree.txt:164 #, priority:100 msgid "\"CONFLICT (binary)\"" -msgstr "" +msgstr "\"CONFLIT (binaire)\"" #. type: Plain text #: en/git-merge-tree.txt:168 #, priority:100 msgid "and <conflict-message> is a more detailed message about the conflict which often (but not always) embeds the <stable-short-type-description> within it. These strings may change in future Git versions. Some examples:" -msgstr "" +msgstr "et <message-de-conflit> est un message plus d챕taill챕 sur le conflit qui souvent (mais pas toujours) embarque la <description-courte-stable>. Ces cha챤nes peuvent changer dans les futures versions Git. Quelques exemples :" #. type: Plain text #: en/git-merge-tree.txt:170 @@ -36455,25 +36455,25 @@ msgstr "\"Fusion automatique de <fichier>\"" #: en/git-merge-tree.txt:171 #, ignore-ellipsis, priority:100 msgid "\"CONFLICT (rename/delete): <oldfile> renamed...but deleted in...\"" -msgstr "" +msgstr "\"CONFLIT (renommage/suppression)혻:<ancienfichier> renomm챕... mais supprim챕 dans ...\"" #. type: Plain text #: en/git-merge-tree.txt:172 #, priority:100 msgid "\"Failed to merge submodule <submodule> (no merge base)\"" -msgstr "" +msgstr "\"횋chec de la fusion du sous-module <sous-module> (pas de base de fusion)\"" #. type: Plain text #: en/git-merge-tree.txt:173 #, priority:100 msgid "\"Warning: cannot merge binary files: <filename>\"" -msgstr "" +msgstr "\"Attention : ne peut pas fusionner des fichiers binaires : <nom-de-fichier>\"" #. type: Plain text #: en/git-merge-tree.txt:175 #, priority:100 msgid "If `-z` is NOT passed:" -msgstr "" +msgstr "Si `-z` n'est PAS pass챕혻:" #. type: Plain text #: en/git-merge-tree.txt:185