diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index 706271588d29a8371663844d3fb727b34f43b22d..1b903400b568508bec635d46a5632df152f32b30 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-10 17:09+0200\n"
+"PO-Revision-Date: 2020-05-16 17:47+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"
@@ -2782,10 +2782,15 @@ msgstr "ISO 8601"
#. type: Plain text
#: en/date-formats.txt:26
-#, fuzzy, priority:280
-#| msgid "Time and date specified by the ISO 8601 standard, for example `2005-04-07T22:13:13`. The parser accepts a space instead of the `T` character as well."
+#, priority:280
msgid "Time and date specified by the ISO 8601 standard, for example `2005-04-07T22:13:13`. The parser accepts a space instead of the `T` character as well. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`"
-msgstr "Les heures et les dates sont sp챕cifi챕es par le standard ISO 8601, par exemple `2005-04-07T22:13:13`. L'analyseur accepte aussi un espace au lieu du caract챔re `T`."
+msgstr ""
+"Les heures et les dates sont sp챕cifi챕es par le standard ISO 8601, par "
+"exemple `2005-04-07T22:13:13`. L'analyseur accepte aussi un espace au lieu "
+"du caract챔re `T`. Les parties fractionnelles d'une seconde seront ignor챕es, "
+"par exemple, `2005-04-07T22:13:13.019` sera consid챕r챕 comme 챕tant "
+"`2005-04-07T22:13:13`"
+
#. type: Plain text
#: en/date-formats.txt:29
@@ -5527,10 +5532,30 @@ msgstr "--recurse-submodules[=yes|on-demand|no]"
#. type: Plain text
#: en/fetch-options.txt:168
-#, fuzzy, priority:220
-#| 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 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. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
-msgstr "Cette option permet de contr척ler si et dans quelles conditions les nouveaux engagements de sous-modules peupl챕s doivent 챕galement 챗tre r챕cup챕r챕s. Elle peut 챗tre utilis챕e comme une option bool챕enne pour d챕sactiver compl챔tement la r챕cursivit챕 lorsqu'elle est d챕finie sur 'no' ou pour visiter r챕cursivement sans condition tous les sous-modules peupl챕s lorsqu'elle est d챕finie sur 'yes', qui est la valeur par d챕faut lorsque cette option est 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."
+#, priority:220
+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. By default, 'on-demand' is used, unless `fetch."
+"recurseSubmodules` is set (see linkgit:git-config[1])."
+msgstr ""
+"Cette option permet de contr척ler si et dans quelles conditions les nouveaux "
+"engagements de sous-modules peupl챕s doivent 챕galement 챗tre r챕cup챕r챕s. Elle "
+"peut 챗tre utilis챕e comme une option bool챕enne pour d챕sactiver compl챔tement "
+"la r챕cursivit챕 lorsqu'elle est d챕finie sur 'no' ou pour visiter "
+"r챕cursivement sans condition tous les sous-modules peupl챕s lorsqu'elle est "
+"d챕finie sur 'yes', qui est la valeur par d챕faut lorsque cette option est "
+"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. 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
@@ -9325,9 +9350,9 @@ msgstr "Les options `-c` et `-C` ont exactement la m챗me s챕mantique que `-m` et
#, priority:240
msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
msgstr ""
-"Avec une option `-d` ou `-D`, `<branchname>` sera supprim챕.\n"
-"Vous pouvez sp챕cifier plus d'une branche pour la suppression.\n"
-"Si la branche a actuellement un reflog, alors le reflog sera aussi supprim챕."
+"Avec une option `-d` ou `-D`, `<branchname>` sera supprim챕. Vous pouvez "
+"sp챕cifier plus d'une branche pour la suppression. Si la branche a "
+"actuellement un reflog, alors le reflog sera aussi supprim챕."
#. type: Plain text
#: en/git-branch.txt:93
@@ -13681,16 +13706,7 @@ msgstr "git-clone - Clone un d챕p척t dans un nouveau r챕pertoire"
#. type: Plain text
#: en/git-clone.txt:21
-#, fuzzy, no-wrap, priority:300
-#| msgid ""
-#| "'git clone' [--template=<template_directory>]\n"
-#| "\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n"
-#| "\t [-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]\n"
-#| "\t [--dissociate] [--separate-git-dir <git dir>]\n"
-#| "\t [--depth <depth>] [--[no-]single-branch] [--no-tags]\n"
-#| "\t [--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]\n"
-#| "\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--] <repository>\n"
-#| "\t [<directory>]\n"
+#, no-wrap, priority:300
msgid ""
"'git clone' [--template=<template_directory>]\n"
"\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n"
@@ -13708,7 +13724,8 @@ msgstr ""
"\t [--dissociate] [--separate-git-dir <r챕pertoire git>]\n"
"\t [--depth <profondeur>] [--[no-]single-branch] [--no-tags]\n"
"\t [--recurse-submodules[=<sp챕c.de chemin>]] [--[no-]shallow-submodules]\n"
-"\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--] <d챕p척t>\n"
+"\t [--[no-]remote-submodules] [--jobs <n>] [--sparse]\n"
+"\t [--filter=<filter>] [--] <d챕p척t>\n"
"\t [<r챕pertoire>]\n"
#. type: Plain text
@@ -37602,13 +37619,28 @@ msgstr "Supprimer toutes les sorties, y compris la liste des r챕f챕rences mises
#: en/git-push.txt:378
#, no-wrap, priority:220
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
#, priority:220
msgid "May be used to make sure all submodule commits used by the revisions to be pushed are available on a remote-tracking branch. If 'check' is used Git will verify that all submodule commits that changed in the revisions to be pushed are available on at least one remote of the submodule. If any commits are missing the push will be aborted and exit with non-zero status. If 'on-demand' is used all submodules that changed in the revisions to be pushed will be pushed. If on-demand was not able to push all necessary revisions it will also be aborted and exit with non-zero status. If 'only' is used all submodules will be recursively pushed while the superproject is left unpushed. A value of 'no' or using `--no-recurse-submodules` can be used to override the push.recurseSubmodules configuration variable when no submodule recursion is required."
msgstr ""
+"Peut 챗tre utilis챕 pour s'assurer que tous les commits de sous-module "
+"utilis챕s par les r챕visions 횪 pousser sont disponibles sur une branche de "
+"suivi 횪 distance. Si 'check' est utilis챕, Git v챕rifiera que tous les "
+"commits de sous-module qui ont chang챕 dans les r챕visions 횪 pousser sont "
+"disponibles sur au moins une branche distante du sous-module. S'il manque "
+"des validations, la pouss챕e sera interrompue et sortira avec un statut non "
+"nul. Si 'on-demand' est utilis챕, tous les sous-module qui ont 챕t챕 modifi챕s "
+"dans les r챕visions 횪 pousser seront pouss챕s. Si 'on-demand' n'a pas pu "
+"pousser toutes les r챕visions n챕cessaires, il sera 챕galement interrompu et "
+"sortira avec un statut non nul. Si 'only' est utilis챕, tous les sous-modules "
+"seront pouss챕s r챕cursivement alors que le superprojet est laiss챕 sans "
+"pouss챕e. La valeur 'no' ou l'utilisation de `--no-recurse-submodules` peut "
+"챗tre utilis챕e pour remplacer la variable de configuration "
+"push.recurseSubmodules lorsqu'aucune r챕cursion de sous-module n'est "
+"n챕cessaire."
#. type: Labeled list
#: en/git-push.txt:393
@@ -37621,84 +37653,104 @@ msgstr "--[no-]verify"
#, priority:220
msgid "Toggle the pre-push hook (see linkgit:githooks[5]). The default is --verify, giving the hook a chance to prevent the push. With --no-verify, the hook is bypassed completely."
msgstr ""
+"Basculer le crochet de pr챕-pouss챕e 'pre-push' (voir linkgit:githooks[5]). "
+"La valeur par d챕faut est --verify, ce qui donne au crochet une chance "
+"d'emp챗cher la pouss챕e. Avec --no-verify, le crochet est compl챔tement "
+"contourn챕."
#. type: Plain text
#: en/git-push.txt:414
#, priority:220
msgid "The output of \"git push\" depends on the transport method used; this section describes the output when pushing over the Git protocol (either locally or via ssh)."
msgstr ""
+"La sortie de \"git push\" d챕pend de la m챕thode de transport utilis챕e ; cette "
+"section d챕crit la sortie lors du passage par protocole Git (soit localement "
+"soit via ssh)."
#. type: Plain text
#: en/git-push.txt:417
#, priority:220
msgid "The status of the push is output in tabular form, with each line representing the status of a single ref. Each line is of the form:"
msgstr ""
+"L'챕tat de la pouss챕e est affich챕 sous forme de tableau, chaque ligne "
+"repr챕sentant l'챕tat d'une seule r챕f챕rence. Chaque ligne est de la forme :"
#. type: delimited block -
#: en/git-push.txt:420
#, no-wrap, priority:220
msgid " <flag> <summary> <from> -> <to> (<reason>)\n"
-msgstr ""
+msgstr " <drapeau> <r챕sum챕> <de> -> <횪> (<raison>)\n"
#. type: Plain text
#: en/git-push.txt:423
#, priority:220
msgid "If --porcelain is used, then each line of the output is of the form:"
msgstr ""
+"Si --porcelain est utilis챕, alors chaque ligne de la sortie est de la forme :"
#. type: delimited block -
#: en/git-push.txt:426
#, no-wrap, priority:220
msgid " <flag> \\t <from>:<to> \\t <summary> (<reason>)\n"
-msgstr ""
+msgstr " <drapeau> \\t <de>:<횪> \\t <r챕sum챕> (<raison>)\n"
#. type: Plain text
#: en/git-push.txt:430
#, priority:220
msgid "The status of up-to-date refs is shown only if --porcelain or --verbose option is used."
msgstr ""
+"L'챕tat des r챕f챕rences 횪 jour n'est indiqu챕 que si l'option --porcelaine ou --"
+"verbose est utilis챕e."
#. type: Plain text
#: en/git-push.txt:434
#, priority:220
msgid "for a successfully pushed fast-forward;"
-msgstr ""
+msgstr "pour une pouss챕e en avance rapide r챕ussie ;"
#. type: Plain text
#: en/git-push.txt:436
#, priority:220
msgid "for a successfully deleted ref;"
-msgstr ""
+msgstr "pour une r챕f. supprim챕e avec succ챔s혻;"
#. type: Plain text
#: en/git-push.txt:437
#, priority:220
msgid "for a successfully pushed new ref;"
-msgstr ""
+msgstr "pour une nouvelle r챕f챕rence pouss챕e avec succ챔s ;"
#. type: Plain text
#: en/git-push.txt:438
#, priority:220
msgid "for a ref that was rejected or failed to push; and"
msgstr ""
+"pour une r챕f챕rence qui a 챕t챕 rejet챕e ou qui n'a pas r챕ussi 횪 챗tre pouss챕e혻; "
+"et"
#. type: Plain text
#: en/git-push.txt:439
#, priority:220
msgid "for a ref that was up to date and did not need pushing."
msgstr ""
+"pour une r챕f챕rence qui 챕tait 횪 jour et n'avait pas besoin d'챗tre pouss챕e."
#. type: Plain text
#: en/git-push.txt:445
#, ignore-ellipsis, priority:220
msgid "For a successfully pushed ref, the summary shows the old and new values of the ref in a form suitable for using as an argument to `git log` (this is `<old>..<new>` in most cases, and `<old>...<new>` for forced non-fast-forward updates)."
msgstr ""
+"Pour une r챕f pouss챕e avec succ챔s, le r챕sum챕 montre les anciennes et les "
+"nouvelles valeurs de la r챕f sous une forme qui peut 챗tre utilis챕e comme "
+"argument pour `git log` (c'est `<ancien>..<nouveau>` dans la plupart des "
+"cas, et `<ancien>...<nouveau>` pour les mises 횪 jour forc챕es pas en avance "
+"rapide)."
#. type: Plain text
#: en/git-push.txt:447
#, priority:220
msgid "For a failed update, more details are given:"
-msgstr ""
+msgstr "En cas d'챕chec de la mise 횪 jour, de plus amples d챕tails sont donn챕s :"
#. type: Labeled list
#: en/git-push.txt:449
@@ -37711,6 +37763,8 @@ msgstr "rejet챕"
#, priority:220
msgid "Git did not try to send the ref at all, typically because it is not a fast-forward and you did not force the update."
msgstr ""
+"Git n'a pas du tout essay챕 d'envoyer la r챕f챕rence, g챕n챕ralement parce que ce "
+"n'est pas une avance rapide et que vous n'avez pas forc챕 la mise 횪 jour."
#. type: Labeled list
#: en/git-push.txt:453
@@ -37723,6 +37777,12 @@ msgstr "le distant a rejet챕"
#, priority:220
msgid "The remote end refused the update. Usually caused by a hook on the remote side, or because the remote repository has one of the following safety options in effect: `receive.denyCurrentBranch` (for pushes to the checked out branch), `receive.denyNonFastForwards` (for forced non-fast-forward updates), `receive.denyDeletes` or `receive.denyDeleteCurrent`. See linkgit:git-config[1]."
msgstr ""
+"Le serveur distant a refus챕 la mise 횪 jour. G챕n챕ralement caus챕 par un "
+"crochet du c척t챕 distant, ou parce que le d챕p척t distant a l'une des options "
+"de s챕curit챕 suivantes en vigueur : `receive.denyCurrentBranch` (pour les "
+"pouss챕es vers la branche extraite), `receive.denyNonFastForwards` (pour les "
+"mises 횪 jour forc챕es mais pas en avance rapide), `receive.denyDeletes` ou "
+"`receive.denyDeleteCurrent`. Voir linkgit:git-config[1]."
#. type: Labeled list
#: en/git-push.txt:462
@@ -37735,48 +37795,70 @@ msgstr "챕chec distant"
#, priority:220
msgid "The remote end did not report the successful update of the ref, perhaps because of a temporary error on the remote side, a break in the network connection, or other transient error."
msgstr ""
+"Le serveur distant n'a pas signal챕 la mise 횪 jour r챕ussie de la r챕f챕rence, "
+"peut-챗tre en raison d'une erreur temporaire du c척t챕 distant, d'une rupture "
+"de la connexion r챕seau ou d'une autre erreur transitoire."
#. type: Plain text
#: en/git-push.txt:472
#, priority:220
msgid "The name of the local ref being pushed, minus its `refs/<type>/` prefix. In the case of deletion, the name of the local ref is omitted."
msgstr ""
+"Le nom de la r챕f챕rence locale qui est pouss챕e, moins son pr챕fixe `refs/"
+"<type>/`. En cas de suppression, le nom de la r챕f챕rence locale est omis."
#. type: Plain text
#: en/git-push.txt:476
#, priority:220
msgid "The name of the remote ref being updated, minus its `refs/<type>/` prefix."
msgstr ""
+"Le nom de la r챕f챕rence distante en cours de mise 횪 jour, moins son pr챕fixe `"
+"refs/<type>/`."
#. type: Plain text
#: en/git-push.txt:481
#, priority:220
msgid "A human-readable explanation. In the case of successfully pushed refs, no explanation is needed. For a failed ref, the reason for failure is described."
msgstr ""
+"Une explication compr챕hensible. Dans le cas des r챕f챕rences qui ont 챕t챕 "
+"pouss챕es avec succ챔s, aucune explication n'est n챕cessaire. Dans le cas d'une "
+"r챕f챕rence en 챕chec, la raison de l'챕chec est d챕crite."
#. type: Title -
#: en/git-push.txt:483
#, no-wrap, priority:220
msgid "NOTE ABOUT FAST-FORWARDS"
-msgstr ""
+msgstr "NOTE SUR LES AVANCES RAPIDES"
#. type: Plain text
#: en/git-push.txt:488
#, priority:220
msgid "When an update changes a branch (or more in general, a ref) that used to point at commit A to point at another commit B, it is called a fast-forward update if and only if B is a descendant of A."
msgstr ""
+"Lorsqu'une mise 횪 jour modifie une branche (ou plus g챕n챕ralement, une r챕f) "
+"qui pointait auparavant vers le commit A pour pointer vers un autre commit "
+"B, on parle de mise 횪 jour en avance rapide si et seulement si B est un "
+"descendant de A."
#. type: Plain text
#: en/git-push.txt:492
#, priority:220
msgid "In a fast-forward update from A to B, the set of commits that the original commit A built on top of is a subset of the commits the new commit B builds on top of. Hence, it does not lose any history."
msgstr ""
+"Dans une mise 횪 jour rapide de A 횪 B, l'ensemble des commits sur lesquels le "
+"commit original A s'appuyait est un sous-ensemble des commits sur lesquels "
+"le nouveau commit B s'appuie. Ainsi, il ne perd pas d'historique."
#. type: Plain text
#: en/git-push.txt:497
#, priority:220
msgid "In contrast, a non-fast-forward update will lose history. For example, suppose you and somebody else started at the same commit X, and you built a history leading to commit B while the other person built a history leading to commit A. The history looks like this:"
msgstr ""
+"En revanche, une mise 횪 jour pas en avance rapide fera perdre de "
+"l'historique. Par exemple, supposons que vous et quelqu'un d'autre ayez "
+"commenc챕 au m챗me commit X, et que vous ayez construit un historique menant "
+"au commit B alors que l'autre personne a construit un historique menant au "
+"commit A. L'historique ressemble 횪 ceci :"
#. type: delimited block -
#: en/git-push.txt:503
@@ -37786,42 +37868,64 @@ msgid ""
" /\n"
" ---X---A\n"
msgstr ""
+" B\n"
+" /\n"
+" ---X---A\n"
#. type: Plain text
#: en/git-push.txt:509
#, priority:220
msgid "Further suppose that the other person already pushed changes leading to A back to the original repository from which you two obtained the original commit X."
msgstr ""
+"Supposons en outre que l'autre personne ait d챕j횪 pouss챕 les modifications "
+"menant 횪 A vers le d챕p척t original dont vous avez tous deux obtenu le commit "
+"X original."
#. type: Plain text
#: en/git-push.txt:512
#, priority:220
msgid "The push done by the other person updated the branch that used to point at commit X to point at commit A. It is a fast-forward."
msgstr ""
+"La pouss챕e effectu챕e par l'autre personne a mis 횪 jour la branche qui "
+"pointait sur le commit X pour pointer sur le commit A. Il s'agit d'une "
+"avance rapide."
#. type: Plain text
#: en/git-push.txt:517
#, priority:220
msgid "But if you try to push, you will attempt to update the branch (that now points at A) with commit B. This does _not_ fast-forward. If you did so, the changes introduced by commit A will be lost, because everybody will now start building on top of B."
msgstr ""
+"Mais si vous essayez de pousser, vous essaierez de mettre 횪 jour la branche ("
+"qui pointe maintenant vers A) avec le commit B. Cela ne fait _pas_ d'avance "
+"rapide. Si vous le faites, les modifications introduits par le commit A "
+"seront perdues, car tout le monde va maintenant commencer 횪 construire sur B."
#. type: Plain text
#: en/git-push.txt:520
#, priority:220
msgid "The command by default does not allow an update that is not a fast-forward to prevent such loss of history."
msgstr ""
+"La commande par d챕faut ne permet pas une mise 횪 jour qui ne soit pas une "
+"avance rapide pour 챕viter une telle perte d'historique."
#. type: Plain text
#: en/git-push.txt:525
#, priority:220
msgid "If you do not want to lose your work (history from X to B) or the work by the other person (history from X to A), you would need to first fetch the history from the repository, create a history that contains changes done by both parties, and push the result back."
msgstr ""
+"Si vous ne voulez pas perdre votre travail (historique de X 횪 B) ou le "
+"travail de l'autre personne (historique de X 횪 A), vous devez d'abord "
+"r챕cup챕rer l'historique du d챕p척t, cr챕er un historique qui contient les "
+"modifications effectu챕es par les deux parties et repousser le r챕sultat."
#. type: Plain text
#: en/git-push.txt:529
#, priority:220
msgid "You can perform \"git pull\", resolve potential conflicts, and \"git push\" the result. A \"git pull\" will create a merge commit C between commits A and B."
msgstr ""
+"Vous pouvez effectuer un \"git pull\", r챕soudre les conflits potentiels et \""
+"git push\" le r챕sultat. Un \"git pull\" cr챕era un commit de fusion C entre "
+"les commit A et B."
#. type: delimited block -
#: en/git-push.txt:535
@@ -37831,18 +37935,26 @@ msgid ""
" / /\n"
" ---X---A\n"
msgstr ""
+" B---C\n"
+" / /\n"
+" ---X---A\n"
#. type: Plain text
#: en/git-push.txt:540
#, priority:220
msgid "Updating A with the resulting merge commit will fast-forward and your push will be accepted."
msgstr ""
+"La mise 횪 jour de A avec le commit de fusion r챕sultant sera une avance "
+"rapide et votre pouss챕e sera accept챕e."
#. type: Plain text
#: en/git-push.txt:545
#, priority:220
msgid "Alternatively, you can rebase your change between X and B on top of A, with \"git pull --rebase\", and push the result back. The rebase will create a new commit D that builds the change between X and B on top of A."
msgstr ""
+"Vous pouvez 챕galement rebaser votre modification entre X et B sur A, avec \""
+"git pull --rebase\", et pousser le r챕sultat. Le rebasage cr챕era un nouveau "
+"commit D qui construit la modification entre X et B sur A."
#. type: delimited block -
#: en/git-push.txt:551
@@ -37852,18 +37964,34 @@ msgid ""
" / /\n"
" ---X---A\n"
msgstr ""
+" B D\n"
+" / /\n"
+" ---X---A\n"
#. type: Plain text
#: en/git-push.txt:556
#, priority:220
msgid "Again, updating A with this commit will fast-forward and your push will be accepted."
msgstr ""
+"L횪 encore, la mise 횪 jour de A avec ce commit sera en avance rapide et votre "
+"pouss챕e sera accept챕e."
#. type: Plain text
#: en/git-push.txt:567
#, priority:220
msgid "There is another common situation where you may encounter non-fast-forward rejection when you try to push, and it is possible even when you are pushing into a repository nobody else pushes into. After you push commit A yourself (in the first picture in this section), replace it with \"git commit --amend\" to produce commit B, and you try to push it out, because forgot that you have pushed A out already. In such a case, and only if you are certain that nobody in the meantime fetched your earlier commit A (and started building on top of it), you can run \"git push --force\" to overwrite it. In other words, \"git push --force\" is a method reserved for a case where you do mean to lose history."
msgstr ""
+"Il existe une autre situation courante dans laquelle vous pouvez rencontrer "
+"un rejet du fait d'absence d'avance rapide lorsque vous essayez de pousser, "
+"et c'est possible m챗me lorsque vous poussez dans un d챕p척t dans lequel "
+"personne d'autre ne pousse. Apr챔s avoir vous-m챗me pouss챕 le commit A (dans "
+"la premi챔re image de cette section), remplacez-le par \"git commit --amend\" "
+"pour produire le commit B, et vous essayez de le pousser, parce que vous "
+"avez oubli챕 que vous avez d챕j횪 pouss챕 A. Dans un tel cas, et seulement si "
+"vous 챗tes certain que personne n'a r챕cup챕r챕 votre commit A pr챕c챕dent (et a "
+"commenc챕 횪 construire dessus), vous pouvez lancer \"git push --force\" pour "
+"l'챕craser. En d'autres termes, \"git push --force\" est une m챕thode r챕serv챕e "
+"aux cas o첫 vous voulez vraiment perdre l'historique."
#. type: Labeled list
#: en/git-push.txt:572
@@ -37876,6 +38004,9 @@ msgstr "`git push`"
#, priority:220
msgid "Works like `git push <remote>`, where <remote> is the current branch's remote (or `origin`, if no remote is configured for the current branch)."
msgstr ""
+"Fonctionne comme `git push <distant>`, o첫 <distant> est le distant de la "
+"branche actuelle (ou `origin`, si aucun distant n'est configur챕 pour la "
+"branche actuelle)."
#. type: Labeled list
#: en/git-push.txt:577
@@ -37888,18 +38019,29 @@ msgstr "`git push origin`"
#, priority:220
msgid "Without additional configuration, pushes the current branch to the configured upstream (`remote.origin.merge` configuration variable) if it has the same name as the current branch, and errors out without pushing otherwise."
msgstr ""
+"Sans configuration suppl챕mentaire, pousse la branche en cours vers l'amont "
+"configur챕 (variable de configuration `remote.origin.merge`) si elle a le "
+"m챗me nom que la branche actuelle et g챕n챔re des erreurs sans pousser "
+"autrement."
#. type: Plain text
#: en/git-push.txt:586
#, priority:220
msgid "The default behavior of this command when no <refspec> is given can be configured by setting the `push` option of the remote, or the `push.default` configuration variable."
msgstr ""
+"Le comportement par d챕faut de cette commande quand aucun <spec-de-r챕f> n'est "
+"donn챕 peut 챗tre configur챕 en d챕finissant l'option `push` du distant, ou la "
+"variable de configuration `push.default`."
#. type: Plain text
#: en/git-push.txt:591
#, priority:220
msgid "For example, to default to pushing only the current branch to `origin` use `git config remote.origin.push HEAD`. Any valid <refspec> (like the ones in the examples below) can be configured as the default for `git push origin`."
msgstr ""
+"Par exemple, pour pousser par d챕faut uniquement la branche actelle vers "
+"`origin`, utilisez `git config remote.origin.push HEAD`. Tout <spec-de-r챕f> "
+"valide (comme ceux des exemples ci-dessous) peut 챗tre configur챕 par d챕faut "
+"pour `git push origin`."
#. type: Labeled list
#: en/git-push.txt:592
@@ -37912,6 +38054,9 @@ msgstr "`git push origin :`"
#, priority:220
msgid "Push \"matching\" branches to `origin`. See <refspec> in the <<OPTIONS,OPTIONS>> section above for a description of \"matching\" branches."
msgstr ""
+"Pousse les branches \"correspondantes\" sur `origin챔. Voir <spec-de-r챕f> "
+"dans la section <<OPTIONS,OPTIONS>> ci-dessus pour une description des "
+"branches \"correspondantes\"."
#. type: Labeled list
#: en/git-push.txt:597
@@ -37924,6 +38069,10 @@ msgstr "`git push origin master`"
#, priority:220
msgid "Find a ref that matches `master` in the source repository (most likely, it would find `refs/heads/master`), and update the same ref (e.g. `refs/heads/master`) in `origin` repository with it. If `master` did not exist remotely, it would be created."
msgstr ""
+"Trouve une r챕f qui correspond 횪 `master` dans le d챕p척t source (le plus "
+"souvent, trouvera `refs/heads/master`), et met 횪 jour la m챗me r챕f (par "
+"exemple `refs/heads/master`) dans le d챕p척t `origin` avec elle. Si `master` "
+"n'existait pas 횪 distance, elle serait cr챕챕e."
#. type: Labeled list
#: en/git-push.txt:604
@@ -60912,12 +61061,13 @@ msgstr "\t(voir <<CRTB,BRANCHES DE SUIVI � DISTANCE CONFIGUR횋ES>> ci-dessous).
#. type: Plain text
#: en/pull-fetch-param.txt:24
-#, fuzzy, no-wrap, priority:220
-#| msgid "\t(see <<CRTB,CONFIGURED REMOTE-TRACKING BRANCHES>> below).\n"
+#, no-wrap, priority:220
msgid ""
"\t(see the section \"CONFIGURED REMOTE-TRACKING BRANCHES\"\n"
"\tin linkgit:git-fetch[1]).\n"
-msgstr "\t(voir <<CRTB,BRANCHES DE SUIVI � DISTANCE CONFIGUR횋ES>> ci-dessous).\n"
+msgstr ""
+"\t(voir la section \"<<BRANCHES DE SUIVI � DISTANCE CONFIGUR횋ES>>\"\n"
+"\tdans linkgit:git-fetch[1]).\n"
#. type: Plain text
#: en/pull-fetch-param.txt:32
@@ -62680,11 +62830,12 @@ msgid ""
"\t \\ / /\\ /\n"
"\t `---X--' `---Y--'\n"
msgstr ""
-"\t .-A---M---N---O---P---Q\n"
-"\t / / / / /\n"
-"\tI B / D /\n"
-"\t \\ / / / /\n"
-"\t `-------------'\n"
+"\t .-A---M-----C--N---O---P\n"
+"\t / / \\ \\ \\/ / /\n"
+"\tI B \\ R-'`-Z' /\n"
+"\t \\ / \\/ /\n"
+"\t \\ / /\\ /\n"
+"\t `---X--' `---Y--'\n"
#. type: Plain text
#: en/rev-list-options.txt:610
@@ -62727,11 +62878,12 @@ msgid ""
"\t \\ / /\\ /\n"
"\t `---X--' `------'\n"
msgstr ""
-"\t .-A---M---N---O---P---Q\n"
-"\t / / / / /\n"
-"\tI B / D /\n"
-"\t \\ / / / /\n"
-"\t `-------------'\n"
+"\t .-A---M--------N---O---P\n"
+"\t / / \\ \\ \\/ / /\n"
+"\tI B \\ R-'`--' /\n"
+"\t \\ / \\/ /\n"
+"\t \\ / /\\ /\n"
+"\t `---X--' `------'\n"
#. type: Plain text
#: en/rev-list-options.txt:638
@@ -62762,11 +62914,12 @@ msgid ""
"\t \\ / /\n"
"\t `---X--'\n"
msgstr ""
-"\t .-A---M---N---O\n"
-"\t / / /\n"
-"\tI B D\n"
-"\t \\ / /\n"
-"\t `---------'\n"
+"\t .-A---M--.\n"
+"\t / / \\\n"
+"\tI B R\n"
+"\t \\ / /\n"
+"\t \\ / /\n"
+"\t `---X--'\n"
#. type: Plain text
#: en/rev-list-options.txt:660
@@ -62827,11 +62980,12 @@ msgid ""
"\t \\ / /\n"
"\t `---X--'\n"
msgstr ""
-"\t .-A---M---N---O\n"
-"\t / / /\n"
-"\tI B D\n"
-"\t \\ / /\n"
-"\t `---------'\n"
+"\t .-A---M--. N\n"
+"\t / / \\ /\n"
+"\tI B R\n"
+"\t \\ / /\n"
+"\t \\ / /\n"
+"\t `---X--'\n"
#. type: Plain text
#: en/rev-list-options.txt:707
@@ -63771,9 +63925,11 @@ msgstr "Les syntaxes suivantes peuvent 챗tre utilis챕es avec eux혻:"
#. type: Plain text
#: en/urls.txt:19
-#, fuzzy, priority:300
-msgid "ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/path/to/repo.git/"
-msgstr "ssh://{startsb}compte@{endsb}h척te.xz{startsb}:port{endsb}/chemin/du/d챕p척t.git/"
+#, priority:300
+msgid ""
+"ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/path/to/repo.git/"
+msgstr ""
+"ssh://{startsb}compte@{endsb}h척te.xz{startsb}:port{endsb}/chemin/du/d챕p척t.git/"
#. type: Plain text
#: en/urls.txt:20
diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po
index 2ffa92747b8896770eb583f343cf57c79bf825ce..45c928352c1d7e96cb236dab28f199a4231c95b2 100644
--- a/po/documentation.pt_BR.po
+++ b/po/documentation.pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
"POT-Creation-Date: 2020-05-16 17:29+0200\n"
-"PO-Revision-Date: 2020-05-14 20:41+0000\n"
+"PO-Revision-Date: 2020-05-16 17:47+0000\n"
"Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
"Language-Team: none\n"
"Language: pt_BR\n"
@@ -4715,16 +4715,16 @@ msgid ""
"\tthe same as `-M5%`. To limit detection to exact renames, use\n"
"\t`-M100%`. The default similarity index is 50%.\n"
msgstr ""
-"\tSe `n` 챕 especificado, 챕 um limiar na semelhan챌a\n"
-"\t챠ndice (isto 챕, quantidade de adi챌찾o/exclus천es comparada com o\n"
+"\tCaso `n` seja usado, 챕 um limiar na similaridade do\n"
+"\t챠ndice (ou seja, a quantidade de adi챌천es/exclus천es comparado com o\n"
"\ttamanho do arquivo). Por exemplo, `-M90%` significa que o Git deve\n"
-"\tconsiderar um par delete/add para ser renomeado se mais de 90%\n"
-"\tdo arquivo n찾o mudou. Sem um sinal `%`, o n첬mero deve ser lido\n"
+"\tconsiderar um par delete/add para ser renomeado caso mais de 90%\n"
+"\tdo arquivo n찾o tenha mudado. Sem um sinal `%`, o n첬mero deve ser lido\n"
"\tcomo uma fra챌찾o, com um ponto decimal antes dele. Ou seja, `-M5`\n"
-"\ttorna-se 0.5, e 챕 portanto, o mesmo que `-M50%`. Da mesma forma,\n"
-"\t-M05` 챕 o mesmo que `-M5%`. Para limitar a detec챌찾o a \n"
-"\trenomea챌천es exatas, use `-M100%`. O 챠ndice de similaridade padr찾o\n"
-"\t챕 de 50%.\n"
+"\ttorna-se 0.5, e 챕 portanto o mesmo que `-M50%`. Da mesma forma,\n"
+"\t`-M05` 챕 o mesmo que `-M5%`. Para limitar a detec챌찾o para \n"
+"\trenomea챌천es exatas use `-M100%`. A predefini챌찾o do 챠ndice de\n"
+"\tsimilaridade padr찾o 챕 de 50%.\n"
#. type: Labeled list
#: en/diff-options.txt:492
@@ -6384,17 +6384,19 @@ msgid ""
msgstr ""
"y - encenar esse peda챌o\n"
"n - n찾o encenar esse peda챌o\n"
-"q - sair; n찾o encenar este peda챌o ou qualquer um dos restantes\n"
+"q - encerrar; n찾o encenar este peda챌o ou qualquer um dos restantes\n"
"a - encenar esse peda챌o e todos os peda챌os posteriores no arquivo\n"
-"d - n찾o encenar esse peda챌o ou qualquer um dos peda챌os posteriores no arquivo\n"
+"d - n찾o encenar esse peda챌o ou qualquer um dos peda챌os posteriores no "
+"arquivo\n"
"g - selecione um peda챌o para ir\n"
-"/ - procure por um peda챌o que corresponda 횪 regex dada\n"
-"j - deixe esse peda챌o indeciso, veja o pr처ximo peda챌o indeciso\n"
-"k - deixe esse peda챌o indeciso, veja o peda챌o indeciso anterior\n"
-"K - deixe esse peda챌o indeciso, veja o peda챌o anterior\n"
+"/ - pesquise por um peda챌o correspondente a express찾o regular usada\n"
+"j - deixe este peda챌o sem decis찾o, consulte o pr처ximo peda챌o sem decis찾o\n"
+"J - deixe este peda챌o sem decis찾o, consulte o pr처ximo peda챌o\n"
+"k - deixe este peda챌o sem decis찾o, consulte o peda챌o sem decis찾o anterior\n"
+"K - deixe este peda챌o sem decis찾o, consulte o peda챌o anterior\n"
"s - divide o peda챌o atual em peda챌os menores\n"
"e - edite manualmente o peda챌o atual\n"
-"? - ajuda de impress찾o\n"
+"? - exiba a ajuda\n"
#. type: Plain text
#: en/git-add.txt:346
@@ -7076,8 +7078,9 @@ msgstr "pule o patch atual reexecutando o comando com a op챌찾o `--skip`."
#, priority:100
msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option."
msgstr ""
-"m찾o resolver o conflito no diret처rio de trabalho e atualizar o arquivo de 챠ndice para coloc찼-lo em um estado que o patch deve ter produzido. \n"
-" Ent찾o execute o comando com a op챌찾o `--continue`."
+"m찾o resolver o conflito no diret처rio de trabalho e atualizar o arquivo do "
+"챠ndice para coloc찼-lo em uma condi챌찾o onde o patch deve ter produzido. "
+"Ent찾o execute o comando com a op챌찾o `--continue`."
#. type: Plain text
#: en/git-am.txt:231
@@ -7298,8 +7301,11 @@ msgstr "Aplique o patch ao contr찼rio."
#, priority:100
msgid "For atomicity, 'git apply' by default fails the whole patch and does not touch the working tree when some of the hunks do not apply. This option makes it apply the parts of the patch that are applicable, and leave the rejected hunks in corresponding *.rej files."
msgstr ""
-"Para atomicidade, 'git apply' por padr찾o falha em todo o patch e n찾o toca na 찼rvore de trabalho quando alguns dos blocos n찾o se aplicam. \n"
-" Essa op챌찾o faz com que ela aplique as partes do patch aplic찼veis e deixa os peda챌os rejeitados nos arquivos *.rej correspondentes."
+"Por quest천es de atomicidade 챕 predefinido que o comando 'git apply' condene "
+"o patch todo e n찾o toque na 찼rvore de trabalho quando alguns dos peda챌os n찾o "
+"se aplicarem. \n"
+" Esta op챌찾o faz com que se aplique apenas as partes do patch que sejam "
+"aplic찼veis descartando o peda챌os rejeitados em arquivos *.rej."
#. type: Plain text
#: en/git-apply.txt:118
@@ -7426,8 +7432,9 @@ msgstr "Ao aplicar um patch, detecte uma linha nova ou modificada que tenha erro
#, priority:100
msgid "By default, the command outputs warning messages but applies the patch. When `git-apply` is used for statistics and not applying a patch, it defaults to `nowarn`."
msgstr ""
-"Por padr찾o, o comando gera mensagens de aviso, mas aplica o patch. \n"
-" Quando o `git-apply` 챕 usado para estat챠sticas e n찾o aplica um patch, o padr찾o 챕` nowarn`."
+"횋 predefinido que o comando gere mensagens de aviso e s처 aplique o patch. "
+"Quando o comando `git-apply` 챕 utilizado para estat챠sticas e n찾o para "
+"aplicar um patch, a sua predefini챌찾o 챕 `nowarn`."
#. type: Plain text
#: en/git-apply.txt:205
@@ -7654,8 +7661,10 @@ msgstr "Enquanto o 'git archimport' tentar찼 criar nomes de ramifica챌천es sens
#, priority:100
msgid "Associating multiple Arch branches to one Git branch is possible; the result will make the most sense only if no commits are made to the first branch, after the second branch is created. Still, this is useful to convert Arch repositories that had been rotated periodically."
msgstr ""
-"A associa챌찾o de v찼rios ramos do Arch a um ramo do Git 챕 poss챠vel; o resultado far찼 mais sentido somente se nenhuma confirma챌찾o for feita na primeira ramifica챌찾o, depois que a segunda ramifica챌찾o for criada. \n"
-" Ainda assim, isso 챕 첬til para converter reposit처rios do Arch que foram rotacionados periodicamente."
+"횋 poss챠vel associar v찼rios ramos do Arch a um ramo do Git; o resultado far찼 "
+"mais sentido somente caso nenhum commit seja feito na primeira ramifica챌찾o, "
+"depois que a segunda ramifica챌찾o for criada. Ainda assim 챕 첬til para "
+"converter os reposit처rios do Arch que forem periodicamente rotacionados."
#. type: Title -
#: en/git-archimport.txt:57
@@ -7874,8 +7883,8 @@ msgstr "<extra>"
#, priority:100
msgid "This can be any options that the archiver backend understands. See next section."
msgstr ""
-"Isso pode ser qualquer op챌찾o que o back-end do arquivador entenda. \n"
-" Veja a pr처xima se챌찾o."
+"Pode ser qualquer op챌찾o que o back-end do arquivador compreenda. Consulte a "
+"pr처xima se챌찾o."
#. type: Labeled list
#: en/git-archive.txt:66
@@ -9064,8 +9073,12 @@ msgstr "--score-debug"
#, priority:100
msgid "Include debugging information related to the movement of lines between files (see `-C`) and lines moved within a file (see `-M`). The first number listed is the score. This is the number of alphanumeric characters detected as having been moved between or within files. This must be above a certain threshold for 'git blame' to consider those lines of code to have been moved."
msgstr ""
-"Inclua informa챌천es de depura챌찾o relacionadas ao movimento de linhas entre arquivos (consulte `-C) e linhas movidas dentro de um arquivo (consulte` -M`). O primeiro n첬mero listado 챕 a pontua챌찾o. \n"
-" Esse 챕 o n첬mero de caracteres alfanum챕ricos detectados como tendo sido movidos entre ou dentro dos arquivos. Isso deve estar acima de um certo limite para 'git blame' considerar essas linhas de c처digo que foram movidas."
+"Inclua informa챌천es de depura챌찾o relacionadas ao movimento das linhas entre "
+"os arquivos (consulte `-C`) e linhas movidas dentro de um arquivo (consulte "
+"`-M`). O primeiro n첬mero listado 챕 a pontua챌찾o. Esse 챕 o n첬mero de "
+"caracteres alfanum챕ricos detectados como sendo movidos entre ou dentro dos "
+"arquivos. Deve estar acima de um certo limite para que o comando 'git "
+"blame' considere que essas linhas do c처digo tenham sido movidas."
#. type: Labeled list
#: en/git-blame.txt:66
diff --git a/po/documentation.tr.po b/po/documentation.tr.po
index 7cab30bab2ff10dd872edc57281298b4b76b2d04..f91e5340c600d838a9ad91027e0eca4816ddacd1 100644
--- a/po/documentation.tr.po
+++ b/po/documentation.tr.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-04-10 21:39+0000\n"
+"PO-Revision-Date: 2020-05-16 17:45+0000\n"
"Last-Translator: O휓uz Ersen <oguzersen@protonmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: tr\n"
@@ -15,7 +15,7 @@ msgstr ""
"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.0-dev\n"
+"X-Generator: Weblate 4.1-dev\n"
#. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:666 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
@@ -9837,17 +9837,15 @@ msgstr ""
#. type: Labeled list
#: en/git-bugreport.txt:40
-#, fuzzy, no-wrap, priority:100
-#| msgid "--path"
+#, no-wrap, priority:100
msgid "-o <path>"
-msgstr "--path"
+msgstr "-o <yol>"
#. type: Labeled list
#: en/git-bugreport.txt:41
-#, fuzzy, no-wrap, priority:100
-#| msgid "--no-empty-directory"
+#, no-wrap, priority:100
msgid "--output-directory <path>"
-msgstr "--no-empty-directory"
+msgstr "--output-directory <yol>"
#. type: Plain text
#: en/git-bugreport.txt:44
@@ -9857,17 +9855,15 @@ msgstr ""
#. type: Labeled list
#: en/git-bugreport.txt:45
-#, fuzzy, no-wrap, priority:100
-#| msgid "--git-format"
+#, no-wrap, priority:100
msgid "-s <format>"
-msgstr "--git-format"
+msgstr "-s <bi챌im>"
#. type: Labeled list
#: en/git-bugreport.txt:46
-#, fuzzy, no-wrap, priority:100
-#| msgid "--git-format"
+#, no-wrap, priority:100
msgid "--suffix <format>"
-msgstr "--git-format"
+msgstr "--suffix <bi챌im>"
#. type: Plain text
#: en/git-bugreport.txt:50
@@ -20415,10 +20411,9 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:129
-#, fuzzy, no-wrap, priority:100
-#| msgid "--recurse-submodules[=<pathspec]"
+#, no-wrap, priority:100
msgid "--rewrite-submodules-to=<name>:<file>"
-msgstr "--recurse-submodules[=<yol belirtimi]"
+msgstr "--rewrite-submodules-to=<ad>:<dosya>"
#. type: Plain text
#: en/git-fast-import.txt:131
@@ -34643,10 +34638,9 @@ msgstr ""
#. type: Title ~
#: en/git-p4.txt:391
-#, fuzzy, no-wrap, priority:100
-#| msgid "--ignore-space-change"
+#, no-wrap, priority:100
msgid "p4-prepare-changelist"
-msgstr "--ignore-space-change"
+msgstr "p4-prepare-changelist"
#. type: Plain text
#: en/git-p4.txt:398
@@ -34662,10 +34656,9 @@ msgstr ""
#. type: Title ~
#: en/git-p4.txt:404
-#, fuzzy, no-wrap, priority:100
-#| msgid "`changes`"
+#, no-wrap, priority:100
msgid "p4-changelist"
-msgstr "`changes`"
+msgstr "p4-changelist"
#. type: Plain text
#: en/git-p4.txt:411
@@ -39258,10 +39251,9 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:642
-#, fuzzy, priority:100
-#| msgid "--fork-point"
+#, priority:100
msgid "--fork-point and --root"
-msgstr "--fork-point"
+msgstr "--fork-point ve --root"
#. type: Plain text
#: en/git-rebase.txt:644
@@ -55050,10 +55042,9 @@ msgstr ""
#. type: Labeled list
#: en/git-update-ref.txt:139
-#, fuzzy, no-wrap, priority:100
-#| msgid "--abort"
+#, no-wrap, priority:100
msgid "abort"
-msgstr "--abort"
+msgstr "abort"
#. type: Plain text
#: en/git-update-ref.txt:142
@@ -58772,10 +58763,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:87
-#, fuzzy, priority:260
-#| msgid "--mboxrd"
+#, priority:260
msgid "'mboxrd'"
-msgstr "--mboxrd"
+msgstr "'mboxrd'"
#. type: Plain text
#: en/pretty-formats.txt:91