From c1ef5f1a8281c509c5e56f738a318676926956f0 Mon Sep 17 00:00:00 2001
From: brandelune <jean.christophe.helary@traduction-libre.org>
Date: Sat, 16 May 2020 16:17:04 +0000
Subject: [PATCH] Translated using Weblate (French)
Currently translated at 44.9% (4645 of 10338 strings)
Translation: Git Manpages/Translations
Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/fr/
Signed-off-by: brandelune <jean.christophe.helary@traduction-libre.org>
---
po/documentation.fr.po | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index 49f4240..25cd978 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: 2020-05-16 17:29+0200\n"
-"PO-Revision-Date: 2020-05-16 16:17+0000\n"
+"PO-Revision-Date: 2020-05-16 17:45+0000\n"
"Last-Translator: brandelune <jean.christophe.helary@traduction-libre.org>\n"
"Language-Team: Jean-No챘l Avila <jn.avila@free.fr>\n"
"Language: fr\n"
@@ -2780,7 +2780,7 @@ msgstr ""
#, fuzzy, no-wrap
#| msgid "merge.guitool"
msgid "merge.autoStash"
-msgstr "merge.guitool"
+msgstr "merge.autoStash"
#. type: Plain text
#: en/config/merge.txt:82
@@ -6695,16 +6695,6 @@ msgstr "--recurse-submodules[=yes|on-demand|no]"
#. type: Plain text
#: en/fetch-options.txt:168
-#, fuzzy
-#| msgid ""
-#| "This option controls if and under what conditions new commits of "
-#| "populated submodules should be fetched too. It can be used as a boolean "
-#| "option to completely disable recursion when set to 'no' or to "
-#| "unconditionally recurse into all populated submodules when set to 'yes', "
-#| "which is the default when this option is used without any value. Use 'on-"
-#| "demand' to only recurse into a populated submodule when the superproject "
-#| "retrieves a commit that updates the submodule's reference to a commit "
-#| "that isn't already in the local submodule clone."
msgid ""
"This option controls if and under what conditions new commits of populated "
"submodules should be fetched too. It can be used as a boolean option to "
@@ -6725,7 +6715,9 @@ msgstr ""
"utilis챕e sans aucune valeur. Utiliser 'on-demand' pour ne visiter "
"r챕cursivement un sous-module peupl챕 que lorsque le superprojet r챕cup챔re un "
"commit qui met 횪 jour la r챕f챕rence du sous-module 횪 un commit qui n'est pas "
-"d챕j횪 dans le clone local du sous-module."
+"d챕j횪 dans le clone local du sous-module. Par d챕faut, 'on-demand' est utilis챕 "
+"횪 moins que `fetch.recurseSubmodules` ne soit param챕tr챕 (voir linkgit:git-"
+"config[1])."
#. type: Labeled list
#: en/fetch-options.txt:170
@@ -46859,7 +46851,7 @@ msgstr ""
#: en/git-push.txt:378
#, no-wrap
msgid "--recurse-submodules=check|on-demand|only|no"
-msgstr ""
+msgstr "--recurse-submodules=check|on-demand|only|no"
#. type: Plain text
#: en/git-push.txt:392
@@ -79433,7 +79425,6 @@ msgstr "Les syntaxes suivantes peuvent 챗tre utilis챕es avec eux혻:"
#. type: Plain text
#: en/urls.txt:19
-#, fuzzy
msgid ""
"ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/path/to/repo.git/"
msgstr ""
--
GitLab