From 1751fe48f1dec85732cb53f48cf4583f447dce24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr> Date: Fri, 24 Jan 2020 15:57:45 +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 35.3% (3395 of 9610 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 | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/po/documentation.fr.po b/po/documentation.fr.po index c51c9f4..0a0d6b7 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: 2019-12-08 16:35+0100\n" -"PO-Revision-Date: 2020-01-20 21:38+0100\n" +"PO-Revision-Date: 2020-01-25 16:21+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" @@ -2613,6 +2613,10 @@ msgstr "merge.renames" #, priority:240 msgid "Whether Git detects renames. If set to \"false\", rename detection is disabled. If set to \"true\", basic rename detection is enabled. Defaults to the value of diff.renames." msgstr "" +"Indique si Git doit d챕tecter les renommages. S'il est d챕fini 횪 \"false\", la " +"d챕tection de renommage est d챕sactiv챕e. S'il est d챕fini 횪 \"true\", la " +"d챕tection de renommage de base est activ챕e. La valeur par d챕faut est " +"diff.renames." #. type: Labeled list #: en/config/merge.txt:46 @@ -2625,6 +2629,17 @@ msgstr "merge.directoryRenames" #, priority:240 msgid "Whether Git detects directory renames, affecting what happens at merge time to new files added to a directory on one side of history when that directory was renamed on the other side of history. If merge.directoryRenames is set to \"false\", directory rename detection is disabled, meaning that such new files will be left behind in the old directory. If set to \"true\", directory rename detection is enabled, meaning that such new files will be moved into the new directory. If set to \"conflict\", a conflict will be reported for such paths. If merge.renames is false, merge.directoryRenames is ignored and treated as false. Defaults to \"conflict\"." msgstr "" +"Indique si Git doit d챕tecter les noms de r챕pertoire, affectant ce qui se " +"arrive lors d'une fusion 횪 de nouveaux fichiers ajout챕s 횪 un r챕pertoire d'un " +"c척t챕 de l'historique lorsque ce r챕pertoire a 챕t챕 renomm챕 de l'autre c척t챕 de " +"l'histoire. Si merge.directoryRenames est r챕gl챕 횪 \"false\", la d챕tection " +"du r챕pertoire est d챕sactiv챕e, ce qui signifie que ces nouveaux fichiers " +"seront laiss챕s dans l'ancien r챕pertoire. S'il est r챕gl챕 sur \"true\", la " +"d챕tection du r챕pertoire est activ챕e, ce qui signifie que ces nouveaux " +"fichiers seront transf챕r챕s dans le nouveau r챕pertoire. S'il est r챕gl챕 pour " +"\"conflict\", un conflit sera signal챕 pour de tels chemins. Si " +"merge.renames est faux, merge.directoryRenames est ignor챕 et trait챕 comme " +"faux. Par d챕faut, la valeur est \"conflict\"." #. type: Labeled list #: en/config/merge.txt:59 -- GitLab