diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index 7694a3abd16fc09a87fb74e651b86fea9fabf626..1119311d7f294ba64d00d0ec0dc25cc71c67aa81 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-05-18 19:52+0200\nPO-Revision-Date: 2023-05-21 07:22+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 4.18-dev\n"
+msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-05-18 19:52+0200\nPO-Revision-Date: 2023-05-30 11:22+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 4.18-dev\n"
#. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:769 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
@@ -186,7 +186,7 @@ msgstr "--contents <fichier>"
#: en/blame-options.txt:70
#, priority:100
msgid "Annotate using the contents from the named file, starting from <rev> if it is specified, and HEAD otherwise. You may specify '-' to make the command read from the standard input for the file contents."
-msgstr ""
+msgstr "Annoter en utilisant le contenu du fichier nomm챕, en commen챌ant par <r챕v> si elle est sp챕cifi챕e, et HEAD sinon. Vous pouvez sp챕cifier '-' pour que la commande lise le contenu du fichier 횪 partir de l'entr챕e standard."
#. type: Labeled list
#: en/blame-options.txt:71
@@ -6002,14 +6002,13 @@ msgstr "Montrer ce qui serait fait, sans faire de changements."
#: en/fetch-options.txt:84
#, priority:220
msgid "Print the output to standard output in an easy-to-parse format for scripts. See section OUTPUT in linkgit:git-fetch[1] for details."
-msgstr ""
+msgstr "Afficher la sortie sur la sortie standard dans un format facile 횪 d챕crypter pour les scripts. Voir la section SORTIE dans linkgit:git-fetch[1] pour plus de d챕tails."
#. type: Plain text
#: en/fetch-options.txt:87
-#, fuzzy, priority:220
-#| msgid "This is incompatible with `--recurse-submodules=[yes|on-demand]`. Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]."
+#, priority:220
msgid "This is incompatible with `--recurse-submodules=[yes|on-demand]` and takes precedence over the `fetch.output` config option."
-msgstr "C'est incompatible avec `--recurse-submodules=[yes|on-demand]`. En interne, ceci est utilis챕 pour impl챕menter l'option `push.negotiate`, voir linkgit:git-config[1]."
+msgstr "C'est incompatible avec `--recurse-submodules=[yes|on-demand]`et a la priorit챕 sur l'option de configuration `fetch.output`."
#. type: Labeled list
#: en/fetch-options.txt:89
@@ -14019,10 +14018,9 @@ msgstr "Apr챔s cette fusion 횪 trois points, les modifications locales ne sont _
#. type: Title ===
#: en/git-checkout.txt:585
-#, fuzzy, no-wrap, priority:240
-#| msgid "merge.conflictStyle"
+#, no-wrap, priority:240
msgid "3. Merge conflict"
-msgstr "merge.conflictStyle"
+msgstr "3. Conflit de fusion"
#. type: Plain text
#: en/git-checkout.txt:589
@@ -18788,7 +18786,7 @@ msgstr "Lorsque Git re챌oit une r챕ponse HTTP contenant un ou plusieurs en-t챗te
#: en/git-credential.txt:191
#, priority:100
msgid "Each 'WWW-Authenticate' header value is passed as a multi-valued attribute 'wwwauth[]', where the order of the attributes is the same as they appear in the HTTP response. This attribute is 'one-way' from Git to pass additional information to credential helpers."
-msgstr ""
+msgstr "Chaque valeur de l'en-t챗te \"WWW-Authenticate\" est transmise sous la forme d'un attribut 횪 valeurs multiples \"wwwauth[]\", l'ordre des attributs 챕tant le m챗me que celui dans lequel ils apparaissent dans la r챕ponse HTTP. Cet attribut est \"횪 sens unique\" 횪 partir de Git pour transmettre des informations suppl챕mentaires aux assistants d'authentification."
#. type: Plain text
#: en/git-credential.txt:193
@@ -21527,10 +21525,9 @@ msgstr "--[no-]gui"
#. type: Plain text
#: en/git-difftool.txt:106
-#, fuzzy, priority:100
-#| msgid "When 'git-difftool' is invoked with the `-g` or `--gui` option the default diff tool will be read from the configured `diff.guitool` variable instead of `diff.tool`. The `--no-gui` option can be used to override this setting. If `diff.guitool` is not set, we will fallback in the order of `merge.guitool`, `diff.tool`, `merge.tool` until a tool is found."
+#, priority:100
msgid "When 'git-difftool' is invoked with the `-g` or `--gui` option the default diff tool will be read from the configured `diff.guitool` variable instead of `diff.tool`. This may be selected automatically using the configuration variable `difftool.guiDefault`. The `--no-gui` option can be used to override these settings. If `diff.guitool` is not set, we will fallback in the order of `merge.guitool`, `diff.tool`, `merge.tool` until a tool is found."
-msgstr "Lorsque 'git-difftool' est invoqu챕 avec l'option `-g` ou `--gui`, l'outil de comparaison par d챕faut sera lu depuis la variable configur챕e `diff.guitool` au lieu de `diff.tool`. L'option `--no-gui` peut 챗tre utilis챕e pour remplacer ce param챔tre. Si `diff.guitool` n'est pas configur챕, nous utiliserons l'ordre suivant : `merge.guitool`, `diff.tool`, `merge.tool` jusqu'횪 ce qu'un outil soit trouv챕."
+msgstr "Lorsque 'git-difftool' est invoqu챕 avec l'option `-g` ou `--gui`, l'outil de comparaison par d챕faut sera lu depuis la variable configur챕e `diff.guitool` au lieu de `diff.tool`. Ceci peut 챗tre s챕lectionn챕 automatiquement en utilisant la variable de configuration `difffftool.guiDefault`. L'option `--no-gui` peut 챗tre utilis챕e pour remplacer ces param챔tres. Si `diff.guitool` n'est pas configur챕, nous utiliserons l'ordre suivant : `merge.guitool`, `diff.tool`, `merge.tool` jusqu'횪 ce qu'un outil soit trouv챕."
#. type: Labeled list
#: en/git-difftool.txt:107
@@ -25426,13 +25423,13 @@ msgstr " <drapeau> <r챕sum챕> <de> -> <횪> [<raison>]\n"
#: en/git-fetch.txt:211
#, priority:220
msgid "When using `--porcelain`, the output format is intended to be machine-parseable. In contrast to the human-readable output formats it thus prints to standard output instead of standard error. Each line is of the form:"
-msgstr ""
+msgstr "Lorsque vous utilisez `--porcelain`, le format de sortie est destin챕 횪 챗tre analys챕 par la machine. Contrairement aux formats de sortie lisibles par l'homme, il s'imprime donc sur la sortie standard au lieu de l'erreur standard. Chaque ligne est de la forme :"
#. type: delimited block -
#: en/git-fetch.txt:214
#, no-wrap, priority:220
msgid "<flag> <old-object-id> <new-object-id> <local-reference>\n"
-msgstr ""
+msgstr "<drapeau> <ancien-id-objet> <nouveau-id-objet> <r챕f챕rence-locale>\n"
#. type: Plain text
#: en/git-fetch.txt:218
@@ -25689,7 +25686,7 @@ msgstr ""
#: en/git-filter-branch.txt:20 en/git-pack-redundant.txt:15
#, no-wrap, priority:100
msgid "WARNING"
-msgstr ""
+msgstr "AVERTISSEMENT"
#. type: Plain text
#: en/git-filter-branch.txt:31
@@ -27037,10 +27034,9 @@ msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:229
-#, fuzzy, no-wrap, priority:80
-#| msgid "--ahead-behind"
+#, no-wrap, priority:80
msgid "ahead-behind:<committish>"
-msgstr "--ahead-behind"
+msgstr "ahead-behind:<commit-esque>"
#. type: Plain text
#: en/git-for-each-ref.txt:233
@@ -27502,10 +27498,9 @@ msgstr "Lorsque plusieurs rustines sont 챕mises, le pr챕fixe du sujet sera plut
#. type: Plain text
#: en/git-format-patch.txt:104
-#, fuzzy, priority:100
-#| msgid "If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a `Message-Id` header to reference."
+#, priority:100
msgid "If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a `Message-ID` header to reference."
-msgstr "Avec `--thread`, `git-format-patch` g챕n챕rera les en-t챗tes `In-Reply-To` et `References` pour que le deuxi챔me courrier de rustine et les suivants apparaissent comme des r챕ponses au premier courrier ; cela g챕n챔re aussi un en-t챗te `Message-Id` pour r챕f챕rence ult챕rieure."
+msgstr "Avec `--thread`, `git-format-patch` g챕n챕rera les en-t챗tes `In-Reply-To` et `References` pour que le deuxi챔me courrier de rustine et les suivants apparaissent comme des r챕ponses au premier courrier ; cela g챕n챔re aussi un en-t챗te `Message-ID` pour r챕f챕rence ult챕rieure."
#. type: Labeled list
#: en/git-format-patch.txt:110
@@ -27659,10 +27654,9 @@ msgstr "--no-thread"
#. type: Plain text
#: en/git-format-patch.txt:168
-#, fuzzy, priority:100
-#| msgid "Controls addition of `In-Reply-To` and `References` headers to make the second and subsequent mails appear as replies to the first. Also controls generation of the `Message-Id` header to reference."
+#, priority:100
msgid "Controls addition of `In-Reply-To` and `References` headers to make the second and subsequent mails appear as replies to the first. Also controls generation of the `Message-ID` header to reference."
-msgstr "Contr척le l'ajout des en-t챗tes `In-Reply-To` et `References` pour que le deuxi챔me courrier et les suivants apparaissent comme des r챕ponses au premier. Contr척le 챕galement la g챕n챕ration de l'en-t챗te `Message-Id` 횪 r챕f챕rencer."
+msgstr "Contr척le l'ajout des en-t챗tes `In-Reply-To` et `References` pour que le deuxi챔me courrier et les suivants apparaissent comme des r챕ponses au premier. Contr척le 챕galement la g챕n챕ration de l'en-t챗te `Message-ID` 횪 r챕f챕rencer."
#. type: Plain text
#: en/git-format-patch.txt:174
@@ -27672,10 +27666,9 @@ msgstr "L'argument optionnel <style> peut 챗tre soit `shallow` soit `deep`. Le f
#. type: Plain text
#: en/git-format-patch.txt:177
-#, fuzzy, priority:100
-#| msgid "The default is `--no-thread`, unless the `format.thread` configuration is set. If `--thread` is specified without a style, it defaults to the style specified by `format.thread` if any, or else `shallow`."
+#, priority:100
msgid "The default is `--no-thread`, unless the `format.thread` configuration is set. `--thread` without an argument is equivalent to `--thread=shallow`."
-msgstr "La valeur par d챕faut est `--no-thread`, sauf si la configuration `format.thread` est d챕finie. Si `--thread` est sp챕cifi챕 sans style, il prend par d챕faut le style sp챕cifi챕 par `format.thread` s'il existe, sinon `shallow`."
+msgstr "La valeur par d챕faut est `--no-thread`, sauf si la configuration `format.thread` est d챕finie. `--thread` sans argument est 챕quivalent 횪 `--thread=shallow`."
#. type: Plain text
#: en/git-format-patch.txt:181
@@ -28331,7 +28324,7 @@ msgstr "Pour des conseils sur l'utilisation de \"git send-email\" pour envoyer v
#: en/git-format-patch.txt:550
#, priority:100
msgid "For hints on submission using the IMAP interface, see the EXAMPLE section of linkgit:git-imap-send[1]."
-msgstr "Pour des conseils sur la soumission en utilisant l'interface IMAP, voir la section EXEMPLE de linkgit:git-imap-send [1]."
+msgstr "Pour des conseils sur la soumission en utilisant l'interface IMAP, voir la section EXEMPLE de linkgit:git-imap-send[1]."
#. type: Title ~
#: en/git-format-patch.txt:552
@@ -29099,10 +29092,9 @@ msgstr "--[no-]cruft"
#. type: Plain text
#: en/git-gc.txt:61
-#, fuzzy, priority:100
-#| msgid "When expiring unreachable objects, pack them separately into a cruft pack instead of storing them as loose objects."
+#, priority:100
msgid "When expiring unreachable objects, pack them separately into a cruft pack instead of storing them as loose objects. `--cruft` is on by default."
-msgstr "Lors de la p챕remption d'objets inaccessibles, les emballer s챕par챕ment dans un paquet comprim챕 au lieu de les stocker en vrac."
+msgstr "Lors de la p챕remption d'objets inaccessibles, les emballer s챕par챕ment dans un paquet comprim챕 au lieu de les stocker en vrac.`--cruft` est activ챕 par d챕faut."
#. type: Labeled list
#: en/git-gc.txt:62
@@ -29148,10 +29140,9 @@ msgstr "--keep-largest-pack"
#. type: Plain text
#: en/git-gc.txt:85
-#, fuzzy, priority:100
-#| msgid "All packs except the largest pack and those marked with a `.keep` files are consolidated into a single pack. When this option is used, `gc.bigPackThreshold` is ignored."
+#, priority:100
msgid "All packs except the largest non-cruft pack, any packs marked with a `.keep` file, and any cruft pack(s) are consolidated into a single pack. When this option is used, `gc.bigPackThreshold` is ignored."
-msgstr "Tous les paquets, 횪 l'exception du plus gros paquet et de ceux marqu챕s avec un fichier `.keep`, sont consolid챕s en un seul paquet. Lorsque cette option est utilis챕e, `gc.bigPackThreshold` est ignor챕."
+msgstr "Tous les paquets 횪 l'exception du plus gros paquet non cruft, tous les paquets marqu챕s avec un fichier `.keep`, et tous les paquets cruft sont consolid챕s en un seul paquet. Lorsque cette option est utilis챕e, `gc.bigPackThreshold` est ignor챕."
#. type: Title -
#: en/git-gc.txt:87
@@ -30450,7 +30441,7 @@ msgstr "Les interfaces de fichiers dans le d챕p척t comme `.git/info/exclude` son
#: en/git-help.txt:86
#, priority:100
msgid "This section of the documentation also covers general or widespread user-interface conventions (e.g. linkgit:gitcli[7]), and pseudo-configuration such as the file-based `.git/hooks/*` interface described in linkgit:githooks[5]."
-msgstr ""
+msgstr "Cette section de la documentation couvre 챕galement les conventions d'interface utilisateur g챕n챕rales ou r챕pandues (par exemple linkgit:gitcli[7]), et la pseudo-configuration telle que l'interface `.git/hooks/*` bas챕e sur les fichiers d챕crite dans linkgit:githooks[5]."
#. type: Labeled list
#: en/git-help.txt:87
@@ -30462,7 +30453,7 @@ msgstr "--developer-interfaces"
#: en/git-help.txt:90
#, priority:100
msgid "Print list of file formats, protocols and other developer interfaces documentation on the standard output."
-msgstr ""
+msgstr "Afficher sur la sortie standard la liste des formats de fichiers, des protocoles et de la documentation relative aux autres interfaces de d챕veloppement."
#. type: Labeled list
#: en/git-help.txt:92
@@ -30474,7 +30465,7 @@ msgstr "--info"
#: en/git-help.txt:95
#, priority:100
msgid "Display manual page for the command in the 'info' format. The 'info' program will be used for that purpose."
-msgstr ""
+msgstr "Afficher la page de manuel de la commande au format 'info'. Le programme 'info' sera utilis챕 횪 cette fin."
#. type: Labeled list
#: en/git-help.txt:97
@@ -30486,13 +30477,13 @@ msgstr "--man"
#: en/git-help.txt:101
#, priority:100
msgid "Display manual page for the command in the 'man' format. This option may be used to override a value set in the `help.format` configuration variable."
-msgstr ""
+msgstr "Afficher la page de manuel de la commande au format 'man'. Cette option peut 챗tre utilis챕e pour remplacer une valeur d챕finie dans la variable de configuration `help.format`."
#. type: Plain text
#: en/git-help.txt:105
#, priority:100
msgid "By default the 'man' program will be used to display the manual page, but the `man.viewer` configuration variable may be used to choose other display programs (see below)."
-msgstr ""
+msgstr "Par d챕faut, le programme 'man' est utilis챕 pour afficher la page de manuel, mais la variable de configuration `man.viewer` peut 챗tre utilis챕e pour choisir d'autres programmes d'affichage (voir ci-dessous)."
#. type: Labeled list
#: en/git-help.txt:107
@@ -30504,13 +30495,13 @@ msgstr "--web"
#: en/git-help.txt:110
#, priority:100
msgid "Display manual page for the command in the 'web' (HTML) format. A web browser will be used for that purpose."
-msgstr ""
+msgstr "Afficher la page de manuel de la commande au format 'web' (HTML). Un navigateur web sera utilis챕 횪 cet effet."
#. type: Plain text
#: en/git-help.txt:116
#, priority:100
msgid "The web browser can be specified using the configuration variable `help.browser`, or `web.browser` if the former is not set. If none of these config variables is set, the 'git web{litdd}browse' helper script (called by 'git help') will pick a suitable default. See linkgit:git-web{litdd}browse[1] for more information about this."
-msgstr ""
+msgstr "Le navigateur web peut 챗tre sp챕cifi챕 en utilisant la variable de configuration `help.browser`, ou `web.browser` si la premi챔re n'est pas d챕finie. Si aucune de ces variables de configuration n'est d챕finie, le script d'aide 'git web{litdd}browse' (appel챕 par 'git help') choisira un navigateur par d챕faut appropri챕. Voir linkgit:git-web{litdd}browse[1] pour plus d'informations 횪 ce sujet."
#. type: Title -
#: en/git-help.txt:118 en/git-interpret-trailers.txt:138 en/git-p4.txt:556 en/git-web--browse.txt:59
@@ -30528,85 +30519,85 @@ msgstr "help.format"
#: en/git-help.txt:127
#, priority:100
msgid "If no command-line option is passed, the `help.format` configuration variable will be checked. The following values are supported for this variable; they make 'git help' behave as their corresponding command- line option:"
-msgstr ""
+msgstr "Si aucune option de ligne de commande n'est pass챕e, la variable de configuration `help.format` sera v챕rifi챕e. Les valeurs suivantes sont support챕es pour cette variable ; elles font que 'git help' se comporte comme l'option de ligne de commande correspondante :"
#. type: Plain text
#: en/git-help.txt:129
#, priority:100
msgid "\"man\" corresponds to '-m|--man',"
-msgstr ""
+msgstr "\"man\" correspond 횪 '-m|--man',"
#. type: Plain text
#: en/git-help.txt:130
#, priority:100
msgid "\"info\" corresponds to '-i|--info',"
-msgstr ""
+msgstr "\"info\" correspond 횪 '-i|--info',"
#. type: Plain text
#: en/git-help.txt:131
#, priority:100
msgid "\"web\" or \"html\" correspond to '-w|--web'."
-msgstr ""
+msgstr "\"web\" ou \"html\" correspondent 횪 '-w|--web'."
#. type: Title ~
#: en/git-help.txt:133
#, no-wrap, priority:100
msgid "help.browser, web.browser and browser.<tool>.path"
-msgstr ""
+msgstr "help.browser, web.browser et browser. <outil>.path"
#. type: Plain text
#: en/git-help.txt:139
#, priority:100
msgid "The `help.browser`, `web.browser` and `browser.<tool>.path` will also be checked if the 'web' format is chosen (either by command-line option or configuration variable). See '-w|--web' in the OPTIONS section above and linkgit:git-web{litdd}browse[1]."
-msgstr ""
+msgstr "Les navigateurs `help.browser`, `web.browser` et `browser.<outil>.path` seront 챕galement v챕rifi챕s si le format 'web' est choisi (soit par une option de la ligne de commande, soit par une variable de configuration). Voir '-w|--web' dans la section OPTIONS ci-dessus et linkgit:git-web{litdd}browse[1]."
#. type: Title ~
#: en/git-help.txt:141
#, no-wrap, priority:100
msgid "man.viewer"
-msgstr ""
+msgstr "man.viewer"
#. type: Plain text
#: en/git-help.txt:145
#, priority:100
msgid "The `man.viewer` configuration variable will be checked if the 'man' format is chosen. The following values are currently supported:"
-msgstr ""
+msgstr "La variable de configuration `man.viewer` sera v챕rifi챕e si le format 'man' est choisi. Les valeurs suivantes sont actuellement prises en charge :"
#. type: Plain text
#: en/git-help.txt:147
#, priority:100
msgid "\"man\": use the 'man' program as usual,"
-msgstr ""
+msgstr "\"man\" : utiliser le programme 'man' comme d'habitude,"
#. type: Plain text
#: en/git-help.txt:149
#, priority:100
msgid "\"woman\": use 'emacsclient' to launch the \"woman\" mode in emacs (this only works starting with emacsclient versions 22),"
-msgstr ""
+msgstr "\"woman\" : utiliser 'emacsclient' pour lancer le mode \"woman\" dans emacs (cela ne fonctionne qu'횪 partir de la version 22 d'emacsclient),"
#. type: Plain text
#: en/git-help.txt:151
#, priority:100
msgid "\"konqueror\": use 'kfmclient' to open the man page in a new konqueror tab (see 'Note about konqueror' below)."
-msgstr ""
+msgstr "\"konqueror\" : utiliser 'kfmclient' pour ouvrir la page de manuel dans un nouvel onglet konqueror (voir 'Note sur konqueror' ci-dessous)."
#. type: Plain text
#: en/git-help.txt:154
#, priority:100
msgid "Values for other tools can be used if there is a corresponding `man.<tool>.cmd` configuration entry (see below)."
-msgstr ""
+msgstr "Les valeurs des autres outils peuvent 챗tre utilis챕es s'il existe une entr챕e de configuration `man.<outil>.cmd` correspondante (voir ci-dessous)."
#. type: Plain text
#: en/git-help.txt:158
#, priority:100
msgid "Multiple values may be given to the `man.viewer` configuration variable. Their corresponding programs will be tried in the order listed in the configuration file."
-msgstr ""
+msgstr "Plusieurs valeurs peuvent 챗tre donn챕es 횪 la variable de configuration `man.viewer`. Les programmes correspondants seront essay챕s dans l'ordre indiqu챕 dans le fichier de configuration."
#. type: Plain text
#: en/git-help.txt:160
#, priority:100
msgid "For example, this configuration:"
-msgstr ""
+msgstr "Par exemple, cette configuration :"
#. type: delimited block -
#: en/git-help.txt:165
@@ -30615,25 +30606,25 @@ msgid ""
"\t[man]\n"
"\t\tviewer = konqueror\n"
"\t\tviewer = woman\n"
-msgstr ""
+msgstr "\t[man]\n\t\tviewer = konqueror\n\t\tviewer = woman\n"
#. type: Plain text
#: en/git-help.txt:169
#, priority:100
msgid "will try to use konqueror first. But this may fail (for example, if DISPLAY is not set) and in that case emacs' woman mode will be tried."
-msgstr ""
+msgstr "essaiera d'abord d'utiliser konqueror. Mais cela peut 챕chouer (par exemple, si DISPLAY n'est pas d챕fini) et dans ce cas, le mode woman d'emacs sera utilis챕."
#. type: Plain text
#: en/git-help.txt:173
#, priority:100
msgid "If everything fails, or if no viewer is configured, the viewer specified in the `GIT_MAN_VIEWER` environment variable will be tried. If that fails too, the 'man' program will be tried anyway."
-msgstr ""
+msgstr "Si tout 챕choue, ou si aucun visualiseur n'est configur챕, le visualiseur sp챕cifi챕 dans la variable d'environnement `GIT_MAN_VIEWER` sera essay챕. Si cela 챕choue aussi, le programme 'man' sera essay챕 de toute fa챌on."
#. type: Title ~
#: en/git-help.txt:175
#, no-wrap, priority:100
msgid "man.<tool>.path"
-msgstr ""
+msgstr "man.<outil>.path"
#. type: Plain text
#: en/git-help.txt:182
@@ -30645,37 +30636,37 @@ msgstr "Vous pouvez fournir explicitement un chemin complet vers votre visualisa
#: en/git-help.txt:184
#, no-wrap, priority:100
msgid "man.<tool>.cmd"
-msgstr ""
+msgstr "man.<outil>.cmd"
#. type: Plain text
#: en/git-help.txt:192
#, priority:100
msgid "When the man viewer, specified by the `man.viewer` configuration variables, is not among the supported ones, then the corresponding `man.<tool>.cmd` configuration variable will be looked up. If this variable exists then the specified tool will be treated as a custom command and a shell eval will be used to run the command with the man page passed as arguments."
-msgstr ""
+msgstr "Lorsque le visualiseur de manuel, sp챕cifi챕 par la variable de configuration `man.viewer`, ne fait pas partie des visualiseurs support챕s, la variable de configuration correspondante `man.<outil>.cmd` sera recherch챕e. Si cette variable existe, l'outil sp챕cifi챕 sera trait챕 comme une commande personnalis챕e et un interpr챕teur de commandes sera utilis챕 pour ex챕cuter la commande avec la page de manuel pass챕e en argument."
#. type: Title ~
#: en/git-help.txt:194
#, no-wrap, priority:100
msgid "Note about konqueror"
-msgstr ""
+msgstr "Note sur konqueror"
#. type: Plain text
#: en/git-help.txt:199
#, priority:100
msgid "When 'konqueror' is specified in the `man.viewer` configuration variable, we launch 'kfmclient' to try to open the man page on an already opened konqueror in a new tab if possible."
-msgstr ""
+msgstr "Lorsque 'konqueror' est sp챕cifi챕 dans la variable de configuration `man.viewer`, 'kfmclient' est lanc챕 pour essayer d'ouvrir la page de manuel sur un konqueror d챕j횪 ouvert, dans un nouvel onglet si possible."
#. type: Plain text
#: en/git-help.txt:203
#, priority:100
msgid "For consistency, we also try such a trick if 'man.konqueror.path' is set to something like `A_PATH_TO/konqueror`. That means we will try to launch `A_PATH_TO/kfmclient` instead."
-msgstr ""
+msgstr "Pour des raisons de coh챕rence, nous essayons aussi de faire cela si 'man.konqueror.path' est r챕gl챕 sur quelque chose comme `UN_CHEMIN_VERS/konqueror`. Cela signifie que nous essaierons de lancer `UN_CHEMIN_VERS/kfmclient` 횪 la place."
#. type: Plain text
#: en/git-help.txt:206 en/git-web--browse.txt:100
#, priority:100
msgid "If you really want to use 'konqueror', then you can use something like the following:"
-msgstr ""
+msgstr "Si vous voulez vraiment utiliser 'konqueror', vous pouvez utiliser quelque chose comme ce qui suit :"
#. type: delimited block -
#: en/git-help.txt:210
@@ -30683,7 +30674,7 @@ msgstr ""
msgid ""
"\t[man]\n"
"\t\tviewer = konq\n"
-msgstr ""
+msgstr "\t[man]\n\t\tviewer = konq\n"
#. type: delimited block -
#: en/git-help.txt:213
@@ -30691,19 +30682,19 @@ msgstr ""
msgid ""
"\t[man \"konq\"]\n"
"\t\tcmd = A_PATH_TO/konqueror\n"
-msgstr ""
+msgstr "\t[man \"konq\"]\n\t\tcmd = UN_CHEMIN_VERS/konqueror\n"
#. type: Title ~
#: en/git-help.txt:216
#, no-wrap, priority:100
msgid "Note about git config --global"
-msgstr ""
+msgstr "Note sur git config --global"
#. type: Plain text
#: en/git-help.txt:220
#, priority:100
msgid "Note that all these configuration variables should probably be set using the `--global` flag, for example like this:"
-msgstr ""
+msgstr "Notez que toutes ces variables de configuration devraient probablement 챗tre d챕finies en utilisant le drapeau `--global`, par exemple comme ceci :"
#. type: delimited block -
#: en/git-help.txt:224
@@ -30711,13 +30702,13 @@ msgstr ""
msgid ""
"$ git config --global help.format web\n"
"$ git config --global web.browser firefox\n"
-msgstr ""
+msgstr "$ git config --global help.format web\n$ git config --global web.browser firefox\n"
#. type: Plain text
#: en/git-help.txt:228 en/git-web--browse.txt:121
#, priority:100
msgid "as they are probably more user specific than repository specific. See linkgit:git-config[1] for more information about this."
-msgstr ""
+msgstr "car ils sont probablement plus sp챕cifiques 횪 l�셵tilisateur qu�셙u d챕p척t. Voir linkgit:git-config[1] pour plus d�셢nformations 횪 ce sujet."
#. type: Title =
#: en/git-http-backend.txt:2
@@ -30729,25 +30720,25 @@ msgstr "git-http-backend(1)"
#: en/git-http-backend.txt:7
#, priority:100
msgid "git-http-backend - Server side implementation of Git over HTTP"
-msgstr ""
+msgstr "git-http-backend - Impl챕mentation c척t챕 serveur de Git sur HTTP"
#. type: Plain text
#: en/git-http-backend.txt:12
#, no-wrap, priority:100
msgid "'git http-backend'\n"
-msgstr ""
+msgstr "'git http-backend'\n"
#. type: Plain text
#: en/git-http-backend.txt:22
#, priority:100
msgid "A simple CGI program to serve the contents of a Git repository to Git clients accessing the repository over http:// and https:// protocols. The program supports clients fetching using both the smart HTTP protocol and the backwards-compatible dumb HTTP protocol, as well as clients pushing using the smart HTTP protocol. It also supports Git's more-efficient \"v2\" protocol if properly configured; see the discussion of `GIT_PROTOCOL` in the ENVIRONMENT section below."
-msgstr ""
+msgstr "Un simple programme CGI pour servir le contenu d'un d챕p척t Git aux clients Git qui acc챔dent au d챕p척t via les protocoles http:// et https://. Le programme supporte les clients qui r챕cup챔rent des donn챕es en utilisant 횪 la fois le protocole HTTP intelligent et le protocole HTTP muet r챕trocompatible, ainsi que les clients qui poussent des donn챕es en utilisant le protocole HTTP intelligent. Il supporte 챕galement le protocole \"v2\" de Git, plus efficace, s'il est correctement configur챕 ; voir la discussion sur `GIT_PROTOCOL` dans la section ENVIRONNEMENT ci-dessous."
#. type: Plain text
#: en/git-http-backend.txt:27
#, priority:100
msgid "It verifies that the directory has the magic file \"git-daemon-export-ok\", and it will refuse to export any Git directory that hasn't explicitly been marked for export this way (unless the `GIT_HTTP_EXPORT_ALL` environmental variable is set)."
-msgstr ""
+msgstr "Il v챕rifie que le r챕pertoire poss챔de le fichier magique \"git-daemon-export-ok\", et il refusera d'exporter tout r챕pertoire Git qui n'a pas 챕t챕 explicitement marqu챕 pour l'exportation de cette mani챔re (횪 moins que la variable d'environnement `GIT_HTTP_EXPORT_ALL` ne soit d챕finie)."
#. type: Plain text
#: en/git-http-backend.txt:33
@@ -33085,10 +33076,9 @@ msgstr ""
#. type: delimited block -
#: en/git-interpret-trailers.txt:448
-#, fuzzy, no-wrap, priority:100
-#| msgid "message\n"
+#, no-wrap, priority:100
msgid "***message***\n"
-msgstr "message\n"
+msgstr "***message***\n"
#. type: delimited block -
#: en/git-interpret-trailers.txt:460
@@ -35633,10 +35623,9 @@ msgstr "--gui"
#. type: Plain text
#: en/git-mergetool.txt:90
-#, fuzzy, priority:240
-#| msgid "When 'git-mergetool' is invoked with the `-g` or `--gui` option the default merge tool will be read from the configured `merge.guitool` variable instead of `merge.tool`. If `merge.guitool` is not set, we will fallback to the tool configured under `merge.tool`."
+#, priority:240
msgid "When 'git-mergetool' is invoked with the `-g` or `--gui` option the default merge tool will be read from the configured `merge.guitool` variable instead of `merge.tool`. If `merge.guitool` is not set, we will fallback to the tool configured under `merge.tool`. This may be autoselected using the configuration variable `mergetool.guiDefault`."
-msgstr "Lorsque 'git-mergetool' est invoqu챕 avec l'option `-g` ou `--gui`, l'outil de fusion par d챕faut sera lu 횪 partir de la variable `merge.guitool` configur챕e au lieu de `merge.tool`. Si `merge.guitool` n'est pas d챕fini, nous reviendrons 횪 l'outil configur챕 sous `merge.tool`."
+msgstr "Lorsque 'git-mergetool' est invoqu챕 avec l'option `-g` ou `--gui`, l'outil de fusion par d챕faut sera lu 횪 partir de la variable `merge.guitool` configur챕e au lieu de `merge.tool`. Si `merge.guitool` n'est pas d챕fini, l'outil configur챕 sous `merge.tool`est utilis챕. L'outil graphique peut 챗tre autos챕lectionn챕 en utilisant la variable de configuration `mergetool.guiDefault`."
#. type: Labeled list
#: en/git-mergetool.txt:91
@@ -35646,10 +35635,9 @@ msgstr "--no-gui"
#. type: Plain text
#: en/git-mergetool.txt:95
-#, fuzzy, priority:240
-#| msgid "This overrides a previous `-g` or `--gui` setting and reads the default merge tool will be read from the configured `merge.tool` variable."
+#, priority:240
msgid "This overrides a previous `-g` or `--gui` setting or `mergetool.guiDefault` configuration and reads the default merge tool from the configured `merge.tool` variable."
-msgstr "Ceci prend le pas sur un r챕glage pr챕c챕dent de `-g` ou `--gui` et lit que l'outil de fusion par d챕faut 횪 partir de la variable `merge.tool` configur챕e."
+msgstr "Ceci prend le pas sur un r챕glage pr챕c챕dent de `-g` ou `--gui` ou la configuration `mergetool.guiDefault` et lit que l'outil de fusion par d챕faut 횪 partir de la variable `merge.tool` configur챕e."
#. type: Plain text
#: en/git-mergetool.txt:102
@@ -40610,14 +40598,7 @@ msgstr "git-push - Met 횪 jour les r챕f챕rences distantes ainsi que les objets a
#. type: Plain text
#: en/git-push.txt:18
-#, fuzzy, ignore-ellipsis, no-wrap, priority:220
-#| msgid ""
-#| "'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]\n"
-#| "\t [--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]\n"
-#| "\t [-u | --set-upstream] [-o <string> | --push-option=<string>]\n"
-#| "\t [--[no-]signed|--signed=(true|false|if-asked)]\n"
-#| "\t [--force-with-lease[=<refname>[:<expect>]] [--force-if-includes]]\n"
-#| "\t [--no-verify] [<repository> [<refspec>...]]\n"
+#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git push' [--all | --branches | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]\n"
"\t [--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]\n"
@@ -40625,13 +40606,7 @@ msgid ""
"\t [--[no-]signed|--signed=(true|false|if-asked)]\n"
"\t [--force-with-lease[=<refname>[:<expect>]] [--force-if-includes]]\n"
"\t [--no-verify] [<repository> [<refspec>...]]\n"
-msgstr ""
-"'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]\n"
-"\t [--repo=<d챕p척t>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]\n"
-"\t [-u | --set-upstream] [-o <cha챤ne> | --push-option=<cha챤ne>]\n"
-"\t [--[no-]signed|--signed=(true|false|if-asked)]\n"
-"\t [--force-with-lease[=<nom-de-r챕f>[:<attendu>]] [--force-if-includes]]\n"
-"\t [--no-verify] [<d챕p척t> [<sp챕c-de-r챕f>...]]\n"
+msgstr "'git push' [--all | --branches | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]\n\t [--repo=<d챕p척t>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]\n\t [-u | --set-upstream] [-o <cha챤ne> | --push-option=<cha챤ne>]\n\t [--[no-]signed|--signed=(true|false|if-asked)]\n\t [--force-with-lease[=<nom-de-r챕f>[:<attendu>]] [--force-if-includes]]\n\t [--no-verify] [<d챕p척t> [<sp챕c-de-r챕f>...]]\n"
#. type: Plain text
#: en/git-push.txt:24
@@ -50172,10 +50147,9 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:323
-#, fuzzy, no-wrap, priority:100
-#| msgid "--to-cmd=<command>"
+#, no-wrap, priority:100
msgid "--header-cmd=<command>"
-msgstr "--to-cmd=<commande>"
+msgstr "--header-cmd=<commande>"
#. type: Plain text
#: en/git-send-email.txt:330
@@ -64130,10 +64104,9 @@ msgstr ""
#. type: Labeled list
#: en/mergetools-merge.txt:14
-#, fuzzy, no-wrap, priority:100
-#| msgid "gvimdiff1"
+#, no-wrap, priority:100
msgid "`gvimdiff1`"
-msgstr "gvimdiff1"
+msgstr "`gvimdiff1`"
#. type: Plain text
#: en/mergetools-merge.txt:15
@@ -64143,10 +64116,9 @@ msgstr ""
#. type: Labeled list
#: en/mergetools-merge.txt:15
-#, fuzzy, no-wrap, priority:100
-#| msgid "gvimdiff2"
+#, no-wrap, priority:100
msgid "`gvimdiff2`"
-msgstr "gvimdiff2"
+msgstr "`gvimdiff2`"
#. type: Plain text
#: en/mergetools-merge.txt:16
@@ -64156,10 +64128,9 @@ msgstr ""
#. type: Labeled list
#: en/mergetools-merge.txt:16
-#, fuzzy, no-wrap, priority:100
-#| msgid "gvimdiff3"
+#, no-wrap, priority:100
msgid "`gvimdiff3`"
-msgstr "gvimdiff3"
+msgstr "`gvimdiff3`"
#. type: Plain text
#: en/mergetools-merge.txt:17
@@ -64169,10 +64140,9 @@ msgstr ""
#. type: Labeled list
#: en/mergetools-merge.txt:17
-#, fuzzy, no-wrap, priority:100
-#| msgid "kdiff3"
+#, no-wrap, priority:100
msgid "`kdiff3`"
-msgstr "kdiff3"
+msgstr "`kdiff3`"
#. type: Plain text
#: en/mergetools-merge.txt:18
@@ -64206,10 +64176,9 @@ msgstr ""
#. type: Labeled list
#: en/mergetools-merge.txt:20
-#, fuzzy, no-wrap, priority:100
-#| msgid "nvimdiff1"
+#, no-wrap, priority:100
msgid "`nvimdiff1`"
-msgstr "nvimdiff1"
+msgstr "`nvimdiff1`"
#. type: Plain text
#: en/mergetools-merge.txt:21
@@ -64219,10 +64188,9 @@ msgstr ""
#. type: Labeled list
#: en/mergetools-merge.txt:21
-#, fuzzy, no-wrap, priority:100
-#| msgid "nvimdiff2"
+#, no-wrap, priority:100
msgid "`nvimdiff2`"
-msgstr "nvimdiff2"
+msgstr "`nvimdiff2`"
#. type: Plain text
#: en/mergetools-merge.txt:22
@@ -64232,10 +64200,9 @@ msgstr ""
#. type: Labeled list
#: en/mergetools-merge.txt:22
-#, fuzzy, no-wrap, priority:100
-#| msgid "nvimdiff3"
+#, no-wrap, priority:100
msgid "`nvimdiff3`"
-msgstr "nvimdiff3"
+msgstr "`nvimdiff3`"
#. type: Plain text
#: en/mergetools-merge.txt:23
@@ -64257,10 +64224,9 @@ msgstr ""
#. type: Labeled list
#: en/mergetools-merge.txt:24
-#, fuzzy, no-wrap, priority:100
-#| msgid "p4merge"
+#, no-wrap, priority:100
msgid "`p4merge`"
-msgstr "p4merge"
+msgstr "`p4merge`"
#. type: Plain text
#: en/mergetools-merge.txt:25
@@ -64318,10 +64284,9 @@ msgstr ""
#. type: Labeled list
#: en/mergetools-merge.txt:29
-#, fuzzy, no-wrap, priority:100
-#| msgid "vimdiff1"
+#, no-wrap, priority:100
msgid "`vimdiff1`"
-msgstr "vimdiff1"
+msgstr "`vimdiff1`"
#. type: Plain text
#: en/mergetools-merge.txt:30
@@ -64331,10 +64296,9 @@ msgstr ""
#. type: Labeled list
#: en/mergetools-merge.txt:30
-#, fuzzy, no-wrap, priority:100
-#| msgid "vimdiff2"
+#, no-wrap, priority:100
msgid "`vimdiff2`"
-msgstr "vimdiff2"
+msgstr "`vimdiff2`"
#. type: Plain text
#: en/mergetools-merge.txt:31
@@ -64344,10 +64308,9 @@ msgstr ""
#. type: Labeled list
#: en/mergetools-merge.txt:31
-#, fuzzy, no-wrap, priority:100
-#| msgid "vimdiff3"
+#, no-wrap, priority:100
msgid "`vimdiff3`"
-msgstr "vimdiff3"
+msgstr "`vimdiff3`"
#. type: Plain text
#: en/mergetools-merge.txt:32
@@ -68402,7 +68365,7 @@ msgstr "Formatage des commits"
#: en/rev-list-options.txt:1045
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
-msgstr "En utilisant ces options, linkgit:git-rev-list[1] agira de la m챗me mani챔re que la famille plus sp챕cialis챕e d'outils de journaux de validation혻: linkgit:git-log[1], linkgit:git-show[1] et linkgit:git-whatch changed[1]"
+msgstr "En utilisant ces options, linkgit:git-rev-list[1] agira de la m챗me mani챔re que la famille plus sp챕cialis챕e d'outils de journaux de validation혻: linkgit:git-log[1], linkgit:git-show[1] et linkgit:git-whatchanged[1]"
#. type: Labeled list
#: en/rev-list-options.txt:1049