diff --git a/po/TEAMS b/po/TEAMS
index b221402ae3..b3184cb0c0 100644
--- a/po/TEAMS
+++ b/po/TEAMS
@@ -58,5 +58,6 @@ Members:	Nguyễn Thái Ngọc Duy <pclouds AT gmail.com>
 
 Language:	zh_CN (Simplified Chinese)
 Repository:	https://github.com/jiangxin/git/
-Leader:		Jiang Xin <worldhello.net@gmail.com>
-Members:	Ray Chen <oldsharp@gmail.com>
+Leader:		Jiang Xin <worldhello.net AT gmail.com>
+Members:	Ray Chen <oldsharp AT gmail.com>
+		依云 <lilydjwg AT gmail.com>
diff --git a/po/bg.po b/po/bg.po
index c80f5cbe00..19be17110a 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -94,8 +94,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git master\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-15 11:57+0800\n"
-"PO-Revision-Date: 2017-07-14 10:54+0200\n"
+"POT-Creation-Date: 2017-07-24 21:54+0800\n"
+"PO-Revision-Date: 2017-07-24 17:26+0200\n"
 "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
@@ -1585,19 +1585,69 @@ msgstr ""
 msgid "in the future"
 msgstr "в бъдещето"
 
-#: date.c:122 date.c:129 date.c:136 date.c:143 date.c:149 date.c:156 date.c:167
-#: date.c:175 date.c:180
-msgid "%"
-msgid_plural "%"
-msgstr[0] "%"
-msgstr[1] "%"
+#: date.c:122
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "преди %<PRIuMAX> секунда"
+msgstr[1] "преди %<PRIuMAX> секунди"
+
+#: date.c:129
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "преди %<PRIuMAX> минута"
+msgstr[1] "преди %<PRIuMAX> минути"
+
+#: date.c:136
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "преди %<PRIuMAX> час"
+msgstr[1] "преди %<PRIuMAX> часа"
+
+#: date.c:143
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "преди %<PRIuMAX> ден"
+msgstr[1] "преди %<PRIuMAX> дена"
+
+#: date.c:149
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "преди %<PRIuMAX> седмица"
+msgstr[1] "преди %<PRIuMAX> седмици"
+
+#: date.c:156
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "преди %<PRIuMAX> месец"
+msgstr[1] "преди %<PRIuMAX> месеца"
+
+#: date.c:167
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> година"
+msgstr[1] "%<PRIuMAX> години"
 
 #. TRANSLATORS: "%s" is "<n> years"
 #: date.c:170
-msgid "%s, %"
-msgid_plural "%s, %"
-msgstr[0] "%s, %"
-msgstr[1] "%s, %"
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "преди %s и %<PRIuMAX> месец"
+msgstr[1] "преди %s и %<PRIuMAX> месеца"
+
+#: date.c:175 date.c:180
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "преди %<PRIuMAX> година"
+msgstr[1] "преди %<PRIuMAX> години"
 
 #: diffcore-order.c:24
 #, c-format
@@ -1776,7 +1826,7 @@ msgstr "неправилно подаване: „%s“"
 msgid "giving up"
 msgstr "преустановяване"
 
-#: fetch-pack.c:533 progress.c:235
+#: fetch-pack.c:533 progress.c:237
 msgid "done"
 msgstr "действието завърши"
 
@@ -3196,12 +3246,12 @@ msgstr "съобщението за подаване към „%s“ не мож
 #: sequencer.c:879
 #, c-format
 msgid "This is the commit message #%d:"
-msgstr "Това е съобщение при подаване №${%d}:"
+msgstr "Това е съобщение при подаване №%d:"
 
 #: sequencer.c:884
 #, c-format
 msgid "The commit message #%d will be skipped:"
-msgstr "Съобщение при подаване №${%d} ще бъде прескочено:"
+msgstr "Съобщение при подаване №%d ще бъде прескочено:"
 
 #: sequencer.c:889
 #, c-format
@@ -8664,7 +8714,7 @@ msgstr ""
 "Погледнете ръководството за повече информация как да изпълните „git help "
 "gc“.\n"
 
-#: builtin/gc.c:432
+#: builtin/gc.c:436
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8673,7 +8723,7 @@ msgstr ""
 "процеса: %<PRIuMAX> (ако сте сигурни, че това не е вярно, това използвайте\n"
 "опцията „--force“)"
 
-#: builtin/gc.c:476
+#: builtin/gc.c:480
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 5fa5ec3f4d..a7bc71fc6a 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,5 +1,4 @@
 # Catalan translations for Git.
-# Copyright (C) 2014 Alex Henrie <alexhenrie24@gmail.com>
 # This file is distributed under the same license as the Git package.
 # Alex Henrie <alexhenrie24@gmail.com>, 2014-2016.
 # Jordi Mas i Hernàndez <jmas@softcatala.org>, 2016-2017
@@ -43,7 +42,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-05-05 09:35+0800\n"
+"POT-Creation-Date: 2017-07-24 21:54+0800\n"
 "PO-Revision-Date: 2017-07-18 20:41+0200\n"
 "Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
 "Language-Team: Catalan\n"
@@ -54,37 +53,37 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.0.1\n"
 
-#: advice.c:55
+#: advice.c:58
 #, c-format
 msgid "hint: %.*s\n"
 msgstr "pista: %.*s\n"
 
-#: advice.c:83
+#: advice.c:86
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "Fer «cherry pick» no és possible perquè teniu fitxers sense fusionar."
 
-#: advice.c:85
+#: advice.c:88
 msgid "Committing is not possible because you have unmerged files."
 msgstr "Cometre no és possible perquè teniu fitxers sense fusionar."
 
-#: advice.c:87
+#: advice.c:90
 msgid "Merging is not possible because you have unmerged files."
 msgstr "Fusionar no és possible perquè teniu fitxers sense fusionar."
 
-#: advice.c:89
+#: advice.c:92
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "Baixar no és possible perquè teniu fitxers sense fusionar."
 
-#: advice.c:91
+#: advice.c:94
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "Revertir no és possible perquè teniu fitxers sense fusionar."
 
-#: advice.c:93
+#: advice.c:96
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "No és possible %s perquè teniu fitxers sense fusionar."
 
-#: advice.c:101
+#: advice.c:104
 msgid ""
 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 "as appropriate to mark resolution and make a commit."
@@ -93,23 +92,23 @@ msgstr ""
 "'git add/rm <fitxer>' segons sigui apropiat per a marcar la\n"
 "resolució i feu una comissió."
 
-#: advice.c:109
+#: advice.c:112
 msgid "Exiting because of an unresolved conflict."
 msgstr "S'està sortint a causa d'un conflicte no resolt."
 
-#: advice.c:114 builtin/merge.c:1185
+#: advice.c:117 builtin/merge.c:1184
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)."
 
-#: advice.c:116
+#: advice.c:119
 msgid "Please, commit your changes before merging."
 msgstr "Si us plau, cometeu els vostres canvis abans de fusionar."
 
-#: advice.c:117
+#: advice.c:120
 msgid "Exiting because of unfinished merge."
 msgstr "S'està sortint a causa d'una fusió no terminada."
 
-#: advice.c:123
+#: advice.c:126
 #, c-format
 msgid ""
 "Note: checking out '%s'.\n"
@@ -136,170 +135,186 @@ msgstr ""
 "\n"
 "  git checkout -b <nom-de-branca-nova>\n"
 
-#: apply.c:57
+#: apply.c:58
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "opció d'espai en blanc '%s' no reconeguda"
 
-#: apply.c:73
+#: apply.c:74
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "opció d'ignora l'espai en blanc '%s' no reconeguda"
 
-#: apply.c:125
+#: apply.c:126
 msgid "--reject and --3way cannot be used together."
 msgstr "--reject i --3way no es poden usar junts."
 
-#: apply.c:127
+#: apply.c:128
 msgid "--cached and --3way cannot be used together."
 msgstr "--cached i --3way no es poden usar junts."
 
-#: apply.c:130
+#: apply.c:131
 msgid "--3way outside a repository"
 msgstr "--3way fora d'un dipòsit"
 
-#: apply.c:141
+#: apply.c:142
 msgid "--index outside a repository"
 msgstr "--index fora d'un dipòsit"
 
-#: apply.c:144
+#: apply.c:145
 msgid "--cached outside a repository"
 msgstr "--cached fora d'un dipòsit"
 
-#: apply.c:845
+#: apply.c:836
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "No es pot preparar l'expressió regular de marca de temps %s"
 
-#: apply.c:854
+#: apply.c:845
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec ha retornat %d per l'entrada: %s"
 
-#: apply.c:938
+#: apply.c:929
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "no s'ha pogut trobar el nom de fitxer en el pedaç a la línia %d"
 
-#: apply.c:977
+#: apply.c:967
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
-msgstr "git apply: git-diff dolent - /dev/null esperat, %s rebut en la línia %d"
+msgstr ""
+"git apply: git-diff dolent - /dev/null esperat, %s rebut en la línia %d"
 
-#: apply.c:983
+#: apply.c:973
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
-msgstr "git apply: git-diff dolent - nom de fitxer nou inconsistent en la línia %d"
+msgstr ""
+"git apply: git-diff dolent - nom de fitxer nou inconsistent en la línia %d"
 
-#: apply.c:984
+#: apply.c:974
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
-msgstr "git apply: git-diff dolent - nom de fitxer antic inconsistent en la línia %d"
+msgstr ""
+"git apply: git-diff dolent - nom de fitxer antic inconsistent en la línia %d"
 
-#: apply.c:990
+#: apply.c:979
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: git-diff dolent - /dev/null esperat en la línia %d"
 
-#: apply.c:1488
+#: apply.c:1008
+#, fuzzy, c-format
+msgid "invalid mode on line %d: %s"
+msgstr "línia d'identitat no vàlida: %s"
+
+#: apply.c:1326
+#, c-format
+msgid "inconsistent header lines %d and %d"
+msgstr ""
+
+#: apply.c:1498
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recompte: línia inesperada: %.*s"
 
-#: apply.c:1557
+#: apply.c:1567
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s"
 
-#: apply.c:1577
+#: apply.c:1587
 #, c-format
 msgid ""
-"git diff header lacks filename information when removing %d leading pathname component (line %d)"
+"git diff header lacks filename information when removing %d leading pathname "
+"component (line %d)"
 msgid_plural ""
-"git diff header lacks filename information when removing %d leading pathname components (line %d)"
+"git diff header lacks filename information when removing %d leading pathname "
+"components (line %d)"
 msgstr[0] ""
-"a la capçalera de git diff li manca informació de nom de fitxer en eliminar %d component de nom "
-"de camí inicial (línia %d)"
+"a la capçalera de git diff li manca informació de nom de fitxer en eliminar "
+"%d component de nom de camí inicial (línia %d)"
 msgstr[1] ""
-"a la capçalera de git diff li manca informació de nom de fitxer en eliminar %d components de nom "
-"de camí inicial (línia %d)"
+"a la capçalera de git diff li manca informació de nom de fitxer en eliminar "
+"%d components de nom de camí inicial (línia %d)"
 
-#: apply.c:1589
+#: apply.c:1600
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
-msgstr "a la capçalera de git diff li manca informació de nom de fitxer (línia %d)"
+msgstr ""
+"a la capçalera de git diff li manca informació de nom de fitxer (línia %d)"
 
-#: apply.c:1759
+#: apply.c:1770
 msgid "new file depends on old contents"
 msgstr "el fitxer nou depèn dels continguts antics"
 
-#: apply.c:1761
+#: apply.c:1772
 msgid "deleted file still has contents"
 msgstr "el fitxer suprimit encara té continguts"
 
-#: apply.c:1795
+#: apply.c:1806
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "pedaç malmès a la línia %d"
 
-#: apply.c:1832
+#: apply.c:1843
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "el fitxer nou %s depèn dels continguts antics"
 
-#: apply.c:1834
+#: apply.c:1845
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "el fitxer suprimit %s encara té continguts"
 
-#: apply.c:1837
+#: apply.c:1848
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** advertència: el fitxer %s queda buit però no se suprimeix"
 
-#: apply.c:1984
+#: apply.c:1995
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "pedaç binari malmès a la línia %d: %.*s"
 
-#: apply.c:2021
+#: apply.c:2032
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "pedaç binari no reconegut a la línia %d"
 
-#: apply.c:2182
+#: apply.c:2193
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "pedaç amb només escombraries a la línia %d"
 
-#: apply.c:2265
+#: apply.c:2276
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
 
-#: apply.c:2269
+#: apply.c:2280
 #, c-format
 msgid "unable to open or read %s"
 msgstr "no s'ha pogut obrir o llegir %s"
 
-#: apply.c:2922
+#: apply.c:2933
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "inici de línia no vàlid: '%c'"
 
-#: apply.c:3041
+#: apply.c:3052
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "El tros #%d ha tingut èxit a %d (desplaçament d'%d línia)."
 msgstr[1] "El tros #%d ha tingut èxit a %d (desplaçament de %d línies)."
 
-#: apply.c:3053
+#: apply.c:3064
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "El context s'ha reduït a (%ld/%ld) per a aplicar el fragment a %d"
 
-#: apply.c:3059
+#: apply.c:3070
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -308,555 +323,575 @@ msgstr ""
 "tot cercant:\n"
 "%.*s"
 
-#: apply.c:3081
+#: apply.c:3092
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "manquen les dades de pedaç binari de '%s'"
 
-#: apply.c:3089
+#: apply.c:3100
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr "no es pot aplicar al revés un pedaç binari sense el tros revés a '%s'"
 
-#: apply.c:3135
+#: apply.c:3146
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
-msgstr "no es pot aplicar un pedaç binari a '%s' sense la línia d'índex completa"
+msgstr ""
+"no es pot aplicar un pedaç binari a '%s' sense la línia d'índex completa"
 
-#: apply.c:3145
+#: apply.c:3156
 #, c-format
-msgid "the patch applies to '%s' (%s), which does not match the current contents."
-msgstr "el pedaç s'aplica a '%s' (%s), el qual no coincideix amb els continguts actuals."
+msgid ""
+"the patch applies to '%s' (%s), which does not match the current contents."
+msgstr ""
+"el pedaç s'aplica a '%s' (%s), el qual no coincideix amb els continguts "
+"actuals."
 
-#: apply.c:3153
+#: apply.c:3164
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "el pedaç s'aplica a un '%s' buit però no és buit"
 
-#: apply.c:3171
+#: apply.c:3182
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "no es pot llegir la postimatge %s necessària per a '%s'"
 
-#: apply.c:3184
+#: apply.c:3195
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "el pedaç binari no s'aplica a '%s'"
 
-#: apply.c:3190
+#: apply.c:3201
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
-msgstr "el pedaç binari a '%s' crea un resultat incorrecte (esperant %s, %s rebut)"
+msgstr ""
+"el pedaç binari a '%s' crea un resultat incorrecte (esperant %s, %s rebut)"
 
-#: apply.c:3211
+#: apply.c:3222
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "el pedaç ha fallat: %s:%ld"
 
-#: apply.c:3333
+#: apply.c:3344
 #, c-format
 msgid "cannot checkout %s"
 msgstr "no es pot agafar %s"
 
-#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253
+#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
 #, c-format
 msgid "failed to read %s"
 msgstr "s'ha produït un error en llegir %s"
 
-#: apply.c:3389
+#: apply.c:3400
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "s'està llegint de '%s' més enllà d'un enllaç simbòlic"
 
-#: apply.c:3418 apply.c:3658
+#: apply.c:3429 apply.c:3669
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "el camí %s s'ha canviat de nom / s'ha suprimit"
 
-#: apply.c:3501 apply.c:3672
+#: apply.c:3512 apply.c:3683
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: no existeix en l'índex"
 
-#: apply.c:3510 apply.c:3680
+#: apply.c:3521 apply.c:3691
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: no coincideix amb l'índex"
 
-#: apply.c:3545
+#: apply.c:3556
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
-msgstr "al dipòsit li manca el blob necessari per a retrocedir a una fusió de 3 vies."
+msgstr ""
+"al dipòsit li manca el blob necessari per a retrocedir a una fusió de 3 vies."
 
-#: apply.c:3548
+#: apply.c:3559
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "S'està retrocedint a una fusió de 3 vies...\n"
 
-#: apply.c:3564 apply.c:3568
+#: apply.c:3575 apply.c:3579
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "no es poden llegir els continguts actuals de '%s'"
 
-#: apply.c:3580
+#: apply.c:3591
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "S'ha produït un error en retrocedir a una fusió de 3 vies...\n"
 
-#: apply.c:3594
+#: apply.c:3605
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "S'ha aplicat el pedaç a '%s' amb conflictes.\n"
 
-#: apply.c:3599
+#: apply.c:3610
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "S'ha aplicat el pedaç a '%s' netament.\n"
 
-#: apply.c:3625
+#: apply.c:3636
 msgid "removal patch leaves file contents"
 msgstr "el pedaç d'eliminació deixa els continguts dels fitxers"
 
-#: apply.c:3697
+#: apply.c:3708
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: tipus erroni"
 
-#: apply.c:3699
+#: apply.c:3710
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s és del tipus %o, s'esperava %o"
 
-#: apply.c:3850 apply.c:3852
+#: apply.c:3860 apply.c:3862
 #, c-format
 msgid "invalid path '%s'"
 msgstr "camí no vàlid: %s"
 
-#: apply.c:3908
+#: apply.c:3918
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: ja existeix en l'índex"
 
-#: apply.c:3911
+#: apply.c:3921
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: ja existeix en el directori de treball"
 
-#: apply.c:3931
+#: apply.c:3941
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o)"
 
-#: apply.c:3936
+#: apply.c:3946
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o) de %s"
 
-#: apply.c:3956
+#: apply.c:3966
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "el fitxer afectat '%s' és més enllà d'un enllaç simbòlic"
 
-#: apply.c:3960
+#: apply.c:3970
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: el pedaç no s'aplica"
 
-#: apply.c:3975
+#: apply.c:3985
 #, c-format
 msgid "Checking patch %s..."
 msgstr "S'està comprovant el pedaç %s..."
 
-#: apply.c:4066
+#: apply.c:4076
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "falta la informació sha1 o és inútil per al submòdul %s"
 
-#: apply.c:4073
+#: apply.c:4083
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "canvi de mode per a %s, el qual no està en el HEAD actual"
 
-#: apply.c:4076
+#: apply.c:4086
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "falta informació sha1 o és inútil (%s)."
 
-#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135
+#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "make_cache_entry ha fallat per al camí '%s'"
 
-#: apply.c:4085
+#: apply.c:4095
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "no s'ha pogut afegir %s a l'índex temporal"
 
-#: apply.c:4095
+#: apply.c:4105
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "no s'ha pogut escriure l'índex temporal a %s"
 
-#: apply.c:4233
+#: apply.c:4243
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "no s'ha pogut eliminar %s de l'índex"
 
-#: apply.c:4268
+#: apply.c:4278
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "pedaç malmès per al submòdul %s"
 
-#: apply.c:4274
+#: apply.c:4284
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "no s'ha pogut fer stat al fitxer novament creat '%s'"
 
-#: apply.c:4282
+#: apply.c:4292
 #, c-format
 msgid "unable to create backing store for newly created file %s"
-msgstr "no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat %s"
+msgstr ""
+"no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat "
+"%s"
 
-#: apply.c:4288 apply.c:4432
+#: apply.c:4298 apply.c:4442
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "no s'ha pogut afegir una entrada de cau per a %s"
 
-#: apply.c:4329
+#: apply.c:4339
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "no s'ha pogut escriure a '%s'"
 
-#: apply.c:4333
+#: apply.c:4343
 #, c-format
 msgid "closing file '%s'"
 msgstr "s'està tancant el fitxer '%s'"
 
-#: apply.c:4403
+#: apply.c:4413
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "no s'ha pogut escriure el fitxer '%s' mode %o"
 
-#: apply.c:4501
+#: apply.c:4511
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "El pedaç %s s'ha aplicat netament."
 
-#: apply.c:4509
+#: apply.c:4519
 msgid "internal error"
 msgstr "error intern"
 
-#: apply.c:4512
+#: apply.c:4522
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "S'està aplicant el pedaç %%s amb %d rebuig..."
 msgstr[1] "S'està aplicant el pedaç %%s amb %d rebutjos..."
 
-#: apply.c:4523
+#: apply.c:4533
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej"
 
-#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988
+#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
 #, c-format
 msgid "cannot open %s"
 msgstr "no es pot obrir %s"
 
-#: apply.c:4545
+#: apply.c:4555
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "El tros #%d s'ha aplicat netament."
 
-#: apply.c:4549
+#: apply.c:4559
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "S'ha rebutjat el tros #%d."
 
-#: apply.c:4659
+#: apply.c:4669
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "S'ha omès el pedaç '%s'."
 
-#: apply.c:4667
+#: apply.c:4677
 msgid "unrecognized input"
 msgstr "entrada no reconeguda"
 
-#: apply.c:4686
+#: apply.c:4696
 msgid "unable to read index file"
 msgstr "no es pot llegir el fitxer d'índex"
 
-#: apply.c:4823
+#: apply.c:4833
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "no es pot obrir el pedaç '%s': %s"
 
-#: apply.c:4850
+#: apply.c:4860
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "s'ha silenciat %d error d'espai en blanc"
 msgstr[1] "s'han silenciat %d errors d'espai en blanc"
 
-#: apply.c:4856 apply.c:4871
+#: apply.c:4866 apply.c:4881
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d línia afegeix errors d'espai en blanc."
 msgstr[1] "%d línies afegeixen errors d'espai en blanc."
 
-#: apply.c:4864
+#: apply.c:4874
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
-msgstr[0] "S'ha aplicat %d línia després d'arreglar els errors d'espai en blanc."
-msgstr[1] "S'han aplicat %d línies després d'arreglar els errors d'espai en blanc."
+msgstr[0] ""
+"S'ha aplicat %d línia després d'arreglar els errors d'espai en blanc."
+msgstr[1] ""
+"S'han aplicat %d línies després d'arreglar els errors d'espai en blanc."
 
-#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
+#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
 msgid "Unable to write new index file"
 msgstr "No s'ha pogut escriure un fitxer d'índex nou"
 
-#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279 builtin/clone.c:113
-#: builtin/fetch.c:98 builtin/pull.c:180 builtin/submodule--helper.c:304
-#: builtin/submodule--helper.c:629 builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161 git-add--interactive.perl:239
+#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
+#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
+#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
+#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
+#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: git-add--interactive.perl:197
 msgid "path"
 msgstr "camí"
 
-#: apply.c:4912
+#: apply.c:4922
 msgid "don't apply changes matching the given path"
 msgstr "no apliquis els canvis que coincideixin amb el camí donat"
 
-#: apply.c:4915
+#: apply.c:4925
 msgid "apply changes matching the given path"
 msgstr "aplica els canvis que coincideixin amb el camí donat"
 
-#: apply.c:4917 builtin/am.c:2285
+#: apply.c:4927 builtin/am.c:2266
 msgid "num"
 msgstr "número"
 
-#: apply.c:4918
+#: apply.c:4928
 msgid "remove <num> leading slashes from traditional diff paths"
-msgstr "elimina <nombre> barres obliqües inicials dels camins de diferència tradicionals"
+msgstr ""
+"elimina <nombre> barres obliqües inicials dels camins de diferència "
+"tradicionals"
 
-#: apply.c:4921
+#: apply.c:4931
 msgid "ignore additions made by the patch"
 msgstr "ignora afegiments fets pel pedaç"
 
-#: apply.c:4923
+#: apply.c:4933
 msgid "instead of applying the patch, output diffstat for the input"
-msgstr "en lloc d'aplicar el pedaç, emet les estadístiques de diferència de l'entrada"
+msgstr ""
+"en lloc d'aplicar el pedaç, emet les estadístiques de diferència de l'entrada"
 
-#: apply.c:4927
+#: apply.c:4937
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "mostra el nombre de línies afegides i suprimides en notació decimal"
 
-#: apply.c:4929
+#: apply.c:4939
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "en lloc d'aplicar el pedaç, emet un resum de l'entrada"
 
-#: apply.c:4931
+#: apply.c:4941
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "en lloc d'aplicar el pedaç, veges si el pedaç és aplicable"
 
-#: apply.c:4933
+#: apply.c:4943
 msgid "make sure the patch is applicable to the current index"
 msgstr "assegura que el pedaç sigui aplicable a l'índex actual"
 
-#: apply.c:4935
+#: apply.c:4945
 msgid "apply a patch without touching the working tree"
 msgstr "aplica un pedaç sense tocar l'arbre de treball"
 
-#: apply.c:4937
+#: apply.c:4947
 msgid "accept a patch that touches outside the working area"
 msgstr "accepta un pedaç que toqui fora de l'àrea de treball"
 
-#: apply.c:4939
+#: apply.c:4949
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)"
 
-#: apply.c:4941
+#: apply.c:4951
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "intenta una fusió de tres vies si el pedaç no s'aplica"
 
-#: apply.c:4943
+#: apply.c:4953
 msgid "build a temporary index based on embedded index information"
 msgstr "construeix un índex temporal basat en la informació d'índex incrustada"
 
-#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515
+#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
 msgid "paths are separated with NUL character"
 msgstr "els camins se separen amb el caràcter NUL"
 
-#: apply.c:4948
+#: apply.c:4958
 msgid "ensure at least <n> lines of context match"
 msgstr "assegura't que almenys <n> línies de context coincideixin"
 
-#: apply.c:4949 builtin/am.c:2264
+#: apply.c:4959 builtin/am.c:2245
 msgid "action"
 msgstr "acció"
 
-#: apply.c:4950
+#: apply.c:4960
 msgid "detect new or modified lines that have whitespace errors"
-msgstr "detecta les línies noves o modificades que tinguin errors d'espai en blanc"
+msgstr ""
+"detecta les línies noves o modificades que tinguin errors d'espai en blanc"
 
-#: apply.c:4953 apply.c:4956
+#: apply.c:4963 apply.c:4966
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignora els canvis d'espai en blanc en cercar context"
 
-#: apply.c:4959
+#: apply.c:4969
 msgid "apply the patch in reverse"
 msgstr "aplica el pedaç al revés"
 
-#: apply.c:4961
+#: apply.c:4971
 msgid "don't expect at least one line of context"
 msgstr "no esperis almenys una línia de context"
 
-#: apply.c:4963
+#: apply.c:4973
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents"
 
-#: apply.c:4965
+#: apply.c:4975
 msgid "allow overlapping hunks"
 msgstr "permet trossos encavalcants"
 
-#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19 builtin/commit.c:1337
-#: builtin/count-objects.c:94 builtin/fsck.c:651 builtin/log.c:1867 builtin/mv.c:122
-#: builtin/read-tree.c:134
+#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
+#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
+#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
 msgid "be verbose"
 msgstr "sigues detallat"
 
-#: apply.c:4968
+#: apply.c:4978
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "tolera una línia nova incorrectament detectada al final del fitxer"
 
-#: apply.c:4971
+#: apply.c:4981
 msgid "do not trust the line counts in the hunk headers"
 msgstr "no confiïs en els recomptes de línia en les capçaleres dels trossos"
 
-#: apply.c:4973 builtin/am.c:2273
+#: apply.c:4983 builtin/am.c:2254
 msgid "root"
 msgstr "arrel"
 
-#: apply.c:4974
+#: apply.c:4984
 msgid "prepend <root> to all filenames"
 msgstr "anteposa <arrel> a tots els noms de fitxer"
 
-#: archive.c:12
+#: archive.c:13
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<opcions>] <arbre> [<camí>...]"
 
-#: archive.c:13
+#: archive.c:14
 msgid "git archive --list"
 msgstr "git archive --list"
 
-#: archive.c:14
-msgid "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
-msgstr "git archive --remote <dipòsit> [--exec <ordre>] [<opcions>] <arbre> [<camí>...]"
-
 #: archive.c:15
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+msgstr ""
+"git archive --remote <dipòsit> [--exec <ordre>] [<opcions>] <arbre> "
+"[<camí>...]"
+
+#: archive.c:16
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list"
 
-#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
+#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "l'especificació de camí '%s' no ha coincidit amb cap fitxer"
 
-#: archive.c:417
+#: archive.c:418
 msgid "fmt"
 msgstr "format"
 
-#: archive.c:417
+#: archive.c:418
 msgid "archive format"
 msgstr "format d'arxiu"
 
-#: archive.c:418 builtin/log.c:1436
+#: archive.c:419 builtin/log.c:1446
 msgid "prefix"
 msgstr "prefix"
 
-#: archive.c:419
+#: archive.c:420
 msgid "prepend prefix to each pathname in the archive"
 msgstr "anteposa el prefix a cada nom de camí en l'arxiu"
 
-#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60
-#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061
-#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/read-tree.c:129 parse-options.h:153
+#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
+#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
+#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
+#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: parse-options.h:153
 msgid "file"
 msgstr "fitxer"
 
-#: archive.c:421 builtin/archive.c:89
+#: archive.c:422 builtin/archive.c:89
 msgid "write the archive to this file"
 msgstr "escriu l'arxiu a aquest fitxer"
 
-#: archive.c:423
+#: archive.c:424
 msgid "read .gitattributes in working directory"
 msgstr "llegeix .gitattributes en el directori de treball"
 
-#: archive.c:424
+#: archive.c:425
 msgid "report archived files on stderr"
 msgstr "informa de fitxers arxivats en stderr"
 
-#: archive.c:425
+#: archive.c:426
 msgid "store only"
 msgstr "només emmagatzema"
 
-#: archive.c:426
+#: archive.c:427
 msgid "compress faster"
 msgstr "comprimeix més ràpidament"
 
-#: archive.c:434
+#: archive.c:435
 msgid "compress better"
 msgstr "comprimeix millor"
 
-#: archive.c:437
+#: archive.c:438
 msgid "list supported archive formats"
 msgstr "llista els formats d'arxiu admesos"
 
-#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106
+#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
 #: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
 msgid "repo"
 msgstr "dipòsit"
 
-#: archive.c:440 builtin/archive.c:91
+#: archive.c:441 builtin/archive.c:91
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "recupera l'arxiu del dipòsit remot <dipòsit>"
 
-#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485
+#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
 msgid "command"
 msgstr "ordre"
 
-#: archive.c:442 builtin/archive.c:93
+#: archive.c:443 builtin/archive.c:93
 msgid "path to the remote git-upload-archive command"
 msgstr "camí a l'ordre git-upload-archive remota"
 
-#: archive.c:449
+#: archive.c:450
 msgid "Unexpected option --remote"
 msgstr "Opció inesperada --remote"
 
-#: archive.c:451
+#: archive.c:452
 msgid "Option --exec can only be used together with --remote"
 msgstr "L'opció --exec només es pot usar junt amb --remote"
 
-#: archive.c:453
+#: archive.c:454
 msgid "Unexpected option --output"
 msgstr "Opció inesperada --output"
 
-#: archive.c:475
+#: archive.c:476
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Format d'arxiu desconegut '%s'"
 
-#: archive.c:482
+#: archive.c:483
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Paràmetre no admès per al format '%s': -%d"
 
-#: attr.c:212
+#: attr.c:214
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s no és un nom d'atribut vàlid"
 
-#: attr.c:408
+#: attr.c:410
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -864,27 +899,22 @@ msgstr ""
 "Els patrons negatius s'ignoren en els atributs de git\n"
 "Useu '\\!' per exclamació capdavantera literal."
 
-#: bisect.c:444
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "No s'ha pogut obrir el fitxer '%s'"
-
-#: bisect.c:449
+#: bisect.c:447
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Comentari amb cometes errònies en el fitxer '%s': %s"
 
-#: bisect.c:657
+#: bisect.c:655
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "No podem bisecar més!\n"
 
-#: bisect.c:710
+#: bisect.c:708
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "No és un nom de comissió vàlid %s"
 
-#: bisect.c:734
+#: bisect.c:732
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -893,7 +923,7 @@ msgstr ""
 "La base de fusió %s és errònia.\n"
 "Això vol dir que el defecte s'ha arreglat entre %s i [%s].\n"
 
-#: bisect.c:739
+#: bisect.c:737
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -902,7 +932,7 @@ msgstr ""
 "La base de fusió %s és nova.\n"
 "La propietat s'ha canviat entre %s i [%s].\n"
 
-#: bisect.c:744
+#: bisect.c:742
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -911,7 +941,7 @@ msgstr ""
 "La base de fusió %s és %s.\n"
 "Això vol dir que la primera comissió '%s' és entre %s i [%s].\n"
 
-#: bisect.c:752
+#: bisect.c:750
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -922,7 +952,7 @@ msgstr ""
 "git bisect no pot funcionar correctament en aquest cas.\n"
 "Potser heu confós les revisions %s i %s?\n"
 
-#: bisect.c:765
+#: bisect.c:763
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -930,39 +960,40 @@ msgid ""
 "We continue anyway."
 msgstr ""
 "s'ha d'ometre la base de fusió entre %s i [%s].\n"
-"Llavors, no podem estar segurs de que la primera comissió %s sigui entre %s i %s.\n"
+"Llavors, no podem estar segurs de que la primera comissió %s sigui entre %s "
+"i %s.\n"
 "Continuem de totes maneres."
 
-#: bisect.c:800
+#: bisect.c:798
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Bisecant: s'ha de provar una base de fusió\n"
 
-#: bisect.c:851
+#: bisect.c:849
 #, c-format
 msgid "a %s revision is needed"
 msgstr "es necessita una revisió %s"
 
-#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255
+#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
 #, c-format
 msgid "could not create file '%s'"
 msgstr "no s'ha pogut crear el fitxer '%s'"
 
-#: bisect.c:919
+#: bisect.c:917
 #, c-format
 msgid "could not read file '%s'"
 msgstr "no s'ha pogut llegir el fitxer '%s'"
 
-#: bisect.c:949
+#: bisect.c:947
 msgid "reading bisect refs failed"
 msgstr "la lectura de les referències de bisecció ha fallat"
 
-#: bisect.c:969
+#: bisect.c:967
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s era ambdós %s i %s\n"
 
-#: bisect.c:977
+#: bisect.c:975
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -971,15 +1002,16 @@ msgstr ""
 "No s'ha trobat cap comissió comprovable.\n"
 "Potser heu començat amb paràmetres de camí dolents?\n"
 
-#: bisect.c:996
+#: bisect.c:994
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
 msgstr[0] "(aproximadament %d pas)"
 msgstr[1] "(aproximadament %d passos)"
 
-#. TRANSLATORS: the last %s will be replaced with
-#. "(roughly %d steps)" translation
+#. TRANSLATORS: the last %s will be replaced with "(roughly %d
+#. steps)" translation.
+#.
 #: bisect.c:1000
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
@@ -987,6 +1019,44 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "Bisecant: manca %d revisió a provar després d'aquesta %s\n"
 msgstr[1] "Bisecant: manquen %d revisions a provar després d'aquesta %s\n"
 
+#: blame.c:1757
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents i --reverse no funcionen bé juntes."
+
+#: blame.c:1768
+msgid "cannot use --contents with final commit object name"
+msgstr "no es pot usar --contents amb el nom d'objecte de la comissió final"
+
+#: blame.c:1788
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+"--reverse i --first-parent-together requereixen una última comissió "
+"especificada"
+
+#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
+#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
+#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
+#: builtin/shortlog.c:177
+msgid "revision walk setup failed"
+msgstr "la configuració del passeig per revisions ha fallat"
+
+#: blame.c:1815
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr ""
+"--reverse --first-parent junts requereixen un rang de la cadena de mares "
+"primeres"
+
+#: blame.c:1826
+#, c-format
+msgid "no such path %s in %s"
+msgstr "no hi ha tal camí %s en %s"
+
+#: blame.c:1837
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "no es pot llegir el blob %s per al camí %s"
+
 #: branch.c:53
 #, c-format
 msgid ""
@@ -1008,7 +1078,9 @@ msgstr "No s'està establint la branca %s com a la seva pròpia font."
 #: branch.c:93
 #, c-format
 msgid "Branch %s set up to track remote branch %s from %s by rebasing."
-msgstr "La branca %s està configurada per a seguir la branca remota %s de %s per rebasar."
+msgstr ""
+"La branca %s està configurada per a seguir la branca remota %s de %s fent "
+"«rebase»."
 
 #: branch.c:94
 #, c-format
@@ -1018,7 +1090,8 @@ msgstr "La branca %s està configurada per a seguir la branca remota %s de %s."
 #: branch.c:98
 #, c-format
 msgid "Branch %s set up to track local branch %s by rebasing."
-msgstr "La branca %s està configurada per a seguir la branca local %s per rebasar."
+msgstr ""
+"La branca %s està configurada per a seguir la branca local %s fent «rebase»."
 
 #: branch.c:99
 #, c-format
@@ -1028,7 +1101,9 @@ msgstr "La branca %s està configurada per a seguir la branca local %s."
 #: branch.c:104
 #, c-format
 msgid "Branch %s set up to track remote ref %s by rebasing."
-msgstr "La branca %s està configurada per a seguir la referència remota %s per rebasar."
+msgstr ""
+"La branca %s està configurada per a seguir la referència remota %s fent "
+"«rebase»."
 
 #: branch.c:105
 #, c-format
@@ -1038,7 +1113,9 @@ msgstr "La branca %s està configurada per a seguir la referència remota %s."
 #: branch.c:109
 #, c-format
 msgid "Branch %s set up to track local ref %s by rebasing."
-msgstr "La branca %s està configurada per a seguir la referència local %s per rebasar."
+msgstr ""
+"La branca %s està configurada per a seguir la referència local %s fent "
+"«rebase»."
 
 #: branch.c:110
 #, c-format
@@ -1071,7 +1148,9 @@ msgstr "No es pot actualitzar la branca actual a la força."
 #: branch.c:218
 #, c-format
 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr "No es pot configurar la informació de seguiment; el punt inicial '%s' no és una branca."
+msgstr ""
+"No es pot configurar la informació de seguiment; el punt inicial '%s' no és "
+"una branca."
 
 #: branch.c:220
 #, c-format
@@ -1119,7 +1198,7 @@ msgstr "No és un punt de ramificació vàlid: '%s'."
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' ja s'ha agafat a '%s'"
 
-#: branch.c:364
+#: branch.c:366
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "La HEAD de l'arbre de treball %s no està actualitzat"
@@ -1129,91 +1208,85 @@ msgstr "La HEAD de l'arbre de treball %s no està actualitzat"
 msgid "'%s' does not look like a v2 bundle file"
 msgstr "'%s' no sembla un fitxer de farcell v2"
 
-#: bundle.c:61
+#: bundle.c:62
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "capçalera no reconeguda: %s%s (%d)"
 
-#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777
+#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
 #, c-format
 msgid "could not open '%s'"
 msgstr "no s'ha pogut obrir '%s'"
 
-#: bundle.c:139
+#: bundle.c:140
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Al dipòsit li manquen aquestes comissions prerequisits:"
 
-#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321 builtin/blame.c:2811
-#: builtin/commit.c:1061 builtin/log.c:353 builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673
-#: builtin/log.c:1916 builtin/merge.c:359 builtin/shortlog.c:176
-msgid "revision walk setup failed"
-msgstr "la configuració del passeig per revisions ha fallat"
-
-#: bundle.c:185
+#: bundle.c:186
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "El farcell conté aquesta referència:"
 msgstr[1] "El farcell conté aquestes %d referències:"
 
-#: bundle.c:192
+#: bundle.c:193
 msgid "The bundle records a complete history."
 msgstr "El farcell registra una història completa."
 
-#: bundle.c:194
+#: bundle.c:195
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "El farcell requereix aquesta referència:"
 msgstr[1] "El farcell requereix aquestes %d referències:"
 
-#: bundle.c:253
+#: bundle.c:254
 msgid "Could not spawn pack-objects"
 msgstr "No s'ha pogut executar el pack-objects"
 
-#: bundle.c:264
+#: bundle.c:265
 msgid "pack-objects died"
 msgstr "El pack-objects s'ha mort"
 
-#: bundle.c:304
+#: bundle.c:307
 msgid "rev-list died"
 msgstr "El rev-list s'ha mort"
 
-#: bundle.c:353
+#: bundle.c:356
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "les opcions de la llista de revisions exclouen la referència '%s'"
 
-#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281
+#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "paràmetre no reconegut: %s"
 
-#: bundle.c:451
+#: bundle.c:454
 msgid "Refusing to create empty bundle."
 msgstr "S'està refusant crear un farcell buit."
 
-#: bundle.c:463
+#: bundle.c:466
 #, c-format
 msgid "cannot create '%s'"
 msgstr "no es pot crear '%s'"
 
-#: bundle.c:491
+#: bundle.c:494
 msgid "index-pack died"
 msgstr "L'index-pack s'ha mort"
 
-#: color.c:300
+#: color.c:301
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "valor de color no vàlid: %.*s"
 
-#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455 builtin/am.c:1489
-#: builtin/am.c:2126
+#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
+#: builtin/am.c:1469 builtin/am.c:2107
 #, c-format
 msgid "could not parse %s"
 msgstr "no s'ha pogut analitzar %s"
 
-#: commit.c:42
+#: commit.c:43
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s no és una comissió!"
@@ -1233,161 +1306,166 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "memòria esgotada"
 
-#: config.c:191
+#: config.c:186
 msgid "relative config include conditionals must come from files"
 msgstr ""
 
-#: config.c:711
+#: config.c:720
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "línia de configuració %d errònia en el blob %s"
 
-#: config.c:715
+#: config.c:724
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "línia de configuració %d errònia en el fitxer %s"
 
-#: config.c:719
+#: config.c:728
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "línia de configuració %d errònia en l'entrada estàndard"
 
-#: config.c:723
+#: config.c:732
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "línia de configuració %d errònia en el blob de submòdul %s"
 
-#: config.c:727
+#: config.c:736
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "línia de configuració %d errònia en la línia d'ordres %s"
 
-#: config.c:731
+#: config.c:740
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "línia de configuració %d errònia en %s"
 
-#: config.c:859
+#: config.c:868
 msgid "out of range"
 msgstr "fora de rang"
 
-#: config.c:859
+#: config.c:868
 msgid "invalid unit"
 msgstr "unitat no vàlida"
 
-#: config.c:865
+#: config.c:874
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "valor de configuració numèric erroni '%s' per '%s': %s"
 
-#: config.c:870
+#: config.c:879
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "valor de configuració numèric erroni '%s' per '%s' en el blob %s: %s"
 
-#: config.c:873
+#: config.c:882
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr "valor de configuració numèric '%s' erroni per '%s' en el fitxer %s: %s"
 
-#: config.c:876
+#: config.c:885
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
-msgstr "valor de configuració numèric '%s' erroni per '%s' en l'entrada estàndard: %s"
+msgstr ""
+"valor de configuració numèric '%s' erroni per '%s' en l'entrada estàndard: %s"
 
-#: config.c:879
+#: config.c:888
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
-msgstr "valor de configuració numèric '%s' erroni' per '%s' en el blob de submòdul %s: %s"
+msgstr ""
+"valor de configuració numèric '%s' erroni' per '%s' en el blob de submòdul "
+"%s: %s"
 
-#: config.c:882
+#: config.c:891
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
-msgstr "valor de configuració numèric '%s' erroni per '%s' en la línia d'ordres %s: %s"
+msgstr ""
+"valor de configuració numèric '%s' erroni per '%s' en la línia d'ordres %s: "
+"%s"
 
-#: config.c:885
+#: config.c:894
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "valor de configuració numèric dolent '%s' per '%s' en %s: %s"
 
-#: config.c:980
+#: config.c:989
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "s'ha produït un error en expandir el directori d'usuari en: '%s'"
 
-#: config.c:1075 config.c:1086
+#: config.c:1084 config.c:1095
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "nivell de compressió de zlib dolent %d"
 
-#: config.c:1203
+#: config.c:1212
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "mode de creació d'objecte no vàlid: %s"
 
-#: config.c:1359
+#: config.c:1368
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "nivell de compressió de paquet %d Erroni"
 
-#: config.c:1557
+#: config.c:1564
 msgid "unable to parse command-line config"
 msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres"
 
-#: config.c:1611
+#: config.c:1894
 msgid "unknown error occurred while reading the configuration files"
 msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració"
 
-#: config.c:1970
+#: config.c:2064
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "%s no vàlid: %s"
 
-#: config.c:1991
+#: config.c:2085
 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr ""
 
-#: config.c:2017
+#: config.c:2111
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 
-#: config.c:2028
+#: config.c:2122
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "no s'ha pogut analitzar '%s' de la configuració de la línia d'ordres"
 
-#: config.c:2030
+#: config.c:2124
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "variable de configuració '%s' errònia en el fitxer '%s' a la línia %d"
 
-#: config.c:2089
+#: config.c:2183
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s té múltiples valors"
 
-#: config.c:2423 config.c:2648
+#: config.c:2517 config.c:2745
 #, c-format
 msgid "fstat on %s failed"
 msgstr "ha fallat fstat a %s"
 
-#: config.c:2541
+#: config.c:2635
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "no s'ha pogut establir '%s' a '%s'"
 
-#: config.c:2543 builtin/remote.c:774
+#: config.c:2637 builtin/remote.c:775
 #, c-format
 msgid "could not unset '%s'"
 msgstr "no s'ha pogut desestablir '%s'"
 
-#: connect.c:49
+#: connect.c:50
 msgid "The remote end hung up upon initial contact"
 msgstr "El costat remot ha penjat en el moment de contacte inicial"
 
-#: connect.c:51
+#: connect.c:52
 msgid ""
 "Could not read from remote repository.\n"
 "\n"
@@ -1399,7 +1477,7 @@ msgstr ""
 "Si us plau, assegureu-vos que tingueu els permisos\n"
 "d'accés correctes i que el dipòsit existeixi."
 
-#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140
+#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
 msgid "Checking connectivity"
 msgstr "S'està comprovant la connectivitat"
 
@@ -1415,101 +1493,103 @@ msgstr "escriptura fallada al rev-list"
 msgid "failed to close rev-list's stdin"
 msgstr "s'ha produït un error en tancar l'stdin del rev-list"
 
-#: convert.c:201
+#: convert.c:205
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
 "The file will have its original line endings in your working directory."
 msgstr ""
 "LF reemplaçarà CRLF en %s.\n"
-"El fitxer tindrà els seus terminadors de línia originals en el vostre directori de treball."
+"El fitxer tindrà els seus terminadors de línia originals en el vostre "
+"directori de treball."
 
-#: convert.c:205
+#: convert.c:209
 #, c-format
 msgid "CRLF would be replaced by LF in %s."
 msgstr "LF reemplaçaria CRLF en %s."
 
-#: convert.c:211
+#: convert.c:215
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
 "The file will have its original line endings in your working directory."
 msgstr ""
 "CRLF reemplaçarà LF en %s.\n"
-"El fitxer tindrà els seus terminadors de línia originals en el vostre directori de treball."
+"El fitxer tindrà els seus terminadors de línia originals en el vostre "
+"directori de treball."
 
-#: convert.c:215
+#: convert.c:219
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr "CRLF reemplaçaria LF en %s"
 
-#: date.c:97
+#: date.c:116
 msgid "in the future"
 msgstr "en el futur"
 
-#: date.c:103
+#: date.c:122
 #, c-format
-msgid "%lu second ago"
-msgid_plural "%lu seconds ago"
-msgstr[0] "fa %lu segon"
-msgstr[1] "fa %lu segons"
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "fa %<PRIuMAX> segon"
+msgstr[1] "fa %<PRIuMAX> segons"
 
-#: date.c:110
+#: date.c:129
 #, c-format
-msgid "%lu minute ago"
-msgid_plural "%lu minutes ago"
-msgstr[0] "fa %lu minut"
-msgstr[1] "fa %lu minuts"
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "fa %<PRIuMAX> minut"
+msgstr[1] "fa %<PRIuMAX> minuts"
 
-#: date.c:117
+#: date.c:136
 #, c-format
-msgid "%lu hour ago"
-msgid_plural "%lu hours ago"
-msgstr[0] "fa %lu hora"
-msgstr[1] "fa %lu hores"
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "fa %<PRIuMAX> hora"
+msgstr[1] "fa %<PRIuMAX> hores"
 
-#: date.c:124
+#: date.c:143
 #, c-format
-msgid "%lu day ago"
-msgid_plural "%lu days ago"
-msgstr[0] "fa %lu dia"
-msgstr[1] "fa %lu dies"
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "fa %<PRIuMAX> dia"
+msgstr[1] "fa %<PRIuMAX> dies"
 
-#: date.c:130
+#: date.c:149
 #, c-format
-msgid "%lu week ago"
-msgid_plural "%lu weeks ago"
-msgstr[0] "fa %lu setmana"
-msgstr[1] "fa %lu setmanes"
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "fa %<PRIuMAX> setmana"
+msgstr[1] "fa %<PRIuMAX> setmanes"
 
-#: date.c:137
+#: date.c:156
 #, c-format
-msgid "%lu month ago"
-msgid_plural "%lu months ago"
-msgstr[0] "fa %lu mes"
-msgstr[1] "fa %lu mesos"
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "fa %<PRIuMAX> mes"
+msgstr[1] "fa %<PRIuMAX> mesos"
 
-#: date.c:148
+#: date.c:167
 #, c-format
-msgid "%lu year"
-msgid_plural "%lu years"
-msgstr[0] "%lu any"
-msgstr[1] "%lu anys"
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> any"
+msgstr[1] "%<PRIuMAX> anys"
 
 #. TRANSLATORS: "%s" is "<n> years"
-#: date.c:151
+#: date.c:170
 #, c-format
-msgid "%s, %lu month ago"
-msgid_plural "%s, %lu months ago"
-msgstr[0] "fa %s i %lu mes"
-msgstr[1] "fa %s i %lu mesos"
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "fa %s i %<PRIuMAX> mes"
+msgstr[1] "fa %s i %<PRIuMAX> mesos"
 
-#: date.c:156 date.c:161
+#: date.c:175 date.c:180
 #, c-format
-msgid "%lu year ago"
-msgid_plural "%lu years ago"
-msgstr[0] "fa %lu any"
-msgstr[1] "fa %lu anys"
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "fa %<PRIuMAX> any"
+msgstr[1] "fa %<PRIuMAX> anys"
 
 #: diffcore-order.c:24
 #, c-format
@@ -1520,27 +1600,30 @@ msgstr "s'ha produït un error en llegir el fitxer d'ordres '%s'"
 msgid "Performing inexact rename detection"
 msgstr "S'està realitzant una detecció inexacta de canvis de nom"
 
-#: diff.c:62
+#: diff.c:63
 #, c-format
 msgid "option '%s' requires a value"
 msgstr "l'opció '%s' requereix un valor"
 
-#: diff.c:124
+#: diff.c:125
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
-msgstr "  S'ha produït un error en analitzar el percentatge limitant de dirstat '%s'\n"
+msgstr ""
+"  S'ha produït un error en analitzar el percentatge limitant de dirstat "
+"'%s'\n"
 
-#: diff.c:129
+#: diff.c:130
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Paràmetre de dirstat desconegut '%s'\n"
 
-#: diff.c:281
+#: diff.c:282
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
-msgstr "Valor desconegut de la variable de configuració de 'diff.submodule': '%s'"
+msgstr ""
+"Valor desconegut de la variable de configuració de 'diff.submodule': '%s'"
 
-#: diff.c:344
+#: diff.c:342
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -1549,20 +1632,20 @@ msgstr ""
 "S'han trobat errors en la variable de configuració 'diff.dirstat':\n"
 "%s"
 
-#: diff.c:3102
+#: diff.c:3101
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "el diff external s'ha mort, s'està aturant a %s"
 
-#: diff.c:3428
+#: diff.c:3427
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only, --name-status, --check i -s són mutualment exclusius"
 
-#: diff.c:3518
+#: diff.c:3517
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow requereix exactament una especificació de camí"
 
-#: diff.c:3681
+#: diff.c:3680
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -1571,276 +1654,283 @@ msgstr ""
 "S'ha produït un error en analitzar el paràmetre d'opció de --dirstat/-X:\n"
 "%s"
 
-#: diff.c:3695
+#: diff.c:3694
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
-msgstr "S'ha produït un error en analitzar el paràmetre d'opció de --submodule: '%s'"
+msgstr ""
+"S'ha produït un error en analitzar el paràmetre d'opció de --submodule: '%s'"
 
-#: diff.c:4719
+#: diff.c:4716
 msgid "inexact rename detection was skipped due to too many files."
 msgstr "s'ha omès la detecció de canvi de nom a causa de massa fitxers."
 
-#: diff.c:4722
+#: diff.c:4719
 msgid "only found copies from modified paths due to too many files."
-msgstr "només s'han trobat còpies des de camins modificats a causa de massa fitxers."
+msgstr ""
+"només s'han trobat còpies des de camins modificats a causa de massa fitxers."
 
-#: diff.c:4725
+#: diff.c:4722
 #, c-format
-msgid "you may want to set your %s variable to at least %d and retry the command."
-msgstr "potser voleu establir la vostra variable %s a almenys %d i tornar a intentar l'ordre."
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+"potser voleu establir la vostra variable %s a almenys %d i tornar a intentar "
+"l'ordre."
 
-#: dir.c:1899
+#: dir.c:1948
 msgid "failed to get kernel name and information"
 msgstr "s'ha produït un error en obtenir el nombre i la informació del nucli"
 
-#: dir.c:2018
+#: dir.c:2067
 msgid "Untracked cache is disabled on this system or location."
-msgstr "La memòria cau no seguida està inhabilitada en aquest sistema o ubicació."
+msgstr ""
+"La memòria cau no seguida està inhabilitada en aquest sistema o ubicació."
 
-#: dir.c:2776 dir.c:2781
+#: dir.c:2846 dir.c:2851
 #, c-format
 msgid "could not create directories for %s"
 msgstr "no s'ha pogut crear directoris per %s"
 
-#: dir.c:2806
+#: dir.c:2876
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "no s'ha pogut migrar el directori de '%s' a '%s'"
 
-#: entry.c:280
+#: entry.c:281
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "no s'ha pogut fer «stat» sobre el fitxer '%s'"
 
-#: fetch-pack.c:249
+#: fetch-pack.c:251
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: llista superficial esperada"
 
-#: fetch-pack.c:261
+#: fetch-pack.c:263
 msgid "git fetch-pack: expected ACK/NAK, got EOF"
 msgstr "git fetch-pack: ACK/NAK esperat, EOF rebut"
 
-#: fetch-pack.c:280 builtin/archive.c:63
+#: fetch-pack.c:282 builtin/archive.c:63
 #, c-format
 msgid "remote error: %s"
 msgstr "error remot: %s"
 
-#: fetch-pack.c:281
+#: fetch-pack.c:283
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: ACK/NAK esperat, '%s' rebut"
 
-#: fetch-pack.c:333
+#: fetch-pack.c:335
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc requereix multi_ack_detailed"
 
-#: fetch-pack.c:419
+#: fetch-pack.c:421
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "línia de shallow no vàlida: %s"
 
-#: fetch-pack.c:425
+#: fetch-pack.c:427
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "línia d'unshallow no vàlida: %s"
 
-#: fetch-pack.c:427
+#: fetch-pack.c:429
 #, c-format
 msgid "object not found: %s"
 msgstr "objecte no trobat: %s"
 
-#: fetch-pack.c:430
+#: fetch-pack.c:432
 #, c-format
 msgid "error in object: %s"
 msgstr "error en objecte: %s"
 
-#: fetch-pack.c:432
+#: fetch-pack.c:434
 #, c-format
 msgid "no shallow found: %s"
 msgstr "no s'ha trobat cap shallow: %s"
 
-#: fetch-pack.c:435
+#: fetch-pack.c:437
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
 
-#: fetch-pack.c:474
+#: fetch-pack.c:476
 #, c-format
 msgid "got %s %d %s"
 msgstr "%s %d %s rebut"
 
-#: fetch-pack.c:488
+#: fetch-pack.c:490
 #, c-format
 msgid "invalid commit %s"
 msgstr "comissió no vàlida %s"
 
-#: fetch-pack.c:521
+#: fetch-pack.c:523
 msgid "giving up"
 msgstr "s'està rendint"
 
-#: fetch-pack.c:531 progress.c:235
+#: fetch-pack.c:533 progress.c:237
 msgid "done"
 msgstr "fet"
 
-#: fetch-pack.c:543
+#: fetch-pack.c:545
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "s'ha rebut %s (%d) %s"
 
-#: fetch-pack.c:589
+#: fetch-pack.c:591
 #, c-format
 msgid "Marking %s as complete"
 msgstr "S'està marcant %s com a complet"
 
-#: fetch-pack.c:737
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr "ja es té %s (%s)"
 
-#: fetch-pack.c:775
+#: fetch-pack.c:813
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr "fetch-pack: no s'ha pogut bifurcar del demultiplexor de banda lateral"
+msgstr "fetch-pack: no s'ha pogut bifurcar del desmultiplexor de banda lateral"
 
-#: fetch-pack.c:783
+#: fetch-pack.c:821
 msgid "protocol error: bad pack header"
 msgstr "error de protocol: capçalera de paquet errònia"
 
-#: fetch-pack.c:839
+#: fetch-pack.c:877
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: no es pot bifurcar de %s"
 
-#: fetch-pack.c:855
+#: fetch-pack.c:893
 #, c-format
 msgid "%s failed"
 msgstr "%s ha fallat"
 
-#: fetch-pack.c:857
+#: fetch-pack.c:895
 msgid "error in sideband demultiplexer"
-msgstr "error en demultiplexor de banda lateral"
+msgstr "error en desmultiplexor de banda lateral"
 
-#: fetch-pack.c:884
+#: fetch-pack.c:922
 msgid "Server does not support shallow clients"
 msgstr "El servidor no permet clients superficials"
 
-#: fetch-pack.c:888
+#: fetch-pack.c:926
 msgid "Server supports multi_ack_detailed"
 msgstr "El servidor accepta multi_ack_detailed"
 
-#: fetch-pack.c:891
+#: fetch-pack.c:929
 msgid "Server supports no-done"
 msgstr "El servidor accepta no-done"
 
-#: fetch-pack.c:897
+#: fetch-pack.c:935
 msgid "Server supports multi_ack"
 msgstr "El servidor accepta multi_ack"
 
-#: fetch-pack.c:901
+#: fetch-pack.c:939
 msgid "Server supports side-band-64k"
 msgstr "El servidor accepta side-band-64k"
 
-#: fetch-pack.c:905
+#: fetch-pack.c:943
 msgid "Server supports side-band"
 msgstr "El servidor accepta banda lateral"
 
-#: fetch-pack.c:909
+#: fetch-pack.c:947
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "El servidor accepta allow-tip-sha1-in-want"
 
-#: fetch-pack.c:913
+#: fetch-pack.c:951
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "El servidor accepta allow-reachable-sha1-in-want"
 
-#: fetch-pack.c:923
+#: fetch-pack.c:961
 msgid "Server supports ofs-delta"
 msgstr "El servidor accepta ofs-delta"
 
-#: fetch-pack.c:930
+#: fetch-pack.c:968
 #, c-format
 msgid "Server version is %.*s"
 msgstr "La versió del servidor és %.*s"
 
-#: fetch-pack.c:936
+#: fetch-pack.c:974
 msgid "Server does not support --shallow-since"
 msgstr "El servidor no admet --shallow-since"
 
-#: fetch-pack.c:940
+#: fetch-pack.c:978
 msgid "Server does not support --shallow-exclude"
 msgstr "El servidor no admet --shallow-exclude"
 
-#: fetch-pack.c:942
+#: fetch-pack.c:980
 msgid "Server does not support --deepen"
 msgstr "El servidor no admet --deepen"
 
-#: fetch-pack.c:953
+#: fetch-pack.c:991
 msgid "no common commits"
 msgstr "cap comissió en comú"
 
-#: fetch-pack.c:965
+#: fetch-pack.c:1003
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: l'obtenció ha fallat."
 
-#: fetch-pack.c:1127
+#: fetch-pack.c:1165
 msgid "no matching remote head"
 msgstr "no hi ha cap HEAD remot coincident"
 
-#: fetch-pack.c:1149
+#: fetch-pack.c:1187
 #, c-format
 msgid "no such remote ref %s"
 msgstr "no existeix la referència remota %s"
 
-#: fetch-pack.c:1152
+#: fetch-pack.c:1190
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "El servidor no permet sol·licitar objectes no anunciats %s"
 
-#: gpg-interface.c:185
+#: gpg-interface.c:181
 msgid "gpg failed to sign the data"
 msgstr "gpg ha fallat en signar les dades"
 
-#: gpg-interface.c:215
+#: gpg-interface.c:211
 msgid "could not create temporary file"
 msgstr "no s'ha pogut crear el fitxer temporal"
 
-#: gpg-interface.c:217
+#: gpg-interface.c:213
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "s'ha produït un error en escriure la signatura separada a '%s'"
 
-#: graph.c:96
+#: graph.c:97
 #, c-format
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "ignora el color invàlid '%.*s' en log.graphColors"
 
-#: grep.c:1796
+#: grep.c:1981
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s': no s'ha pogut llegir %s"
 
-#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133
+#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "s'ha produït un error en fer stat a '%s'"
 
-#: grep.c:1824
+#: grep.c:2009
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s': lectura curta"
 
-#: help.c:218
+#: help.c:179
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "ordres de git disponibles en '%s'"
 
-#: help.c:225
+#: help.c:186
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH"
 
-#: help.c:256
+#: help.c:217
 msgid "These are common Git commands used in various situations:"
-msgstr "Aquestes són ordres del Git habitualment usades en diverses situacions:"
+msgstr ""
+"Aquestes són ordres del Git habitualment usades en diverses situacions:"
 
-#: help.c:321
+#: help.c:281
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -1849,30 +1939,53 @@ msgstr ""
 "'%s' sembla una ordre de git, però no hem pogut\n"
 "executar-la. Pot ser que git-%s estigui malmès?"
 
-#: help.c:376
+#: help.c:336
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "Ai. El vostre sistema no informa de cap ordre de Git."
 
-#: help.c:398
-#, c-format
-msgid ""
-"WARNING: You called a Git command named '%s', which does not exist.\n"
-"Continuing under the assumption that you meant '%s'"
+#: help.c:358
+#, fuzzy, c-format
+msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr ""
-"ADVERTÈNCIA: Heu invocat una ordre de Git amb nom '%s', la qual no existeix.\n"
+"ADVERTÈNCIA: Heu invocat una ordre de Git amb nom '%s', la qual no "
+"existeix.\n"
 "S'està continuant sota l'assumpció que volíeu dir '%s'"
 
-#: help.c:403
+#: help.c:363
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr ""
+
+#: help.c:368
 #, c-format
-msgid "in %0.1f seconds automatically..."
-msgstr "en %0.1f segons automàticament..."
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr ""
 
-#: help.c:410
+#: help.c:376
 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr "git: '%s' no és una ordre de git. Vegeu 'git --help'."
 
-#: help.c:414 help.c:480
+#: help.c:380
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+msgstr[1] ""
+
+#: help.c:395
+msgid "git version [<options>]"
+msgstr "git version [<opcions>]"
+
+#: help.c:456
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
+
+#: help.c:460
 msgid ""
 "\n"
 "Did you mean this?"
@@ -1886,12 +1999,7 @@ msgstr[1] ""
 "\n"
 "Volíeu dir un d'aquests?"
 
-#: help.c:476
-#, c-format
-msgid "%s: %s - %s"
-msgstr "%s: %s - %s"
-
-#: ident.c:343
+#: ident.c:342
 msgid ""
 "\n"
 "*** Please tell me who you are.\n"
@@ -1916,35 +2024,40 @@ msgstr ""
 "per a establir la identitat predeterminada del vostre compte.\n"
 "Ometeu --global per a establir la identitat només en aquest dipòsit.\n"
 
-#: ident.c:367
+#: ident.c:366
 msgid "no email was given and auto-detection is disabled"
-msgstr "no s'ha proporcionat cap adreça electrònica i la detecció automàtica està inhabilitada"
+msgstr ""
+"no s'ha proporcionat cap adreça electrònica i la detecció automàtica està "
+"inhabilitada"
 
-#: ident.c:372
+#: ident.c:371
 #, c-format
 msgid "unable to auto-detect email address (got '%s')"
-msgstr "no s'ha pogut detectar automàticament una adreça de correu vàlida ('%s' rebut)"
+msgstr ""
+"no s'ha pogut detectar automàticament una adreça de correu vàlida ('%s' "
+"rebut)"
 
-#: ident.c:382
+#: ident.c:381
 msgid "no name was given and auto-detection is disabled"
-msgstr "no s'ha proporcionat cap nom i la detecció automàtica està inhabilitada"
+msgstr ""
+"no s'ha proporcionat cap nom i la detecció automàtica està inhabilitada"
 
-#: ident.c:388
+#: ident.c:387
 #, c-format
 msgid "unable to auto-detect name (got '%s')"
 msgstr "no s'ha pogut detectar automàticament el nom ('%s' rebut)"
 
-#: ident.c:396
+#: ident.c:395
 #, c-format
 msgid "empty ident name (for <%s>) not allowed"
 msgstr ""
 
-#: ident.c:402
+#: ident.c:401
 #, c-format
 msgid "name consists only of disallowed characters: %s"
 msgstr ""
 
-#: ident.c:417 builtin/commit.c:611
+#: ident.c:416 builtin/commit.c:612
 #, c-format
 msgid "invalid date format: %s"
 msgstr "format de data no vàlid: %s"
@@ -1978,256 +2091,268 @@ msgstr "No s'ha pogut crear '%s.lock': %s"
 msgid "failed to read the cache"
 msgstr "s'ha produït un error en llegir la memòria cau"
 
-#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393 builtin/checkout.c:607
-#: builtin/clone.c:749
+#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
+#: builtin/checkout.c:591 builtin/clone.c:753
 msgid "unable to write new index file"
 msgstr "no s'ha pogut escriure un fitxer d'índex nou"
 
-#: merge-recursive.c:209
+#: merge-recursive.c:210
 msgid "(bad commit)\n"
 msgstr "(comissió errònia)\n"
 
-#: merge-recursive.c:231 merge-recursive.c:239
+#: merge-recursive.c:232 merge-recursive.c:240
 #, c-format
 msgid "addinfo_cache failed for path '%s'"
 msgstr "addinfo_cache ha fallat per al camí '%s'"
 
-#: merge-recursive.c:303
+#: merge-recursive.c:304
 msgid "error building trees"
 msgstr "error en construir arbres"
 
-#: merge-recursive.c:727
+#: merge-recursive.c:728
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "s'ha produït un error en crear el camí '%s'%s"
 
-#: merge-recursive.c:738
+#: merge-recursive.c:739
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "S'està eliminant %s per a fer espai per al subdirectori\n"
 
-#: merge-recursive.c:752 merge-recursive.c:771
+#: merge-recursive.c:753 merge-recursive.c:772
 msgid ": perhaps a D/F conflict?"
 msgstr ": potser un conflicte D/F?"
 
-#: merge-recursive.c:761
+#: merge-recursive.c:762
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "s'està refusant perdre el fitxer no seguit a '%s'"
 
-#: merge-recursive.c:803 builtin/cat-file.c:34
+#: merge-recursive.c:804 builtin/cat-file.c:36
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "no es pot llegir l'objecte %s '%s'"
 
-#: merge-recursive.c:805
+#: merge-recursive.c:806
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "blob esperat per a %s '%s'"
 
-#: merge-recursive.c:829
+#: merge-recursive.c:830
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "s'ha produït un error en obrir '%s': %s"
 
-#: merge-recursive.c:840
+#: merge-recursive.c:841
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "s'ha produït un error en fer l'enllaç simbòlic '%s': %s"
 
-#: merge-recursive.c:845
+#: merge-recursive.c:846
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "no se sap què fer amb %06o %s '%s'"
 
-#: merge-recursive.c:985
+#: merge-recursive.c:986
 msgid "Failed to execute internal merge"
 msgstr "S'ha produït un error en executar la fusió interna"
 
-#: merge-recursive.c:989
+#: merge-recursive.c:990
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "No s'ha pogut afegir %s a la base de dades"
 
-#: merge-recursive.c:1092
+#: merge-recursive.c:1093
 #, c-format
-msgid "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left in tree."
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
 msgstr ""
-"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s s'ha deixat en "
-"l'arbre."
+"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
+"s'ha deixat en l'arbre."
 
-#: merge-recursive.c:1097
+#: merge-recursive.c:1098
 #, c-format
-msgid "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s left in tree."
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
 msgstr ""
-"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s de %s s'ha deixat en "
-"l'arbre."
+"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s "
+"de %s s'ha deixat en l'arbre."
 
-#: merge-recursive.c:1104
+#: merge-recursive.c:1105
 #, c-format
-msgid "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left in tree at %s."
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
 msgstr ""
-"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s s'ha deixat en "
-"l'arbre a %s."
+"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
+"s'ha deixat en l'arbre a %s."
 
-#: merge-recursive.c:1109
+#: merge-recursive.c:1110
 #, c-format
 msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s left in tree at %s."
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree at %s."
 msgstr ""
-"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s de %s s'ha deixat en "
-"l'arbre a %s."
+"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s "
+"de %s s'ha deixat en l'arbre a %s."
 
-#: merge-recursive.c:1143
+#: merge-recursive.c:1144
 msgid "rename"
 msgstr "canvi de nom"
 
-#: merge-recursive.c:1143
+#: merge-recursive.c:1144
 msgid "renamed"
 msgstr "canviat de nom"
 
-#: merge-recursive.c:1200
+#: merge-recursive.c:1201
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s és un directori en %s; s'està afegint com a %s en lloc d'això"
 
-#: merge-recursive.c:1225
+#: merge-recursive.c:1226
 #, c-format
 msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s\"->\"%s\" in \"%s"
-"\"%s"
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
 msgstr ""
-"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom \"%s\"->\"%s\" en la branca \"%s\" canvi de "
-"nom \"%s\"->\"%s\" en \"%s\"%s"
+"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom \"%s\"->\"%s\" en la "
+"branca \"%s\" canvi de nom \"%s\"->\"%s\" en \"%s\"%s"
 
-#: merge-recursive.c:1230
+#: merge-recursive.c:1231
 msgid " (left unresolved)"
 msgstr " (deixat sense resolució)"
 
-#: merge-recursive.c:1292
+#: merge-recursive.c:1293
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
-"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de nom %s->%s en %s"
+"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de "
+"nom %s->%s en %s"
 
-#: merge-recursive.c:1325
+#: merge-recursive.c:1326
 #, c-format
 msgid "Renaming %s to %s and %s to %s instead"
 msgstr "S'està canviant el nom de %s a %s i %s a %s en lloc d'això"
 
-#: merge-recursive.c:1528
+#: merge-recursive.c:1529
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
-msgstr "CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s en %s. %s afegit en %s"
+msgstr ""
+"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s en %s. %s afegit en "
+"%s"
 
-#: merge-recursive.c:1543
+#: merge-recursive.c:1544
 #, c-format
 msgid "Adding merged %s"
 msgstr "S'està afegint %s fusionat"
 
-#: merge-recursive.c:1550 merge-recursive.c:1780
+#: merge-recursive.c:1551 merge-recursive.c:1781
 #, c-format
 msgid "Adding as %s instead"
 msgstr "S'està afegint com a %s en lloc d'això"
 
-#: merge-recursive.c:1607
+#: merge-recursive.c:1608
 #, c-format
 msgid "cannot read object %s"
 msgstr "no es pot llegir l'objecte %s"
 
-#: merge-recursive.c:1610
+#: merge-recursive.c:1611
 #, c-format
 msgid "object %s is not a blob"
 msgstr "l'objecte %s no és un blob"
 
-#: merge-recursive.c:1679
+#: merge-recursive.c:1680
 msgid "modify"
 msgstr "modificació"
 
-#: merge-recursive.c:1679
+#: merge-recursive.c:1680
 msgid "modified"
 msgstr "modificat"
 
-#: merge-recursive.c:1689
+#: merge-recursive.c:1690
 msgid "content"
 msgstr "contingut"
 
-#: merge-recursive.c:1696
+#: merge-recursive.c:1697
 msgid "add/add"
 msgstr "afegiment/afegiment"
 
-#: merge-recursive.c:1732
+#: merge-recursive.c:1733
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "S'ha omès %s (el fusionat és igual a l'existent)"
 
-#: merge-recursive.c:1746
+#: merge-recursive.c:1747
 #, c-format
 msgid "Auto-merging %s"
 msgstr "S'està autofusionant %s"
 
-#: merge-recursive.c:1750 git-submodule.sh:944
+#: merge-recursive.c:1751 git-submodule.sh:945
 msgid "submodule"
 msgstr "submòdul"
 
-#: merge-recursive.c:1751
+#: merge-recursive.c:1752
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
 
-#: merge-recursive.c:1845
+#: merge-recursive.c:1846
 #, c-format
 msgid "Removing %s"
 msgstr "S'està eliminant %s"
 
-#: merge-recursive.c:1871
+#: merge-recursive.c:1872
 msgid "file/directory"
 msgstr "fitxer/directori"
 
-#: merge-recursive.c:1877
+#: merge-recursive.c:1878
 msgid "directory/file"
 msgstr "directori/fitxer"
 
-#: merge-recursive.c:1883
+#: merge-recursive.c:1884
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
-msgstr "CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a %s"
+msgstr ""
+"CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a "
+"%s"
 
-#: merge-recursive.c:1892
+#: merge-recursive.c:1893
 #, c-format
 msgid "Adding %s"
 msgstr "S'està afegint %s"
 
-#: merge-recursive.c:1929
+#: merge-recursive.c:1930
 msgid "Already up-to-date!"
 msgstr "Ja està al dia!"
 
-#: merge-recursive.c:1938
+#: merge-recursive.c:1939
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "la fusió dels arbres %s i %s ha fallat"
 
-#: merge-recursive.c:2021
+#: merge-recursive.c:2022
 msgid "Merging:"
 msgstr "Fusionant:"
 
-#: merge-recursive.c:2034
+#: merge-recursive.c:2035
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "s'ha trobat %u avantpassat en comú:"
 msgstr[1] "s'han trobat %u avantpassats en comú:"
 
-#: merge-recursive.c:2073
+#: merge-recursive.c:2074
 msgid "merge returned no commit"
 msgstr "la fusió no ha retornat cap comissió"
 
-#: merge-recursive.c:2136
+#: merge-recursive.c:2137
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "No s'ha pogut analitzar l'objecte '%s'"
 
-#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792
+#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
 msgid "Unable to write index."
 msgstr "No s'ha pogut escriure l'índex."
 
@@ -2235,35 +2360,37 @@ msgstr "No s'ha pogut escriure l'índex."
 #, c-format
 msgid ""
 "You have not concluded your previous notes merge (%s exists).\n"
-"Please, use 'git notes merge --commit' or 'git notes merge --abort' to commit/abort the previous "
-"merge before you start a new notes merge."
+"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
+"commit/abort the previous merge before you start a new notes merge."
 msgstr ""
 "No heu acabat la vostra fusió de notes prèvia (%s existeix).\n"
-"Si us plau, useu 'git notes merge --commit' o 'git notes merge --abort' per a cometre/avortar la "
-"fusió prèvia abans de començar una fusió de notes nova."
+"Si us plau, useu 'git notes merge --commit' o 'git notes merge --abort' per "
+"a cometre/avortar la fusió prèvia abans de començar una fusió de notes nova."
 
 #: notes-merge.c:280
 #, c-format
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr "No heu conclòs la vostra fusió de notes (%s existeix)."
 
-#: notes-utils.c:41
+#: notes-utils.c:42
 msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr "No es pot cometre un arbre de notes no inicialitzat / no referenciat"
 
-#: notes-utils.c:100
+#: notes-utils.c:101
 #, c-format
 msgid "Bad notes.rewriteMode value: '%s'"
 msgstr "Valor de notes.rewriteMode erroni: '%s'"
 
-#: notes-utils.c:110
+#: notes-utils.c:111
 #, c-format
 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr "S'està refusant reescriure les notes en %s (fora de refs/notes/)"
 
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: notes-utils.c:137
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#: notes-utils.c:141
 #, c-format
 msgid "Bad %s value: '%s'"
 msgstr "Valor erroni de %s: '%s'"
@@ -2273,28 +2400,29 @@ msgstr "Valor erroni de %s: '%s'"
 msgid "unable to parse object: %s"
 msgstr "no s'ha pogut analitzar l'objecte: %s"
 
-#: parse-options.c:572
+#: parse-options.c:573
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:590
+#: parse-options.c:591
 #, c-format
 msgid "usage: %s"
 msgstr "ús: %s"
 
 #. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation
-#: parse-options.c:594
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:597
 #, c-format
 msgid "   or: %s"
 msgstr " o: %s"
 
-#: parse-options.c:597
+#: parse-options.c:600
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:631
+#: parse-options.c:634
 msgid "-NUM"
 msgstr "-NUM"
 
@@ -2303,100 +2431,103 @@ msgstr "-NUM"
 msgid "malformed object name '%s'"
 msgstr "nom d'objecte mal format '%s'"
 
-#: path.c:810
+#: path.c:890
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "No s'ha pogut fer %s escrivible pel grup"
 
-#: pathspec.c:125
+#: pathspec.c:129
 msgid "Escape character '\\' not allowed as last character in attr value"
-msgstr "El caràcter d'escapament '\\' no està permès com a últim caràcter en un valor d'un atribut"
+msgstr ""
+"El caràcter d'escapament '\\' no està permès com a últim caràcter en un "
+"valor d'un atribut"
 
-#: pathspec.c:143
+#: pathspec.c:147
 msgid "Only one 'attr:' specification is allowed."
 msgstr "només es permet una especificació 'attr:'."
 
-#: pathspec.c:146
+#: pathspec.c:150
 msgid "attr spec must not be empty"
 msgstr "una especificació d'atribut no pot estar buida"
 
-#: pathspec.c:189
+#: pathspec.c:193
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "nom d'atribut no vàlid %s"
 
-#: pathspec.c:254
+#: pathspec.c:258
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr "els ajusts d'especificació de camí 'glob' i 'noglob' globals són incompatibles"
+msgstr ""
+"els ajusts d'especificació de camí 'glob' i 'noglob' globals són "
+"incompatibles"
 
-#: pathspec.c:261
-msgid "global 'literal' pathspec setting is incompatible with all other global pathspec settings"
+#: pathspec.c:265
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
 msgstr ""
-"l'ajust d'especificació de camí 'literal' global és incompatible amb tots els altres ajusts "
-"d'especificació de camí globals"
+"l'ajust d'especificació de camí 'literal' global és incompatible amb tots "
+"els altres ajusts d'especificació de camí globals"
 
-#: pathspec.c:301
+#: pathspec.c:305
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "paràmetre no vàlid per a la màgia d'especificació de camí 'prefix'"
 
-#: pathspec.c:322
+#: pathspec.c:326
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "Màgia d'especificació de camí no vàlida '%.*s' en '%s'"
 
-#: pathspec.c:327
+#: pathspec.c:331
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "')' mancant al final de la màgia d'especificació de camí en '%s'"
 
-#: pathspec.c:365
+#: pathspec.c:369
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "Màgia d'especificació de camí no implementada '%c' en '%s'"
 
-#: pathspec.c:421 pathspec.c:443
-#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "L'especificació '%s' és en el submòdul '%.*s'"
-
-#: pathspec.c:483
+#: pathspec.c:428
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: 'literal' i 'glob' són incompatibles"
 
-#: pathspec.c:496
+#: pathspec.c:441
 #, c-format
 msgid "%s: '%s' is outside repository"
 msgstr "%s: '%s' és fora del dipòsit"
 
-#: pathspec.c:584
+#: pathspec.c:515
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s' (mnemònic: '%c')"
 
-#: pathspec.c:594
+#: pathspec.c:525
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
-msgstr "%s: aquesta ordre no està admesa amb la màgia d'especificació de camí: %s"
+msgstr ""
+"%s: aquesta ordre no està admesa amb la màgia d'especificació de camí: %s"
 
-#: pathspec.c:644
+#: pathspec.c:575
 msgid ""
-"empty strings as pathspecs will be made invalid in upcoming releases. please use . instead if "
-"you meant to match all paths"
+"empty strings as pathspecs will be made invalid in upcoming releases. please "
+"use . instead if you meant to match all paths"
 msgstr ""
-"es faran no vàlides les cadenes buides com especificacions de camí en versions futures. Si us "
-"plau, useu . en lloc d'això si volíeu coincidir amb tots els camins"
+"es faran no vàlides les cadenes buides com especificacions de camí en "
+"versions futures. Si us plau, useu . en lloc d'això si volíeu coincidir amb "
+"tots els camins"
 
-#: pathspec.c:668
+#: pathspec.c:599
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "l'especificació de camí '%s' és més enllà d'un enllaç simbòlic"
 
-#: pretty.c:982
+#: pretty.c:963
 msgid "unable to parse --pretty format"
 msgstr "no s'ha pogut analitzar el format --pretty"
 
-#: read-cache.c:1442
+#: read-cache.c:1443
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -2405,7 +2536,7 @@ msgstr ""
 "index.version està establerta, però el valor no és vàlid.\n"
 "S'està usant la versió %i"
 
-#: read-cache.c:1452
+#: read-cache.c:1453
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2414,46 +2545,51 @@ msgstr ""
 "GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n"
 "S'està usant la versió %i"
 
-#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048
+#: read-cache.c:2308 builtin/merge.c:1019
+#, c-format
+msgid "could not close '%s'"
+msgstr "no s'ha pogut tancar '%s'"
+
+#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
 #, c-format
 msgid "could not stat '%s'"
 msgstr "no s'ha pogut fer stat a '%s'"
 
-#: read-cache.c:2388
+#: read-cache.c:2396
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "no s'ha pogut obrir el directori git: %s"
 
-#: read-cache.c:2400
+#: read-cache.c:2408
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "no s'ha pogut desenllaçar: %s"
 
-#: refs.c:620 builtin/merge.c:844
+#: refs.c:622
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "No s'ha pogut obrir '%s' per a escriptura"
 
-#: refs.c:1667
+#: refs.c:1769
 msgid "ref updates forbidden inside quarantine environment"
 msgstr ""
 
-#: refs/files-backend.c:1631
+#: refs/files-backend.c:1664
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "no s'ha pogut suprimir la referència %s: %s"
 
-#: refs/files-backend.c:1634
+#: refs/files-backend.c:1667
 #, c-format
 msgid "could not delete references: %s"
 msgstr "no s'ha pogut suprimir les referències: %s"
 
-#: refs/files-backend.c:1643
+#: refs/files-backend.c:1676
 #, c-format
 msgid "could not remove reference %s"
 msgstr "no s'ha pogut eliminar la referència %s"
 
-#: ref-filter.c:35 wt-status.c:1780
+#: ref-filter.c:35 wt-status.c:1811
 msgid "gone"
 msgstr "no hi és"
 
@@ -2472,312 +2608,320 @@ msgstr "darrere per %d"
 msgid "ahead %d, behind %d"
 msgstr "davant per %d, darrere per %d"
 
-#: ref-filter.c:104
+#: ref-filter.c:105
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "format esperat: %%(color:<color>)"
 
-#: ref-filter.c:106
+#: ref-filter.c:107
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "color no reconegut: %%(color:%s)"
 
-#: ref-filter.c:120
+#: ref-filter.c:121
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "valor enter esperat pel nom de referència:lstrip=%s"
 
-#: ref-filter.c:124
+#: ref-filter.c:125
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "valor enter esperat pel nom de referència:rstrip=%s"
 
-#: ref-filter.c:126
+#: ref-filter.c:127
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "paràmetre %%(%s) desconegut: %s"
 
-#: ref-filter.c:166
+#: ref-filter.c:167
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) no accepta paràmetres"
 
-#: ref-filter.c:173
+#: ref-filter.c:174
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "%%(subject) no accepta paràmetres"
 
-#: ref-filter.c:180
+#: ref-filter.c:181
 #, c-format
 msgid "%%(trailers) does not take arguments"
 msgstr "%%(trailers) no accepta paràmetres"
 
-#: ref-filter.c:199
+#: ref-filter.c:200
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "valor positiu esperat conté:lines=%s"
 
-#: ref-filter.c:201
+#: ref-filter.c:202
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "paràmetre %%(contents) no reconegut: %s"
 
-#: ref-filter.c:214
+#: ref-filter.c:215
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "valor positiu esperat nom d'objecte:curt=%s"
 
-#: ref-filter.c:218
+#: ref-filter.c:219
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "paràmetre %%(objectname) no reconegut: %s"
 
-#: ref-filter.c:245
+#: ref-filter.c:246
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "format esperat: %%(align:<amplada>,<posició>)"
 
-#: ref-filter.c:257
+#: ref-filter.c:258
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "posició no reconeguda:%s"
 
-#: ref-filter.c:261
+#: ref-filter.c:262
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "amplada no reconeguda:%s"
 
-#: ref-filter.c:267
+#: ref-filter.c:268
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "paràmetre %%(align) no reconegut: %s"
 
-#: ref-filter.c:271
+#: ref-filter.c:272
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "amplada positiva esperada amb l'àtom %%(align)"
 
-#: ref-filter.c:286
+#: ref-filter.c:287
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "paràmetre %%(if) no reconegut: %s"
 
-#: ref-filter.c:371
+#: ref-filter.c:378
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "nom de camp mal format: %.*s"
 
-#: ref-filter.c:397
+#: ref-filter.c:404
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "nom de camp desconegut: %.*s"
 
-#: ref-filter.c:501
+#: ref-filter.c:508
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "format: s'ha usat l'àtom %%(if) sense un àtom %%(then)"
 
-#: ref-filter.c:561
+#: ref-filter.c:568
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "format: s'ha usat l'àtom %%(then) sense un àtom %%(if)"
 
-#: ref-filter.c:563
+#: ref-filter.c:570
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "format: s'ha usat l'àtom %%(then) més d'un cop"
 
-#: ref-filter.c:565
+#: ref-filter.c:572
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: s'ha usat l'àtom %%(then) després de %%(else)"
 
-#: ref-filter.c:591
+#: ref-filter.c:598
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "format: s'ha usat l'àtom %%(else) sense un àtom %%(if)"
 
-#: ref-filter.c:593
+#: ref-filter.c:600
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "format: s'ha usat l'àtom %%(else) sense un àtom %%(then)"
 
-#: ref-filter.c:595
+#: ref-filter.c:602
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "format: s'ha usat l'àtom %%(else) més d'un cop"
 
-#: ref-filter.c:608
+#: ref-filter.c:615
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent"
 
-#: ref-filter.c:663
+#: ref-filter.c:670
 #, c-format
 msgid "malformed format string %s"
 msgstr "cadena de format mal format %s"
 
-#: ref-filter.c:1247
+#: ref-filter.c:1254
 #, c-format
 msgid "(no branch, rebasing %s)"
-msgstr "(cap branca, s'està rebasant %s)"
+msgstr "(cap branca, s'està fent «rebase» %s)"
 
-#: ref-filter.c:1250
+#: ref-filter.c:1257
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(cap branca, bisecció començada en %s)"
 
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached at " in wt-status.c
-#: ref-filter.c:1256
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached at " in wt-status.c
+#.
+#: ref-filter.c:1265
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD separat a %s)"
 
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached from " in wt-status.c
-#: ref-filter.c:1261
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached from " in wt-status.c
+#.
+#: ref-filter.c:1272
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD separat de %s)"
 
-#: ref-filter.c:1265
+#: ref-filter.c:1276
 msgid "(no branch)"
 msgstr "(cap branca)"
 
-#: ref-filter.c:1420 ref-filter.c:1451
+#: ref-filter.c:1426 ref-filter.c:1457
 #, c-format
 msgid "missing object %s for %s"
 msgstr "manca l'objecte %s per a %s"
 
-#: ref-filter.c:1423 ref-filter.c:1454
+#: ref-filter.c:1429 ref-filter.c:1460
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer ha fallat en %s per a %s"
 
-#: ref-filter.c:1692
+#: ref-filter.c:1760
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "objecte mal format a '%s'"
 
-#: ref-filter.c:1759
+#: ref-filter.c:1827
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "s'està ignorant la referència amb nom malmès %s"
 
-#: ref-filter.c:1764
+#: ref-filter.c:1832
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "s'està ignorant la referència trencada %s"
 
-#: ref-filter.c:2028
+#: ref-filter.c:2095
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "format: manca l'àtom %%(end)"
 
-#: ref-filter.c:2109
+#: ref-filter.c:2176
 #, c-format
 msgid "malformed object name %s"
 msgstr "nom d'objecte %s mal format"
 
-#: remote.c:754
+#: remote.c:747
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "No es poden obtenir ambdós %s i %s a %s"
 
-#: remote.c:758
+#: remote.c:751
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s generalment segueix %s, no %s"
 
-#: remote.c:762
+#: remote.c:755
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s segueix ambdós %s i %s"
 
-#: remote.c:770
+#: remote.c:763
 msgid "Internal error"
 msgstr "Error intern"
 
-#: remote.c:1685 remote.c:1787
+#: remote.c:1680 remote.c:1782
 msgid "HEAD does not point to a branch"
 msgstr "HEAD no assenyala cap branca"
 
-#: remote.c:1694
+#: remote.c:1689
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "no hi ha tal branca: '%s'"
 
-#: remote.c:1697
+#: remote.c:1692
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "cap font configurada per a la branca '%s'"
 
-#: remote.c:1703
+#: remote.c:1698
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "la branca font '%s' no s'emmagatzema com a branca amb seguiment remot"
 
-#: remote.c:1718
+#: remote.c:1713
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr "el destí de pujada '%s' en el remot '%s' no té cap branca amb seguiment remot"
+msgstr ""
+"el destí de pujada '%s' en el remot '%s' no té cap branca amb seguiment remot"
 
-#: remote.c:1730
+#: remote.c:1725
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "la branca '%s' no té cap remot al qual pujar"
 
-#: remote.c:1741
+#: remote.c:1736
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "les especificacions de referència de '%s' no inclouen '%s'"
 
-#: remote.c:1754
+#: remote.c:1749
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "push no té destí (push.default és 'nothing')"
 
-#: remote.c:1776
+#: remote.c:1771
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "no es pot resoldre una pujada 'simple' a un sol destí"
 
-#: remote.c:2081
+#: remote.c:2076
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "La vostra branca està basada en '%s', però la font no hi és.\n"
 
-#: remote.c:2085
+#: remote.c:2080
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (useu \"git branch --unset-upstream\" per a arreglar)\n"
 
-#: remote.c:2088
+#: remote.c:2083
 #, c-format
 msgid "Your branch is up-to-date with '%s'.\n"
 msgstr "La vostra branca està al dia amb '%s'.\n"
 
-#: remote.c:2092
+#: remote.c:2087
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "La vostra branca està davant de '%s' per %d comissió.\n"
 msgstr[1] "La vostra branca està davant de '%s' per %d comissions.\n"
 
-#: remote.c:2098
+#: remote.c:2093
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (useu \"git push\" per a publicar les vostres comissions locals)\n"
 
-#: remote.c:2101
+#: remote.c:2096
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
-msgid_plural "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] "La vostra branca està darrere de '%s' per %d comissió, i pot avançar-se ràpidament.\n"
-msgstr[1] "La vostra branca està darrere de '%s' per %d comissions, i pot avançar-se ràpidament.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] ""
+"La vostra branca està darrere de '%s' per %d comissió, i pot avançar-se "
+"ràpidament.\n"
+msgstr[1] ""
+"La vostra branca està darrere de '%s' per %d comissions, i pot avançar-se "
+"ràpidament.\n"
 
-#: remote.c:2109
+#: remote.c:2104
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr " (useu \"git pull\" per a actualitzar la vostra branca local)\n"
 
-#: remote.c:2112
+#: remote.c:2107
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -2792,81 +2936,79 @@ msgstr[1] ""
 "La vostra branca i '%s' han divergit,\n"
 "i tenen %d i %d comissions distintes cada una, respectivament.\n"
 
-#: remote.c:2122
+#: remote.c:2117
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  (useu \"git pull\" per a fusionar la branca remota a la vostra)\n"
 
-#: revision.c:2158
+#: revision.c:2187
 msgid "your current branch appears to be broken"
 msgstr "la vostra branca actual sembla malmesa"
 
-#: revision.c:2161
+#: revision.c:2190
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "la vostra branca actual '%s' encara no té cap comissió"
 
-#: revision.c:2355
+#: revision.c:2384
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent és incompatible amb --bisect"
 
-#: run-command.c:125
+#: run-command.c:644
 msgid "open /dev/null failed"
 msgstr "s'ha produït un error en obrir /dev/null"
 
-#: run-command.c:127
-#, c-format
-msgid "dup2(%d,%d) failed"
-msgstr "dup2(%d,%d) ha fallat"
-
-#: send-pack.c:150
+#: send-pack.c:151
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "no s'ha pogut analitzar l'estat del desempaquetament remot: %s"
 
-#: send-pack.c:152
+#: send-pack.c:153
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "s'ha produït un error en el desempaquetament remot: %s"
 
-#: send-pack.c:315
+#: send-pack.c:316
 msgid "failed to sign the push certificate"
 msgstr "s'ha produït un error en signar el certificat de pujada"
 
-#: send-pack.c:428
+#: send-pack.c:429
 msgid "the receiving end does not support --signed push"
 msgstr "el destí receptor no admet pujar --signed"
 
-#: send-pack.c:430
-msgid "not sending a push certificate since the receiving end does not support --signed push"
+#: send-pack.c:431
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
 msgstr ""
-"no s'està enviant una certificació de pujada perquè el destí receptor no admet pujar --signed"
+"no s'està enviant una certificació de pujada perquè el destí receptor no "
+"admet pujar --signed"
 
-#: send-pack.c:442
+#: send-pack.c:443
 msgid "the receiving end does not support --atomic push"
 msgstr "el destí receptor no admet pujar --atomic"
 
-#: send-pack.c:447
+#: send-pack.c:448
 msgid "the receiving end does not support push options"
 msgstr "el destí receptor no admet opcions de pujada"
 
-#: sequencer.c:215
+#: sequencer.c:216
 msgid "revert"
 msgstr "revertir"
 
-#: sequencer.c:217
+#: sequencer.c:218
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:219
+#: sequencer.c:220
 msgid "rebase -i"
 msgstr "rebase -i"
 
-#: sequencer.c:221
+#: sequencer.c:222
 #, c-format
 msgid "Unknown action: %d"
 msgstr "Acció desconeguda: %d"
 
-#: sequencer.c:278
+#: sequencer.c:279
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -2874,7 +3016,7 @@ msgstr ""
 "després de resoldre els conflictes, marqueu els camins\n"
 "corregits amb 'git add <camins>' o 'git rm <camins>'"
 
-#: sequencer.c:281
+#: sequencer.c:282
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -2884,63 +3026,63 @@ msgstr ""
 "corregits amb 'git add <camins>' o 'git rm <camins>'\n"
 "i cometeu el resultat amb 'git commit'"
 
-#: sequencer.c:294 sequencer.c:1682
+#: sequencer.c:295 sequencer.c:1685
 #, c-format
 msgid "could not lock '%s'"
 msgstr "no s'ha pogut bloquejar '%s'"
 
-#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701
+#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
 #, c-format
 msgid "could not write to '%s'"
 msgstr "no s'ha pogut escriure a '%s'"
 
-#: sequencer.c:301
+#: sequencer.c:302
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "no s'ha pogut escriure el terminador de línia a '%s'"
 
-#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689
+#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
 #, c-format
 msgid "failed to finalize '%s'."
 msgstr "s'ha produït un error en finalitzar '%s'."
 
-#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257 builtin/commit.c:749
-#: builtin/merge.c:1018
+#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
+#: builtin/commit.c:750 builtin/merge.c:1017
 #, c-format
 msgid "could not read '%s'"
 msgstr "no s'ha pogut llegir '%s'"
 
-#: sequencer.c:355
+#: sequencer.c:356
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "els vostres canvis locals se sobreescriurien per %s."
 
-#: sequencer.c:359
+#: sequencer.c:360
 msgid "commit your changes or stash them to proceed."
 msgstr "cometeu els vostres canvis o emmagatzemeu-los per a procedir."
 
-#: sequencer.c:388
+#: sequencer.c:389
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: avanç ràpid"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. * "rebase -i".
+#. "rebase -i".
 #.
-#: sequencer.c:470
+#: sequencer.c:472
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou"
 
-#: sequencer.c:489
+#: sequencer.c:491
 msgid "could not resolve HEAD commit\n"
 msgstr "no s'ha pogut resoldre la comissió HEAD\n"
 
-#: sequencer.c:509
+#: sequencer.c:511
 msgid "unable to update cache tree\n"
 msgstr "no s'ha pogut actualitzar l'arbre cau\n"
 
-#: sequencer.c:592
+#: sequencer.c:595
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -2957,7 +3099,8 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 "teniu canvis «staged» en el vostre arbre de treball\n"
-"Si aquests canvis estan pensats per fer «squash» a la comissió prèvia, executeu:\n"
+"Si aquests canvis estan pensats per fer «squash» a la comissió prèvia, "
+"executeu:\n"
 "\n"
 "  git commit --amend %s\n"
 "\n"
@@ -2969,17 +3112,17 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:694
+#: sequencer.c:697
 #, c-format
 msgid "could not parse commit %s\n"
 msgstr "no s'ha pogut analitzar la comissió %s\n"
 
-#: sequencer.c:699
+#: sequencer.c:702
 #, c-format
 msgid "could not parse parent commit %s\n"
 msgstr "no s'ha pogut analitzar la comissió pare %s\n"
 
-#: sequencer.c:821
+#: sequencer.c:824
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
@@ -2990,7 +3133,7 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:827
+#: sequencer.c:830
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
@@ -3001,229 +3144,230 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:833 sequencer.c:858
+#: sequencer.c:836 sequencer.c:861
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Això és una combinació de %d comissions."
 
-#: sequencer.c:842
+#: sequencer.c:845
 msgid "need a HEAD to fixup"
 msgstr "cal un HEAD per reparar-ho"
 
-#: sequencer.c:844
+#: sequencer.c:847
 msgid "could not read HEAD"
 msgstr "no s'ha pogut llegir HEAD"
 
-#: sequencer.c:846
+#: sequencer.c:849
 msgid "could not read HEAD's commit message"
 msgstr "no s'ha pogut llegir el missatge de comissió de HEAD"
 
-#: sequencer.c:852
+#: sequencer.c:855
 #, c-format
 msgid "cannot write '%s'"
 msgstr "no es pot escriure '%s'"
 
-#: sequencer.c:861 git-rebase--interactive.sh:445
+#: sequencer.c:864 git-rebase--interactive.sh:445
 msgid "This is the 1st commit message:"
 msgstr "Aquest és el 1r missatge de comissió:"
 
-#: sequencer.c:869
+#: sequencer.c:872
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "no s'ha pogut llegir el missatge de comissió: %s"
 
-#: sequencer.c:876
+#: sequencer.c:879
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Aquest és el missatge de comissió #%d:"
 
-#: sequencer.c:881
+#: sequencer.c:884
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "El missatge de comissió núm. #%d s'ometrà:"
 
-#: sequencer.c:886
+#: sequencer.c:889
 #, c-format
 msgid "unknown command: %d"
 msgstr "ordre desconeguda: %d"
 
-#: sequencer.c:952
+#: sequencer.c:955
 msgid "your index file is unmerged."
 msgstr "el vostre fitxer d'índex està sense fusionar."
 
-#: sequencer.c:970
+#: sequencer.c:973
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "la comissió %s és una fusió però no s'ha donat cap opció -m."
 
-#: sequencer.c:978
+#: sequencer.c:981
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "la comissió %s no té pare %d"
 
-#: sequencer.c:982
+#: sequencer.c:985
 #, c-format
 msgid "mainline was specified but commit %s is not a merge."
-msgstr "s'ha especificat la línia principal però la comissió %s no és una fusió."
+msgstr ""
+"s'ha especificat la línia principal però la comissió %s no és una fusió."
 
-#: sequencer.c:988
+#: sequencer.c:991
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "no es pot obtenir el missatge de comissió de %s"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1009
+#: sequencer.c:1012
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: no es pot analitzar la comissió pare %s"
 
-#: sequencer.c:1071 sequencer.c:1827
+#: sequencer.c:1075 sequencer.c:1830
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "no s'ha pogut canviar el nom '%s' a '%s'"
 
-#: sequencer.c:1122
+#: sequencer.c:1126
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "no s'ha pogut revertir %s... %s"
 
-#: sequencer.c:1123
+#: sequencer.c:1127
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "no s'ha pogut aplicar %s... %s"
 
-#: sequencer.c:1165
+#: sequencer.c:1169
 msgid "empty commit set passed"
 msgstr "conjunt de comissions buit passat"
 
-#: sequencer.c:1175
+#: sequencer.c:1179
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: s'ha produït un error en llegir l'índex"
 
-#: sequencer.c:1182
+#: sequencer.c:1186
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: s'ha produït un error en actualitzar l'índex"
 
-#: sequencer.c:1303
+#: sequencer.c:1306
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "línia no vàlida %d: %.*s"
 
-#: sequencer.c:1311
+#: sequencer.c:1314
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "No es pot '%s' sense una comissió prèvia"
 
-#: sequencer.c:1344
+#: sequencer.c:1347
 #, c-format
 msgid "could not read '%s'."
 msgstr "no s'ha pogut llegir '%s'."
 
-#: sequencer.c:1356
+#: sequencer.c:1359
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "si us plau, corregiu-ho això usant 'git rebase --edit-todo'."
 
-#: sequencer.c:1358
+#: sequencer.c:1361
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "full d'instruccions inusable: '%s'"
 
-#: sequencer.c:1363
+#: sequencer.c:1366
 msgid "no commits parsed."
 msgstr "no s'ha analitzat cap comissió."
 
-#: sequencer.c:1374
+#: sequencer.c:1377
 msgid "cannot cherry-pick during a revert."
 msgstr "no es pot fer «cherry pick» durant una reversió."
 
-#: sequencer.c:1376
+#: sequencer.c:1379
 msgid "cannot revert during a cherry-pick."
 msgstr "no es pot revertir durant un «cherry pick»."
 
-#: sequencer.c:1439
+#: sequencer.c:1442
 #, c-format
 msgid "invalid key: %s"
 msgstr "clau no vàlida: %s"
 
-#: sequencer.c:1442
+#: sequencer.c:1445
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valor no vàlid per a %s: %s"
 
-#: sequencer.c:1499
+#: sequencer.c:1502
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "full d'opcions mal format: '%s'"
 
-#: sequencer.c:1537
+#: sequencer.c:1540
 msgid "a cherry-pick or revert is already in progress"
 msgstr "un «cherry pick» o una reversió ja està en curs"
 
-#: sequencer.c:1538
+#: sequencer.c:1541
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\""
 
-#: sequencer.c:1541
+#: sequencer.c:1544
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "no s'ha pogut crear el directori de seqüenciador '%s'"
 
-#: sequencer.c:1555
+#: sequencer.c:1558
 msgid "could not lock HEAD"
 msgstr "no s'ha pogut bloquejar HEAD"
 
-#: sequencer.c:1611 sequencer.c:2181
+#: sequencer.c:1614 sequencer.c:2188
 msgid "no cherry-pick or revert in progress"
 msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
 
-#: sequencer.c:1613
+#: sequencer.c:1616
 msgid "cannot resolve HEAD"
 msgstr "no es pot resoldre HEAD"
 
-#: sequencer.c:1615 sequencer.c:1649
+#: sequencer.c:1618 sequencer.c:1652
 msgid "cannot abort from a branch yet to be born"
 msgstr "no es pot avortar des d'una branca que encara ha de nàixer"
 
-#: sequencer.c:1635 builtin/grep.c:910
+#: sequencer.c:1638 builtin/grep.c:929
 #, c-format
 msgid "cannot open '%s'"
 msgstr "no es pot obrir '%s'"
 
-#: sequencer.c:1637
+#: sequencer.c:1640
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "no es pot llegir '%s': %s"
 
-#: sequencer.c:1638
+#: sequencer.c:1641
 msgid "unexpected end of file"
 msgstr "final de fitxer inesperat"
 
-#: sequencer.c:1644
+#: sequencer.c:1647
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "el fitxer HEAD emmagatzemat abans de fer «cherry pick» '%s' és malmès"
 
-#: sequencer.c:1655
+#: sequencer.c:1658
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr "Sembla que heu mogut HEAD sense rebobinar, comproveu-ho HEAD"
 
-#: sequencer.c:1792 sequencer.c:2080
+#: sequencer.c:1795 sequencer.c:2086
 msgid "cannot read HEAD"
 msgstr "No es pot llegir HEAD"
 
-#: sequencer.c:1832 builtin/difftool.c:616
+#: sequencer.c:1835 builtin/difftool.c:633
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "no s'ha pogut copiar '%s' a '%s'"
 
-#: sequencer.c:1848
+#: sequencer.c:1851
 msgid "could not read index"
 msgstr "no s'ha pogut llegir l'índex"
 
-#: sequencer.c:1853
+#: sequencer.c:1856
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3238,11 +3382,11 @@ msgstr ""
 " git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1859
+#: sequencer.c:1862
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "i ha fet canvis a l'índex i/o l'arbre de treball\n"
 
-#: sequencer.c:1865
+#: sequencer.c:1868
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3258,17 +3402,17 @@ msgstr ""
 "\n"
 " git rebase --continue\n"
 
-#: sequencer.c:1920 git-rebase.sh:169
-#, c-format
-msgid "Applied autostash."
+#: sequencer.c:1925
+#, fuzzy, c-format
+msgid "Applied autostash.\n"
 msgstr "S'ha aplicat el magatzem automàtic."
 
-#: sequencer.c:1932
+#: sequencer.c:1937
 #, c-format
 msgid "cannot store %s"
 msgstr "no es pot emmagatzemar %s"
 
-#: sequencer.c:1934 git-rebase.sh:173
+#: sequencer.c:1940 git-rebase.sh:173
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -3279,57 +3423,57 @@ msgstr ""
 "Els vostres canvis estan segurs en el magatzem.\n"
 "Podeu executar \"git stash pop\" o \"git stash drop\" en qualsevol moment.\n"
 
-#: sequencer.c:2016
+#: sequencer.c:2022
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Aturat a %s...  %.*s\n"
 
-#: sequencer.c:2058
+#: sequencer.c:2064
 #, c-format
 msgid "unknown command %d"
 msgstr "ordre %d desconeguda"
 
-#: sequencer.c:2088
+#: sequencer.c:2094
 msgid "could not read orig-head"
 msgstr "No s'ha pogut llegir orig-head"
 
-#: sequencer.c:2092
+#: sequencer.c:2099
 msgid "could not read 'onto'"
 msgstr "no s'ha pogut llegir 'onto'"
 
-#: sequencer.c:2099
+#: sequencer.c:2106
 #, c-format
 msgid "could not update %s"
 msgstr "no s'ha pogut analitzar %s"
 
-#: sequencer.c:2106
+#: sequencer.c:2113
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "no s'ha pogut actualitzar HEAD a %s"
 
-#: sequencer.c:2190
+#: sequencer.c:2197
 msgid "cannot rebase: You have unstaged changes."
-msgstr "No es pot rebasar: Teniu canvis «unstaged»."
+msgstr "No es pot fer «rebase»: teniu canvis «unstaged»."
 
-#: sequencer.c:2195
+#: sequencer.c:2202
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
 
-#: sequencer.c:2204
+#: sequencer.c:2211
 msgid "cannot amend non-existing commit"
 msgstr "no es pot esmenar una comissió no existent"
 
-#: sequencer.c:2206
+#: sequencer.c:2213
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "fitxer no vàlid: '%s'"
 
-#: sequencer.c:2208
+#: sequencer.c:2215
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contingut no vàlid: '%s'"
 
-#: sequencer.c:2211
+#: sequencer.c:2218
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3339,34 +3483,35 @@ msgstr ""
 "Teniu canvis no comesos en el vostre arbre de treball. Si us plau,\n"
 "primer cometeu-los i després executeu 'git rebase --continue' de nou."
 
-#: sequencer.c:2221
+#: sequencer.c:2228
 msgid "could not commit staged changes."
 msgstr "No s'ha pogut cometre els canvis «staged»."
 
-#: sequencer.c:2301
+#: sequencer.c:2308
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: no es pot fer «cherry pick» a %s"
 
-#: sequencer.c:2305
+#: sequencer.c:2312
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: revisió dolenta"
 
-#: sequencer.c:2338
+#: sequencer.c:2345
 msgid "can't revert as initial commit"
 msgstr "no es pot revertir com a comissió inicial"
 
-#: setup.c:165
+#: setup.c:171
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
 "Use 'git <command> -- <path>...' to specify paths that do not exist locally."
 msgstr ""
 "%s: no hi ha tal camí en l'arbre de treball.\n"
-"Useu 'git <ordre> -- <camí>...' per a especificar camins que no existeixin localment."
+"Useu 'git <ordre> -- <camí>...' per a especificar camins que no existeixin "
+"localment."
 
-#: setup.c:178
+#: setup.c:184
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -3377,7 +3522,7 @@ msgstr ""
 "Useu '--' per a separar els camins de les revisions, com això:\n"
 "'git <ordre> [<revisió>...] -- [<fitxer>...]'"
 
-#: setup.c:228
+#: setup.c:252
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -3388,72 +3533,76 @@ msgstr ""
 "Useu '--' per a separar els camins de les revisions, com això:\n"
 "'git <ordre> [<revisió>...] -- [<fitxer>...]'"
 
-#: setup.c:475
+#: setup.c:504
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "S'esperava una versió de dipòsit de git <= %d, s'ha trobat %d"
 
-#: setup.c:483
+#: setup.c:512
 msgid "unknown repository extensions found:"
 msgstr "s'han trobat extensions de dipòsit desconegudes:"
 
-#: setup.c:776
+#: setup.c:810
 #, c-format
 msgid "Not a git repository (or any of the parent directories): %s"
 msgstr "No és un dipòsit de git (ni cap dels directoris pares): %s"
 
-#: setup.c:778 builtin/index-pack.c:1646
+#: setup.c:812 builtin/index-pack.c:1652
 msgid "Cannot come back to cwd"
 msgstr "No es pot tornar al directori de treball actual"
 
-#: setup.c:1010
+#: setup.c:1050
 msgid "Unable to read current working directory"
 msgstr "No s'ha pogut llegir el directori de treball actual"
 
-#: setup.c:1022 setup.c:1028
+#: setup.c:1062 setup.c:1068
 #, c-format
 msgid "Cannot change to '%s'"
 msgstr "No es pot canviar a '%s'"
 
-#: setup.c:1041
+#: setup.c:1081
 #, c-format
 msgid ""
 "Not a git repository (or any parent up to mount point %s)\n"
 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
 msgstr ""
 "No un dipòsit de git (ni cap pare fins al punt de muntatge %s)\n"
-"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM no està establert)."
+"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
+"no està establert)."
 
-#: setup.c:1106
+#: setup.c:1173
 #, c-format
 msgid ""
 "Problem with core.sharedRepository filemode value (0%.3o).\n"
 "The owner of files must always have read and write permissions."
 msgstr ""
-"Hi ha un problema amb el valor de mode de fitxer core.sharedRepository (0%.3o).\n"
-"El propietari dels fitxers sempre ha de tenir permisos de lectura i escriptura."
+"Hi ha un problema amb el valor de mode de fitxer core.sharedRepository "
+"(0%.3o).\n"
+"El propietari dels fitxers sempre ha de tenir permisos de lectura i "
+"escriptura."
 
-#: sha1_file.c:559
+#: sha1_file.c:560
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "el camí '%s' no existeix"
 
-#: sha1_file.c:585
+#: sha1_file.c:586
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "Encara no se suporta el dipòsit de referència '%s' com a agafament enllaçat."
+msgstr ""
+"Encara no se suporta el dipòsit de referència '%s' com a agafament enllaçat."
 
-#: sha1_file.c:591
+#: sha1_file.c:592
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "el dipòsit de referència '%s' no és un dipòsit local."
 
-#: sha1_file.c:597
+#: sha1_file.c:598
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "el dipòsit de referència '%s' és superficial"
 
-#: sha1_file.c:605
+#: sha1_file.c:606
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "el dipòsit de referència '%s' és empeltat"
@@ -3462,26 +3611,28 @@ msgstr "el dipòsit de referència '%s' és empeltat"
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)"
 
-#: sha1_file.c:2721
+#: sha1_file.c:2729
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr "desplaçament abans d'inici d'índex de paquet per a %s (índex corromput?)"
+msgstr ""
+"desplaçament abans d'inici d'índex de paquet per a %s (índex corromput?)"
 
-#: sha1_file.c:2725
+#: sha1_file.c:2733
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr "desplaçament més enllà de la fi d'índex de paquet per a %s (índex truncat?)"
+msgstr ""
+"desplaçament més enllà de la fi d'índex de paquet per a %s (índex truncat?)"
 
-#: sha1_name.c:409
+#: sha1_name.c:419
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "l'SHA1 %s curt és ambigu"
 
-#: sha1_name.c:420
+#: sha1_name.c:430
 msgid "The candidates are:"
 msgstr "Els candidats són:"
 
-#: sha1_name.c:580
+#: sha1_name.c:589
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -3505,69 +3656,85 @@ msgstr ""
 "suprimiu-les. Desactiveu aquest missatge executant\n"
 "\"git config advice.objectNameWarning false\""
 
-#: submodule.c:67 submodule.c:101
+#: submodule.c:70 submodule.c:104
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr "No es pot canviar un .gitmodules no fusionat, primer resoleu els conflictes de fusió"
+msgstr ""
+"No es pot canviar un .gitmodules no fusionat, primer resoleu els conflictes "
+"de fusió"
 
-#: submodule.c:71 submodule.c:105
+#: submodule.c:74 submodule.c:108
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "No s'ha pogut trobar la secció en .gitmodules on path=%s"
 
-#: submodule.c:79
+#: submodule.c:82
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s"
 
-#: submodule.c:112
+#: submodule.c:115
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "No s'ha pogut eliminar l'entrada de .gitmodules per a %s"
 
-#: submodule.c:123
+#: submodule.c:126
 msgid "staging updated .gitmodules failed"
 msgstr "l'allistament del .gitmodules actualitzat ha fallat"
 
-#: submodule.c:161
+#: submodule.c:165
 msgid "negative values not allowed for submodule.fetchJobs"
 msgstr "no es permeten els valors negatius a submodule.fetchJobs"
 
-#: submodule.c:1194
+#: submodule.c:376
+#, fuzzy, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "S'està ometent el submòdul '%s'"
+
+#: submodule.c:407
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "L'especificació '%s' és en el submòdul '%.*s'"
+
+#: submodule.c:1337
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "'%s' no reconegut com un dipòsit git"
 
-#: submodule.c:1332
+#: submodule.c:1475
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "no s'ha pogut iniciar 'git status' al submòdul '%s'"
 
-#: submodule.c:1345
+#: submodule.c:1488
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "no s'ha pogut executar 'git status' al submòdul '%s'"
 
-#: submodule.c:1421
+#: submodule.c:1581
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "el submòdul '%s' té l'índex brut"
 
-#: submodule.c:1678
+#: submodule.c:1845
 #, c-format
-msgid "relocate_gitdir for submodule '%s' with more than one worktree not supported"
-msgstr "no està admès relocate_gitdir per al submòdul '%s' amb més d'un arbre de treball"
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr ""
+"no està admès relocate_gitdir per al submòdul '%s' amb més d'un arbre de "
+"treball"
 
-#: submodule.c:1690 submodule.c:1746
+#: submodule.c:1857 submodule.c:1913
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "no s'ha trobat el nom pel submòdul '%s'"
 
-#: submodule.c:1694 builtin/submodule--helper.c:678 builtin/submodule--helper.c:688
+#: submodule.c:1861 builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:688
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "no s'ha pogut crear el directori '%s'"
 
-#: submodule.c:1697
+#: submodule.c:1864
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3578,93 +3745,94 @@ msgstr ""
 "'%s' a\n"
 "'%s'\n"
 
-#: submodule.c:1781
+#: submodule.c:1948
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "s'ha produït un error en cercar recursivament al camí de submòdul '%s'"
 
-#: submodule.c:1825
+#: submodule.c:1992
 msgid "could not start ls-files in .."
 msgstr "no s'ha pogut iniciar ls-files a .."
 
-#: submodule.c:1845
+#: submodule.c:2012
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr "ERRADA: la cadena del camí retornada no coincideix amb cwd?"
 
-#: submodule.c:1864
+#: submodule.c:2031
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree ha retornat un codi de retorn %d no esperat"
 
-#: submodule-config.c:380
+#: submodule-config.c:420
 #, c-format
 msgid "invalid value for %s"
 msgstr "valor no vàlid per a %s"
 
-#: trailer.c:240
+#: trailer.c:241
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "l'execució de l'ordre de remolc '%s' ha fallat"
 
-#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539 trailer.c:543
+#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
+#: trailer.c:544
 #, c-format
 msgid "unknown value '%s' for key '%s'"
 msgstr "valor desconegut '%s' per a la clau '%s'"
 
-#: trailer.c:525 trailer.c:530 builtin/remote.c:289
+#: trailer.c:526 trailer.c:531 builtin/remote.c:290
 #, c-format
 msgid "more than one %s"
 msgstr "més d'un %s"
 
-#: trailer.c:702
+#: trailer.c:703
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "testimoni de remolc buit en el remolc '%.*s'"
 
-#: trailer.c:722
+#: trailer.c:723
 #, c-format
 msgid "could not read input file '%s'"
 msgstr "no s'ha pogut llegir el fitxer d'entrada '%s'"
 
-#: trailer.c:725
+#: trailer.c:726
 msgid "could not read from stdin"
 msgstr "no s'ha pogut llegir des d'stdin"
 
-#: trailer.c:949 builtin/am.c:44
+#: trailer.c:950 builtin/am.c:45
 #, c-format
 msgid "could not stat %s"
 msgstr "no s'ha pogut fer stat a %s"
 
-#: trailer.c:951
+#: trailer.c:952
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "el fitxer %s no és un fitxer regular"
 
-#: trailer.c:953
+#: trailer.c:954
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "el fitxer %s no és gravable per l'usuari"
 
-#: trailer.c:965
+#: trailer.c:966
 msgid "could not open temporary file"
 msgstr "no s'ha pogut obrir el fitxer temporal"
 
-#: trailer.c:1001
+#: trailer.c:1002
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s"
 
-#: transport.c:62
+#: transport.c:63
 #, c-format
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "Canviaria la font de '%s' a '%s' de '%s'\n"
 
-#: transport.c:151
+#: transport.c:152
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: opció de profunditat no vàlida '%s'"
 
-#: transport.c:889
+#: transport.c:890
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -3673,7 +3841,7 @@ msgstr ""
 "Els camins de submòdul següents contenen canvis que no\n"
 "es poden trobar en cap remot:\n"
 
-#: transport.c:893
+#: transport.c:894
 #, c-format
 msgid ""
 "\n"
@@ -3699,11 +3867,11 @@ msgstr ""
 "\n"
 "per a pujar-los a un remot.\n"
 
-#: transport.c:901
+#: transport.c:902
 msgid "Aborting."
 msgstr "S'està avortant."
 
-#: transport-helper.c:1080
+#: transport-helper.c:1071
 #, c-format
 msgid "Could not read ref %s"
 msgstr "No s'ha pogut llegir la referència %s"
@@ -3724,43 +3892,49 @@ msgstr "nom de fitxer buit en una entrada d'arbre"
 msgid "too-short tree file"
 msgstr "fitxer d'arbre massa curt"
 
-#: unpack-trees.c:104
+#: unpack-trees.c:105
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%sPlease commit your changes or stash them before you switch branches."
 msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per agafar:\n"
-"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de canviar de branca."
+"Els vostres canvis locals als fitxers següents se sobreescriurien per "
+"agafar:\n"
+"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de "
+"canviar de branca."
 
-#: unpack-trees.c:106
+#: unpack-trees.c:107
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%s"
 msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per agafar:\n"
+"Els vostres canvis locals als fitxers següents se sobreescriurien per "
+"agafar:\n"
 "%%s"
 
-#: unpack-trees.c:109
+#: unpack-trees.c:110
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%sPlease commit your changes or stash them before you merge."
 msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per fusionar:\n"
-"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de fusionar."
+"Els vostres canvis locals als fitxers següents se sobreescriurien per "
+"fusionar:\n"
+"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de "
+"fusionar."
 
-#: unpack-trees.c:111
+#: unpack-trees.c:112
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%s"
 msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per fusionar:\n"
+"Els vostres canvis locals als fitxers següents se sobreescriurien per "
+"fusionar:\n"
 "%%s"
 
-#: unpack-trees.c:114
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -3769,7 +3943,7 @@ msgstr ""
 "Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
 "%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de %s."
 
-#: unpack-trees.c:116
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -3778,7 +3952,7 @@ msgstr ""
 "Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
 "%%s"
 
-#: unpack-trees.c:121
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -3787,43 +3961,47 @@ msgstr ""
 "En actualitzar els directoris següents perdria fitxers no seguits en el:\n"
 "%s"
 
-#: unpack-trees.c:125
+#: unpack-trees.c:126
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%sPlease move or remove them before you switch branches."
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per agafar:\n"
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
+"agafar:\n"
 "%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca."
 
-#: unpack-trees.c:127
+#: unpack-trees.c:128
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%s"
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per agafar:\n"
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
+"agafar:\n"
 "%%s"
 
-#: unpack-trees.c:130
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%sPlease move or remove them before you merge."
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per fusionar:\n"
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
+"fusionar:\n"
 "%%sSi us plau, moveu-los o elimineu-los abans de fusionar."
 
-#: unpack-trees.c:132
+#: unpack-trees.c:133
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%s"
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per fusionar:\n"
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
+"fusionar:\n"
 "%%s"
 
-#: unpack-trees.c:135
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -3832,7 +4010,7 @@ msgstr ""
 "Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
 "%%sSi us plau, moveu-los o elimineu-los abans de %s."
 
-#: unpack-trees.c:137
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -3841,94 +4019,106 @@ msgstr ""
 "Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
 "%%s"
 
-#: unpack-trees.c:142
+#: unpack-trees.c:143
 #, c-format
 msgid ""
-"The following untracked working tree files would be overwritten by checkout:\n"
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
 "%%sPlease move or remove them before you switch branches."
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per agafar:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
+"agafar:\n"
 "%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca."
 
-#: unpack-trees.c:144
+#: unpack-trees.c:145
 #, c-format
 msgid ""
-"The following untracked working tree files would be overwritten by checkout:\n"
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
 "%%s"
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per agafar:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
+"agafar:\n"
 "%%s"
 
-#: unpack-trees.c:147
+#: unpack-trees.c:148
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%sPlease move or remove them before you merge."
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per fusionar:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
+"fusionar:\n"
 "%%sSi us plau, moveu-los o elimineu-los abans de fusionar."
 
-#: unpack-trees.c:149
+#: unpack-trees.c:150
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%s"
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per fusionar:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
+"fusionar:\n"
 "%%s"
 
-#: unpack-trees.c:152
+#: unpack-trees.c:153
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%sPlease move or remove them before you %s."
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per %s:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
+"%s:\n"
 "%%sSi us plau, moveu-los o elimineu-los abans de %s."
 
-#: unpack-trees.c:154
+#: unpack-trees.c:155
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%s"
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per %s:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
+"%s:\n"
 "%%s"
 
-#: unpack-trees.c:161
+#: unpack-trees.c:162
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "L'entrada '%s' encavalca amb '%s'.  No es pot vincular."
 
-#: unpack-trees.c:164
+#: unpack-trees.c:165
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up-to-date:\n"
 "%s"
 msgstr ""
-"No es pot actualitzar l'agafament parcial: les entrades següents no estan al dia:\n"
+"No es pot actualitzar l'agafament parcial: les entrades següents no estan al "
+"dia:\n"
 "%s"
 
-#: unpack-trees.c:166
+#: unpack-trees.c:167
 #, c-format
 msgid ""
-"The following working tree files would be overwritten by sparse checkout update:\n"
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
 "%s"
 msgstr ""
-"Els fitxers següents en l'arbre de treball se sobreescriurien per actualitzar l'agafament "
-"parcial:\n"
+"Els fitxers següents en l'arbre de treball se sobreescriurien per "
+"actualitzar l'agafament parcial:\n"
 "%s"
 
-#: unpack-trees.c:168
+#: unpack-trees.c:169
 #, c-format
 msgid ""
-"The following working tree files would be removed by sparse checkout update:\n"
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
 "%s"
 msgstr ""
-"Els fitxers següents en l'arbre de treball s'eliminarien per actualitzar l'agafament parcial:\n"
+"Els fitxers següents en l'arbre de treball s'eliminarien per actualitzar "
+"l'agafament parcial:\n"
 "%s"
 
-#: unpack-trees.c:170
+#: unpack-trees.c:171
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -3937,17 +4127,17 @@ msgstr ""
 "No es pot actualitzar el submòdul:\n"
 "%s"
 
-#: unpack-trees.c:247
+#: unpack-trees.c:248
 #, c-format
 msgid "Aborting\n"
 msgstr "S'està avortant\n"
 
-#: unpack-trees.c:272
+#: unpack-trees.c:277
 #, c-format
 msgid "submodule update strategy not supported for submodule '%s'"
 msgstr "el submòdul'%s' té una estratègia d'actualització no admesa"
 
-#: unpack-trees.c:340
+#: unpack-trees.c:346
 msgid "Checking out files"
 msgstr "S'estan agafant fitxers"
 
@@ -3980,182 +4170,195 @@ msgstr "número de port no vàlid"
 msgid "invalid '..' path segment"
 msgstr "segment de camí '..' no vàlid"
 
-#: worktree.c:285
+#: worktree.c:245
 #, c-format
 msgid "failed to read '%s'"
 msgstr "s'ha produït un error en llegir '%s'"
 
-#: wrapper.c:222 wrapper.c:392
+#: wrapper.c:223 wrapper.c:393
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "no s'ha pogut obrir '%s' per a lectura i escriptura"
 
-#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
+#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "no s'ha pogut obrir '%s' per a escriptura"
 
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757 builtin/am.c:849
-#: builtin/commit.c:1700 builtin/merge.c:1015 builtin/pull.c:341
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
+#: builtin/am.c:849 builtin/merge.c:1014
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "no s'ha pogut obrir '%s' per a lectura"
 
-#: wrapper.c:581 wrapper.c:602
+#: wrapper.c:424 wrapper.c:624
 #, c-format
 msgid "unable to access '%s'"
 msgstr "no s'ha pogut accedir a '%s'"
 
-#: wrapper.c:610
+#: wrapper.c:632
 msgid "unable to get current working directory"
 msgstr "no s'ha pogut obtenir el directori de treball actual"
 
-#: wrapper.c:634
+#: wrapper.c:656
 #, c-format
 msgid "could not write to %s"
 msgstr "no s'ha pogut escriure a %s"
 
-#: wrapper.c:636
+#: wrapper.c:658
 #, c-format
 msgid "could not close %s"
 msgstr "no s'ha pogut tancar %s"
 
-#: wt-status.c:151
+#: wt-status.c:152
 msgid "Unmerged paths:"
 msgstr "Camins sense fusionar:"
 
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  (useu \"git reset %s <fitxer>...\" per a fer «unstage»)"
 
-#: wt-status.c:180 wt-status.c:207
+#: wt-status.c:181 wt-status.c:208
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  (useu \"git rm --cached <fitxer>...\" per a fer «unstage»)"
 
-#: wt-status.c:184
+#: wt-status.c:185
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (useu \"git add <fitxer>...\" per a senyalar resolució)"
 
-#: wt-status.c:186 wt-status.c:190
+#: wt-status.c:187 wt-status.c:191
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr "  (useu \"git add/rm <fitxer>...\" segons sigui apropiat per a senyalar resolució)"
+msgstr ""
+"  (useu \"git add/rm <fitxer>...\" segons sigui apropiat per a senyalar "
+"resolució)"
 
-#: wt-status.c:188
+#: wt-status.c:189
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (useu \"git rm <fitxer>...\" per a senyalar resolució)"
 
-#: wt-status.c:199 wt-status.c:958
+#: wt-status.c:200 wt-status.c:981
 msgid "Changes to be committed:"
 msgstr "Canvis a cometre:"
 
-#: wt-status.c:217 wt-status.c:967
+#: wt-status.c:218 wt-status.c:990
 msgid "Changes not staged for commit:"
 msgstr "Canvis no «staged» per a cometre:"
 
-#: wt-status.c:221
+#: wt-status.c:222
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr "  (useu \"git add <fitxer>...\" per a actualitzar què es cometrà)"
 
-#: wt-status.c:223
+#: wt-status.c:224
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr "  (useu \"git add/rm <fitxer>...\" per a actualitzar què es cometrà)"
 
-#: wt-status.c:224
-msgid "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
+#: wt-status.c:225
+msgid ""
+"  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
-"  (useu \"git checkout -- <fitxer>...\" per a descartar els canvis en el directori de treball)"
+"  (useu \"git checkout -- <fitxer>...\" per a descartar els canvis en el "
+"directori de treball)"
 
-#: wt-status.c:226
+#: wt-status.c:227
 msgid "  (commit or discard the untracked or modified content in submodules)"
-msgstr "  (cometeu o descarteu el contingut modificat o no seguit en els submòduls)"
+msgstr ""
+"  (cometeu o descarteu el contingut modificat o no seguit en els submòduls)"
 
-#: wt-status.c:238
+#: wt-status.c:239
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
-msgstr "  (useu \"git %s <fitxer>...\" per a incloure-ho en el qual es cometrà)"
+msgstr ""
+"  (useu \"git %s <fitxer>...\" per a incloure-ho en el qual es cometrà)"
 
-#: wt-status.c:253
+#: wt-status.c:254
 msgid "both deleted:"
 msgstr "suprimit per ambdós:"
 
-#: wt-status.c:255
+#: wt-status.c:256
 msgid "added by us:"
 msgstr "afegit per nosaltres:"
 
-#: wt-status.c:257
+#: wt-status.c:258
 msgid "deleted by them:"
 msgstr "suprimit per ells:"
 
-#: wt-status.c:259
+#: wt-status.c:260
 msgid "added by them:"
 msgstr "afegit per ells:"
 
-#: wt-status.c:261
+#: wt-status.c:262
 msgid "deleted by us:"
 msgstr "suprimit per nosaltres:"
 
-#: wt-status.c:263
+#: wt-status.c:264
 msgid "both added:"
 msgstr "afegit per ambdós:"
 
-#: wt-status.c:265
+#: wt-status.c:266
 msgid "both modified:"
 msgstr "modificat per ambdós:"
 
-#: wt-status.c:275
+#: wt-status.c:276
 msgid "new file:"
 msgstr "fitxer nou:"
 
-#: wt-status.c:277
+#: wt-status.c:278
 msgid "copied:"
 msgstr "copiat:"
 
-#: wt-status.c:279
+#: wt-status.c:280
 msgid "deleted:"
 msgstr "suprimit:"
 
-#: wt-status.c:281
+#: wt-status.c:282
 msgid "modified:"
 msgstr "modificat:"
 
-#: wt-status.c:283
+#: wt-status.c:284
 msgid "renamed:"
 msgstr "canviat de nom:"
 
-#: wt-status.c:285
+#: wt-status.c:286
 msgid "typechange:"
 msgstr "canviat de tipus:"
 
-#: wt-status.c:287
+#: wt-status.c:288
 msgid "unknown:"
 msgstr "desconegut:"
 
-#: wt-status.c:289
+#: wt-status.c:290
 msgid "unmerged:"
 msgstr "sense fusionar:"
 
-#: wt-status.c:371
+#: wt-status.c:372
 msgid "new commits, "
 msgstr "comissions noves, "
 
-#: wt-status.c:373
+#: wt-status.c:374
 msgid "modified content, "
 msgstr "contingut modificat, "
 
-#: wt-status.c:375
+#: wt-status.c:376
 msgid "untracked content, "
 msgstr "contingut no seguit, "
 
-#: wt-status.c:831
+#: wt-status.c:821
+#, fuzzy, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "Actualment esteu fent «rebase»."
+msgstr[1] "Actualment esteu fent «rebase»."
+
+#: wt-status.c:853
 msgid "Submodules changed but not updated:"
 msgstr "Submòduls canviats però no actualitzats:"
 
-#: wt-status.c:833
+#: wt-status.c:855
 msgid "Submodule changes to be committed:"
 msgstr "Canvis de submòdul a cometre:"
 
-#: wt-status.c:914
+#: wt-status.c:937
 msgid ""
 "Do not touch the line above.\n"
 "Everything below will be removed."
@@ -4163,221 +4366,243 @@ msgstr ""
 "No toqueu la línia a dalt.\n"
 "Tot el que hi ha a sota s'eliminarà."
 
-#: wt-status.c:1026
+#: wt-status.c:1049
 msgid "You have unmerged paths."
 msgstr "Teniu camins sense fusionar."
 
-#: wt-status.c:1029
+#: wt-status.c:1052
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (arregleu els conflictes i executeu \"git commit\")"
 
-#: wt-status.c:1031
+#: wt-status.c:1054
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (useu \"git merge --abort\" per a avortar la fusió)"
 
-#: wt-status.c:1036
+#: wt-status.c:1059
 msgid "All conflicts fixed but you are still merging."
 msgstr "Tots els conflictes estan arreglats però encara esteu fusionant."
 
-#: wt-status.c:1039
+#: wt-status.c:1062
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (useu \"git commit\" per a concloure la fusió)"
 
-#: wt-status.c:1049
+#: wt-status.c:1072
 msgid "You are in the middle of an am session."
 msgstr "Esteu enmig d'una sessió am."
 
-#: wt-status.c:1052
+#: wt-status.c:1075
 msgid "The current patch is empty."
 msgstr "El pedaç actual està buit."
 
-#: wt-status.c:1056
+#: wt-status.c:1079
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (arregleu els conflictes i després executeu \"git am --continue\")"
 
-#: wt-status.c:1058
+#: wt-status.c:1081
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (useu \"git am --skip\" per a ometre aquest pedaç)"
 
-#: wt-status.c:1060
+#: wt-status.c:1083
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (useu \"git am --abort\" per a restaurar la branca original)"
 
-#: wt-status.c:1189
+#: wt-status.c:1214
 msgid "git-rebase-todo is missing."
 msgstr "Manca git-rebase-todo."
 
-#: wt-status.c:1191
+#: wt-status.c:1216
 msgid "No commands done."
 msgstr "No s'ha fet cap ordre."
 
-#: wt-status.c:1194
+#: wt-status.c:1219
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "Última ordre feta (%d ordre feta):"
 msgstr[1] "Últimes ordres fetes (%d ordres fetes):"
 
-#: wt-status.c:1205
+#: wt-status.c:1230
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (vegeu més en el fitxer %s)"
 
-#: wt-status.c:1210
+#: wt-status.c:1235
 msgid "No commands remaining."
 msgstr "No manca cap ordre."
 
-#: wt-status.c:1213
+#: wt-status.c:1238
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] "Ordre següent a fer (manca %d ordre):"
 msgstr[1] "Ordres següents a fer (manquen %d ordres):"
 
-#: wt-status.c:1221
+#: wt-status.c:1246
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (useu \"git rebase --edit-todo\" per a veure i editar)"
 
-#: wt-status.c:1234
+#: wt-status.c:1259
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "Actualment esteu rebasant la branca '%s' en '%s'."
+msgstr "Actualment esteu fent «rebase» de la branca '%s' en '%s'."
 
-#: wt-status.c:1239
+#: wt-status.c:1264
 msgid "You are currently rebasing."
-msgstr "Actualment esteu rebasant."
+msgstr "Actualment esteu fent «rebase»."
 
-#: wt-status.c:1253
+#: wt-status.c:1278
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
-msgstr "  (arregleu els conflictes i després executeu \"git rebase --continue\")"
+msgstr ""
+"  (arregleu els conflictes i després executeu \"git rebase --continue\")"
 
-#: wt-status.c:1255
+#: wt-status.c:1280
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (useu \"git rebase --skip\" per a ometre aquest pedaç)"
 
-#: wt-status.c:1257
+#: wt-status.c:1282
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  (useu \"git rebase --abort\" per a agafar la branca original)"
 
-#: wt-status.c:1263
+#: wt-status.c:1288
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
-msgstr "  (tots els conflictes estan arreglats: executeu \"git rebase --continue\")"
+msgstr ""
+"  (tots els conflictes estan arreglats: executeu \"git rebase --continue\")"
 
-#: wt-status.c:1267
+#: wt-status.c:1292
 #, c-format
-msgid "You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr "Actualment esteu dividint una comissió mentre rebaseu la branca '%s' en '%s'."
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Actualment esteu dividint una comissió mentre es fa «rebase» de la branca "
+"'%s' en '%s'."
 
-#: wt-status.c:1272
+#: wt-status.c:1297
 msgid "You are currently splitting a commit during a rebase."
-msgstr "Actualment esteu dividint una comissió durant un rebasament."
+msgstr "Actualment esteu dividint una comissió durant un «rebase»."
 
-#: wt-status.c:1275
+#: wt-status.c:1300
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
-"  (Una vegada que el vostre directori de treball sigui net, executeu \"git rebase --continue\")"
+"  (Una vegada que el vostre directori de treball sigui net, executeu \"git "
+"rebase --continue\")"
 
-#: wt-status.c:1279
+#: wt-status.c:1304
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
-msgstr "Actualment esteu editant una comissió mentre es fa «rebase» de la branca '%s' en '%s'."
+msgstr ""
+"Actualment esteu editant una comissió mentre es fa «rebase» de la branca "
+"'%s' en '%s'."
 
-#: wt-status.c:1284
+#: wt-status.c:1309
 msgid "You are currently editing a commit during a rebase."
 msgstr "Actualment esteu editant una comissió durant un «rebase»."
 
-#: wt-status.c:1287
+#: wt-status.c:1312
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  (useu \"git commit --amend\" per a esmenar la comissió actual)"
 
-#: wt-status.c:1289
-msgid "  (use \"git rebase --continue\" once you are satisfied with your changes)"
-msgstr "  (useu \"git rebase --continue\" una vegada que estigueu satisfet amb els vostres canvis)"
+#: wt-status.c:1314
+msgid ""
+"  (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr ""
+"  (useu \"git rebase --continue\" una vegada que estigueu satisfet amb els "
+"vostres canvis)"
 
-#: wt-status.c:1299
+#: wt-status.c:1324
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Actualment esteu fent «cherry pick» a la comissió %s."
 
-#: wt-status.c:1304
+#: wt-status.c:1329
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (arregleu els conflictes i executeu \"git cherry-pick --continue\")"
 
-#: wt-status.c:1307
+#: wt-status.c:1332
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
-msgstr "  (tots els conflictes estan arreglats: executeu \"git cherry-pick --continue\")"
+msgstr ""
+"  (tots els conflictes estan arreglats: executeu \"git cherry-pick --continue"
+"\")"
 
-#: wt-status.c:1309
+#: wt-status.c:1334
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
-msgstr "  (useu \"git cherry-pick --abort\" per a cancel·lar l'operació de «cherry pick»)"
+msgstr ""
+"  (useu \"git cherry-pick --abort\" per a cancel·lar l'operació de «cherry "
+"pick»)"
 
-#: wt-status.c:1318
+#: wt-status.c:1343
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Actualment esteu revertint la comissió %s."
 
-#: wt-status.c:1323
+#: wt-status.c:1348
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (arregleu els conflictes i executeu \"git revert --continue\")"
 
-#: wt-status.c:1326
+#: wt-status.c:1351
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
-msgstr "  (tots els conflictes estan arreglats: executeu \"git revert --continue\")"
+msgstr ""
+"  (tots els conflictes estan arreglats: executeu \"git revert --continue\")"
 
-#: wt-status.c:1328
+#: wt-status.c:1353
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
-msgstr "  (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)"
+msgstr ""
+"  (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)"
 
-#: wt-status.c:1339
+#: wt-status.c:1364
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Actualment esteu bisecant, heu començat des de la branca '%s'."
 
-#: wt-status.c:1343
+#: wt-status.c:1368
 msgid "You are currently bisecting."
 msgstr "Actualment esteu bisecant."
 
-#: wt-status.c:1346
+#: wt-status.c:1371
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (useu \"git bisect reset\" per a tornar a la branca original)"
 
-#: wt-status.c:1543
+#: wt-status.c:1568
 msgid "On branch "
 msgstr "En la branca "
 
-#: wt-status.c:1549
+#: wt-status.c:1574
 msgid "interactive rebase in progress; onto "
 msgstr "«rebase» interactiu en progrés; sobre "
 
-#: wt-status.c:1551
+#: wt-status.c:1576
 msgid "rebase in progress; onto "
 msgstr "«rebase» en progrés; sobre "
 
-#: wt-status.c:1556
+#: wt-status.c:1581
 msgid "HEAD detached at "
 msgstr "HEAD separat a "
 
-#: wt-status.c:1558
+#: wt-status.c:1583
 msgid "HEAD detached from "
 msgstr "HEAD separat de "
 
-#: wt-status.c:1561
+#: wt-status.c:1586
 msgid "Not currently on any branch."
 msgstr "Actualment no s'és en cap branca."
 
-#: wt-status.c:1579
+#: wt-status.c:1606
 msgid "Initial commit"
 msgstr "Comissió inicial"
 
-#: wt-status.c:1593
+#: wt-status.c:1607
+#, fuzzy
+msgid "No commits yet"
+msgstr "no s'ha analitzat cap comissió."
+
+#: wt-status.c:1621
 msgid "Untracked files"
 msgstr "Fitxers no seguits"
 
-#: wt-status.c:1595
+#: wt-status.c:1623
 msgid "Ignored files"
 msgstr "Fitxers ignorats"
 
-#: wt-status.c:1599
+#: wt-status.c:1627
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4389,251 +4614,290 @@ msgstr ""
 "oblidar-vos d'afegir fitxers nous vosaltres mateixos (vegeu\n"
 "'git help status')."
 
-#: wt-status.c:1605
+#: wt-status.c:1633
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Els fitxers no seguits no estan llistats%s"
 
-#: wt-status.c:1607
+#: wt-status.c:1635
 msgid " (use -u option to show untracked files)"
 msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)"
 
-#: wt-status.c:1613
+#: wt-status.c:1641
 msgid "No changes"
 msgstr "Sense canvis"
 
-#: wt-status.c:1618
+#: wt-status.c:1646
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
-msgstr "no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n"
+msgstr ""
+"no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n"
 
-#: wt-status.c:1621
+#: wt-status.c:1649
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "no hi ha canvis afegits a cometre\n"
 
-#: wt-status.c:1624
+#: wt-status.c:1652
 #, c-format
-msgid "nothing added to commit but untracked files present (use \"git add\" to track)\n"
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
 msgstr ""
-"no hi ha res afegit a cometre però existeixen fitxers no seguits (useu \"git add\" per a seguir-"
-"los)\n"
+"no hi ha res afegit a cometre però existeixen fitxers no seguits (useu \"git "
+"add\" per a seguir-los)\n"
 
-#: wt-status.c:1627
+#: wt-status.c:1655
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "no hi ha res afegit a cometre però existeixen fitxer no seguits\n"
 
-#: wt-status.c:1630
+#: wt-status.c:1658
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
-msgstr "no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-los)\n"
+msgstr ""
+"no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-"
+"los)\n"
 
-#: wt-status.c:1633 wt-status.c:1638
+#: wt-status.c:1661 wt-status.c:1666
 #, c-format
 msgid "nothing to commit\n"
 msgstr "no hi ha res a cometre\n"
 
-#: wt-status.c:1636
+#: wt-status.c:1664
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr "no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n"
+msgstr ""
+"no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n"
 
-#: wt-status.c:1640
+#: wt-status.c:1668
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "no hi ha res a cometre, l'arbre de treball està net\n"
 
-#: wt-status.c:1749
-msgid "Initial commit on "
-msgstr "Comissió inicial en "
+#: wt-status.c:1780
+#, fuzzy
+msgid "No commits yet on "
+msgstr "No s'ha fet cap ordre."
 
-#: wt-status.c:1753
+#: wt-status.c:1784
 msgid "HEAD (no branch)"
 msgstr "HEAD (sense branca)"
 
-#: wt-status.c:1782 wt-status.c:1790
+#: wt-status.c:1813 wt-status.c:1821
 msgid "behind "
 msgstr "darrere "
 
-#: wt-status.c:1785 wt-status.c:1788
+#: wt-status.c:1816 wt-status.c:1819
 msgid "ahead "
 msgstr "davant per "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2280
+#: wt-status.c:2311
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "no es pot %s: Teniu canvis «unstaged»."
 
-#: wt-status.c:2286
+#: wt-status.c:2317
 msgid "additionally, your index contains uncommitted changes."
 msgstr "addicionalment, el vostre índex conté canvis sense cometre."
 
-#: wt-status.c:2288
+#: wt-status.c:2319
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "no es pot %s: El vostre índex conté canvis sense cometre."
 
-#: compat/precompose_utf8.c:57 builtin/clone.c:432
+#: compat/precompose_utf8.c:58 builtin/clone.c:436
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "s'ha produït un error en desenllaçar '%s'"
 
-#: builtin/add.c:22
+#: builtin/add.c:24
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<opcions>] [--] <especificació-de-camí>..."
 
-#: builtin/add.c:80
+#: builtin/add.c:82
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "estat de diff inesperat %c"
 
-#: builtin/add.c:85 builtin/commit.c:291
+#: builtin/add.c:87 builtin/commit.c:292
 msgid "updating files failed"
 msgstr "s'ha produït un error en actualitzar els fitxers"
 
-#: builtin/add.c:95
+#: builtin/add.c:97
 #, c-format
 msgid "remove '%s'\n"
 msgstr "elimina '%s'\n"
 
-#: builtin/add.c:149
+#: builtin/add.c:151
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Canvis «unstaged» després d'actualitzar l'índex:"
 
-#: builtin/add.c:209 builtin/rev-parse.c:872
+#: builtin/add.c:211 builtin/rev-parse.c:873
 msgid "Could not read the index"
 msgstr "No s'ha pogut llegir l'índex"
 
-#: builtin/add.c:220
+#: builtin/add.c:222
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "No s'ha pogut obrir '%s' per a escriptura."
 
-#: builtin/add.c:224
+#: builtin/add.c:226
 msgid "Could not write patch"
 msgstr "No s'ha pogut escriure el pedaç"
 
-#: builtin/add.c:227
+#: builtin/add.c:229
 msgid "editing patch failed"
 msgstr "l'edició del pedaç ha fallat"
 
-#: builtin/add.c:230
+#: builtin/add.c:232
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "No s'ha pogut fer stat a '%s'"
 
-#: builtin/add.c:232
+#: builtin/add.c:234
 msgid "Empty patch. Aborted."
 msgstr "El pedaç és buit. S'ha avortat."
 
-#: builtin/add.c:237
+#: builtin/add.c:239
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "No s'ha pogut aplicar '%s'"
 
-#: builtin/add.c:247
+#: builtin/add.c:249
 msgid "The following paths are ignored by one of your .gitignore files:\n"
-msgstr "Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
+msgstr ""
+"Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
 
-#: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123
-#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524 builtin/remote.c:1328
-#: builtin/rm.c:241 builtin/send-pack.c:163
+#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
+#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
+#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
 msgstr "marxa en sec"
 
-#: builtin/add.c:269
+#: builtin/add.c:272
 msgid "interactive picking"
 msgstr "recull interactiu"
 
-#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286
+#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
 msgid "select hunks interactively"
 msgstr "selecciona els trossos interactivament"
 
-#: builtin/add.c:271
+#: builtin/add.c:274
 msgid "edit current diff and apply"
 msgstr "edita la diferència actual i aplica-la"
 
-#: builtin/add.c:272
+#: builtin/add.c:275
 msgid "allow adding otherwise ignored files"
 msgstr "permet afegir fitxers que d'altra manera s'ignoren"
 
-#: builtin/add.c:273
+#: builtin/add.c:276
 msgid "update tracked files"
 msgstr "actualitza els fitxers seguits"
 
-#: builtin/add.c:274
+#: builtin/add.c:277
 msgid "record only the fact that the path will be added later"
 msgstr "registra només el fet de que el camí s'afegirà més tard"
 
-#: builtin/add.c:275
+#: builtin/add.c:278
 msgid "add changes from all tracked and untracked files"
 msgstr "afegeix els canvis de tots els fitxers seguits i no seguits"
 
-#: builtin/add.c:278
+#: builtin/add.c:281
 msgid "ignore paths removed in the working tree (same as --no-all)"
-msgstr "ignora els camins eliminats en l'arbre de treball (el mateix que --no-all)"
+msgstr ""
+"ignora els camins eliminats en l'arbre de treball (el mateix que --no-all)"
 
-#: builtin/add.c:280
+#: builtin/add.c:283
 msgid "don't add, only refresh the index"
 msgstr "no afegeixis, només actualitza l'índex"
 
-#: builtin/add.c:281
+#: builtin/add.c:284
 msgid "just skip files which cannot be added because of errors"
 msgstr "només omet els fitxers que no es poden afegir a causa d'errors"
 
-#: builtin/add.c:282
+#: builtin/add.c:285
 msgid "check if - even missing - files are ignored in dry run"
-msgstr "comproveu si els fitxers - fins i tot els absents - s'ignoren en marxa en sec"
+msgstr ""
+"comproveu si els fitxers - fins i tot els absents - s'ignoren en marxa en sec"
 
-#: builtin/add.c:283 builtin/update-index.c:951
+#: builtin/add.c:286 builtin/update-index.c:952
 msgid "(+/-)x"
 msgstr "(+/-)x"
 
-#: builtin/add.c:283 builtin/update-index.c:952
+#: builtin/add.c:286 builtin/update-index.c:953
 msgid "override the executable bit of the listed files"
 msgstr "passa per alt el bit executable dels fitxers llistats"
 
-#: builtin/add.c:305
+#: builtin/add.c:288
+#, fuzzy
+msgid "warn when adding an embedded repository"
+msgstr "crea un dipòsit nu"
+
+#: builtin/add.c:303
+#, c-format
+msgid ""
+"You've added another git repository inside your current repository.\n"
+"Clones of the outer repository will not contain the contents of\n"
+"the embedded repository and will not know how to obtain it.\n"
+"If you meant to add a submodule, use:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"If you added this path by mistake, you can remove it from the\n"
+"index with:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"See \"git help submodule\" for more information."
+msgstr ""
+
+#: builtin/add.c:331
+#, fuzzy, c-format
+msgid "adding embedded git repository: %s"
+msgstr "--stdin requereix d'un dipòsit git"
+
+#: builtin/add.c:349
 #, c-format
 msgid "Use -f if you really want to add them.\n"
 msgstr "Useu -f si realment els voleu afegir.\n"
 
-#: builtin/add.c:312
+#: builtin/add.c:357
 msgid "adding files failed"
 msgstr "l'afegiment de fitxers ha fallat"
 
-#: builtin/add.c:348
+#: builtin/add.c:394
 msgid "-A and -u are mutually incompatible"
 msgstr "-A i -u són mútuament incompatibles"
 
-#: builtin/add.c:355
+#: builtin/add.c:401
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr "L'opció --ignore-missing només es pot usar junt amb --dry-run"
 
-#: builtin/add.c:359
+#: builtin/add.c:405
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "el paràmetre --chmod '%s' ha de ser o -x o +x"
 
-#: builtin/add.c:374
+#: builtin/add.c:420
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "No s'ha especificat res, no s'ha afegit res.\n"
 
-#: builtin/add.c:375
+#: builtin/add.c:421
 #, c-format
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Potser volíeu dir 'git add .'?\n"
 
-#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298 builtin/checkout.c:491
-#: builtin/clean.c:920 builtin/commit.c:350 builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271
+#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
+#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
+#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
 #: builtin/submodule--helper.c:244
 msgid "index file corrupt"
 msgstr "fitxer d'índex malmès"
 
-#: builtin/am.c:412
+#: builtin/am.c:413
 msgid "could not parse author script"
 msgstr "no s'ha pogut analitzar l'script d'autor"
 
@@ -4681,7 +4945,7 @@ msgstr "desplaçament de zona de temps no vàlid"
 msgid "Patch format detection failed."
 msgstr "La detecció de format de pedaç ha fallat."
 
-#: builtin/am.c:991 builtin/clone.c:397
+#: builtin/am.c:991 builtin/clone.c:401
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "s'ha produït un error en crear el directori '%s'"
@@ -4690,48 +4954,54 @@ msgstr "s'ha produït un error en crear el directori '%s'"
 msgid "Failed to split patches."
 msgstr "S'ha produït un error en dividir els pedaços."
 
-#: builtin/am.c:1127 builtin/commit.c:376
+#: builtin/am.c:1120 builtin/commit.c:377
 msgid "unable to write index file"
 msgstr "no s'ha pogut escriure el fitxer d'índex"
 
-#: builtin/am.c:1178
+#: builtin/am.c:1171
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Quan hàgiu resolt aquest problema, executeu \"%s --continue\"."
 
-#: builtin/am.c:1179
+#: builtin/am.c:1172
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
-msgstr "Si preferiu ometre aquest pedaç, executeu \"%s --skip\" en lloc d'això."
+msgstr ""
+"Si preferiu ometre aquest pedaç, executeu \"%s --skip\" en lloc d'això."
 
-#: builtin/am.c:1180
+#: builtin/am.c:1173
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
-msgstr "Per a restaurar la branca original i deixar d'apedaçar, executeu \"%s --abort\"."
+msgstr ""
+"Per a restaurar la branca original i deixar d'apedaçar, executeu \"%s --abort"
+"\"."
 
-#: builtin/am.c:1315
-msgid "Patch is empty. Was it split wrong?"
-msgstr "El pedaç és buit. S'ha dividit malament?"
+#: builtin/am.c:1304
+#, fuzzy
+msgid "Patch is empty."
+msgstr "El pedaç actual està buit."
 
-#: builtin/am.c:1386 builtin/log.c:1557
-#, c-format
-msgid "invalid ident line: %s"
+#: builtin/am.c:1370
+#, fuzzy, c-format
+msgid "invalid ident line: %.*s"
 msgstr "línia d'identitat no vàlida: %s"
 
-#: builtin/am.c:1413
+#: builtin/am.c:1392
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "no s'ha pogut analitzar la comissió %s"
 
-#: builtin/am.c:1606
+#: builtin/am.c:1586
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
-msgstr "Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3 vies."
+msgstr ""
+"Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3 "
+"vies."
 
-#: builtin/am.c:1608
+#: builtin/am.c:1588
 msgid "Using index info to reconstruct a base tree..."
 msgstr "S'està usant la informació d'índex per a reconstruir un arbre base..."
 
-#: builtin/am.c:1627
+#: builtin/am.c:1607
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -4739,36 +5009,38 @@ msgstr ""
 "Heu editat el vostre pedaç a mà?\n"
 "No s'aplica als blobs recordats en el seu índex."
 
-#: builtin/am.c:1633
+#: builtin/am.c:1613
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "S'està retrocedint a apedaçar la base i una fusió de 3 vies..."
 
-#: builtin/am.c:1658
+#: builtin/am.c:1638
 msgid "Failed to merge in the changes."
 msgstr "S'ha produït un error en fusionar els canvis."
 
-#: builtin/am.c:1682 builtin/merge.c:631
+#: builtin/am.c:1662 builtin/merge.c:632
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree ha fallat en escriure un arbre"
 
-#: builtin/am.c:1689
+#: builtin/am.c:1669
 msgid "applying to an empty history"
 msgstr "s'està aplicant a una història buida"
 
-#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802 builtin/merge.c:827
+#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
+#: builtin/merge.c:828
 msgid "failed to write commit object"
 msgstr "s'ha produït un error en escriure l'objecte de comissió"
 
-#: builtin/am.c:1735 builtin/am.c:1739
+#: builtin/am.c:1715 builtin/am.c:1719
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "no es pot reprendre: %s no existeix."
 
-#: builtin/am.c:1755
+#: builtin/am.c:1735
 msgid "cannot be interactive without stdin connected to a terminal."
-msgstr "no es pot ser interactiu sense que stdin estigui connectada a un terminal."
+msgstr ""
+"no es pot ser interactiu sense que stdin estigui connectada a un terminal."
 
-#: builtin/am.c:1760
+#: builtin/am.c:1740
 msgid "Commit Body is:"
 msgstr "El cos de la comissió és:"
 
@@ -4776,35 +5048,37 @@ msgstr "El cos de la comissió és:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1770
+#: builtin/am.c:1750
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
-msgstr "Voleu aplicar-lo? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls tots: "
+msgstr ""
+"Voleu aplicar-lo? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls "
+"tots: "
 
-#: builtin/am.c:1820
+#: builtin/am.c:1800
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Índex brut: no es poden aplicar pedaços (bruts: %s)"
 
-#: builtin/am.c:1860 builtin/am.c:1932
+#: builtin/am.c:1840 builtin/am.c:1912
 #, c-format
 msgid "Applying: %.*s"
 msgstr "S'està aplicant: %.*s"
 
-#: builtin/am.c:1876
+#: builtin/am.c:1856
 msgid "No changes -- Patch already applied."
 msgstr "Sense canvis -- El pedaç ja s'ha aplicat."
 
-#: builtin/am.c:1884
+#: builtin/am.c:1864
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "El pedaç ha fallat a %s %.*s"
 
-#: builtin/am.c:1890
+#: builtin/am.c:1870
 #, c-format
 msgid "The copy of the patch that failed is found in: %s"
 msgstr "La còpia del pedaç que ha fallat es troba en: %s"
 
-#: builtin/am.c:1935
+#: builtin/am.c:1915
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -4814,24 +5088,25 @@ msgstr ""
 "Si no hi ha res per fer «stage», probablement alguna altra cosa ja ha\n"
 "introduït els mateixos canvis; potser voleu ometre aquest pedaç."
 
-#: builtin/am.c:1942
+#: builtin/am.c:1922
 msgid ""
 "You still have unmerged paths in your index.\n"
-"Did you forget to use 'git add'?"
+"You should 'git add' each file with resolved conflicts to mark them as "
+"such.\n"
+"You might run `git rm` on a file to accept \"deleted by them\" for it."
 msgstr ""
-"Encara teniu camins sense fusionar en el vostre índex.\n"
-"Heu oblidat d'usar 'git add'?"
 
-#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308 builtin/reset.c:316
+#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
+#: builtin/reset.c:331
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "No s'ha pogut analitzar l'objecte '%s'."
 
-#: builtin/am.c:2102
+#: builtin/am.c:2083
 msgid "failed to clean index"
 msgstr "s'ha produït un error en netejar l'índex"
 
-#: builtin/am.c:2136
+#: builtin/am.c:2117
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -4839,130 +5114,136 @@ msgstr ""
 "Sembla que heu mogut HEAD després de l'última fallada de 'am'.\n"
 "No s'està rebobinant a ORIG_HEAD"
 
-#: builtin/am.c:2199
+#: builtin/am.c:2180
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Valor no vàlid per a --patch-format: %s"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2213
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<opcions>] [(<bústia> | <directori-de-correu>)...]"
 
-#: builtin/am.c:2233
+#: builtin/am.c:2214
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<opcions>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2220
 msgid "run interactively"
 msgstr "executa interactivament"
 
-#: builtin/am.c:2241
+#: builtin/am.c:2222
 msgid "historical option -- no-op"
 msgstr "opció històrica -- no-op"
 
-#: builtin/am.c:2243
+#: builtin/am.c:2224
 msgid "allow fall back on 3way merging if needed"
 msgstr "permet retrocedir a una fusió de 3 vies si és necessari"
 
-#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57 builtin/repack.c:178
+#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/repack.c:180
 msgid "be quiet"
 msgstr "silenciós"
 
-#: builtin/am.c:2246
+#: builtin/am.c:2227
 msgid "add a Signed-off-by line to the commit message"
 msgstr "afegeix una línia Signed-off-by al missatge de comissió"
 
-#: builtin/am.c:2249
+#: builtin/am.c:2230
 msgid "recode into utf8 (default)"
 msgstr "recodifica en utf8 (per defecte)"
 
-#: builtin/am.c:2251
+#: builtin/am.c:2232
 msgid "pass -k flag to git-mailinfo"
 msgstr "passa la bandera -k al git-mailinfo"
 
-#: builtin/am.c:2253
+#: builtin/am.c:2234
 msgid "pass -b flag to git-mailinfo"
 msgstr "passa la bandera -b al git-mailinfo"
 
-#: builtin/am.c:2255
+#: builtin/am.c:2236
 msgid "pass -m flag to git-mailinfo"
 msgstr "passa la bandera -m al git-mailinfo"
 
-#: builtin/am.c:2257
+#: builtin/am.c:2238
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "passa la bandera --keep-cr al git-mailsplit per al format mbox"
 
-#: builtin/am.c:2260
+#: builtin/am.c:2241
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
-msgstr "no passis la bandera --keep-cr al git-mailsplit independent de am.keepcr"
+msgstr ""
+"no passis la bandera --keep-cr al git-mailsplit independent de am.keepcr"
 
-#: builtin/am.c:2263
+#: builtin/am.c:2244
 msgid "strip everything before a scissors line"
 msgstr "elimina tot abans d'una línia de tisores"
 
-#: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277
-#: builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2292
+#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2273
 msgid "pass it through git-apply"
 msgstr "passa-ho a través del git-apply"
 
-#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:1045
-#: builtin/merge.c:201 builtin/pull.c:135 builtin/pull.c:194 builtin/repack.c:187
-#: builtin/repack.c:191 builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398
-#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
+#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
+#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193
+#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169
+#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134
+#: parse-options.h:245
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/replace.c:443
-#: builtin/tag.c:433 builtin/verify-tag.c:38
+#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
+#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
 msgid "format"
 msgstr "format"
 
-#: builtin/am.c:2289
+#: builtin/am.c:2270
 msgid "format the patch(es) are in"
 msgstr "el format en el qual estan els pedaços"
 
-#: builtin/am.c:2295
+#: builtin/am.c:2276
 msgid "override error message when patch failure occurs"
-msgstr "passa per alt el missatge d'error quan s'ocorre una fallada en apedaçar"
+msgstr ""
+"passa per alt el missatge d'error quan s'ocorre una fallada en apedaçar"
 
-#: builtin/am.c:2297
+#: builtin/am.c:2278
 msgid "continue applying patches after resolving a conflict"
 msgstr "segueix aplicant pedaços després de resoldre un conflicte"
 
-#: builtin/am.c:2300
+#: builtin/am.c:2281
 msgid "synonyms for --continue"
 msgstr "sinònims de --continue"
 
-#: builtin/am.c:2303
+#: builtin/am.c:2284
 msgid "skip the current patch"
 msgstr "omet el pedaç actual"
 
-#: builtin/am.c:2306
+#: builtin/am.c:2287
 msgid "restore the original branch and abort the patching operation."
 msgstr "restaura la branca original i avorta l'operació d'apedaçament."
 
-#: builtin/am.c:2310
+#: builtin/am.c:2291
 msgid "lie about committer date"
 msgstr "menteix sobre la data del comitent"
 
-#: builtin/am.c:2312
+#: builtin/am.c:2293
 msgid "use current timestamp for author date"
 msgstr "usa el marc de temps actual per la data d'autor"
 
-#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232 builtin/pull.c:165
-#: builtin/revert.c:111 builtin/tag.c:413
+#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
+#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
 msgid "key-id"
 msgstr "ID de clau"
 
-#: builtin/am.c:2315
+#: builtin/am.c:2296
 msgid "GPG-sign commits"
 msgstr "signa les comissions amb GPG"
 
-#: builtin/am.c:2318
+#: builtin/am.c:2299
 msgid "(internal use for git-rebase)"
 msgstr "(ús intern per al git-rebase)"
 
-#: builtin/am.c:2333
+#: builtin/am.c:2317
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -4970,16 +5251,18 @@ msgstr ""
 "Fa molt que l'opció -b/--binary no ha fet res, i\n"
 "s'eliminarà. Si us plau, no l'useu més."
 
-#: builtin/am.c:2340
+#: builtin/am.c:2324
 msgid "failed to read the index"
 msgstr "S'ha produït un error en llegir l'índex"
 
-#: builtin/am.c:2355
+#: builtin/am.c:2339
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
-msgstr "un directori de rebasament anterior %s encara existeix però s'ha donat una bústia."
+msgstr ""
+"un directori de «rebase» anterior %s encara existeix però s'ha donat una "
+"bústia."
 
-#: builtin/am.c:2379
+#: builtin/am.c:2363
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -4988,7 +5271,7 @@ msgstr ""
 "S'ha trobat un directori %s extraviat.\n"
 "Useu \"git am --abort\" per a eliminar-lo."
 
-#: builtin/am.c:2385
+#: builtin/am.c:2369
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Una operació de resolució no està en curs; no reprenem."
 
@@ -5038,190 +5321,173 @@ msgstr "realitza 'git bisect next'"
 msgid "update BISECT_HEAD instead of checking out the current commit"
 msgstr "actualitza BISECT_HEAD en lloc d'agafar la comissió actual"
 
-#: builtin/blame.c:33
+#: builtin/blame.c:27
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<opcions>] [<opcions-de-revisió>] [<revisió>] [--] fitxer"
 
-#: builtin/blame.c:38
+#: builtin/blame.c:32
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "es documenten les <opcions-de-revisió> en git-rev-list(1)"
 
-#: builtin/blame.c:1777
-msgid "Blaming lines"
-msgstr "S'està fent un «blame»"
-
-#: builtin/blame.c:2573
+#: builtin/blame.c:668
 msgid "Show blame entries as we find them, incrementally"
 msgstr "Mostra les entrades «blame» mentre les trobem, incrementalment"
 
-#: builtin/blame.c:2574
+#: builtin/blame.c:669
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
-msgstr "Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: desactivat)"
+msgstr ""
+"Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: "
+"desactivat)"
 
-#: builtin/blame.c:2575
+#: builtin/blame.c:670
 msgid "Do not treat root commits as boundaries (Default: off)"
-msgstr "No tractis les comissions d'arrel com a límits (Per defecte: desactivat)"
+msgstr ""
+"No tractis les comissions d'arrel com a límits (Per defecte: desactivat)"
 
-#: builtin/blame.c:2576
+#: builtin/blame.c:671
 msgid "Show work cost statistics"
 msgstr "Mostra les estadístiques de preu de treball"
 
-#: builtin/blame.c:2577
+#: builtin/blame.c:672
 msgid "Force progress reporting"
 msgstr "Força l'informe de progrés"
 
-#: builtin/blame.c:2578
+#: builtin/blame.c:673
 msgid "Show output score for blame entries"
 msgstr "Mostra la puntuació de sortida de les entrades «blame»"
 
-#: builtin/blame.c:2579
+#: builtin/blame.c:674
 msgid "Show original filename (Default: auto)"
 msgstr "Mostra el nom de fitxer original (Per defecte: automàtic)"
 
-#: builtin/blame.c:2580
+#: builtin/blame.c:675
 msgid "Show original linenumber (Default: off)"
 msgstr "Mostra el número de línia original (Per defecte: desactivat)"
 
-#: builtin/blame.c:2581
+#: builtin/blame.c:676
 msgid "Show in a format designed for machine consumption"
 msgstr "Presenta en un format dissenyat per consumpció per màquina"
 
-#: builtin/blame.c:2582
+#: builtin/blame.c:677
 msgid "Show porcelain format with per-line commit information"
 msgstr "Mostra el format de porcellana amb informació de comissió per línia"
 
-#: builtin/blame.c:2583
+#: builtin/blame.c:678
 msgid "Use the same output mode as git-annotate (Default: off)"
-msgstr "Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)"
+msgstr ""
+"Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)"
 
-#: builtin/blame.c:2584
+#: builtin/blame.c:679
 msgid "Show raw timestamp (Default: off)"
 msgstr "Mostra la marca de temps crua (Per defecte: desactivat)"
 
-#: builtin/blame.c:2585
+#: builtin/blame.c:680
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)"
 
-#: builtin/blame.c:2586
+#: builtin/blame.c:681
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "Omet el nom d'autor i la marca de temps (Per defecte: desactivat)"
 
-#: builtin/blame.c:2587
+#: builtin/blame.c:682
 msgid "Show author email instead of name (Default: off)"
-msgstr "Mostra l'adreça de correu electrònic de l'autor en lloc del nom (Per defecte: desactivat)"
+msgstr ""
+"Mostra l'adreça de correu electrònic de l'autor en lloc del nom (Per "
+"defecte: desactivat)"
 
-#: builtin/blame.c:2588
+#: builtin/blame.c:683
 msgid "Ignore whitespace differences"
 msgstr "Ignora les diferències d'espai en blanc"
 
-#: builtin/blame.c:2595
+#: builtin/blame.c:690
 msgid "Use an experimental heuristic to improve diffs"
 msgstr "Usa un heurístic experimental per a millorar les diferències"
 
-#: builtin/blame.c:2597
+#: builtin/blame.c:692
 msgid "Spend extra cycles to find better match"
 msgstr "Gasta cicles extres per a trobar una coincidència millor"
 
-#: builtin/blame.c:2598
+#: builtin/blame.c:693
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "Usa les revisions de <fitxer> en lloc d'invocar git-rev-list"
 
-#: builtin/blame.c:2599
+#: builtin/blame.c:694
 msgid "Use <file>'s contents as the final image"
 msgstr "Usa els continguts de <fitxer> com a la imatge final"
 
-#: builtin/blame.c:2600 builtin/blame.c:2601
+#: builtin/blame.c:695 builtin/blame.c:696
 msgid "score"
 msgstr "puntuació"
 
-#: builtin/blame.c:2600
+#: builtin/blame.c:695
 msgid "Find line copies within and across files"
 msgstr "Troba còpies de línia dins i a través dels fitxers"
 
-#: builtin/blame.c:2601
+#: builtin/blame.c:696
 msgid "Find line movements within and across files"
 msgstr "Troba moviments de línia dins i a través dels fitxers"
 
-#: builtin/blame.c:2602
+#: builtin/blame.c:697
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:2602
+#: builtin/blame.c:697
 msgid "Process only line range n,m, counting from 1"
 msgstr "Processa només el rang de línies n,m, comptant des d'1"
 
-#: builtin/blame.c:2649
+#: builtin/blame.c:744
 msgid "--progress can't be used with --incremental or porcelain formats"
-msgstr "no es pot usar --progress amb els formats --incremental o de porcellana"
-
-#. TRANSLATORS: This string is used to tell us the maximum
-#. display width for a relative timestamp in "git blame"
-#. output.  For C locale, "4 years, 11 months ago", which
-#. takes 22 places, is the longest among various forms of
-#. relative timestamps, but your language may need more or
-#. fewer display columns.
-#: builtin/blame.c:2697
+msgstr ""
+"no es pot usar --progress amb els formats --incremental o de porcellana"
+
+#. TRANSLATORS: This string is used to tell us the
+#. maximum display width for a relative timestamp in
+#. "git blame" output.  For C locale, "4 years, 11
+#. months ago", which takes 22 places, is the longest
+#. among various forms of relative timestamps, but
+#. your language may need more or fewer display
+#. columns.
+#.
+#: builtin/blame.c:795
 msgid "4 years, 11 months ago"
 msgstr "fa 4 anys i 11 mesos"
 
-#: builtin/blame.c:2777
-msgid "--contents and --reverse do not blend well."
-msgstr "--contents i --reverse no funcionen bé juntes."
-
-#: builtin/blame.c:2797
-msgid "cannot use --contents with final commit object name"
-msgstr "no es pot usar --contents amb el nom d'objecte de la comissió final"
-
-#: builtin/blame.c:2802
-msgid "--reverse and --first-parent together require specified latest commit"
-msgstr "--reverse i --first-parent-together requereixen una última comissió especificada"
-
-#: builtin/blame.c:2829
-msgid "--reverse --first-parent together require range along first-parent chain"
-msgstr "--reverse --first-parent junts requereixen un rang de la cadena de mares primeres"
-
-#: builtin/blame.c:2840
-#, c-format
-msgid "no such path %s in %s"
-msgstr "no hi ha tal camí %s en %s"
-
-#: builtin/blame.c:2851
-#, c-format
-msgid "cannot read blob %s for path %s"
-msgstr "no es pot llegir el blob %s per al camí %s"
-
-#: builtin/blame.c:2870
+#: builtin/blame.c:882
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "el fitxer %s té només %lu línia"
 msgstr[1] "el fitxer %s té només %lu línies"
 
-#: builtin/branch.c:26
+#: builtin/blame.c:928
+msgid "Blaming lines"
+msgstr "S'està fent un «blame»"
+
+#: builtin/branch.c:27
 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
 msgstr "git branch [<opcions>] [-r | -a] [--merged | --no-merged]"
 
-#: builtin/branch.c:27
+#: builtin/branch.c:28
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
 msgstr "git branch [<opcions>] [-l] [-f] <nom-de-branca> [<punt-inicial>]"
 
-#: builtin/branch.c:28
+#: builtin/branch.c:29
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<opcions>] [-r] (-d | -D) <nom-de-branca>..."
 
-#: builtin/branch.c:29
+#: builtin/branch.c:30
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<opcions>] (-m | -M) [<branca-antiga>] <branca-nova>"
 
-#: builtin/branch.c:30
+#: builtin/branch.c:31
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<opcions>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:31
+#: builtin/branch.c:32
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<opcions>] [-r | -a] [--format]"
 
-#: builtin/branch.c:144
+#: builtin/branch.c:145
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -5231,7 +5497,7 @@ msgstr ""
 "         fusionat a '%s', però encara no\n"
 "         s'ha fusionat a HEAD."
 
-#: builtin/branch.c:148
+#: builtin/branch.c:149
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -5241,12 +5507,12 @@ msgstr ""
 "         s'ha fusionat a '%s', encara que està\n"
 "         fusionada a HEAD."
 
-#: builtin/branch.c:162
+#: builtin/branch.c:163
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "No s'ha pogut trobar l'objecte de comissió de '%s'"
 
-#: builtin/branch.c:166
+#: builtin/branch.c:167
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -5255,91 +5521,93 @@ msgstr ""
 "La branca '%s' no està totalment fusionada.\n"
 "Si esteu segur que la voleu suprimir, executeu 'git branch -D %s'."
 
-#: builtin/branch.c:179
+#: builtin/branch.c:180
 msgid "Update of config-file failed"
 msgstr "L'actualització del fitxer de configuració ha fallat"
 
-#: builtin/branch.c:210
+#: builtin/branch.c:211
 msgid "cannot use -a with -d"
 msgstr "no es pot usar -a amb -d"
 
-#: builtin/branch.c:216
+#: builtin/branch.c:217
 msgid "Couldn't look up commit object for HEAD"
 msgstr "No s'ha pogut trobar l'objecte de comissió de HEAD"
 
-#: builtin/branch.c:230
+#: builtin/branch.c:231
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "No es pot suprimir la branca '%s' agafada a '%s'"
 
-#: builtin/branch.c:245
+#: builtin/branch.c:246
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "no s'ha trobat la branca amb seguiment remot '%s'."
 
-#: builtin/branch.c:246
+#: builtin/branch.c:247
 #, c-format
 msgid "branch '%s' not found."
 msgstr "no s'ha trobat la branca '%s'."
 
-#: builtin/branch.c:261
+#: builtin/branch.c:262
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr "Error en suprimir la branca amb seguiment remot '%s'"
 
-#: builtin/branch.c:262
+#: builtin/branch.c:263
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "Error en suprimir la branca '%s'"
 
-#: builtin/branch.c:269
+#: builtin/branch.c:270
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "S'ha suprimit la branca amb seguiment remot %s (era %s).\n"
 
-#: builtin/branch.c:270
+#: builtin/branch.c:271
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "S'ha suprimit la branca %s (era %s).\n"
 
-#: builtin/branch.c:441
+#: builtin/branch.c:445
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "S'està fent «rebase» en la branca %s a %s"
 
-#: builtin/branch.c:445
+#: builtin/branch.c:449
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "La branca %s s'està bisecant a %s"
 
-#: builtin/branch.c:460
+#: builtin/branch.c:464
 msgid "cannot rename the current branch while not on any."
 msgstr "no es pot canviar el nom de la branca actual mentre no s'és a cap."
 
-#: builtin/branch.c:470
+#: builtin/branch.c:474
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Nom de branca no vàlid: '%s'"
 
-#: builtin/branch.c:487
+#: builtin/branch.c:491
 msgid "Branch rename failed"
 msgstr "El canvi de nom de branca ha fallat"
 
-#: builtin/branch.c:490
+#: builtin/branch.c:494
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "S'ha canviat el nom de la branca mal anomenada '%s'"
 
-#: builtin/branch.c:493
+#: builtin/branch.c:497
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "S'ha canviat el nom de la branca a %s, però HEAD no està actualitzat!"
 
-#: builtin/branch.c:502
+#: builtin/branch.c:506
 msgid "Branch is renamed, but update of config-file failed"
-msgstr "La branca està canviada de nom, però l'actualització del fitxer de configuració ha fallat"
+msgstr ""
+"La branca està canviada de nom, però l'actualització del fitxer de "
+"configuració ha fallat"
 
-#: builtin/branch.c:518
+#: builtin/branch.c:522
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -5350,219 +5618,225 @@ msgstr ""
 "  %s\n"
 "S'eliminaran les línies que comencin amb '%c'.\n"
 
-#: builtin/branch.c:551
+#: builtin/branch.c:555
 msgid "Generic options"
 msgstr "Opcions genèriques"
 
-#: builtin/branch.c:553
+#: builtin/branch.c:557
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "mostra el hash i l'assumpte, doneu dues vegades per la branca font"
 
-#: builtin/branch.c:554
+#: builtin/branch.c:558
 msgid "suppress informational messages"
 msgstr "omet els missatges informatius"
 
-#: builtin/branch.c:555
+#: builtin/branch.c:559
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "configura el mode de seguiment (vegeu git-pull(1))"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:561
 msgid "change upstream info"
 msgstr "canvia la informació de font"
 
-#: builtin/branch.c:559
+#: builtin/branch.c:563
 msgid "upstream"
 msgstr "font"
 
-#: builtin/branch.c:559
+#: builtin/branch.c:563
 msgid "change the upstream info"
 msgstr "canvia la informació de font"
 
-#: builtin/branch.c:560
+#: builtin/branch.c:564
 msgid "Unset the upstream info"
 msgstr "Desestableix la informació de font"
 
-#: builtin/branch.c:561
+#: builtin/branch.c:565
 msgid "use colored output"
 msgstr "usa sortida colorada"
 
-#: builtin/branch.c:562
+#: builtin/branch.c:566
 msgid "act on remote-tracking branches"
 msgstr "actua en branques amb seguiment remot"
 
-#: builtin/branch.c:564 builtin/branch.c:566
+#: builtin/branch.c:568 builtin/branch.c:570
 msgid "print only branches that contain the commit"
 msgstr "imprimeix només les branques que continguin la comissió"
 
-#: builtin/branch.c:565 builtin/branch.c:567
+#: builtin/branch.c:569 builtin/branch.c:571
 msgid "print only branches that don't contain the commit"
 msgstr "imprimeix només les branques que no continguin la comissió"
 
-#: builtin/branch.c:570
+#: builtin/branch.c:574
 msgid "Specific git-branch actions:"
 msgstr "Accions de git-branch específiques:"
 
-#: builtin/branch.c:571
+#: builtin/branch.c:575
 msgid "list both remote-tracking and local branches"
 msgstr "llista les branques amb seguiment remot i les locals"
 
-#: builtin/branch.c:573
+#: builtin/branch.c:577
 msgid "delete fully merged branch"
 msgstr "suprimeix la branca si està completament fusionada"
 
-#: builtin/branch.c:574
+#: builtin/branch.c:578
 msgid "delete branch (even if not merged)"
 msgstr "suprimeix la branca (encara que no estigui fusionada)"
 
-#: builtin/branch.c:575
+#: builtin/branch.c:579
 msgid "move/rename a branch and its reflog"
 msgstr "mou/canvia de nom una branca i el seu registre de referència"
 
-#: builtin/branch.c:576
+#: builtin/branch.c:580
 msgid "move/rename a branch, even if target exists"
 msgstr "mou/canvia de nom una branca, encara que el destí existeixi"
 
-#: builtin/branch.c:577
+#: builtin/branch.c:581
 msgid "list branch names"
 msgstr "llista els noms de branca"
 
-#: builtin/branch.c:578
+#: builtin/branch.c:582
 msgid "create the branch's reflog"
 msgstr "crea el registre de referència de la branca"
 
-#: builtin/branch.c:580
+#: builtin/branch.c:584
 msgid "edit the description for the branch"
 msgstr "edita la descripció de la branca"
 
-#: builtin/branch.c:581
+#: builtin/branch.c:585
 msgid "force creation, move/rename, deletion"
 msgstr "força creació, moviment/canvi de nom, supressió"
 
-#: builtin/branch.c:582
+#: builtin/branch.c:586
 msgid "print only branches that are merged"
 msgstr "imprimeix només les branques que s'han fusionat"
 
-#: builtin/branch.c:583
+#: builtin/branch.c:587
 msgid "print only branches that are not merged"
 msgstr "imprimeix només les branques que no s'han fusionat"
 
-#: builtin/branch.c:584
+#: builtin/branch.c:588
 msgid "list branches in columns"
 msgstr "llista les branques en columnes"
 
-#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426
+#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
 msgid "key"
 msgstr "clau"
 
-#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
 msgid "field name to sort on"
 msgstr "nom del camp en el qual ordenar"
 
-#: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404 builtin/notes.c:407
-#: builtin/notes.c:567 builtin/notes.c:570 builtin/tag.c:429
+#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
+#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
+#: builtin/tag.c:430
 msgid "object"
 msgstr "objecte"
 
-#: builtin/branch.c:589
+#: builtin/branch.c:593
 msgid "print only branches of the object"
 msgstr "imprimeix només les branques de l'objecte"
 
-#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434
+#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
 msgid "sorting and filtering are case insensitive"
 msgstr "l'ordenació i el filtratge distingeixen entre majúscules i minúscules"
 
-#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433 builtin/verify-tag.c:38
+#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr "format a usar en la sortida"
 
-#: builtin/branch.c:611
+#: builtin/branch.c:615
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "S'ha produït un error en resoldre HEAD com a referència vàlida."
 
-#: builtin/branch.c:615 builtin/clone.c:724
+#: builtin/branch.c:619 builtin/clone.c:728
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD no trobat sota refs/heads!"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:642
 msgid "--column and --verbose are incompatible"
 msgstr "--column i --verbose són incompatibles"
 
-#: builtin/branch.c:649 builtin/branch.c:701
+#: builtin/branch.c:653 builtin/branch.c:705
 msgid "branch name required"
 msgstr "cal el nom de branca"
 
-#: builtin/branch.c:677
+#: builtin/branch.c:681
 msgid "Cannot give description to detached HEAD"
 msgstr "No es pot donar descripció a un HEAD separat"
 
-#: builtin/branch.c:682
+#: builtin/branch.c:686
 msgid "cannot edit description of more than one branch"
 msgstr "no es pot editar la descripció de més d'una branca"
 
-#: builtin/branch.c:689
+#: builtin/branch.c:693
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Encara no hi ha cap comissió en la branca '%s'."
 
-#: builtin/branch.c:692
+#: builtin/branch.c:696
 #, c-format
 msgid "No branch named '%s'."
 msgstr "No hi ha branca amb nom '%s'."
 
-#: builtin/branch.c:707
+#: builtin/branch.c:711
 msgid "too many branches for a rename operation"
 msgstr "hi ha massa branques per a una operació de canvi de nom"
 
-#: builtin/branch.c:712
+#: builtin/branch.c:716
 msgid "too many branches to set new upstream"
 msgstr "hi ha massa branques per a establir una nova font"
 
-#: builtin/branch.c:716
+#: builtin/branch.c:720
 #, c-format
-msgid "could not set upstream of HEAD to %s when it does not point to any branch."
-msgstr "no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca."
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
+msgstr ""
+"no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca."
 
-#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762
+#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
 #, c-format
 msgid "no such branch '%s'"
 msgstr "no hi ha tal branca '%s'"
 
-#: builtin/branch.c:723
+#: builtin/branch.c:727
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "la branca '%s' no existeix"
 
-#: builtin/branch.c:735
+#: builtin/branch.c:739
 msgid "too many branches to unset upstream"
 msgstr "hi ha massa branques per a desestablir la font"
 
-#: builtin/branch.c:739
+#: builtin/branch.c:743
 msgid "could not unset upstream of HEAD when it does not point to any branch."
-msgstr "no s'ha pogut desestablir la font de HEAD perquè no assenyala cap branca."
+msgstr ""
+"no s'ha pogut desestablir la font de HEAD perquè no assenyala cap branca."
 
-#: builtin/branch.c:745
+#: builtin/branch.c:749
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "La branca '%s' no té informació de font"
 
-#: builtin/branch.c:759
+#: builtin/branch.c:763
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr "no té sentit crear 'HEAD' manualment"
 
-#: builtin/branch.c:765
+#: builtin/branch.c:769
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
-msgstr "les opcions -a i -r a 'git branch' no tenen sentit amb un nom de branca"
+msgstr ""
+"les opcions -a i -r a 'git branch' no tenen sentit amb un nom de branca"
 
-#: builtin/branch.c:768
+#: builtin/branch.c:772
 #, c-format
 msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-"
-"upstream-to\n"
+"The --set-upstream flag is deprecated and will be removed. Consider using --"
+"track or --set-upstream-to\n"
 msgstr ""
-"La bandera --set-upstream està en desús i s'eliminarà. Considereu usar --track o --set-upstream-"
-"to\n"
+"La bandera --set-upstream està en desús i s'eliminarà. Considereu usar --"
+"track o --set-upstream-to\n"
 
-#: builtin/branch.c:785
+#: builtin/branch.c:789
 #, c-format
 msgid ""
 "\n"
@@ -5586,311 +5860,322 @@ msgstr "Cal un dipòsit per a fer un farcell."
 msgid "Need a repository to unbundle."
 msgstr "Cal un dipòsit per a desfer un farcell."
 
-#: builtin/cat-file.c:513
+#: builtin/cat-file.c:519
 msgid ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --"
-"textconv | --filters) [--path=<path>] <object>"
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <type> | --textconv | --filters) [--path=<path>] <object>"
 msgstr ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <tipus> | --"
-"textconv | --filters [--path=<camí>]) <objecte>"
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <tipus> | --textconv | --filters [--path=<camí>]) <objecte>"
 
-#: builtin/cat-file.c:514
-msgid "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]"
-msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]"
+#: builtin/cat-file.c:520
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
 
-#: builtin/cat-file.c:551
+#: builtin/cat-file.c:557
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<tipus> pot ser un de: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:552
+#: builtin/cat-file.c:558
 msgid "show object type"
 msgstr "mostra el tipus de l'objecte"
 
-#: builtin/cat-file.c:553
+#: builtin/cat-file.c:559
 msgid "show object size"
 msgstr "mostra la mida de l'objecte"
 
-#: builtin/cat-file.c:555
+#: builtin/cat-file.c:561
 msgid "exit with zero when there's no error"
 msgstr "surt amb zero quan no hi ha error"
 
-#: builtin/cat-file.c:556
+#: builtin/cat-file.c:562
 msgid "pretty-print object's content"
 msgstr "imprimeix bellament el contingut de l'objecte"
 
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:564
 msgid "for blob objects, run textconv on object's content"
 msgstr "en els objectes de blob, executa textconv en el contingut de l'objecte"
 
-#: builtin/cat-file.c:560
+#: builtin/cat-file.c:566
 msgid "for blob objects, run filters on object's content"
-msgstr "en els objectes de blob, executa els filtres en el contingut de l'objecte"
+msgstr ""
+"en els objectes de blob, executa els filtres en el contingut de l'objecte"
 
-#: builtin/cat-file.c:561 git-submodule.sh:943
+#: builtin/cat-file.c:567 git-submodule.sh:944
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:568
 msgid "use a specific path for --textconv/--filters"
 msgstr "usa un camí específic per a --textconv/--filters"
 
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:570
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "permet que -s i -t funcionin amb objectes trencats/malmesos"
 
-#: builtin/cat-file.c:565
+#: builtin/cat-file.c:571
 msgid "buffer --batch output"
 msgstr "posa la sortida de --batch en memòria intermèdia"
 
-#: builtin/cat-file.c:567
+#: builtin/cat-file.c:573
 msgid "show info and content of objects fed from the standard input"
-msgstr "mostra la informació i contingut dels objectes rebuts de l'entrada estàndard"
+msgstr ""
+"mostra la informació i contingut dels objectes rebuts de l'entrada estàndard"
 
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:576
 msgid "show info about objects fed from the standard input"
 msgstr "mostra informació sobre els objectes rebuts de l'entrada estàndard"
 
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:579
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
-msgstr "segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-check)"
+msgstr ""
+"segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-check)"
 
-#: builtin/cat-file.c:575
+#: builtin/cat-file.c:581
 msgid "show all objects with --batch or --batch-check"
 msgstr "mostra tots els objectes amb --batch o --batch-check"
 
-#: builtin/check-attr.c:11
+#: builtin/check-attr.c:12
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
 msgstr "git check-attr [-a | --all | <atribut>...] [--] <nom-de-camí>..."
 
-#: builtin/check-attr.c:12
+#: builtin/check-attr.c:13
 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 msgstr "git check-attr --stdin [-z] [-a | --all | <atribut>...]"
 
-#: builtin/check-attr.c:19
+#: builtin/check-attr.c:20
 msgid "report all attributes set on file"
 msgstr "informa de tots els atributs establerts en el fitxer"
 
-#: builtin/check-attr.c:20
+#: builtin/check-attr.c:21
 msgid "use .gitattributes only from the index"
 msgstr "usa .gitattributes només des de l'índex"
 
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
 msgid "read file names from stdin"
 msgstr "llegeix els noms de fitxer d'stdin"
 
-#: builtin/check-attr.c:23 builtin/check-ignore.c:24
+#: builtin/check-attr.c:24 builtin/check-ignore.c:26
 msgid "terminate input and output records by a NUL character"
 msgstr "acaba els registres d'entrada i de sortida amb un caràcter NUL"
 
-#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356
+#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
 msgid "suppress progress reporting"
 msgstr "omet els informes de progrés"
 
-#: builtin/check-ignore.c:26
+#: builtin/check-ignore.c:28
 msgid "show non-matching input paths"
 msgstr "mostra els camins d'entrada que no coincideixin"
 
-#: builtin/check-ignore.c:28
+#: builtin/check-ignore.c:30
 msgid "ignore index when checking"
 msgstr "ignora l'índex en comprovar"
 
-#: builtin/check-ignore.c:154
+#: builtin/check-ignore.c:158
 msgid "cannot specify pathnames with --stdin"
 msgstr "no es pot especificar noms de camí amb --stdin"
 
-#: builtin/check-ignore.c:157
+#: builtin/check-ignore.c:161
 msgid "-z only makes sense with --stdin"
 msgstr "-z només té sentit amb --stdin"
 
-#: builtin/check-ignore.c:159
+#: builtin/check-ignore.c:163
 msgid "no path specified"
 msgstr "cap camí especificat"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:167
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet només és vàlid amb un sol nom de camí"
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:169
 msgid "cannot have both --quiet and --verbose"
 msgstr "no es pot tenir ambdós --quiet i --verbose"
 
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c:172
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching és vàlid només amb --verbose"
 
-#: builtin/check-mailmap.c:8
+#: builtin/check-mailmap.c:9
 msgid "git check-mailmap [<options>] <contact>..."
 msgstr "git check-mailmap [<opcions>] <contacte>..."
 
-#: builtin/check-mailmap.c:13
+#: builtin/check-mailmap.c:14
 msgid "also read contacts from stdin"
 msgstr "també llegeix els contactes des d'stdin"
 
-#: builtin/check-mailmap.c:24
+#: builtin/check-mailmap.c:25
 #, c-format
 msgid "unable to parse contact: %s"
 msgstr "no s'ha pogut analitzar el contacte: %s"
 
-#: builtin/check-mailmap.c:47
+#: builtin/check-mailmap.c:48
 msgid "no contacts specified"
 msgstr "no hi ha contactes especificats"
 
-#: builtin/checkout-index.c:127
+#: builtin/checkout-index.c:128
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<opcions>] [--] [<fitxer>...]"
 
-#: builtin/checkout-index.c:144
+#: builtin/checkout-index.c:145
 msgid "stage should be between 1 and 3 or all"
 msgstr "«stage» ha de ser entre 1 i 3 o all"
 
-#: builtin/checkout-index.c:160
+#: builtin/checkout-index.c:161
 msgid "check out all files in the index"
 msgstr "agafa tots els fitxers en l'índex"
 
-#: builtin/checkout-index.c:161
+#: builtin/checkout-index.c:162
 msgid "force overwrite of existing files"
 msgstr "força la sobreescriptura de fitxers existents"
 
-#: builtin/checkout-index.c:163
+#: builtin/checkout-index.c:164
 msgid "no warning for existing files and files not in index"
-msgstr "cap advertència per a fitxers existents i fitxers que no siguin a l'índex"
+msgstr ""
+"cap advertència per a fitxers existents i fitxers que no siguin a l'índex"
 
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:166
 msgid "don't checkout new files"
 msgstr "no agafis fitxers nous"
 
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:168
 msgid "update stat information in the index file"
 msgstr "actualitza la informació d'estadístiques en el fitxer d'índex"
 
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:172
 msgid "read list of paths from the standard input"
 msgstr "llegeix la llista de camins des de l'entrada estàndard"
 
-#: builtin/checkout-index.c:173
+#: builtin/checkout-index.c:174
 msgid "write the content to temporary files"
 msgstr "escriu el contingut a fitxers temporals"
 
-#: builtin/checkout-index.c:174 builtin/column.c:30 builtin/submodule--helper.c:635
-#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:477
+#: builtin/checkout-index.c:175 builtin/column.c:31
+#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
+#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
+#: builtin/worktree.c:478
 msgid "string"
 msgstr "cadena"
 
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:176
 msgid "when creating files, prepend <string>"
 msgstr "en crear fitxers, anteposa <cadena>"
 
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:178
 msgid "copy out the files from named stage"
 msgstr "copia els fitxers des de «stage» amb nom"
 
-#: builtin/checkout.c:27
+#: builtin/checkout.c:26
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<opcions>] <branca>"
 
-#: builtin/checkout.c:28
+#: builtin/checkout.c:27
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..."
 
-#: builtin/checkout.c:153 builtin/checkout.c:186
+#: builtin/checkout.c:135 builtin/checkout.c:168
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "el camí '%s' no té la nostra versió"
 
-#: builtin/checkout.c:155 builtin/checkout.c:188
+#: builtin/checkout.c:137 builtin/checkout.c:170
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "el camí '%s' no té la seva versió"
 
-#: builtin/checkout.c:171
+#: builtin/checkout.c:153
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "el camí '%s' no té totes les versions necessàries"
 
-#: builtin/checkout.c:215
+#: builtin/checkout.c:197
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "el camí '%s' no té les versions necessàries"
 
-#: builtin/checkout.c:232
+#: builtin/checkout.c:214
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "camí '%s': no es pot fusionar"
 
-#: builtin/checkout.c:249
+#: builtin/checkout.c:231
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "No s'ha pogut afegir el resultat de fusió per a '%s'"
 
-#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275 builtin/checkout.c:278
+#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
+#: builtin/checkout.c:262
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' no es pot usar amb actualització de camins"
 
-#: builtin/checkout.c:281 builtin/checkout.c:284
+#: builtin/checkout.c:265 builtin/checkout.c:268
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' no es pot usar amb %s"
 
-#: builtin/checkout.c:287
+#: builtin/checkout.c:271
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
-msgstr "No es poden actualitzar els camins i canviar a la branca '%s' a la vegada."
+msgstr ""
+"No es poden actualitzar els camins i canviar a la branca '%s' a la vegada."
 
-#: builtin/checkout.c:358 builtin/checkout.c:365
+#: builtin/checkout.c:342 builtin/checkout.c:349
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "el camí '%s' està sense fusionar"
 
-#: builtin/checkout.c:513
+#: builtin/checkout.c:497
 msgid "you need to resolve your current index first"
 msgstr "heu de primer resoldre el vostre índex actual"
 
-#: builtin/checkout.c:644
+#: builtin/checkout.c:628
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "No es pot fer reflog per a '%s': %s\n"
 
-#: builtin/checkout.c:685
+#: builtin/checkout.c:669
 msgid "HEAD is now at"
 msgstr "HEAD ara és a"
 
-#: builtin/checkout.c:689 builtin/clone.c:678
+#: builtin/checkout.c:673 builtin/clone.c:682
 msgid "unable to update HEAD"
 msgstr "no s'ha pogut actualitzar HEAD"
 
-#: builtin/checkout.c:693
+#: builtin/checkout.c:677
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Restableix la branca '%s'\n"
 
-#: builtin/checkout.c:696
+#: builtin/checkout.c:680
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Ja en '%s'\n"
 
-#: builtin/checkout.c:700
+#: builtin/checkout.c:684
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "S'ha canviat i restablert a la branca '%s'\n"
 
-#: builtin/checkout.c:702 builtin/checkout.c:1090
+#: builtin/checkout.c:686 builtin/checkout.c:1075
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "S'ha canviat a la branca nova '%s'\n"
 
-#: builtin/checkout.c:704
+#: builtin/checkout.c:688
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "S'ha canviat a la branca '%s'\n"
 
-#: builtin/checkout.c:755
+#: builtin/checkout.c:739
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... i %d més.\n"
 
-#: builtin/checkout.c:761
+#: builtin/checkout.c:745
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -5913,7 +6198,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:780
+#: builtin/checkout.c:764
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -5940,161 +6225,160 @@ msgstr[1] ""
 " git branch <nom-de-branca-nova> %s\n"
 "\n"
 
-#: builtin/checkout.c:816
+#: builtin/checkout.c:800
 msgid "internal error in revision walk"
 msgstr "error intern en el passeig per revisions"
 
-#: builtin/checkout.c:820
+#: builtin/checkout.c:804
 msgid "Previous HEAD position was"
 msgstr "La posició de HEAD anterior era"
 
-#: builtin/checkout.c:847 builtin/checkout.c:1085
+#: builtin/checkout.c:832 builtin/checkout.c:1070
 msgid "You are on a branch yet to be born"
 msgstr "Sou en una branca que encara ha de néixer"
 
-#: builtin/checkout.c:991
+#: builtin/checkout.c:976
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "s'esperava només una referència, s'han donat %d."
 
-#: builtin/checkout.c:1031 builtin/worktree.c:214
+#: builtin/checkout.c:1016 builtin/worktree.c:215
 #, c-format
 msgid "invalid reference: %s"
 msgstr "referència no vàlida: %s"
 
-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1045
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "la referència no és un arbre: %s"
 
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1084
 msgid "paths cannot be used with switching branches"
 msgstr "els camins no es poden usar amb canvi de branca"
 
-#: builtin/checkout.c:1102 builtin/checkout.c:1106
+#: builtin/checkout.c:1087 builtin/checkout.c:1091
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' no es pot usar amb canvi de branca"
 
-#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118 builtin/checkout.c:1121
+#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
+#: builtin/checkout.c:1106
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' no es pot usar amb '%s'"
 
-#: builtin/checkout.c:1126
+#: builtin/checkout.c:1111
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "No es pot canviar la branca a la no comissió '%s'"
 
-#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111 builtin/remote.c:165
-#: builtin/remote.c:167 builtin/worktree.c:329 builtin/worktree.c:331
+#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
+#: builtin/worktree.c:330
 msgid "branch"
 msgstr "branca"
 
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1145
 msgid "create and checkout a new branch"
 msgstr "crea i agafa una branca nova"
 
-#: builtin/checkout.c:1162
+#: builtin/checkout.c:1147
 msgid "create/reset and checkout a branch"
 msgstr "crea/restableix i agafa una branca"
 
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1148
 msgid "create reflog for new branch"
 msgstr "crea un registre de referència per a la branca nova"
 
-#: builtin/checkout.c:1164 builtin/worktree.c:333
+#: builtin/checkout.c:1149 builtin/worktree.c:332
 msgid "detach HEAD at named commit"
 msgstr "separa HEAD a la comissió anomenada"
 
-#: builtin/checkout.c:1165
+#: builtin/checkout.c:1150
 msgid "set upstream info for new branch"
 msgstr "estableix la informació de font de la branca nova"
 
-#: builtin/checkout.c:1167
+#: builtin/checkout.c:1152
 msgid "new-branch"
 msgstr "branca-nova"
 
-#: builtin/checkout.c:1167
+#: builtin/checkout.c:1152
 msgid "new unparented branch"
 msgstr "branca òrfena nova"
 
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1153
 msgid "checkout our version for unmerged files"
 msgstr "agafa la versió nostra dels fitxers sense fusionar"
 
-#: builtin/checkout.c:1170
+#: builtin/checkout.c:1155
 msgid "checkout their version for unmerged files"
 msgstr "agafa la versió seva dels fitxers sense fusionar"
 
-#: builtin/checkout.c:1172
+#: builtin/checkout.c:1157
 msgid "force checkout (throw away local modifications)"
 msgstr "agafa a la força (descarta qualsevol modificació local)"
 
-#: builtin/checkout.c:1173
+#: builtin/checkout.c:1158
 msgid "perform a 3-way merge with the new branch"
 msgstr "realitza una fusió de 3 vies amb la branca nova"
 
-#: builtin/checkout.c:1174 builtin/merge.c:234
+#: builtin/checkout.c:1159 builtin/merge.c:235
 msgid "update ignored files (default)"
 msgstr "actualitza els fitxers ignorats (per defecte)"
 
-#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251
+#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
 msgid "style"
 msgstr "estil"
 
-#: builtin/checkout.c:1176
+#: builtin/checkout.c:1161
 msgid "conflict style (merge or diff3)"
 msgstr "estil de conflicte (fusió o diff3)"
 
-#: builtin/checkout.c:1179
+#: builtin/checkout.c:1164
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "no limitis les especificacions de camí només a entrades disperses"
 
-#: builtin/checkout.c:1181
+#: builtin/checkout.c:1166
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "dubta 'git checkout <cap-branca-així>'"
 
-#: builtin/checkout.c:1183
+#: builtin/checkout.c:1168
 msgid "do not check if another worktree is holding the given ref"
 msgstr "no comprovis si altre arbre de treball té la referència donada"
 
-#: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119 builtin/merge.c:231
-#: builtin/pull.c:117 builtin/push.c:539 builtin/send-pack.c:172
+#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
+#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: builtin/send-pack.c:173
 msgid "force progress reporting"
 msgstr "força l'informe de progrés"
 
-#: builtin/checkout.c:1224
+#: builtin/checkout.c:1203
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b, -B i --orphan són mutualment exclusius"
 
-#: builtin/checkout.c:1241
+#: builtin/checkout.c:1220
 msgid "--track needs a branch name"
 msgstr "--track necessita un nom de branca"
 
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1225
 msgid "Missing branch name; try -b"
 msgstr "Manca el nom de branca; proveu -b"
 
-#: builtin/checkout.c:1282
+#: builtin/checkout.c:1261
 msgid "invalid path specification"
 msgstr "especificació de camí no vàlida"
 
-#: builtin/checkout.c:1289
+#: builtin/checkout.c:1268
 #, c-format
-msgid ""
-"Cannot update paths and switch to branch '%s' at the same time.\n"
-"Did you intend to checkout '%s' which can not be resolved as commit?"
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr ""
-"No es poden actualitzar els camins i canviar a la branca '%s' a la vegada.\n"
-"Volíeu agafar '%s', la qual no es pot resoldre com a comissió?"
 
-#: builtin/checkout.c:1294
+#: builtin/checkout.c:1272
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach no accepta un paràmetre de camí '%s'"
 
-#: builtin/checkout.c:1298
+#: builtin/checkout.c:1276
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -6102,36 +6386,38 @@ msgstr ""
 "git checkout: --ours/--theirs, --force i --merge són incompatibles en\n"
 "agafar de l'índex."
 
-#: builtin/clean.c:25
-msgid "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
-msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e <patró>] [-x | -X] [--] <camins>..."
+#: builtin/clean.c:26
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+msgstr ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <patró>] [-x | -X] [--] <camins>..."
 
-#: builtin/clean.c:29
+#: builtin/clean.c:30
 #, c-format
 msgid "Removing %s\n"
 msgstr "S'està eliminant %s\n"
 
-#: builtin/clean.c:30
+#: builtin/clean.c:31
 #, c-format
 msgid "Would remove %s\n"
 msgstr "Eliminaria %s\n"
 
-#: builtin/clean.c:31
+#: builtin/clean.c:32
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "S'està ometent el dipòsit %s\n"
 
-#: builtin/clean.c:32
+#: builtin/clean.c:33
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "Ometria el dipòsit %s\n"
 
-#: builtin/clean.c:33
+#: builtin/clean.c:34
 #, c-format
 msgid "failed to remove %s"
 msgstr "s'ha produït un error en eliminar %s"
 
-#: builtin/clean.c:297 git-add--interactive.perl:614
+#: builtin/clean.c:298 git-add--interactive.perl:572
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6144,7 +6430,7 @@ msgstr ""
 "foo        - selecciona un ítem basat en un prefix únic\n"
 "           - (buit) no seleccionis res\n"
 
-#: builtin/clean.c:301 git-add--interactive.perl:623
+#: builtin/clean.c:302 git-add--interactive.perl:581
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6165,37 +6451,38 @@ msgstr ""
 "*          - tria tots els ítems\n"
 "           - (buit) finalitza la selecció\n"
 
-#: builtin/clean.c:517 git-add--interactive.perl:589 git-add--interactive.perl:594
+#: builtin/clean.c:518 git-add--interactive.perl:547
+#: git-add--interactive.perl:552
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Perdó (%s)?\n"
 
-#: builtin/clean.c:659
+#: builtin/clean.c:660
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Introduïu els patrons a ignorar>> "
 
-#: builtin/clean.c:696
+#: builtin/clean.c:697
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "ADVERTÈNCIA: No es poden trobar ítems que coincideixin amb: %s"
 
-#: builtin/clean.c:717
+#: builtin/clean.c:718
 msgid "Select items to delete"
 msgstr "Selecciona els ítems a suprimir"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:758
+#: builtin/clean.c:759
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Voleu eliminar %s [y/N]? "
 
-#: builtin/clean.c:783 git-add--interactive.perl:1660
+#: builtin/clean.c:784 git-add--interactive.perl:1616
 #, c-format
 msgid "Bye.\n"
 msgstr "Adéu.\n"
 
-#: builtin/clean.c:791
+#: builtin/clean.c:792
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -6213,15 +6500,15 @@ msgstr ""
 "help                - aquesta pantalla\n"
 "?                   - ajuda de selecció de l'avís"
 
-#: builtin/clean.c:818 git-add--interactive.perl:1736
+#: builtin/clean.c:819 git-add--interactive.perl:1692
 msgid "*** Commands ***"
 msgstr "*** Ordres ***"
 
-#: builtin/clean.c:819 git-add--interactive.perl:1733
+#: builtin/clean.c:820 git-add--interactive.perl:1689
 msgid "What now"
 msgstr "I ara què"
 
-#: builtin/clean.c:827
+#: builtin/clean.c:828
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Eliminaria l'ítem següent:"
@@ -6231,183 +6518,196 @@ msgstr[1] "Eliminaria els ítems següents:"
 msgid "No more files to clean, exiting."
 msgstr "No hi ha més fitxers a netejar; s'està sortint."
 
-#: builtin/clean.c:875
+#: builtin/clean.c:906
 msgid "do not print names of files removed"
 msgstr "no imprimeixis els noms dels fitxers eliminats"
 
-#: builtin/clean.c:877
+#: builtin/clean.c:908
 msgid "force"
 msgstr "força"
 
-#: builtin/clean.c:878
+#: builtin/clean.c:909
 msgid "interactive cleaning"
 msgstr "neteja interactiva"
 
-#: builtin/clean.c:880
+#: builtin/clean.c:911
 msgid "remove whole directories"
 msgstr "elimina directoris sencers"
 
-#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451 builtin/grep.c:1063
-#: builtin/ls-files.c:546 builtin/name-rev.c:348 builtin/name-rev.c:350 builtin/show-ref.c:176
+#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
+#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
+#: builtin/name-rev.c:399 builtin/show-ref.c:176
 msgid "pattern"
 msgstr "patró"
 
-#: builtin/clean.c:882
+#: builtin/clean.c:913
 msgid "add <pattern> to ignore rules"
 msgstr "afegiu <patró> per a ignorar les regles"
 
-#: builtin/clean.c:883
+#: builtin/clean.c:914
 msgid "remove ignored files, too"
 msgstr "elimina els fitxers ignorats, també"
 
-#: builtin/clean.c:885
+#: builtin/clean.c:916
 msgid "remove only ignored files"
 msgstr "elimina només els fitxers ignorats"
 
-#: builtin/clean.c:903
+#: builtin/clean.c:934
 msgid "-x and -X cannot be used together"
 msgstr "-x i -X no es poden usar junts"
 
-#: builtin/clean.c:907
-msgid "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to clean"
+#: builtin/clean.c:938
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
 msgstr ""
-"clean.requireForce està establerta a veritat i ni -i, -n ni -f s'han indicat; refusant netejar"
+"clean.requireForce està establerta a veritat i ni -i, -n ni -f s'han "
+"indicat; refusant netejar"
 
-#: builtin/clean.c:910
-msgid "clean.requireForce defaults to true and neither -i, -n, nor -f given; refusing to clean"
+#: builtin/clean.c:941
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
 msgstr ""
-"clean.requireForce és per defecte veritat i ni -i, -n ni -f s'han indicat; refusant netejar"
+"clean.requireForce és per defecte veritat i ni -i, -n ni -f s'han indicat; "
+"refusant netejar"
 
-#: builtin/clone.c:37
+#: builtin/clone.c:38
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<opcions>] [--] <dipòsit> [<directori>]"
 
-#: builtin/clone.c:80
+#: builtin/clone.c:82
 msgid "don't create a checkout"
 msgstr "no facis cap agafament"
 
-#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478
+#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
 msgid "create a bare repository"
 msgstr "crea un dipòsit nu"
 
-#: builtin/clone.c:85
+#: builtin/clone.c:87
 msgid "create a mirror repository (implies bare)"
 msgstr "crea un dipòsit mirall (implica bare)"
 
-#: builtin/clone.c:87
+#: builtin/clone.c:89
 msgid "to clone from a local repository"
 msgstr "per a clonar des d'un dipòsit local"
 
-#: builtin/clone.c:89
+#: builtin/clone.c:91
 msgid "don't use local hardlinks, always copy"
 msgstr "no usis enllaços durs locals, sempre copia"
 
-#: builtin/clone.c:91
+#: builtin/clone.c:93
 msgid "setup as shared repository"
 msgstr "configura com a dipòsit compartit"
 
-#: builtin/clone.c:93 builtin/clone.c:97
+#: builtin/clone.c:95 builtin/clone.c:99
 msgid "pathspec"
 msgstr "especificació de camí"
 
-#: builtin/clone.c:93 builtin/clone.c:97
+#: builtin/clone.c:95 builtin/clone.c:99
 msgid "initialize submodules in the clone"
 msgstr "inicialitza els submòduls en el clon"
 
-#: builtin/clone.c:100
+#: builtin/clone.c:102
 msgid "number of submodules cloned in parallel"
 msgstr "nombre de submòduls clonats en paral·lel"
 
-#: builtin/clone.c:101 builtin/init-db.c:475
+#: builtin/clone.c:103 builtin/init-db.c:476
 msgid "template-directory"
 msgstr "directori-de-plantilla"
 
-#: builtin/clone.c:102 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:477
 msgid "directory from which templates will be used"
 msgstr "directori des del qual s'usaran les plantilles"
 
-#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642
+#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
 #: builtin/submodule--helper.c:983
 msgid "reference repository"
 msgstr "dipòsit de referència"
 
-#: builtin/clone.c:108
+#: builtin/clone.c:110
 msgid "use --reference only while cloning"
 msgstr "usa --reference només en clonar"
 
-#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43
+#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
 msgid "name"
 msgstr "nom"
 
-#: builtin/clone.c:110
+#: builtin/clone.c:112
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "usa <nom> en lloc de 'origin' per a seguir la font"
 
-#: builtin/clone.c:112
+#: builtin/clone.c:114
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "agafa <branca> en lloc del HEAD del remot"
 
-#: builtin/clone.c:114
+#: builtin/clone.c:116
 msgid "path to git-upload-pack on the remote"
 msgstr "camí a git-upload-pack en el remot"
 
-#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006 builtin/pull.c:202
+#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
+#: builtin/pull.c:205
 msgid "depth"
 msgstr "profunditat"
 
-#: builtin/clone.c:116
+#: builtin/clone.c:118
 msgid "create a shallow clone of that depth"
 msgstr "crea un clon superficial de tal profunditat"
 
-#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918 parse-options.h:142
+#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: parse-options.h:142
 msgid "time"
 msgstr "hora"
 
-#: builtin/clone.c:118
+#: builtin/clone.c:120
 msgid "create a shallow clone since a specific time"
 msgstr "crea un clon superficial des d'una hora específica"
 
-#: builtin/clone.c:119 builtin/fetch.c:124
+#: builtin/clone.c:121 builtin/fetch.c:119
 msgid "revision"
 msgstr "revisió"
 
-#: builtin/clone.c:120 builtin/fetch.c:125
+#: builtin/clone.c:122 builtin/fetch.c:120
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "aprofundeix la història d'un clon superficial, excloent una revisió"
 
-#: builtin/clone.c:122
+#: builtin/clone.c:124
 msgid "clone only one branch, HEAD or --branch"
 msgstr "clona només una branca, HEAD o --branch"
 
-#: builtin/clone.c:124
+#: builtin/clone.c:126
+msgid "don't clone any tags, and make later fetches not to follow them"
+msgstr ""
+
+#: builtin/clone.c:128
 msgid "any cloned submodules will be shallow"
 msgstr "qualsevol submòdul clonat serà superficial"
 
-#: builtin/clone.c:125 builtin/init-db.c:484
+#: builtin/clone.c:129 builtin/init-db.c:485
 msgid "gitdir"
 msgstr "directori de git"
 
-#: builtin/clone.c:126 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:486
 msgid "separate git dir from working tree"
 msgstr "separa el directori de git de l'arbre de treball"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:131
 msgid "key=value"
 msgstr "clau=valor"
 
-#: builtin/clone.c:128
+#: builtin/clone.c:132
 msgid "set config inside the new repository"
 msgstr "estableix la configuració dins del dipòsit nou"
 
-#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550
+#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
 msgid "use IPv4 addresses only"
 msgstr "usa només adreces IPv4"
 
-#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552
+#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
 msgid "use IPv6 addresses only"
 msgstr "usa només adreces IPv6"
 
-#: builtin/clone.c:268
+#: builtin/clone.c:272
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -6415,42 +6715,42 @@ msgstr ""
 "No s'ha pogut endevinar cap nom de directori.\n"
 "Si us plau, especifiqueu un directori en la línia d'ordres"
 
-#: builtin/clone.c:321
+#: builtin/clone.c:325
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: No s'ha pogut afegir un alternatiu per a '%s': %s\n"
 
-#: builtin/clone.c:393
+#: builtin/clone.c:397
 #, c-format
 msgid "failed to open '%s'"
 msgstr "s'ha produït un error en obrir '%s'"
 
-#: builtin/clone.c:401
+#: builtin/clone.c:405
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existeix i no és directori"
 
-#: builtin/clone.c:415
+#: builtin/clone.c:419
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "s'ha produït un error en fer stat a '%s'\n"
 
-#: builtin/clone.c:437
+#: builtin/clone.c:441
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "s'ha produït un error en crear l'enllaç '%s'"
 
-#: builtin/clone.c:441
+#: builtin/clone.c:445
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "s'ha produït un error en copiar el fitxer a '%s'"
 
-#: builtin/clone.c:466
+#: builtin/clone.c:470
 #, c-format
 msgid "done.\n"
 msgstr "fet.\n"
 
-#: builtin/clone.c:478
+#: builtin/clone.c:482
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -6461,177 +6761,185 @@ msgstr ""
 "'git status' i tornar a intentar l'agafament amb\n"
 "'git checkout -f HEAD'\n"
 
-#: builtin/clone.c:555
+#: builtin/clone.c:559
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "No s'ha pogut trobar la branca remota %s per a clonar."
 
-#: builtin/clone.c:650
+#: builtin/clone.c:654
 msgid "remote did not send all necessary objects"
 msgstr "el remot no ha enviat tots els objectes necessaris"
 
-#: builtin/clone.c:666
+#: builtin/clone.c:670
 #, c-format
 msgid "unable to update %s"
 msgstr "no s'ha pogut actualitzar %s"
 
-#: builtin/clone.c:715
+#: builtin/clone.c:719
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
-msgstr "el HEAD remot es refereix a una referència que no existeix; no s'ha pogut agafar.\n"
+msgstr ""
+"el HEAD remot es refereix a una referència que no existeix; no s'ha pogut "
+"agafar.\n"
 
-#: builtin/clone.c:746
+#: builtin/clone.c:750
 msgid "unable to checkout working tree"
 msgstr "no s'ha pogut agafar l'arbre de treball"
 
-#: builtin/clone.c:786
+#: builtin/clone.c:792
 msgid "unable to write parameters to config file"
 msgstr "no s'ha pogut escriure els paràmetres al fitxer de configuració"
 
-#: builtin/clone.c:849
+#: builtin/clone.c:855
 msgid "cannot repack to clean up"
 msgstr "no es pot reempaquetar per a netejar"
 
-#: builtin/clone.c:851
+#: builtin/clone.c:857
 msgid "cannot unlink temporary alternates file"
 msgstr "no es pot desenllaçar el fitxer d'alternatives temporal"
 
-#: builtin/clone.c:884 builtin/receive-pack.c:1900
+#: builtin/clone.c:890 builtin/receive-pack.c:1945
 msgid "Too many arguments."
 msgstr "Hi ha massa paràmetres."
 
-#: builtin/clone.c:888
+#: builtin/clone.c:894
 msgid "You must specify a repository to clone."
 msgstr "Heu d'especificar un dipòsit per a clonar."
 
-#: builtin/clone.c:901
+#: builtin/clone.c:907
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "les opcions --bare i --origin %s són incompatibles."
 
-#: builtin/clone.c:904
+#: builtin/clone.c:910
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare i --separate-git-dir són incompatibles."
 
-#: builtin/clone.c:917
+#: builtin/clone.c:923
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "el dipòsit '%s' no existeix"
 
-#: builtin/clone.c:923 builtin/fetch.c:1337
+#: builtin/clone.c:929 builtin/fetch.c:1337
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "la profunditat %s no és nombre positiu"
 
-#: builtin/clone.c:933
+#: builtin/clone.c:939
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "el camí destí '%s' ja existeix i no és un directori buit."
 
-#: builtin/clone.c:943
+#: builtin/clone.c:949
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "l'arbre de treball '%s' ja existeix."
 
-#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252 builtin/worktree.c:221
-#: builtin/worktree.c:251
+#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
+#: builtin/worktree.c:222 builtin/worktree.c:252
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "no s'han pogut crear els directoris inicials de '%s'"
 
-#: builtin/clone.c:961
+#: builtin/clone.c:967
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "no s'ha pogut crear el directori d'arbre de treball '%s'"
 
-#: builtin/clone.c:973
+#: builtin/clone.c:979
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "S'està clonant al dipòsit nu '%s'...\n"
 
-#: builtin/clone.c:975
+#: builtin/clone.c:981
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "S'està clonant a '%s'...\n"
 
-#: builtin/clone.c:999
-msgid "clone --recursive is not compatible with both --reference and --reference-if-able"
-msgstr "clone --recursive no és compatible amb ambdós --reference i --reference-if-able"
+#: builtin/clone.c:1005
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr ""
+"clone --recursive no és compatible amb ambdós --reference i --reference-if-"
+"able"
 
-#: builtin/clone.c:1055
+#: builtin/clone.c:1067
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth s'ignora en els clons locals; useu file:// en lloc d'això."
 
-#: builtin/clone.c:1057
+#: builtin/clone.c:1069
 msgid "--shallow-since is ignored in local clones; use file:// instead."
-msgstr "--shallow-since s'ignora en els clons locals; useu file:// en lloc d'això."
+msgstr ""
+"--shallow-since s'ignora en els clons locals; useu file:// en lloc d'això."
 
-#: builtin/clone.c:1059
+#: builtin/clone.c:1071
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
-msgstr "--shallow-exclude s'ignora en els clons locals; useu file:// en lloc d'això."
+msgstr ""
+"--shallow-exclude s'ignora en els clons locals; useu file:// en lloc d'això."
 
-#: builtin/clone.c:1062
+#: builtin/clone.c:1074
 msgid "source repository is shallow, ignoring --local"
 msgstr "el dipòsit font és superficial, s'està ignorant --local"
 
-#: builtin/clone.c:1067
+#: builtin/clone.c:1079
 msgid "--local is ignored"
 msgstr "--local s'ignora"
 
-#: builtin/clone.c:1071
+#: builtin/clone.c:1083
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr "No se sap com clonar %s"
 
-#: builtin/clone.c:1126 builtin/clone.c:1134
+#: builtin/clone.c:1138 builtin/clone.c:1146
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "La branca remota %s no es troba en la font %s"
 
-#: builtin/clone.c:1137
+#: builtin/clone.c:1149
 msgid "You appear to have cloned an empty repository."
 msgstr "Sembla que heu clonat un dipòsit buit."
 
-#: builtin/column.c:9
+#: builtin/column.c:10
 msgid "git column [<options>]"
 msgstr "git column [<opcions>]"
 
-#: builtin/column.c:26
+#: builtin/column.c:27
 msgid "lookup config vars"
 msgstr "cerca les variables de configuració"
 
-#: builtin/column.c:27 builtin/column.c:28
+#: builtin/column.c:28 builtin/column.c:29
 msgid "layout to use"
 msgstr "disposició a usar"
 
-#: builtin/column.c:29
+#: builtin/column.c:30
 msgid "Maximum width"
 msgstr "Amplada màxima"
 
-#: builtin/column.c:30
+#: builtin/column.c:31
 msgid "Padding space on left border"
 msgstr "Espai d'encoixinada en el marge esquerre"
 
-#: builtin/column.c:31
+#: builtin/column.c:32
 msgid "Padding space on right border"
 msgstr "Espai d'encoixinada en el marge dret"
 
-#: builtin/column.c:32
+#: builtin/column.c:33
 msgid "Padding space between columns"
 msgstr "Espai d'encoixinada entre columnes"
 
-#: builtin/column.c:51
+#: builtin/column.c:52
 msgid "--command must be the first argument"
 msgstr "--command ha de ser el primer paràmetre"
 
-#: builtin/commit.c:38
+#: builtin/commit.c:39
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<opcions>] [--] <especificació-de-camí>..."
 
-#: builtin/commit.c:43
+#: builtin/commit.c:44
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<opcions>] [--] <especificació-de-camí>..."
 
-#: builtin/commit.c:48
+#: builtin/commit.c:49
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -6658,7 +6966,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: builtin/commit.c:61
+#: builtin/commit.c:62
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -6684,7 +6992,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: builtin/commit.c:73
+#: builtin/commit.c:74
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -6694,7 +7002,7 @@ msgstr ""
 "deixaria buida. Podeu repetir la vostra ordre amb --allow-empty, o\n"
 "podeu eliminar la comissió per complet amb \"git reset HEAD^\".\n"
 
-#: builtin/commit.c:78
+#: builtin/commit.c:79
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -6702,17 +7010,18 @@ msgid ""
 "    git commit --allow-empty\n"
 "\n"
 msgstr ""
-"El «cherry pick» previ ja està buit, possiblement a causa de resolució de conflicte.\n"
+"El «cherry pick» previ ja està buit, possiblement a causa de resolució de "
+"conflicte.\n"
 "Si el voleu cometre de totes maneres, useu:\n"
 "\n"
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:85
+#: builtin/commit.c:86
 msgid "Otherwise, please use 'git reset'\n"
 msgstr "D'altra manera, si us plau, useu 'git reset'\n"
 
-#: builtin/commit.c:88
+#: builtin/commit.c:89
 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"
@@ -6728,61 +7037,61 @@ msgstr ""
 "Llavors \"git cherry-pick --continue\" reprendrà\n"
 "com a «cherry pick» les comissions restants.\n"
 
-#: builtin/commit.c:318
+#: builtin/commit.c:319
 msgid "failed to unpack HEAD tree object"
 msgstr "s'ha produït un error en desempaquetar l'objecte d'arbre HEAD"
 
-#: builtin/commit.c:359
+#: builtin/commit.c:360
 msgid "unable to create temporary index"
 msgstr "no s'ha pogut crear un índex temporal"
 
-#: builtin/commit.c:365
+#: builtin/commit.c:366
 msgid "interactive add failed"
 msgstr "l'afegiment interactiu ha fallat"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:379
 msgid "unable to update temporary index"
 msgstr "no s'ha pogut actualitzar l'índex temporal"
 
-#: builtin/commit.c:380
+#: builtin/commit.c:381
 msgid "Failed to update main cache tree"
 msgstr "S'ha produït un error en actualitzar l'arbre principal de memòria cau"
 
-#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
+#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
 msgid "unable to write new_index file"
 msgstr "no s'ha pogut escriure el fitxer new_index"
 
-#: builtin/commit.c:458
+#: builtin/commit.c:459
 msgid "cannot do a partial commit during a merge."
 msgstr "no es pot fer una comissió parcial durant una fusió."
 
-#: builtin/commit.c:460
+#: builtin/commit.c:461
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "no es pot fer una comissió parcial durant un «cherry pick»."
 
-#: builtin/commit.c:469
+#: builtin/commit.c:470
 msgid "cannot read the index"
 msgstr "no es pot llegir l'índex"
 
-#: builtin/commit.c:488
+#: builtin/commit.c:489
 msgid "unable to write temporary index file"
 msgstr "no s'ha pogut escriure un fitxer d'índex temporal"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:583
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "a la comissió '%s' li manca la capçalera d'autor"
 
-#: builtin/commit.c:584
+#: builtin/commit.c:585
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "la comissió '%s' té una línia d'autor mal formada"
 
-#: builtin/commit.c:603
+#: builtin/commit.c:604
 msgid "malformed --author parameter"
 msgstr "paràmetre --author mal format"
 
-#: builtin/commit.c:655
+#: builtin/commit.c:656
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -6790,38 +7099,38 @@ msgstr ""
 "no es pot seleccionar un caràcter de comentari que\n"
 "no sigui usat en el missatge de comissió actual"
 
-#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
+#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "no s'ha pogut trobar la comissió %s"
 
-#: builtin/commit.c:704 builtin/shortlog.c:294
+#: builtin/commit.c:705 builtin/shortlog.c:295
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(s'està llegint el missatge de registre des de l'entrada estàndard)\n"
 
-#: builtin/commit.c:706
+#: builtin/commit.c:707
 msgid "could not read log from standard input"
 msgstr "no s'ha pogut llegir el registre des de l'entrada estàndard"
 
-#: builtin/commit.c:710
+#: builtin/commit.c:711
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "no s'ha pogut llegir el fitxer de registre '%s'"
 
-#: builtin/commit.c:737 builtin/commit.c:745
+#: builtin/commit.c:738 builtin/commit.c:746
 msgid "could not read SQUASH_MSG"
 msgstr "no s'ha pogut llegir SQUASH_MSG"
 
-#: builtin/commit.c:742
+#: builtin/commit.c:743
 msgid "could not read MERGE_MSG"
 msgstr "no s'ha pogut llegir MERGE_MSG"
 
-#: builtin/commit.c:796
+#: builtin/commit.c:797
 msgid "could not write commit template"
 msgstr "no s'ha pogut escriure la plantilla de comissió"
 
-#: builtin/commit.c:814
+#: builtin/commit.c:815
 #, c-format
 msgid ""
 "\n"
@@ -6836,7 +7145,7 @@ msgstr ""
 "\t%s\n"
 "i intenteu-ho de nou.\n"
 
-#: builtin/commit.c:819
+#: builtin/commit.c:820
 #, c-format
 msgid ""
 "\n"
@@ -6851,7 +7160,7 @@ msgstr ""
 "\t%s\n"
 "i intenteu-ho de nou.\n"
 
-#: builtin/commit.c:832
+#: builtin/commit.c:833
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -6861,7 +7170,7 @@ msgstr ""
 "S'ignoraran les línies començant amb '%c', i un missatge de\n"
 "comissió buit avorta la comissió.\n"
 
-#: builtin/commit.c:839
+#: builtin/commit.c:840
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -6872,339 +7181,352 @@ msgstr ""
 "Es retindran les línies començants amb '%c'; podeu eliminar-les vosaltres\n"
 "mateixos si voleu. Un missatge buit avorta la comissió.\n"
 
-#: builtin/commit.c:859
+#: builtin/commit.c:857
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:    %.*s <%.*s>"
 
-#: builtin/commit.c:867
+#: builtin/commit.c:865
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sData:      %s"
 
-#: builtin/commit.c:874
+#: builtin/commit.c:872
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sComitent: %.*s <%.*s>"
 
-#: builtin/commit.c:892
+#: builtin/commit.c:889
 msgid "Cannot read index"
 msgstr "No es pot llegir l'índex"
 
-#: builtin/commit.c:954
+#: builtin/commit.c:951
 msgid "Error building trees"
 msgstr "Error en construir arbres"
 
-#: builtin/commit.c:968 builtin/tag.c:273
+#: builtin/commit.c:965 builtin/tag.c:274
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Si us plau, proveïu el missatge usant l'opció -m o l'opció -F.\n"
 
-#: builtin/commit.c:1071
+#: builtin/commit.c:1068
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s' no és 'Nom <adreça-de-correu-electrònic>' i no coincideix amb\n"
 "cap autor existent"
 
-#: builtin/commit.c:1086 builtin/commit.c:1325
+#: builtin/commit.c:1083 builtin/commit.c:1328
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Mode de fitxers no seguits no vàlid '%s'"
 
-#: builtin/commit.c:1124
+#: builtin/commit.c:1121
 msgid "--long and -z are incompatible"
 msgstr "--long i -z són incompatibles"
 
-#: builtin/commit.c:1154
+#: builtin/commit.c:1151
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Usar ambdós --reset-author i --author no té sentit"
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1160
 msgid "You have nothing to amend."
 msgstr "No teniu res a esmenar."
 
-#: builtin/commit.c:1166
+#: builtin/commit.c:1163
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Esteu enmig d'una fusió -- no es pot esmenar."
 
-#: builtin/commit.c:1168
+#: builtin/commit.c:1165
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Esteu enmig d'un «cherry pick» -- no es pot esmenar."
 
-#: builtin/commit.c:1171
+#: builtin/commit.c:1168
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Les opcions --squash i --fixup no es poden usar juntes"
 
-#: builtin/commit.c:1181
+#: builtin/commit.c:1178
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Només un de -c/-C/-F/--fixup es pot usar."
 
-#: builtin/commit.c:1183
+#: builtin/commit.c:1180
 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
 msgstr "L'opció -m no es pot combinar amb -c/-C/-F/--fixup."
 
-#: builtin/commit.c:1191
+#: builtin/commit.c:1188
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author només es pot usar amb -C, -c o --amend."
 
-#: builtin/commit.c:1208
+#: builtin/commit.c:1205
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr "Només un de --include/--only/--all/--interactive/--patch es pot usar."
 
-#: builtin/commit.c:1210
+#: builtin/commit.c:1207
 msgid "No paths with --include/--only does not make sense."
 msgstr "--include/--only no té sentit sense camí."
 
-#: builtin/commit.c:1212
-msgid "Explicit paths specified without -i or -o; assuming --only paths..."
-msgstr "S'han especificat camins explícits sense -i o -o; s'està presumint --only camins..."
-
-#: builtin/commit.c:1224 builtin/tag.c:551
+#: builtin/commit.c:1219 builtin/tag.c:552
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Mode de neteja no vàlid %s"
 
-#: builtin/commit.c:1229
+#: builtin/commit.c:1224
 msgid "Paths with -a does not make sense."
 msgstr "-a no té sentit amb camins."
 
-#: builtin/commit.c:1339 builtin/commit.c:1612
+#: builtin/commit.c:1342 builtin/commit.c:1617
 msgid "show status concisely"
 msgstr "mostra l'estat concisament"
 
-#: builtin/commit.c:1341 builtin/commit.c:1614
+#: builtin/commit.c:1344 builtin/commit.c:1619
 msgid "show branch information"
 msgstr "mostra la informació de branca"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1346
+#, fuzzy
+msgid "show stash information"
+msgstr "mostra la informació de branca"
+
+#: builtin/commit.c:1348
 msgid "version"
 msgstr "versió"
 
-#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 builtin/worktree.c:448
+#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
+#: builtin/worktree.c:449
 msgid "machine-readable output"
 msgstr "sortida llegible per màquina"
 
-#: builtin/commit.c:1346 builtin/commit.c:1618
+#: builtin/commit.c:1351 builtin/commit.c:1623
 msgid "show status in long format (default)"
 msgstr "mostra l'estat en format llarg (per defecte)"
 
-#: builtin/commit.c:1349 builtin/commit.c:1621
+#: builtin/commit.c:1354 builtin/commit.c:1626
 msgid "terminate entries with NUL"
 msgstr "acaba les entrades amb NUL"
 
-#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981 builtin/fast-export.c:984
-#: builtin/tag.c:411
+#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
+#: builtin/fast-export.c:986 builtin/tag.c:412
 msgid "mode"
 msgstr "mode"
 
-#: builtin/commit.c:1352 builtin/commit.c:1624
+#: builtin/commit.c:1357 builtin/commit.c:1629
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
-msgstr "mostra els fitxers no seguits, modes opcionals: all, normal, no. (Per defecte: all)"
+msgstr ""
+"mostra els fitxers no seguits, modes opcionals: all, normal, no. (Per "
+"defecte: all)"
 
-#: builtin/commit.c:1355
+#: builtin/commit.c:1360
 msgid "show ignored files"
 msgstr "mostra els fitxers ignorats"
 
-#: builtin/commit.c:1356 parse-options.h:155
+#: builtin/commit.c:1361 parse-options.h:155
 msgid "when"
 msgstr "quan"
 
-#: builtin/commit.c:1357
-msgid "ignore changes to submodules, optional when: all, dirty, untracked. (Default: all)"
-msgstr "ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per defecte: all)"
+#: builtin/commit.c:1362
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
+msgstr ""
+"ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per "
+"defecte: all)"
 
-#: builtin/commit.c:1359
+#: builtin/commit.c:1364
 msgid "list untracked files in columns"
 msgstr "mostra els fitxers no seguits en columnes"
 
-#: builtin/commit.c:1435
+#: builtin/commit.c:1440
 msgid "couldn't look up newly created commit"
 msgstr "no s'ha pogut trobar la comissió novament creada"
 
-#: builtin/commit.c:1437
+#: builtin/commit.c:1442
 msgid "could not parse newly created commit"
 msgstr "no s'ha pogut analitzar la comissió novament creada"
 
-#: builtin/commit.c:1482
+#: builtin/commit.c:1487
 msgid "detached HEAD"
 msgstr "HEAD separat"
 
-#: builtin/commit.c:1485
+#: builtin/commit.c:1490
 msgid " (root-commit)"
 msgstr " (comissió d'arrel)"
 
-#: builtin/commit.c:1582
+#: builtin/commit.c:1587
 msgid "suppress summary after successful commit"
 msgstr "omet el resum després d'una comissió reeixida"
 
-#: builtin/commit.c:1583
+#: builtin/commit.c:1588
 msgid "show diff in commit message template"
 msgstr "mostra la diferència en la plantilla de missatge de comissió"
 
-#: builtin/commit.c:1585
+#: builtin/commit.c:1590
 msgid "Commit message options"
 msgstr "Opcions de missatge de comissió"
 
-#: builtin/commit.c:1586 builtin/tag.c:409
+#: builtin/commit.c:1591 builtin/tag.c:410
 msgid "read message from file"
 msgstr "llegiu el missatge des d'un fitxer"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1592
 msgid "author"
 msgstr "autor"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1592
 msgid "override author for commit"
 msgstr "autor corregit de la comissió"
 
-#: builtin/commit.c:1588 builtin/gc.c:357
+#: builtin/commit.c:1593 builtin/gc.c:358
 msgid "date"
 msgstr "data"
 
-#: builtin/commit.c:1588
+#: builtin/commit.c:1593
 msgid "override date for commit"
 msgstr "data corregida de la comissió"
 
-#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398 builtin/notes.c:561
-#: builtin/tag.c:407
+#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
+#: builtin/notes.c:564 builtin/tag.c:408
 msgid "message"
 msgstr "missatge"
 
-#: builtin/commit.c:1589
+#: builtin/commit.c:1594
 msgid "commit message"
 msgstr "missatge de comissió"
 
-#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592 builtin/commit.c:1593
-#: parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
+#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
 msgid "commit"
 msgstr "comissió"
 
-#: builtin/commit.c:1590
+#: builtin/commit.c:1595
 msgid "reuse and edit message from specified commit"
 msgstr "reusa i edita el missatge de la comissió especificada"
 
-#: builtin/commit.c:1591
+#: builtin/commit.c:1596
 msgid "reuse message from specified commit"
 msgstr "reusa el missatge de la comissió especificada"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1597
 msgid "use autosquash formatted message to fixup specified commit"
-msgstr "usa el missatge formatat de «squash» automàtic per a corregir la comissió especificada"
+msgstr ""
+"usa el missatge formatat de «squash» automàtic per a corregir la comissió "
+"especificada"
 
-#: builtin/commit.c:1593
+#: builtin/commit.c:1598
 msgid "use autosquash formatted message to squash specified commit"
-msgstr "usa el missatge formatat de «squash» automàtic per a «squash» a la comissió especificada"
+msgstr ""
+"usa el missatge formatat de «squash» automàtic per a «squash» a la comissió "
+"especificada"
 
-#: builtin/commit.c:1594
+#: builtin/commit.c:1599
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "l'autor de la comissió ja sóc jo (s'usa amb -C/-c/--amend)"
 
-#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104
+#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr "afegeix Signed-off-by:"
 
-#: builtin/commit.c:1596
+#: builtin/commit.c:1601
 msgid "use specified template file"
 msgstr "usa el fitxer de plantilla especificat"
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1602
 msgid "force edit of commit"
 msgstr "força l'edició de la comissió"
 
-#: builtin/commit.c:1598
+#: builtin/commit.c:1603
 msgid "default"
 msgstr "per defecte"
 
-#: builtin/commit.c:1598 builtin/tag.c:412
+#: builtin/commit.c:1603 builtin/tag.c:413
 msgid "how to strip spaces and #comments from message"
 msgstr "com suprimir els espais i #comentaris del missatge"
 
-#: builtin/commit.c:1599
+#: builtin/commit.c:1604
 msgid "include status in commit message template"
 msgstr "inclou l'estat en la plantilla de missatge de comissió"
 
-#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166 builtin/revert.c:112
+#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr "signa la comissió amb GPG"
 
-#: builtin/commit.c:1604
+#: builtin/commit.c:1609
 msgid "Commit contents options"
 msgstr "Opcions dels continguts de les comissions"
 
-#: builtin/commit.c:1605
+#: builtin/commit.c:1610
 msgid "commit all changed files"
 msgstr "comet tots els fitxers canviats"
 
-#: builtin/commit.c:1606
+#: builtin/commit.c:1611
 msgid "add specified files to index for commit"
 msgstr "afegeix els fitxers especificats a l'índex per a cometre"
 
-#: builtin/commit.c:1607
+#: builtin/commit.c:1612
 msgid "interactively add files"
 msgstr "afegeix els fitxers interactivament"
 
-#: builtin/commit.c:1608
+#: builtin/commit.c:1613
 msgid "interactively add changes"
 msgstr "afegeix els canvis interactivament"
 
-#: builtin/commit.c:1609
+#: builtin/commit.c:1614
 msgid "commit only specified files"
 msgstr "comet només els fitxers especificats"
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1615
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "evita els ganxos de precomissió i missatge de comissió"
 
-#: builtin/commit.c:1611
+#: builtin/commit.c:1616
 msgid "show what would be committed"
 msgstr "mostra què es cometria"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c:1627
 msgid "amend previous commit"
 msgstr "esmena la comissió anterior"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1628
 msgid "bypass post-rewrite hook"
 msgstr "evita el ganxo de post escriptura"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1633
 msgid "ok to record an empty change"
 msgstr "està bé registrar un canvi buit"
 
-#: builtin/commit.c:1630
+#: builtin/commit.c:1635
 msgid "ok to record a change with an empty message"
 msgstr "està bé registrar un canvi amb missatge buit"
 
-#: builtin/commit.c:1659
+#: builtin/commit.c:1665
 msgid "could not parse HEAD commit"
 msgstr "no s'ha pogut analitzar la comissió HEAD"
 
-#: builtin/commit.c:1707
+#: builtin/commit.c:1710
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Fitxer MERGE_HEAD malmès (%s)"
 
-#: builtin/commit.c:1714
+#: builtin/commit.c:1717
 msgid "could not read MERGE_MODE"
 msgstr "no s'ha pogut llegir MERGE_MODE"
 
-#: builtin/commit.c:1733
+#: builtin/commit.c:1736
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "no s'ha pogut llegir el missatge de comissió: %s"
 
-#: builtin/commit.c:1744
+#: builtin/commit.c:1747
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "S'està avortant la comissió; no heu editat el missatge.\n"
 
-#: builtin/commit.c:1749
+#: builtin/commit.c:1752
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "S'està avortant la comissió a causa d'un missatge de comissió buit.\n"
 
-#: builtin/commit.c:1797
+#: builtin/commit.c:1800
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -7215,143 +7537,146 @@ msgstr ""
 "que la quota no estigui excedida, i després\n"
 "\"git reset HEAD\" per a recuperar."
 
-#: builtin/config.c:9
+#: builtin/config.c:10
 msgid "git config [<options>]"
 msgstr "git config [<opcions>]"
 
-#: builtin/config.c:56
+#: builtin/config.c:57
 msgid "Config file location"
 msgstr "Ubicació del fitxer de configuració"
 
-#: builtin/config.c:57
+#: builtin/config.c:58
 msgid "use global config file"
 msgstr "usa el fitxer de configuració global"
 
-#: builtin/config.c:58
+#: builtin/config.c:59
 msgid "use system config file"
 msgstr "usa el fitxer de configuració del sistema"
 
-#: builtin/config.c:59
+#: builtin/config.c:60
 msgid "use repository config file"
 msgstr "usa el fitxer de configuració del dipòsit"
 
-#: builtin/config.c:60
+#: builtin/config.c:61
 msgid "use given config file"
 msgstr "usa el fitxer de configuració donat"
 
-#: builtin/config.c:61
+#: builtin/config.c:62
 msgid "blob-id"
 msgstr "ID de blob"
 
-#: builtin/config.c:61
+#: builtin/config.c:62
 msgid "read config from given blob object"
 msgstr "llegeix la configuració de l'objecte de blob donat"
 
-#: builtin/config.c:62
+#: builtin/config.c:63
 msgid "Action"
 msgstr "Acció"
 
-#: builtin/config.c:63
+#: builtin/config.c:64
 msgid "get value: name [value-regex]"
 msgstr "obtén valor: nom [regex-de-valors]"
 
-#: builtin/config.c:64
+#: builtin/config.c:65
 msgid "get all values: key [value-regex]"
 msgstr "obtén tots els valors: clau [regex-de-valors]"
 
-#: builtin/config.c:65
+#: builtin/config.c:66
 msgid "get values for regexp: name-regex [value-regex]"
 msgstr "obtén valors de regexp: regex-de-noms [regex-de-valors]"
 
-#: builtin/config.c:66
+#: builtin/config.c:67
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "obtén el valor específic per a l'URL: secció[.variable] URL"
 
-#: builtin/config.c:67
+#: builtin/config.c:68
 msgid "replace all matching variables: name value [value_regex]"
-msgstr "reemplaça totes les variables que coincideixen: nom valor [regex_de_valors]"
+msgstr ""
+"reemplaça totes les variables que coincideixen: nom valor [regex_de_valors]"
 
-#: builtin/config.c:68
+#: builtin/config.c:69
 msgid "add a new variable: name value"
 msgstr "afegeix una variable nova: nom valor"
 
-#: builtin/config.c:69
+#: builtin/config.c:70
 msgid "remove a variable: name [value-regex]"
 msgstr "elimina una variable: nom [regex-de-valors]"
 
-#: builtin/config.c:70
+#: builtin/config.c:71
 msgid "remove all matches: name [value-regex]"
 msgstr "elimina totes les coincidències: nom [regex-de-valors]"
 
-#: builtin/config.c:71
+#: builtin/config.c:72
 msgid "rename section: old-name new-name"
 msgstr "canvia el nom de secció: nom-antic nom-nou"
 
-#: builtin/config.c:72
+#: builtin/config.c:73
 msgid "remove a section: name"
 msgstr "elimina una secció: nom"
 
-#: builtin/config.c:73
+#: builtin/config.c:74
 msgid "list all"
 msgstr "llista tots"
 
-#: builtin/config.c:74
+#: builtin/config.c:75
 msgid "open an editor"
 msgstr "obre un editor"
 
-#: builtin/config.c:75
+#: builtin/config.c:76
 msgid "find the color configured: slot [default]"
 msgstr "troba el color configurat: ranura [per defecte]"
 
-#: builtin/config.c:76
+#: builtin/config.c:77
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "troba l'ajust de color: ranura [stdout-és-tty]"
 
-#: builtin/config.c:77
+#: builtin/config.c:78
 msgid "Type"
 msgstr "Tipus"
 
-#: builtin/config.c:78
+#: builtin/config.c:79
 msgid "value is \"true\" or \"false\""
 msgstr "el valor és \"true\" o \"false\""
 
-#: builtin/config.c:79
+#: builtin/config.c:80
 msgid "value is decimal number"
 msgstr "el valor és un nombre decimal"
 
-#: builtin/config.c:80
+#: builtin/config.c:81
 msgid "value is --bool or --int"
 msgstr "el valor és --bool o --int"
 
-#: builtin/config.c:81
+#: builtin/config.c:82
 msgid "value is a path (file or directory name)"
 msgstr "el valor és un camí (nom de fitxer o directori)"
 
-#: builtin/config.c:82
+#: builtin/config.c:83
 msgid "Other"
 msgstr "Altre"
 
-#: builtin/config.c:83
+#: builtin/config.c:84
 msgid "terminate values with NUL byte"
 msgstr "acaba els valors amb un octet NUL"
 
-#: builtin/config.c:84
+#: builtin/config.c:85
 msgid "show variable names only"
 msgstr "mostra només els noms de variable"
 
-#: builtin/config.c:85
+#: builtin/config.c:86
 msgid "respect include directives on lookup"
 msgstr "respecta les directives d'inclusió en cercar"
 
-#: builtin/config.c:86
+#: builtin/config.c:87
 msgid "show origin of config (file, standard input, blob, command line)"
-msgstr "mostra l'origen de la configuració (fitxer, entrada estàndard, blob, línia d'ordres)"
+msgstr ""
+"mostra l'origen de la configuració (fitxer, entrada estàndard, blob, línia "
+"d'ordres)"
 
-#: builtin/config.c:328
+#: builtin/config.c:327
 msgid "unable to parse default color value"
 msgstr "no s'ha pogut analitzar el valor de color per defecte"
 
-#: builtin/config.c:472
+#: builtin/config.c:471
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -7366,12 +7691,17 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:615
+#: builtin/config.c:499
+#, fuzzy
+msgid "--local can only be used inside a git repository"
+msgstr "--cached fora d'un dipòsit"
+
+#: builtin/config.c:621
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "no es pot crear el fitxer de configuració '%s'"
 
-#: builtin/config.c:627
+#: builtin/config.c:633
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -7380,75 +7710,75 @@ msgstr ""
 "no es pot sobreescriure múltiples valors amb un sol valor\n"
 "       Useu una expressió regular, --add o --replace-all per a canviar %s."
 
-#: builtin/count-objects.c:86
+#: builtin/count-objects.c:87
 msgid "git count-objects [-v] [-H | --human-readable]"
 msgstr "git count-objects [-v] [-H | --human-readable]"
 
-#: builtin/count-objects.c:96
+#: builtin/count-objects.c:97
 msgid "print sizes in human readable format"
 msgstr "imprimeix les mides en un format llegible pels humans"
 
-#: builtin/describe.c:18
+#: builtin/describe.c:19
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<opcions>] [<comissió>...]"
 
-#: builtin/describe.c:19
+#: builtin/describe.c:20
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<opcions>] --dirty"
 
-#: builtin/describe.c:53
+#: builtin/describe.c:54
 msgid "head"
 msgstr "davant per"
 
-#: builtin/describe.c:53
+#: builtin/describe.c:54
 msgid "lightweight"
 msgstr "lleuger"
 
-#: builtin/describe.c:53
+#: builtin/describe.c:54
 msgid "annotated"
 msgstr "anotat"
 
-#: builtin/describe.c:250
+#: builtin/describe.c:253
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "l'etiqueta anotada %s no és disponible"
 
-#: builtin/describe.c:254
+#: builtin/describe.c:257
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "l'etiqueta anotada %s no té nom incrustat"
 
-#: builtin/describe.c:256
+#: builtin/describe.c:259
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "l'etiqueta '%s' realment és '%s' aquí"
 
-#: builtin/describe.c:283 builtin/log.c:487
+#: builtin/describe.c:286 builtin/log.c:489
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "%s no és un nom d'objecte vàlid"
 
-#: builtin/describe.c:286
+#: builtin/describe.c:289
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s no és un objecte de '%s' vàlid"
 
-#: builtin/describe.c:303
+#: builtin/describe.c:306
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "cap etiqueta coincideix exactament amb '%s'"
 
-#: builtin/describe.c:305
+#: builtin/describe.c:308
 #, c-format
 msgid "searching to describe %s\n"
 msgstr "s'està cercant per a descriure %s\n"
 
-#: builtin/describe.c:352
+#: builtin/describe.c:355
 #, c-format
 msgid "finished search at %s\n"
 msgstr "s'ha finalitzat la cerca a %s\n"
 
-#: builtin/describe.c:379
+#: builtin/describe.c:382
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -7457,7 +7787,7 @@ msgstr ""
 "Cap etiqueta anotada pot descriure '%s'.\n"
 "No obstant, hi havia etiquetes no anotades: proveu --tags."
 
-#: builtin/describe.c:383
+#: builtin/describe.c:386
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -7466,12 +7796,12 @@ msgstr ""
 "Cap etiqueta pot descriure '%s'.\n"
 "Proveu --always, o creeu algunes etiquetes."
 
-#: builtin/describe.c:413
+#: builtin/describe.c:416
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu comissions travessades\n"
 
-#: builtin/describe.c:416
+#: builtin/describe.c:419
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -7480,75 +7810,75 @@ msgstr ""
 "s'han trobat més de %i etiquetes: s'han llistat les %i més recents\n"
 "s'ha renunciat la cerca a %s\n"
 
-#: builtin/describe.c:438
+#: builtin/describe.c:441
 msgid "find the tag that comes after the commit"
 msgstr "troba l'etiqueta que vingui després de la comissió"
 
-#: builtin/describe.c:439
+#: builtin/describe.c:442
 msgid "debug search strategy on stderr"
 msgstr "estratègia de cerca de depuració en stderr"
 
-#: builtin/describe.c:440
+#: builtin/describe.c:443
 msgid "use any ref"
 msgstr "usa qualsevol referència"
 
-#: builtin/describe.c:441
+#: builtin/describe.c:444
 msgid "use any tag, even unannotated"
 msgstr "usa qualsevol etiqueta, fins i tot aquelles sense anotar"
 
-#: builtin/describe.c:442
+#: builtin/describe.c:445
 msgid "always use long format"
 msgstr "sempre usa el format llarg"
 
-#: builtin/describe.c:443
+#: builtin/describe.c:446
 msgid "only follow first parent"
 msgstr "només segueix la primera mare"
 
-#: builtin/describe.c:446
+#: builtin/describe.c:449
 msgid "only output exact matches"
 msgstr "emet només coincidències exactes"
 
-#: builtin/describe.c:448
+#: builtin/describe.c:451
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "considera les <n> etiquetes més recents (per defecte: 10)"
 
-#: builtin/describe.c:450
+#: builtin/describe.c:453
 msgid "only consider tags matching <pattern>"
 msgstr "només considera les etiquetes que coincideixen amb <patró>"
 
-#: builtin/describe.c:452
+#: builtin/describe.c:455
 msgid "do not consider tags matching <pattern>"
 msgstr "no consideris les etiquetes que no coincideixen amb <patró>"
 
-#: builtin/describe.c:454 builtin/name-rev.c:357
+#: builtin/describe.c:457 builtin/name-rev.c:406
 msgid "show abbreviated commit object as fallback"
 msgstr "mostra l'objecte de comissió abreviat com a sistema alternatiu"
 
-#: builtin/describe.c:455 builtin/describe.c:458
+#: builtin/describe.c:458 builtin/describe.c:461
 msgid "mark"
 msgstr "marca"
 
-#: builtin/describe.c:456
+#: builtin/describe.c:459
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-dirty\")"
 
-#: builtin/describe.c:459
+#: builtin/describe.c:462
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-broken\")"
 
-#: builtin/describe.c:477
+#: builtin/describe.c:480
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long és incompatible amb --abbrev=0"
 
-#: builtin/describe.c:506
+#: builtin/describe.c:509
 msgid "No names found, cannot describe anything."
 msgstr "No s'ha trobat cap nom, no es pot descriure res."
 
-#: builtin/describe.c:549
+#: builtin/describe.c:552
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty és incompatible amb les comissions"
 
-#: builtin/describe.c:551
+#: builtin/describe.c:554
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken és incompatible amb les comissions"
 
@@ -7557,345 +7887,352 @@ msgstr "--broken és incompatible amb les comissions"
 msgid "'%s': not a regular file or symlink"
 msgstr "'%s': no és ni fitxer regular ni enllaç simbòlic"
 
-#: builtin/diff.c:234
+#: builtin/diff.c:235
 #, c-format
 msgid "invalid option: %s"
 msgstr "opció no vàlida: %s"
 
-#: builtin/diff.c:358
+#: builtin/diff.c:359
 msgid "Not a git repository"
 msgstr "No és un dipòsit de git"
 
-#: builtin/diff.c:401
+#: builtin/diff.c:402
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "s'ha donat un objecte no vàlid '%s'."
 
-#: builtin/diff.c:410
+#: builtin/diff.c:411
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "s'ha donat més de dos blobs: '%s"
 
-#: builtin/diff.c:417
+#: builtin/diff.c:416
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "s'ha donat l'objecte no gestionat '%s'."
 
-#: builtin/difftool.c:28
+#: builtin/difftool.c:29
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<opcions>] [<commit> [<commit>]] [--] [<camí>...]"
 
-#: builtin/difftool.c:241
+#: builtin/difftool.c:249
 #, c-format
 msgid "failed: %d"
 msgstr "ha fallat: %d"
 
-#: builtin/difftool.c:283
+#: builtin/difftool.c:291
 #, c-format
 msgid "could not read symlink %s"
 msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
 
-#: builtin/difftool.c:285
+#: builtin/difftool.c:293
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "no s'ha pogut llegir el fitxer d'enllaç simbòlic %s"
 
-#: builtin/difftool.c:293
+#: builtin/difftool.c:301
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "No es pot llegir l'objecte %s per l'enllaç simbòlic %s"
 
-#: builtin/difftool.c:395
+#: builtin/difftool.c:403
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
 msgstr ""
 
-#: builtin/difftool.c:609
+#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "s'han modificat ambdós fitxers: '%s' i '%s'."
 
-#: builtin/difftool.c:611
+#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "s'ha deixat un fitxer de l'arbre de treball."
 
-#: builtin/difftool.c:622
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "existeix un fitxer temporal a %s'."
 
-#: builtin/difftool.c:623
+#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "podeu netejar o recuperar-los."
 
-#: builtin/difftool.c:669
+#: builtin/difftool.c:689
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "utilitza `diff.guitool` en comptes de `diff.tool`"
 
-#: builtin/difftool.c:671
+#: builtin/difftool.c:691
 msgid "perform a full-directory diff"
 msgstr "fes un diff de tot el directori"
 
-#: builtin/difftool.c:673
+#: builtin/difftool.c:693
 msgid "do not prompt before launching a diff tool"
 msgstr "no preguntis abans d'executar l'eina diff"
 
-#: builtin/difftool.c:679
+#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "utilitza enllaços simbòlics en mode dir-diff"
 
-#: builtin/difftool.c:680
+#: builtin/difftool.c:700
 msgid "<tool>"
 msgstr "<tool>"
 
-#: builtin/difftool.c:681
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "utilitza l'eina de diff especificada"
 
-#: builtin/difftool.c:683
+#: builtin/difftool.c:703
 msgid "print a list of diff tools that may be used with `--tool`"
-msgstr "imprimeix una llista de totes les eines diff que podeu usar amb `--tool`"
+msgstr ""
+"imprimeix una llista de totes les eines diff que podeu usar amb `--tool`"
 
-#: builtin/difftool.c:686
-msgid "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit code"
+#: builtin/difftool.c:706
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
 msgstr ""
 
-#: builtin/difftool.c:688
+#: builtin/difftool.c:708
 msgid "<command>"
 msgstr "<command>"
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr "especifiqueu una ordre personalitzada per veure diffs"
 
-#: builtin/difftool.c:713
+#: builtin/difftool.c:733
 msgid "no <tool> given for --tool=<tool>"
 msgstr "no s'ha proporcionat <tool> per --tool=<tool>"
 
-#: builtin/difftool.c:720
+#: builtin/difftool.c:740
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "no s'ha proporcionat <cmd> per --extcmd=<cmd>"
 
-#: builtin/fast-export.c:25
+#: builtin/fast-export.c:26
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [opcions-de-llista-de-revisions]"
 
-#: builtin/fast-export.c:980
+#: builtin/fast-export.c:982
 msgid "show progress after <n> objects"
 msgstr "mostra el progrés després de <n> objectes"
 
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:984
 msgid "select handling of signed tags"
 msgstr "selecciona la gestió de les etiquetes signades"
 
-#: builtin/fast-export.c:985
+#: builtin/fast-export.c:987
 msgid "select handling of tags that tag filtered objects"
 msgstr "selecciona la gestió de les etiquetes que etiquetin objectes filtrats"
 
-#: builtin/fast-export.c:988
+#: builtin/fast-export.c:990
 msgid "Dump marks to this file"
 msgstr "Bolca les marques a aquest fitxer"
 
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:992
 msgid "Import marks from this file"
 msgstr "Importa les marques d'aquest fitxer"
 
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:994
 msgid "Fake a tagger when tags lack one"
 msgstr "Fingeix un etiquetador quan els en manca un a les etiquetes"
 
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:996
 msgid "Output full tree for each commit"
 msgstr "Imprimeix l'arbre complet de cada comissió"
 
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:998
 msgid "Use the done feature to terminate the stream"
 msgstr "Usa la característica done per a acabar el corrent"
 
-#: builtin/fast-export.c:997
+#: builtin/fast-export.c:999
 msgid "Skip output of blob data"
 msgstr "Omet l'emissió de dades de blob"
 
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1000
 msgid "refspec"
 msgstr "especificació de referència"
 
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1001
 msgid "Apply refspec to exported refs"
 msgstr "Aplica l'especificació de referència a les referències exportades"
 
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1002
 msgid "anonymize output"
 msgstr "anonimitza la sortida"
 
-#: builtin/fetch.c:21
+#: builtin/fetch.c:22
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
 
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<opcions>] <grup>"
 
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<opcions>] [(<dipòsit> | <grup>)...]"
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<opcions>]"
 
-#: builtin/fetch.c:95 builtin/pull.c:175
+#: builtin/fetch.c:90 builtin/pull.c:182
 msgid "fetch from all remotes"
 msgstr "obtén de tots els remots"
 
-#: builtin/fetch.c:97 builtin/pull.c:178
+#: builtin/fetch.c:92 builtin/pull.c:185
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure"
 
-#: builtin/fetch.c:99 builtin/pull.c:181
+#: builtin/fetch.c:94 builtin/pull.c:188
 msgid "path to upload pack on remote end"
 msgstr "camí al qual pujar el paquet al costat remot"
 
-#: builtin/fetch.c:100 builtin/pull.c:183
+#: builtin/fetch.c:95 builtin/pull.c:190
 msgid "force overwrite of local branch"
 msgstr "força la sobreescriptura de la branca local"
 
-#: builtin/fetch.c:102
+#: builtin/fetch.c:97
 msgid "fetch from multiple remotes"
 msgstr "obtén de múltiples remots"
 
-#: builtin/fetch.c:104 builtin/pull.c:185
+#: builtin/fetch.c:99 builtin/pull.c:192
 msgid "fetch all tags and associated objects"
 msgstr "obtén totes les etiquetes i tots els objectes associats"
 
-#: builtin/fetch.c:106
+#: builtin/fetch.c:101
 msgid "do not fetch all tags (--no-tags)"
 msgstr "no obtinguis les etiquetes (--no-tags)"
 
-#: builtin/fetch.c:108
+#: builtin/fetch.c:103
 msgid "number of submodules fetched in parallel"
 msgstr "nombre de submòduls obtinguts en paral·lel"
 
-#: builtin/fetch.c:110 builtin/pull.c:188
+#: builtin/fetch.c:105 builtin/pull.c:195
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "poda les branques amb seguiment remot que ja no estiguin en el remot"
 
-#: builtin/fetch.c:111 builtin/pull.c:191
+#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
 msgid "on-demand"
 msgstr "sota demanda"
 
-#: builtin/fetch.c:112 builtin/pull.c:192
+#: builtin/fetch.c:107
 msgid "control recursive fetching of submodules"
 msgstr "controla l'obtenció recursiva de submòduls"
 
-#: builtin/fetch.c:116 builtin/pull.c:200
+#: builtin/fetch.c:111 builtin/pull.c:203
 msgid "keep downloaded pack"
 msgstr "retén el paquet baixat"
 
-#: builtin/fetch.c:118
+#: builtin/fetch.c:113
 msgid "allow updating of HEAD ref"
 msgstr "permet l'actualització de la referència HEAD"
 
-#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
+#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
 msgid "deepen history of shallow clone"
 msgstr "aprofundeix la història d'un clon superficial"
 
-#: builtin/fetch.c:123
+#: builtin/fetch.c:118
 msgid "deepen history of shallow repository based on time"
 msgstr "aprofundeix la història d'un clon superficial basat en temps"
 
-#: builtin/fetch.c:129 builtin/pull.c:206
+#: builtin/fetch.c:124 builtin/pull.c:209
 msgid "convert to a complete repository"
 msgstr "converteix en un dipòsit complet"
 
-#: builtin/fetch.c:131 builtin/log.c:1440
+#: builtin/fetch.c:126 builtin/log.c:1450
 msgid "dir"
 msgstr "directori"
 
-#: builtin/fetch.c:132
+#: builtin/fetch.c:127
 msgid "prepend this to submodule path output"
 msgstr "anteposa això a la sortida de camí del submòdul"
 
-#: builtin/fetch.c:135
-msgid "default mode for recursion"
-msgstr "mode de recursivitat per defecte"
+#: builtin/fetch.c:130
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr ""
 
-#: builtin/fetch.c:137 builtin/pull.c:209
+#: builtin/fetch.c:134 builtin/pull.c:212
 msgid "accept refs that update .git/shallow"
 msgstr "accepta les referències que actualitzin .git/shallow"
 
-#: builtin/fetch.c:138 builtin/pull.c:211
+#: builtin/fetch.c:135 builtin/pull.c:214
 msgid "refmap"
 msgstr "mapa de referències"
 
-#: builtin/fetch.c:139 builtin/pull.c:212
+#: builtin/fetch.c:136 builtin/pull.c:215
 msgid "specify fetch refmap"
 msgstr "mostra el mapa de referències d'obtenció"
 
-#: builtin/fetch.c:395
+#: builtin/fetch.c:394
 msgid "Couldn't find remote ref HEAD"
 msgstr "No s'ha pogut trobar la referència HEAD remota"
 
-#: builtin/fetch.c:513
+#: builtin/fetch.c:512
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "la configuració fetch.output conté un valor no vàlid %s"
 
-#: builtin/fetch.c:606
+#: builtin/fetch.c:605
 #, c-format
 msgid "object %s not found"
 msgstr "objecte %s no trobat"
 
-#: builtin/fetch.c:610
+#: builtin/fetch.c:609
 msgid "[up to date]"
 msgstr "[al dia]"
 
-#: builtin/fetch.c:623 builtin/fetch.c:703
+#: builtin/fetch.c:622 builtin/fetch.c:702
 msgid "[rejected]"
 msgstr "[rebutjat]"
 
-#: builtin/fetch.c:624
+#: builtin/fetch.c:623
 msgid "can't fetch in current branch"
 msgstr "no es pot obtenir en la branca actual"
 
-#: builtin/fetch.c:633
+#: builtin/fetch.c:632
 msgid "[tag update]"
 msgstr "[actualització d'etiqueta]"
 
-#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683 builtin/fetch.c:698
+#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
+#: builtin/fetch.c:697
 msgid "unable to update local ref"
 msgstr "no s'ha pogut actualitzar la referència local"
 
-#: builtin/fetch.c:653
+#: builtin/fetch.c:652
 msgid "[new tag]"
 msgstr "[etiqueta nova]"
 
-#: builtin/fetch.c:656
+#: builtin/fetch.c:655
 msgid "[new branch]"
 msgstr "[branca nova]"
 
-#: builtin/fetch.c:659
+#: builtin/fetch.c:658
 msgid "[new ref]"
 msgstr "[referència nova]"
 
-#: builtin/fetch.c:698
+#: builtin/fetch.c:697
 msgid "forced update"
 msgstr "actualització forçada"
 
-#: builtin/fetch.c:703
+#: builtin/fetch.c:702
 msgid "non-fast-forward"
 msgstr "sense avanç ràpid"
 
-#: builtin/fetch.c:748
+#: builtin/fetch.c:747
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s no ha enviat tots els objectes necessaris\n"
 
-#: builtin/fetch.c:768
+#: builtin/fetch.c:767
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
-msgstr "rebutja %s perquè no es permet que les arrels superficials s'actualitzin"
+msgstr ""
+"rebutja %s perquè no es permet que les arrels superficials s'actualitzin"
 
 #: builtin/fetch.c:855 builtin/fetch.c:951
 #, c-format
@@ -7926,7 +8263,7 @@ msgstr "   (%s s'ha tornat penjant)"
 msgid "[deleted]"
 msgstr "[suprimit]"
 
-#: builtin/fetch.c:955 builtin/remote.c:1022
+#: builtin/fetch.c:955 builtin/remote.c:1023
 msgid "(none)"
 msgstr "(cap)"
 
@@ -7955,7 +8292,7 @@ msgstr "No se sap com obtenir de %s"
 msgid "Fetching %s\n"
 msgstr "S'està obtenint %s\n"
 
-#: builtin/fetch.c:1238 builtin/remote.c:96
+#: builtin/fetch.c:1238 builtin/remote.c:97
 #, c-format
 msgid "Could not fetch %s"
 msgstr "No s'ha pogut obtenir %s"
@@ -7988,100 +8325,104 @@ msgstr "--depth i --unshallow no es poden usar junts"
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow en un dipòsit complet no té sentit"
 
-#: builtin/fetch.c:1352
+#: builtin/fetch.c:1349
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all no accepta un paràmetre de dipòsit"
 
-#: builtin/fetch.c:1354
+#: builtin/fetch.c:1351
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all no té sentit amb especificacions de referència"
 
-#: builtin/fetch.c:1365
+#: builtin/fetch.c:1362
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "No hi ha tal remot ni tal grup remot: %s"
 
-#: builtin/fetch.c:1373
+#: builtin/fetch.c:1370
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "Obtenir un grup i especificar referències no té sentit"
 
-#: builtin/fmt-merge-msg.c:14
-msgid "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
-msgstr "git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]"
+#: builtin/fmt-merge-msg.c:15
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+msgstr ""
+"git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]"
 
-#: builtin/fmt-merge-msg.c:663
+#: builtin/fmt-merge-msg.c:664
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "emplena el registre amb <n> entrades del registre curt com a màxim"
 
-#: builtin/fmt-merge-msg.c:666
+#: builtin/fmt-merge-msg.c:667
 msgid "alias for --log (deprecated)"
 msgstr "àlies per --log (en desús)"
 
-#: builtin/fmt-merge-msg.c:669
+#: builtin/fmt-merge-msg.c:670
 msgid "text"
 msgstr "text"
 
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:671
 msgid "use <text> as start of message"
 msgstr "usa <text> com a inici de missatge"
 
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
 msgid "file to read from"
 msgstr "fitxer del qual llegir"
 
-#: builtin/for-each-ref.c:9
+#: builtin/for-each-ref.c:10
 msgid "git for-each-ref [<options>] [<pattern>]"
 msgstr "git for-each-ref [<opcions>] [<patró>]"
 
-#: builtin/for-each-ref.c:10
+#: builtin/for-each-ref.c:11
 msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <objecte>]"
 
-#: builtin/for-each-ref.c:11
+#: builtin/for-each-ref.c:12
 msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
 msgstr "git for-each-ref [(--merged | --no-merged) [<comissió>]]"
 
-#: builtin/for-each-ref.c:12
+#: builtin/for-each-ref.c:13
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
-msgstr "git for-each-ref [--contains  [<comissió>]] [--no-contains [<comissió>]]"
+msgstr ""
+"git for-each-ref [--contains  [<comissió>]] [--no-contains [<comissió>]]"
 
-#: builtin/for-each-ref.c:27
+#: builtin/for-each-ref.c:28
 msgid "quote placeholders suitably for shells"
-msgstr "posa els marcadors de posició de forma adequada per a intèrprets d'ordres"
+msgstr ""
+"posa els marcadors de posició de forma adequada per a intèrprets d'ordres"
 
-#: builtin/for-each-ref.c:29
+#: builtin/for-each-ref.c:30
 msgid "quote placeholders suitably for perl"
 msgstr "posa els marcadors de posició entre cometes adequades per al perl"
 
-#: builtin/for-each-ref.c:31
+#: builtin/for-each-ref.c:32
 msgid "quote placeholders suitably for python"
 msgstr "posa els marcadors de posició entre cometes adequades per al python"
 
-#: builtin/for-each-ref.c:33
+#: builtin/for-each-ref.c:34
 msgid "quote placeholders suitably for Tcl"
 msgstr "posa els marcadors de posició entre cometes adequades per al Tcl"
 
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
 msgid "show only <n> matched refs"
 msgstr "mostra només <n> referències coincidents"
 
-#: builtin/for-each-ref.c:41
+#: builtin/for-each-ref.c:42
 msgid "print only refs which points at the given object"
 msgstr "imprimeix només les referències que assenyalin l'objecte donat"
 
-#: builtin/for-each-ref.c:43
+#: builtin/for-each-ref.c:44
 msgid "print only refs that are merged"
 msgstr "imprimeix només les referències que s'han fusionat"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 msgid "print only refs that are not merged"
 msgstr "imprimeix només les referències que no s'han fusionat"
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
 msgid "print only refs which contain the commit"
 msgstr "imprimeix només les referències que continguin la comissió"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
 msgid "print only refs which don't contain the commit"
 msgstr "imprimeix només les referències que no continguin la comissió"
 
@@ -8145,21 +8486,21 @@ msgstr "mostra els noms detallats dels objectes abastables"
 msgid "Checking objects"
 msgstr "S'estan comprovant els objectes"
 
-#: builtin/gc.c:25
+#: builtin/gc.c:26
 msgid "git gc [<options>]"
 msgstr "git gc [<opcions>]"
 
-#: builtin/gc.c:78
+#: builtin/gc.c:79
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "S'ha produït un error en fer fstat %s: %s"
 
-#: builtin/gc.c:310
+#: builtin/gc.c:311
 #, c-format
 msgid "Can't stat %s"
 msgstr "No es pot fer stat en %s"
 
-#: builtin/gc.c:319
+#: builtin/gc.c:320
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -8174,391 +8515,422 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:358
+#: builtin/gc.c:359
 msgid "prune unreferenced objects"
 msgstr "poda objectes sense referència"
 
-#: builtin/gc.c:360
+#: builtin/gc.c:361
 msgid "be more thorough (increased runtime)"
 msgstr "sigues més exhaustiu (el temps d'execució augmenta)"
 
-#: builtin/gc.c:361
+#: builtin/gc.c:362
 msgid "enable auto-gc mode"
 msgstr "habilita el mode de recollida d'escombraries automàtica"
 
-#: builtin/gc.c:362
+#: builtin/gc.c:363
 msgid "force running gc even if there may be another gc running"
 msgstr "força l'execució de gc encara que hi pugui haver un altre gc executant"
 
-#: builtin/gc.c:379
+#: builtin/gc.c:380
 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr "No s'ha pogut analitzar el valor gc.logexpiry %s"
 
-#: builtin/gc.c:407
+#: builtin/gc.c:408
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
-msgstr "S'està empaquetant el dipòsit automàticament en el fons per rendiment òptim.\n"
+msgstr ""
+"S'està empaquetant el dipòsit automàticament en el fons per rendiment "
+"òptim.\n"
 
-#: builtin/gc.c:409
+#: builtin/gc.c:410
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "S'està empaquetant automàticament el dipòsit per rendiment òptim.\n"
 
-#: builtin/gc.c:410
+#: builtin/gc.c:411
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Vegeu \"git help gc\" per neteja manual.\n"
 
-#: builtin/gc.c:431
+#: builtin/gc.c:436
 #, c-format
-msgid "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
-msgstr "gc ja s'està executant en la màquina '%s' pid %<PRIuMAX> (useu --force si no)"
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr ""
+"gc ja s'està executant en la màquina '%s' pid %<PRIuMAX> (useu --force si no)"
 
-#: builtin/gc.c:475
-msgid "There are too many unreachable loose objects; run 'git prune' to remove them."
-msgstr "Hi ha massa objectes solts inabastables; executeu 'git prune' per a eliminar-los."
+#: builtin/gc.c:480
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+"Hi ha massa objectes solts inabastables; executeu 'git prune' per a eliminar-"
+"los."
 
-#: builtin/grep.c:25
+#: builtin/grep.c:27
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<opcions>] [-e] <patró> [<revisió>...] [[--] <camí>...]"
 
-#: builtin/grep.c:232
+#: builtin/grep.c:235
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: s'ha produït un error en crear fil: %s"
 
-#: builtin/grep.c:290
+#: builtin/grep.c:293
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "s'ha especificat un nombre de fils no vàlid (%d) per a %s"
 
-#: builtin/grep.c:769 builtin/grep.c:810
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#, c-format
+msgid "no threads support, ignoring %s"
+msgstr "no hi ha suport de fils, s'està ignorant %s"
+
+#: builtin/grep.c:788 builtin/grep.c:829
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "no s'ha pogut llegir l'arbre (%s)"
 
-#: builtin/grep.c:829
+#: builtin/grep.c:848
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "no es pot fer grep des d'un objecte de tipus %s"
 
-#: builtin/grep.c:893
+#: builtin/grep.c:912
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "l'opció `%c' espera un valor numèric"
 
-#: builtin/grep.c:980
+#: builtin/grep.c:999
 msgid "search in index instead of in the work tree"
 msgstr "cerca en l'índex en lloc de l'arbre de treball"
 
-#: builtin/grep.c:982
+#: builtin/grep.c:1001
 msgid "find in contents not managed by git"
 msgstr "cerca en continguts no gestionats per git"
 
-#: builtin/grep.c:984
+#: builtin/grep.c:1003
 msgid "search in both tracked and untracked files"
 msgstr "cerca tant en fitxers seguits com en no seguits"
 
-#: builtin/grep.c:986
+#: builtin/grep.c:1005
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignora els fitxers especificats mitjançant '.gitignore'"
 
-#: builtin/grep.c:988
+#: builtin/grep.c:1007
 msgid "recursively search in each submodule"
 msgstr "cerca recursivament a cada submòdul"
 
-#: builtin/grep.c:990
+#: builtin/grep.c:1009
 msgid "basename"
 msgstr "nom base"
 
-#: builtin/grep.c:991
+#: builtin/grep.c:1010
 msgid "prepend parent project's basename to output"
 msgstr "anteposa això a la sortida del nom base del projecte pare"
 
-#: builtin/grep.c:994
+#: builtin/grep.c:1013
 msgid "show non-matching lines"
 msgstr "mostra les línies no coincidents"
 
-#: builtin/grep.c:996
+#: builtin/grep.c:1015
 msgid "case insensitive matching"
 msgstr "coincidència insensible a majúscula i minúscula"
 
-#: builtin/grep.c:998
+#: builtin/grep.c:1017
 msgid "match patterns only at word boundaries"
 msgstr "coincideix amb els patrons només als límits de paraula"
 
-#: builtin/grep.c:1000
+#: builtin/grep.c:1019
 msgid "process binary files as text"
 msgstr "processa els fitxers binaris com a text"
 
-#: builtin/grep.c:1002
+#: builtin/grep.c:1021
 msgid "don't match patterns in binary files"
 msgstr "no coincideixis amb els patrons en els fitxers binaris"
 
-#: builtin/grep.c:1005
+#: builtin/grep.c:1024
 msgid "process binary files with textconv filters"
 msgstr "processa els fitxers binaris amb filtres de textconv"
 
-#: builtin/grep.c:1007
+#: builtin/grep.c:1026
 msgid "descend at most <depth> levels"
 msgstr "descendeix com a màxim <profunditat> nivells"
 
-#: builtin/grep.c:1011
+#: builtin/grep.c:1030
 msgid "use extended POSIX regular expressions"
 msgstr "usa les expressions regulars POSIX esteses"
 
-#: builtin/grep.c:1014
+#: builtin/grep.c:1033
 msgid "use basic POSIX regular expressions (default)"
 msgstr "usa les expressions regulars POSIX bàsiques (per defecte)"
 
-#: builtin/grep.c:1017
+#: builtin/grep.c:1036
 msgid "interpret patterns as fixed strings"
 msgstr "interpreta els patrons com a cadenes fixes"
 
-#: builtin/grep.c:1020
+#: builtin/grep.c:1039
 msgid "use Perl-compatible regular expressions"
 msgstr "usa les expressions regulars compatibles amb Perl"
 
-#: builtin/grep.c:1023
+#: builtin/grep.c:1042
 msgid "show line numbers"
 msgstr "mostra els números de línia"
 
-#: builtin/grep.c:1024
+#: builtin/grep.c:1043
 msgid "don't show filenames"
 msgstr "no mostris els noms de fitxer"
 
-#: builtin/grep.c:1025
+#: builtin/grep.c:1044
 msgid "show filenames"
 msgstr "mostra els noms de fitxer"
 
-#: builtin/grep.c:1027
+#: builtin/grep.c:1046
 msgid "show filenames relative to top directory"
 msgstr "mostra els noms de fitxer relatius al directori superior"
 
-#: builtin/grep.c:1029
+#: builtin/grep.c:1048
 msgid "show only filenames instead of matching lines"
 msgstr "mostra només els noms de fitxer en lloc de les línies coincidents"
 
-#: builtin/grep.c:1031
+#: builtin/grep.c:1050
 msgid "synonym for --files-with-matches"
 msgstr "sinònim de --files-with-matches"
 
-#: builtin/grep.c:1034
+#: builtin/grep.c:1053
 msgid "show only the names of files without match"
 msgstr "mostra només els noms dels fitxers sense coincidència"
 
-#: builtin/grep.c:1036
+#: builtin/grep.c:1055
 msgid "print NUL after filenames"
 msgstr "imprimeix NUL després dels noms de fitxer"
 
-#: builtin/grep.c:1038
+#: builtin/grep.c:1057
 msgid "show the number of matches instead of matching lines"
 msgstr "mostra el nombre de coincidències en lloc de les línies coincidents"
 
-#: builtin/grep.c:1039
+#: builtin/grep.c:1058
 msgid "highlight matches"
 msgstr "ressalta les coincidències"
 
-#: builtin/grep.c:1041
+#: builtin/grep.c:1060
 msgid "print empty line between matches from different files"
 msgstr "imprimeix una línia buida entre coincidències de fitxers distints"
 
-#: builtin/grep.c:1043
+#: builtin/grep.c:1062
 msgid "show filename only once above matches from same file"
-msgstr "mostra el nom de fitxer només una vegada a dalt de les coincidències del mateix fitxer"
+msgstr ""
+"mostra el nom de fitxer només una vegada a dalt de les coincidències del "
+"mateix fitxer"
 
-#: builtin/grep.c:1046
+#: builtin/grep.c:1065
 msgid "show <n> context lines before and after matches"
 msgstr "mostra <n> línies de context abans i després d'una coincidència"
 
-#: builtin/grep.c:1049
+#: builtin/grep.c:1068
 msgid "show <n> context lines before matches"
 msgstr "mostra <n> línies de context abans d'una coincidència"
 
-#: builtin/grep.c:1051
+#: builtin/grep.c:1070
 msgid "show <n> context lines after matches"
 msgstr "mostra <n> línies de context després d'una coincidència"
 
-#: builtin/grep.c:1053
+#: builtin/grep.c:1072
 msgid "use <n> worker threads"
 msgstr "usa <n> fils de treball"
 
-#: builtin/grep.c:1054
+#: builtin/grep.c:1073
 msgid "shortcut for -C NUM"
 msgstr "drecera per -C NUM"
 
-#: builtin/grep.c:1057
+#: builtin/grep.c:1076
 msgid "show a line with the function name before matches"
 msgstr "mostra una línia amb el nom de funció abans de les coincidències"
 
-#: builtin/grep.c:1059
+#: builtin/grep.c:1078
 msgid "show the surrounding function"
 msgstr "mostra la funció circumdant"
 
-#: builtin/grep.c:1062
+#: builtin/grep.c:1081
 msgid "read patterns from file"
 msgstr "llegeix els patrons des d'un fitxer"
 
-#: builtin/grep.c:1064
+#: builtin/grep.c:1083
 msgid "match <pattern>"
 msgstr "coincideix amb <patró>"
 
-#: builtin/grep.c:1066
+#: builtin/grep.c:1085
 msgid "combine patterns specified with -e"
 msgstr "combina els patrons especificats amb -e"
 
-#: builtin/grep.c:1078
+#: builtin/grep.c:1097
 msgid "indicate hit with exit status without output"
 msgstr "indica coincidència amb estat de sortida sense sortida textual"
 
-#: builtin/grep.c:1080
+#: builtin/grep.c:1099
 msgid "show only matches from files that match all patterns"
-msgstr "mostra només les coincidències dels fitxers que coincideixin amb tots els patrons"
+msgstr ""
+"mostra només les coincidències dels fitxers que coincideixin amb tots els "
+"patrons"
 
-#: builtin/grep.c:1082
+#: builtin/grep.c:1101
 msgid "show parse tree for grep expression"
 msgstr "mostra l'arbre d'anàlisis de l'expressió de grep"
 
-#: builtin/grep.c:1086
+#: builtin/grep.c:1105
 msgid "pager"
 msgstr "paginador"
 
-#: builtin/grep.c:1086
+#: builtin/grep.c:1105
 msgid "show matching files in the pager"
 msgstr "mostra els fitxers coincidents en el paginador"
 
-#: builtin/grep.c:1089
+#: builtin/grep.c:1108
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)"
 
-#: builtin/grep.c:1153
+#: builtin/grep.c:1172
 msgid "no pattern given."
 msgstr "cap patró donat."
 
-#: builtin/grep.c:1189
+#: builtin/grep.c:1204
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index o --untracked no es pot usar amb revisions"
 
-#: builtin/grep.c:1195
+#: builtin/grep.c:1211
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "no s'ha pogut resoldre la revisió: %s"
 
-#: builtin/grep.c:1228 builtin/index-pack.c:1485
+#: builtin/grep.c:1245 builtin/index-pack.c:1490
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "s'ha especificat un nombre de fils no vàlid (%d)"
 
-#: builtin/grep.c:1251
+#: builtin/grep.c:1250
+#, fuzzy
+msgid "no threads support, ignoring --threads"
+msgstr "no hi ha suport de fils, s'està ignorant %s"
+
+#: builtin/grep.c:1281
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager només funciona en l'arbre de treball"
 
-#: builtin/grep.c:1274
+#: builtin/grep.c:1304
 msgid "option not supported with --recurse-submodules."
 msgstr "opció no admesa amb --recurse-submodules."
 
-#: builtin/grep.c:1280
+#: builtin/grep.c:1310
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr "--cached o --untracked no es pot usar amb --no-index."
 
-#: builtin/grep.c:1286
+#: builtin/grep.c:1316
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr "--[no-]exclude-standard no es pot usar per als continguts seguits."
 
-#: builtin/grep.c:1294
+#: builtin/grep.c:1324
 msgid "both --cached and trees are given."
 msgstr "s'han donat ambdós --caches i arbres."
 
-#: builtin/hash-object.c:81
-msgid "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] [--] <file>..."
+#: builtin/hash-object.c:82
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
 msgstr ""
-"git hash-object [-t <tipus>] [-w] [--path=<fitxer> | --no-filters] [--stdin] [--] <fitxer>..."
+"git hash-object [-t <tipus>] [-w] [--path=<fitxer> | --no-filters] [--stdin] "
+"[--] <fitxer>..."
 
-#: builtin/hash-object.c:82
+#: builtin/hash-object.c:83
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
 msgid "type"
 msgstr "tipus"
 
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
 msgid "object type"
 msgstr "tipus d'objecte"
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "write the object into the object database"
 msgstr "escriu l'objecte a la base de dades d'objectes"
 
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98
 msgid "read the object from stdin"
 msgstr "llegeix l'objecte des d'stdin"
 
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:100
 msgid "store file as is without filters"
 msgstr "emmagatzema el fitxer tal com és sense filtres"
 
-#: builtin/hash-object.c:100
-msgid "just hash any random garbage to create corrupt objects for debugging Git"
-msgstr "només suma qualsevol brossa aleatòria per a crear objectes malmesos per a depurar al Git"
-
 #: builtin/hash-object.c:101
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
+msgstr ""
+"només suma qualsevol brossa aleatòria per a crear objectes malmesos per a "
+"depurar al Git"
+
+#: builtin/hash-object.c:102
 msgid "process file as it were from this path"
 msgstr "processa el fitxer com si fos d'aquest camí"
 
-#: builtin/help.c:42
+#: builtin/help.c:43
 msgid "print all available commands"
 msgstr "imprimeix totes les ordres disponibles"
 
-#: builtin/help.c:43
+#: builtin/help.c:44
 msgid "exclude guides"
 msgstr "exclou guies"
 
-#: builtin/help.c:44
+#: builtin/help.c:45
 msgid "print list of useful guides"
 msgstr "imprimeix la llista de guies útils"
 
-#: builtin/help.c:45
+#: builtin/help.c:46
 msgid "show man page"
 msgstr "mostra la pàgina de manual"
 
-#: builtin/help.c:46
+#: builtin/help.c:47
 msgid "show manual in web browser"
 msgstr "mostra la pàgina de manual en el navegador web"
 
-#: builtin/help.c:48
+#: builtin/help.c:49
 msgid "show info page"
 msgstr "mostra la pàgina d'informació"
 
-#: builtin/help.c:54
+#: builtin/help.c:55
 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
 msgstr "git help [--all] [--guides] [--man | --web | --info] [<ordre>]"
 
-#: builtin/help.c:66
+#: builtin/help.c:67
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "format d'ajuda no reconegut '%s'"
 
-#: builtin/help.c:93
+#: builtin/help.c:94
 msgid "Failed to start emacsclient."
 msgstr "S'ha produït un error'ha produït un error en iniciar emacsclient."
 
-#: builtin/help.c:106
+#: builtin/help.c:107
 msgid "Failed to parse emacsclient version."
 msgstr "S'ha produït un error en analitzar la versió d'emacsclient."
 
-#: builtin/help.c:114
+#: builtin/help.c:115
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "la versió d'emacsclient '%d' és massa vella (< 22)."
 
-#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
+#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "s'ha produït un error en executar '%s'"
 
-#: builtin/help.c:207
+#: builtin/help.c:208
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -8567,7 +8939,7 @@ msgstr ""
 "'%s': camí a un visualitzador de manuals no compatible.\n"
 "Si us plau, considereu usar 'man.<eina>.cmd' en lloc d'això."
 
-#: builtin/help.c:219
+#: builtin/help.c:220
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -8576,132 +8948,132 @@ msgstr ""
 "'%s': ordre per a un visualitzador de manuals compatible.\n"
 "Si us plau, considereu usar 'man.<eina>.path' en lloc d'això."
 
-#: builtin/help.c:336
+#: builtin/help.c:337
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s': visualitzador de manuals desconegut."
 
-#: builtin/help.c:353
+#: builtin/help.c:354
 msgid "no man viewer handled the request"
 msgstr "cap visualitzador de manuals ha gestionat la sol·licitud"
 
-#: builtin/help.c:361
+#: builtin/help.c:362
 msgid "no info viewer handled the request"
 msgstr "cap visualitzador d'informació ha gestionat la sol·licitud"
 
-#: builtin/help.c:403
+#: builtin/help.c:404
 msgid "Defining attributes per path"
 msgstr "La definició d'atributs per camí"
 
-#: builtin/help.c:404
+#: builtin/help.c:405
 msgid "Everyday Git With 20 Commands Or So"
 msgstr "Git quotidià amb més o menys 20 ordres"
 
-#: builtin/help.c:405
+#: builtin/help.c:406
 msgid "A Git glossary"
 msgstr "Un glossari de Git"
 
-#: builtin/help.c:406
+#: builtin/help.c:407
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Especifica els fitxers intencionalment no seguits a ignorar"
 
-#: builtin/help.c:407
+#: builtin/help.c:408
 msgid "Defining submodule properties"
 msgstr "La definició de les propietats de submòduls"
 
-#: builtin/help.c:408
+#: builtin/help.c:409
 msgid "Specifying revisions and ranges for Git"
 msgstr "L'especificació de revisions i rangs per al Git"
 
-#: builtin/help.c:409
+#: builtin/help.c:410
 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
 msgstr "Una introducció tutorial al Git (per a la versió 1.5.1 o més nova)"
 
-#: builtin/help.c:410
+#: builtin/help.c:411
 msgid "An overview of recommended workflows with Git"
 msgstr "Una visió de conjunt de fluxos de treball recomanats amb Git"
 
-#: builtin/help.c:422
+#: builtin/help.c:423
 msgid "The common Git guides are:\n"
 msgstr "Les guies de Git comunes són:\n"
 
-#: builtin/help.c:440
+#: builtin/help.c:441
 #, c-format
 msgid "`git %s' is aliased to `%s'"
 msgstr "`git %s' és un àlies de `%s'"
 
-#: builtin/help.c:462 builtin/help.c:479
+#: builtin/help.c:463 builtin/help.c:480
 #, c-format
 msgid "usage: %s%s"
 msgstr "ús: %s%s"
 
-#: builtin/index-pack.c:154
+#: builtin/index-pack.c:155
 #, c-format
 msgid "unable to open %s"
 msgstr "no s'ha pogut obrir %s"
 
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "hi ha una discordança de tipus d'objecte a %s"
 
-#: builtin/index-pack.c:224
+#: builtin/index-pack.c:225
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "no s'ha rebut l'objecte esperat %s"
 
-#: builtin/index-pack.c:227
+#: builtin/index-pack.c:228
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "objecte %s: tipus %s esperat, %s trobat"
 
-#: builtin/index-pack.c:269
+#: builtin/index-pack.c:270
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "no es pot omplir %d octet"
 msgstr[1] "no es pot omplir %d octets"
 
-#: builtin/index-pack.c:279
+#: builtin/index-pack.c:280
 msgid "early EOF"
 msgstr "EOF prematur"
 
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
 msgid "read error on input"
 msgstr "error de lectura d'entrada"
 
-#: builtin/index-pack.c:292
+#: builtin/index-pack.c:293
 msgid "used more bytes than were available"
 msgstr "s'han usat més octets que hi havia disponibles"
 
-#: builtin/index-pack.c:299
+#: builtin/index-pack.c:300
 msgid "pack too large for current definition of off_t"
 msgstr "paquet massa gran per a la definició actual d'off_t"
 
-#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
+#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
 msgid "pack exceeds maximum allowed size"
 msgstr "el paquet supera la mida màxima permesa"
 
-#: builtin/index-pack.c:317
+#: builtin/index-pack.c:318
 #, c-format
 msgid "unable to create '%s'"
 msgstr "no s'ha pogut crear '%s'"
 
-#: builtin/index-pack.c:323
+#: builtin/index-pack.c:324
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "no es pot obrir el fitxer de paquet '%s'"
 
-#: builtin/index-pack.c:337
+#: builtin/index-pack.c:338
 msgid "pack signature mismatch"
 msgstr "hi ha una discordança de signatura de paquet"
 
-#: builtin/index-pack.c:339
+#: builtin/index-pack.c:340
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "la versió de paquet %<PRIu32> no és compatible"
 
-#: builtin/index-pack.c:357
+#: builtin/index-pack.c:358
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "el paquet té un objecte dolent a la posició %<PRIuMAX>: %s"
@@ -8713,7 +9085,8 @@ msgstr "la inflació ha retornat %d"
 
 #: builtin/index-pack.c:528
 msgid "offset value overflow for delta base object"
-msgstr "desbordament de valor de desplaçament per a l'objecte base de diferències"
+msgstr ""
+"desbordament de valor de desplaçament per a l'objecte base de diferències"
 
 #: builtin/index-pack.c:536
 msgid "delta base offset is out of bound"
@@ -8733,19 +9106,21 @@ msgstr "no es pot fer pread en el fitxer de paquet"
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] "el final del fitxer de paquet és prematur, manca %<PRIuMAX> octet"
-msgstr[1] "el final del fitxer de paquet és prematur, manquen %<PRIuMAX> octets"
+msgstr[1] ""
+"el final del fitxer de paquet és prematur, manquen %<PRIuMAX> octets"
 
 #: builtin/index-pack.c:603
 msgid "serious inflate inconsistency"
 msgstr "hi ha una inconsistència seriosa d'inflació"
 
-#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
 #: builtin/index-pack.c:816 builtin/index-pack.c:825
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !"
 
-#: builtin/index-pack.c:752 builtin/pack-objects.c:164 builtin/pack-objects.c:257
+#: builtin/index-pack.c:751 builtin/pack-objects.c:167
+#: builtin/pack-objects.c:261
 #, c-format
 msgid "unable to read %s"
 msgstr "no s'ha pogut llegir %s"
@@ -8765,293 +9140,291 @@ msgstr "no es pot llegir l'objecte existent %s"
 msgid "invalid blob object %s"
 msgstr "objecte de blob no vàlid %s"
 
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:851
 #, c-format
 msgid "invalid %s"
 msgstr "%s no vàlid"
 
-#: builtin/index-pack.c:853
+#: builtin/index-pack.c:854
 msgid "Error in object"
 msgstr "Error en objecte"
 
-#: builtin/index-pack.c:855
+#: builtin/index-pack.c:856
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "No tots els objectes fills de %s són abastables"
 
-#: builtin/index-pack.c:927 builtin/index-pack.c:958
+#: builtin/index-pack.c:928 builtin/index-pack.c:959
 msgid "failed to apply delta"
 msgstr "s'ha produït un error en aplicar la diferència"
 
-#: builtin/index-pack.c:1128
+#: builtin/index-pack.c:1130
 msgid "Receiving objects"
 msgstr "S'estan rebent objectes"
 
-#: builtin/index-pack.c:1128
+#: builtin/index-pack.c:1130
 msgid "Indexing objects"
 msgstr "S'estan indexant objectes"
 
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1164
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "el paquet és malmès (discordança SHA1)"
 
-#: builtin/index-pack.c:1165
+#: builtin/index-pack.c:1169
 msgid "cannot fstat packfile"
 msgstr "no es pot fer fstat en el fitxer de paquet"
 
-#: builtin/index-pack.c:1168
+#: builtin/index-pack.c:1172
 msgid "pack has junk at the end"
 msgstr "el paquet té brossa al seu final"
 
-#: builtin/index-pack.c:1179
+#: builtin/index-pack.c:1184
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "confusió més enllà de la bogeria en parse_pack_objects()"
 
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1207
 msgid "Resolving deltas"
 msgstr "S'estan resolent les diferències"
 
-#: builtin/index-pack.c:1213
+#: builtin/index-pack.c:1218
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "no s'ha pogut crear fil: %s"
 
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1260
 msgid "confusion beyond insanity"
 msgstr "confusió més enllà de la bogeria"
 
-#: builtin/index-pack.c:1261
+#: builtin/index-pack.c:1266
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "s'ha completat amb %d objecte local"
 msgstr[1] "s'ha completat amb %d objectes locals"
 
-#: builtin/index-pack.c:1273
+#: builtin/index-pack.c:1278
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Suma de verificació final no esperada per a %s (corrupció de disc?)"
 
-#: builtin/index-pack.c:1277
+#: builtin/index-pack.c:1282
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "El paquet té %d diferència no resolta"
 msgstr[1] "El paquet té %d diferències no resoltes"
 
-#: builtin/index-pack.c:1301
+#: builtin/index-pack.c:1306
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "no s'ha pogut desinflar l'objecte annexat (%d)"
 
-#: builtin/index-pack.c:1377
+#: builtin/index-pack.c:1382
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "l'objecte local %s és malmès"
 
-#: builtin/index-pack.c:1403
+#: builtin/index-pack.c:1408
 msgid "error while closing pack file"
 msgstr "error en tancar el fitxer de paquet"
 
-#: builtin/index-pack.c:1415
+#: builtin/index-pack.c:1420
 #, c-format
 msgid "cannot write keep file '%s'"
 msgstr "no es pot escriure el fitxer a retenir '%s'"
 
-#: builtin/index-pack.c:1423
+#: builtin/index-pack.c:1428
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr "no es pot tancar el fitxer escrit a retenir '%s'"
 
-#: builtin/index-pack.c:1433
+#: builtin/index-pack.c:1438
 msgid "cannot store pack file"
 msgstr "no es pot emmagatzemar el fitxer de paquet"
 
-#: builtin/index-pack.c:1441
+#: builtin/index-pack.c:1446
 msgid "cannot store index file"
 msgstr "no es pot emmagatzemar el fitxer d'índex"
 
-#: builtin/index-pack.c:1479
+#: builtin/index-pack.c:1484
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "pack.indexversion=%<PRIu32> dolent"
 
-#: builtin/index-pack.c:1489 builtin/index-pack.c:1686
-#, c-format
-msgid "no threads support, ignoring %s"
-msgstr "no hi ha suport de fils, s'està ignorant %s"
-
-#: builtin/index-pack.c:1547
+#: builtin/index-pack.c:1552
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "No es pot obrir el fitxer de paquet existent '%s'"
 
-#: builtin/index-pack.c:1549
+#: builtin/index-pack.c:1554
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "No es pot obrir el fitxer d'índex de paquets existent de '%s'"
 
-#: builtin/index-pack.c:1596
+#: builtin/index-pack.c:1602
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "sense diferències: %d objecte"
 msgstr[1] "sense diferències: %d objectes"
 
-#: builtin/index-pack.c:1603
+#: builtin/index-pack.c:1609
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "longitud de cadena = %d: %lu objecte"
 msgstr[1] "longitud de cadena = %d: %lu objectes"
 
-#: builtin/index-pack.c:1616
+#: builtin/index-pack.c:1622
 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr "el nom del fitxer de paquet '%s' no acaba amb '.pack'"
 
-#: builtin/index-pack.c:1698 builtin/index-pack.c:1701 builtin/index-pack.c:1717
-#: builtin/index-pack.c:1721
+#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
+#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
 #, c-format
 msgid "bad %s"
 msgstr "%s dolent"
 
-#: builtin/index-pack.c:1737
+#: builtin/index-pack.c:1743
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin no es pot usar sense --stdin"
 
-#: builtin/index-pack.c:1739
+#: builtin/index-pack.c:1745
 msgid "--stdin requires a git repository"
 msgstr "--stdin requereix d'un dipòsit git"
 
-#: builtin/index-pack.c:1747
+#: builtin/index-pack.c:1753
 msgid "--verify with no packfile name given"
 msgstr "s'ha donat --verify sense nom de fitxer de paquet"
 
-#: builtin/init-db.c:54
+#: builtin/init-db.c:55
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "no es pot fer stat en '%s'"
 
-#: builtin/init-db.c:60
+#: builtin/init-db.c:61
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "no es pot fer stat en la plantilla '%s'"
 
-#: builtin/init-db.c:65
+#: builtin/init-db.c:66
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "no es pot fer opendir en el directori '%s'"
 
-#: builtin/init-db.c:76
+#: builtin/init-db.c:77
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "no es pot fer readlink en '%s'"
 
-#: builtin/init-db.c:78
+#: builtin/init-db.c:79
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "no es pot fer symlink en '%s' '%s'"
 
-#: builtin/init-db.c:84
+#: builtin/init-db.c:85
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "no es pot copiar '%s' a '%s'"
 
-#: builtin/init-db.c:88
+#: builtin/init-db.c:89
 #, c-format
 msgid "ignoring template %s"
 msgstr "s'està ignorant la plantilla %s"
 
-#: builtin/init-db.c:119
+#: builtin/init-db.c:120
 #, c-format
 msgid "templates not found %s"
 msgstr "no s'han trobat les plantilles %s"
 
-#: builtin/init-db.c:134
+#: builtin/init-db.c:135
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "no s'està copiant plantilles de '%s': %s"
 
-#: builtin/init-db.c:327
+#: builtin/init-db.c:328
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "no s'ha pogut gestionar el tipus de fitxer %d"
 
-#: builtin/init-db.c:330
+#: builtin/init-db.c:331
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "no s'ha pogut moure %s a %s"
 
-#: builtin/init-db.c:347 builtin/init-db.c:350
+#: builtin/init-db.c:348 builtin/init-db.c:351
 #, c-format
 msgid "%s already exists"
 msgstr "%s ja existeix"
 
-#: builtin/init-db.c:403
+#: builtin/init-db.c:404
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "S'ha reinicialitzat el dipòsit compartit existent del Git en %s%s\n"
 
-#: builtin/init-db.c:404
+#: builtin/init-db.c:405
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "S'ha reinicialitzat el dipòsit existent del Git en %s%s\n"
 
-#: builtin/init-db.c:408
+#: builtin/init-db.c:409
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "S'ha inicialitzat un dipòsit compartit buit del Git en %s%s\n"
 
-#: builtin/init-db.c:409
+#: builtin/init-db.c:410
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "S'ha inicialitzat un dipòsit buit del Git en %s%s\n"
 
-#: builtin/init-db.c:457
+#: builtin/init-db.c:458
 msgid ""
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared[=<permissions>]] "
-"[<directory>]"
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
 msgstr ""
-"git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--shared[=<permisos>]] "
-"[<directori>]"
+"git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--"
+"shared[=<permisos>]] [<directori>]"
 
-#: builtin/init-db.c:480
+#: builtin/init-db.c:481
 msgid "permissions"
 msgstr "permisos"
 
-#: builtin/init-db.c:481
+#: builtin/init-db.c:482
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "especifica que el dipòsit de git es compartirà entre diversos usuaris"
 
-#: builtin/init-db.c:515 builtin/init-db.c:520
+#: builtin/init-db.c:516 builtin/init-db.c:521
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "no es pot mkdir %s"
 
-#: builtin/init-db.c:524
+#: builtin/init-db.c:525
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "no es pot canviar de directori a %s"
 
-#: builtin/init-db.c:545
+#: builtin/init-db.c:546
 #, c-format
 msgid ""
-"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-dir=<directory>)"
-msgstr "no es permet %s (o --work-tree=<directori>) sense especificar %s (o --git-dir=<directori>)"
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr ""
+"no es permet %s (o --work-tree=<directori>) sense especificar %s (o --git-"
+"dir=<directori>)"
 
-#: builtin/init-db.c:573
+#: builtin/init-db.c:574
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "No es pot accedir a l'arbre de treball '%s'"
 
 #: builtin/interpret-trailers.c:15
 msgid ""
-"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
-"[<file>...]"
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
 msgstr ""
-"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <testimoni>[(=|:)<valor>])...] "
-"[<fitxer>...]"
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<testimoni>[(=|:)<valor>])...] [<fitxer>...]"
 
 #: builtin/interpret-trailers.c:26
 msgid "edit files in place"
@@ -9073,333 +9446,343 @@ msgstr "remolcs a afegir"
 msgid "no input file given for in-place editing"
 msgstr "no s'ha donat cap fitxer d'entrada per a edició in situ"
 
-#: builtin/log.c:44
+#: builtin/log.c:45
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<opcions>] [<rang-de-revisions>] [[--] <camí>...]"
 
-#: builtin/log.c:45
+#: builtin/log.c:46
 msgid "git show [<options>] <object>..."
 msgstr "git show [<opcions>] <objecte>..."
 
-#: builtin/log.c:89
+#: builtin/log.c:90
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "opció --decorate no vàlida: %s"
 
-#: builtin/log.c:144
+#: builtin/log.c:147
 msgid "suppress diff output"
 msgstr "omet la sortida de diferències"
 
-#: builtin/log.c:145
+#: builtin/log.c:148
 msgid "show source"
 msgstr "mostra la font"
 
-#: builtin/log.c:146
+#: builtin/log.c:149
 msgid "Use mail map file"
 msgstr "Usa el fitxer de mapa de correu"
 
-#: builtin/log.c:147
+#: builtin/log.c:150
 msgid "decorate options"
 msgstr "opcions de decoració"
 
-#: builtin/log.c:150
+#: builtin/log.c:153
 msgid "Process line range n,m in file, counting from 1"
 msgstr "Processa el rang de línies n,m en el fitxer, comptant des d'1"
 
-#: builtin/log.c:246
+#: builtin/log.c:249
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Sortida final: %d %s\n"
 
-#: builtin/log.c:493
+#: builtin/log.c:497
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: fitxer dolent"
 
-#: builtin/log.c:507 builtin/log.c:601
+#: builtin/log.c:512 builtin/log.c:606
 #, c-format
 msgid "Could not read object %s"
 msgstr "No es pot llegir l'objecte %s"
 
-#: builtin/log.c:625
+#: builtin/log.c:630
 #, c-format
 msgid "Unknown type: %d"
 msgstr "Tipus desconegut: %d"
 
-#: builtin/log.c:746
+#: builtin/log.c:751
 msgid "format.headers without value"
 msgstr "format.headers sense valor"
 
-#: builtin/log.c:846
+#: builtin/log.c:852
 msgid "name of output directory is too long"
 msgstr "el nom del directori de sortida és massa llarg"
 
-#: builtin/log.c:861
+#: builtin/log.c:868
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "No es pot obrir el fitxer de pedaç %s"
 
-#: builtin/log.c:875
+#: builtin/log.c:885
 msgid "Need exactly one range."
 msgstr "Cal exactament un rang."
 
-#: builtin/log.c:885
+#: builtin/log.c:895
 msgid "Not a range."
 msgstr "No és un rang."
 
-#: builtin/log.c:991
+#: builtin/log.c:1001
 msgid "Cover letter needs email format"
 msgstr "La carta de presentació necessita el format de correu electrònic"
 
-#: builtin/log.c:1071
+#: builtin/log.c:1081
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to boig: %s"
 
-#: builtin/log.c:1098
+#: builtin/log.c:1108
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]"
 
-#: builtin/log.c:1148
+#: builtin/log.c:1158
 msgid "Two output directories?"
 msgstr "Hi ha dos directoris de sortida?"
 
-#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912
+#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
 #, c-format
 msgid "Unknown commit %s"
 msgstr "Comissió desconeguda %s"
 
-#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532
+#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "S'ha produït un error en resoldre '%s' com a referència vàlida."
 
-#: builtin/log.c:1270
+#: builtin/log.c:1280
 msgid "Could not find exact merge base."
 msgstr "No s'ha pogut trobar la base exacta de fusió."
 
-#: builtin/log.c:1274
+#: builtin/log.c:1284
 msgid ""
 "Failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
 "Or you could specify base commit by --base=<base-commit-id> manually."
 msgstr ""
-"S'ha produït un error en obtenir la font. Si voleu registrar la comissió base\n"
+"S'ha produït un error en obtenir la font. Si voleu registrar la comissió "
+"base\n"
 "automàticament, si us plau, useu git branch --set-upstream-to per a\n"
 "seguir una branca remota. O podeu especificar la comissió base manualment\n"
 "amb --base=<id-de-comissió-base>."
 
-#: builtin/log.c:1294
+#: builtin/log.c:1304
 msgid "Failed to find exact merge base"
 msgstr "S'ha produït un error en trobar la base exacta de fusió."
 
-#: builtin/log.c:1305
+#: builtin/log.c:1315
 msgid "base commit should be the ancestor of revision list"
 msgstr "la comissió base ha de ser l'avantpassat de la llista de revisions"
 
-#: builtin/log.c:1309
+#: builtin/log.c:1319
 msgid "base commit shouldn't be in revision list"
 msgstr "la comissió base no ha de ser en la llista de revisions"
 
-#: builtin/log.c:1358
+#: builtin/log.c:1368
 msgid "cannot get patch id"
 msgstr "no es pot obtenir l'id del pedaç"
 
-#: builtin/log.c:1415
+#: builtin/log.c:1425
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "usa [PATCH n/m] fins i tot amb un sol pedaç"
 
-#: builtin/log.c:1418
+#: builtin/log.c:1428
 msgid "use [PATCH] even with multiple patches"
 msgstr "usa [PATCH] fins i tot amb múltiples pedaços"
 
-#: builtin/log.c:1422
+#: builtin/log.c:1432
 msgid "print patches to standard out"
 msgstr "imprimeix els pedaços a la sortida estàndard"
 
-#: builtin/log.c:1424
+#: builtin/log.c:1434
 msgid "generate a cover letter"
 msgstr "genera una carta de presentació"
 
-#: builtin/log.c:1426
+#: builtin/log.c:1436
 msgid "use simple number sequence for output file names"
 msgstr "usa una seqüència de números per als noms dels fitxers de sortida"
 
-#: builtin/log.c:1427
+#: builtin/log.c:1437
 msgid "sfx"
 msgstr "sufix"
 
-#: builtin/log.c:1428
+#: builtin/log.c:1438
 msgid "use <sfx> instead of '.patch'"
 msgstr "usa <sufix> en lloc de '.patch'"
 
-#: builtin/log.c:1430
+#: builtin/log.c:1440
 msgid "start numbering patches at <n> instead of 1"
 msgstr "comença numerant els pedaços a <n> en lloc d'1"
 
-#: builtin/log.c:1432
+#: builtin/log.c:1442
 msgid "mark the series as Nth re-roll"
 msgstr "marca la sèrie com a l'enèsima llançada"
 
-#: builtin/log.c:1434
+#: builtin/log.c:1444
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "Usa [RFC PATCH] en lloc de [PATCH]"
 
-#: builtin/log.c:1437
+#: builtin/log.c:1447
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "Usa [<prefix>] en lloc de [PATCH]"
 
-#: builtin/log.c:1440
+#: builtin/log.c:1450
 msgid "store resulting files in <dir>"
 msgstr "emmagatzema els fitxers resultants a <directori>"
 
-#: builtin/log.c:1443
+#: builtin/log.c:1453
 msgid "don't strip/add [PATCH]"
 msgstr "no despullis/afegeixis [PATCH]"
 
-#: builtin/log.c:1446
+#: builtin/log.c:1456
 msgid "don't output binary diffs"
 msgstr "no emetis diferències binàries"
 
-#: builtin/log.c:1448
+#: builtin/log.c:1458
 msgid "output all-zero hash in From header"
 msgstr "emet un hash de tots zeros en la capçalera From"
 
-#: builtin/log.c:1450
+#: builtin/log.c:1460
 msgid "don't include a patch matching a commit upstream"
 msgstr "no incloguis pedaços que coincideixin amb comissions a la font"
 
-#: builtin/log.c:1452
+#: builtin/log.c:1462
 msgid "show patch format instead of default (patch + stat)"
-msgstr "mostra el format de pedaç en lloc del per defecte (pedaç + estadístiques)"
+msgstr ""
+"mostra el format de pedaç en lloc del per defecte (pedaç + estadístiques)"
 
-#: builtin/log.c:1454
+#: builtin/log.c:1464
 msgid "Messaging"
 msgstr "Missatgeria"
 
-#: builtin/log.c:1455
+#: builtin/log.c:1465
 msgid "header"
 msgstr "capçalera"
 
-#: builtin/log.c:1456
+#: builtin/log.c:1466
 msgid "add email header"
 msgstr "afegeix una capçalera de correu electrònic"
 
-#: builtin/log.c:1457 builtin/log.c:1459
+#: builtin/log.c:1467 builtin/log.c:1469
 msgid "email"
 msgstr "correu electrònic"
 
-#: builtin/log.c:1457
+#: builtin/log.c:1467
 msgid "add To: header"
 msgstr "afegeix la capçalera To:"
 
-#: builtin/log.c:1459
+#: builtin/log.c:1469
 msgid "add Cc: header"
 msgstr "afegeix la capçalera Cc:"
 
-#: builtin/log.c:1461
+#: builtin/log.c:1471
 msgid "ident"
 msgstr "identitat"
 
-#: builtin/log.c:1462
+#: builtin/log.c:1472
 msgid "set From address to <ident> (or committer ident if absent)"
-msgstr "estableix l'adreça From a <identitat> (o la identitat del comitent si manca)"
+msgstr ""
+"estableix l'adreça From a <identitat> (o la identitat del comitent si manca)"
 
-#: builtin/log.c:1464
+#: builtin/log.c:1474
 msgid "message-id"
 msgstr "ID de missatge"
 
-#: builtin/log.c:1465
+#: builtin/log.c:1475
 msgid "make first mail a reply to <message-id>"
 msgstr "fes que el primer missatge sigui una resposta a <ID de missatge>"
 
-#: builtin/log.c:1466 builtin/log.c:1469
+#: builtin/log.c:1476 builtin/log.c:1479
 msgid "boundary"
 msgstr "límit"
 
-#: builtin/log.c:1467
+#: builtin/log.c:1477
 msgid "attach the patch"
 msgstr "ajunta el pedaç"
 
-#: builtin/log.c:1470
+#: builtin/log.c:1480
 msgid "inline the patch"
 msgstr "posa el pedaç en el cos"
 
-#: builtin/log.c:1474
+#: builtin/log.c:1484
 msgid "enable message threading, styles: shallow, deep"
 msgstr "habilita l'enfilada de missatges, estils: shallow, deep"
 
-#: builtin/log.c:1476
+#: builtin/log.c:1486
 msgid "signature"
 msgstr "signatura"
 
-#: builtin/log.c:1477
+#: builtin/log.c:1487
 msgid "add a signature"
 msgstr "afegeix una signatura"
 
-#: builtin/log.c:1478
+#: builtin/log.c:1488
 msgid "base-commit"
 msgstr "comissió base"
 
-#: builtin/log.c:1479
+#: builtin/log.c:1489
 msgid "add prerequisite tree info to the patch series"
 msgstr "afegeix la informació d'arbre prerequerida a la sèrie de pedaços"
 
-#: builtin/log.c:1481
+#: builtin/log.c:1491
 msgid "add a signature from a file"
 msgstr "afegeix una signatura des d'un fitxer"
 
-#: builtin/log.c:1482
+#: builtin/log.c:1492
 msgid "don't print the patch filenames"
 msgstr "no imprimeixis els noms de fitxer del pedaç"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1567
+#, c-format
+msgid "invalid ident line: %s"
+msgstr "línia d'identitat no vàlida: %s"
+
+#: builtin/log.c:1582
 msgid "-n and -k are mutually exclusive."
 msgstr "-n i -k són mutualment exclusius."
 
-#: builtin/log.c:1574
+#: builtin/log.c:1584
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr "--subject-prefix/--rfc i -k són mutualment exclusius."
 
-#: builtin/log.c:1582
+#: builtin/log.c:1592
 msgid "--name-only does not make sense"
 msgstr "--name-only no té sentit"
 
-#: builtin/log.c:1584
+#: builtin/log.c:1594
 msgid "--name-status does not make sense"
 msgstr "--name-status no té sentit"
 
-#: builtin/log.c:1586
+#: builtin/log.c:1596
 msgid "--check does not make sense"
 msgstr "--check no té sentit"
 
-#: builtin/log.c:1616
+#: builtin/log.c:1626
 msgid "standard output, or directory, which one?"
 msgstr "sortida estàndard o directori, quin dels dos?"
 
-#: builtin/log.c:1618
+#: builtin/log.c:1628
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "No s'ha pogut crear el directori '%s'"
 
-#: builtin/log.c:1712
+#: builtin/log.c:1722
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "no s'ha pogut llegir el fitxer de signatura '%s'"
 
-#: builtin/log.c:1784
+#: builtin/log.c:1794
 msgid "Failed to create output files"
 msgstr "S'ha produït un error en crear els fitxers de sortida"
 
-#: builtin/log.c:1833
+#: builtin/log.c:1843
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"
 
-#: builtin/log.c:1887
+#: builtin/log.c:1897
 #, c-format
-msgid "Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr ""
-"No s'ha pogut trobar una branca remota seguida. Si us plau, especifiqueu <font> manualment.\n"
+"No s'ha pogut trobar una branca remota seguida. Si us plau, especifiqueu "
+"<font> manualment.\n"
 
 #: builtin/ls-files.c:468
 msgid "git ls-files [<options>] [<file>...]"
@@ -9415,7 +9798,8 @@ msgstr "usa lletres minúscules per als fitxers 'assume unchanged'"
 
 #: builtin/ls-files.c:521
 msgid "show cached files in the output (default)"
-msgstr "mostra en la sortida els fitxers desats en la memòria cau (per defecte)"
+msgstr ""
+"mostra en la sortida els fitxers desats en la memòria cau (per defecte)"
 
 #: builtin/ls-files.c:523
 msgid "show deleted files in the output"
@@ -9495,7 +9879,8 @@ msgstr "arbre"
 
 #: builtin/ls-files.c:565
 msgid "pretend that paths removed since <tree-ish> are still present"
-msgstr "pretén que els camins eliminats després de <arbre> encara siguin presents"
+msgstr ""
+"pretén que els camins eliminats després de <arbre> encara siguin presents"
 
 #: builtin/ls-files.c:567
 msgid "show debugging data"
@@ -9548,211 +9933,221 @@ msgstr "surt amb codi de sortida 2 si no es troba cap referència coincident"
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "mostra la referència subjacent a més de l'objecte que senyali"
 
-#: builtin/ls-tree.c:28
+#: builtin/ls-tree.c:29
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
 msgstr "git ls-tree [<opcions>] <arbre> [<camí>...]"
 
-#: builtin/ls-tree.c:126
+#: builtin/ls-tree.c:127
 msgid "only show trees"
 msgstr "mostra només els arbres"
 
-#: builtin/ls-tree.c:128
+#: builtin/ls-tree.c:129
 msgid "recurse into subtrees"
 msgstr "inclou recursivament als subarbres"
 
-#: builtin/ls-tree.c:130
+#: builtin/ls-tree.c:131
 msgid "show trees when recursing"
-msgstr "mostra els arbres en recursar"
+msgstr "mostra els arbres quan es treballa recursivament"
 
-#: builtin/ls-tree.c:133
+#: builtin/ls-tree.c:134
 msgid "terminate entries with NUL byte"
 msgstr "acaba les entrades amb un octet NUL"
 
-#: builtin/ls-tree.c:134
+#: builtin/ls-tree.c:135
 msgid "include object size"
 msgstr "mida de l'objecte d'inclusió"
 
-#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
+#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
 msgid "list only filenames"
 msgstr "llista només els noms de fitxer"
 
-#: builtin/ls-tree.c:141
+#: builtin/ls-tree.c:142
 msgid "use full path names"
 msgstr "usa els noms de camí complets"
 
-#: builtin/ls-tree.c:143
+#: builtin/ls-tree.c:144
 msgid "list entire tree; not just current directory (implies --full-name)"
-msgstr "llista l'arbre sencer; no només el directori actual (implica --full-name)"
+msgstr ""
+"llista l'arbre sencer; no només el directori actual (implica --full-name)"
 
-#: builtin/merge.c:46
+#: builtin/mailsplit.c:241
+#, c-format
+msgid "empty mbox: '%s'"
+msgstr ""
+
+#: builtin/merge.c:47
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<opcions>] [<comissió>...]"
 
-#: builtin/merge.c:47
+#: builtin/merge.c:48
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:48
+#: builtin/merge.c:49
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:103
+#: builtin/merge.c:104
 msgid "switch `m' requires a value"
 msgstr "l'opció `m' requereix un valor"
 
-#: builtin/merge.c:140
+#: builtin/merge.c:141
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "No s'ha pogut trobar l'estratègia de fusió '%s'.\n"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:142
 #, c-format
 msgid "Available strategies are:"
 msgstr "Les estratègies disponibles són:"
 
-#: builtin/merge.c:146
+#: builtin/merge.c:147
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Les estratègies personalitzades disponibles són:"
 
-#: builtin/merge.c:196 builtin/pull.c:127
+#: builtin/merge.c:197 builtin/pull.c:134
 msgid "do not show a diffstat at the end of the merge"
 msgstr "no mostris les estadístiques de diferència al final de la fusió"
 
-#: builtin/merge.c:199 builtin/pull.c:130
+#: builtin/merge.c:200 builtin/pull.c:137
 msgid "show a diffstat at the end of the merge"
 msgstr "mostra les estadístiques de diferència al final de la fusió"
 
-#: builtin/merge.c:200 builtin/pull.c:133
+#: builtin/merge.c:201 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(sinònim de --stat)"
 
-#: builtin/merge.c:202 builtin/pull.c:136
+#: builtin/merge.c:203 builtin/pull.c:143
 msgid "add (at most <n>) entries from shortlog to merge commit message"
-msgstr "afegeix (com a màxim <n>) entrades del registre curt al missatge de comissió de fusió"
+msgstr ""
+"afegeix (com a màxim <n>) entrades del registre curt al missatge de comissió "
+"de fusió"
 
-#: builtin/merge.c:205 builtin/pull.c:139
+#: builtin/merge.c:206 builtin/pull.c:146
 msgid "create a single commit instead of doing a merge"
 msgstr "crea una única comissió en lloc de fusionar"
 
-#: builtin/merge.c:207 builtin/pull.c:142
+#: builtin/merge.c:208 builtin/pull.c:149
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "realitza una comissió si la fusió té èxit (per defecte)"
 
-#: builtin/merge.c:209 builtin/pull.c:145
+#: builtin/merge.c:210 builtin/pull.c:152
 msgid "edit message before committing"
 msgstr "edita el missatge abans de cometre"
 
-#: builtin/merge.c:210
+#: builtin/merge.c:211
 msgid "allow fast-forward (default)"
 msgstr "permet l'avanç ràpid (per defecte)"
 
-#: builtin/merge.c:212 builtin/pull.c:151
+#: builtin/merge.c:213 builtin/pull.c:158
 msgid "abort if fast-forward is not possible"
 msgstr "avorta si l'avanç ràpid no és possible"
 
-#: builtin/merge.c:216 builtin/pull.c:154
+#: builtin/merge.c:217 builtin/pull.c:161
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "verifica que la comissió anomenada tingui una signatura GPG vàlida"
 
-#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158 builtin/revert.c:108
+#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/revert.c:109
 msgid "strategy"
 msgstr "estratègia"
 
-#: builtin/merge.c:218 builtin/pull.c:159
+#: builtin/merge.c:219 builtin/pull.c:166
 msgid "merge strategy to use"
 msgstr "estratègia de fusió a usar"
 
-#: builtin/merge.c:219 builtin/pull.c:162
+#: builtin/merge.c:220 builtin/pull.c:169
 msgid "option=value"
 msgstr "opció=valor"
 
-#: builtin/merge.c:220 builtin/pull.c:163
+#: builtin/merge.c:221 builtin/pull.c:170
 msgid "option for selected merge strategy"
 msgstr "opció per a l'estratègia de fusió seleccionada"
 
-#: builtin/merge.c:222
+#: builtin/merge.c:223
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "missatge de comissió de fusió (per a una fusió no d'avanç ràpid)"
 
-#: builtin/merge.c:226
+#: builtin/merge.c:227
 msgid "abort the current in-progress merge"
 msgstr "avorta la fusió en curs actual"
 
-#: builtin/merge.c:228
+#: builtin/merge.c:229
 msgid "continue the current in-progress merge"
 msgstr "continua la fusió en curs actual"
 
-#: builtin/merge.c:230 builtin/pull.c:170
+#: builtin/merge.c:231 builtin/pull.c:177
 msgid "allow merging unrelated histories"
 msgstr "permet fusionar històries no relacionades"
 
-#: builtin/merge.c:258
+#: builtin/merge.c:259
 msgid "could not run stash."
 msgstr "no s'ha pogut executar stash."
 
-#: builtin/merge.c:263
+#: builtin/merge.c:264
 msgid "stash failed"
 msgstr "l'emmagatzemament ha fallat"
 
-#: builtin/merge.c:268
+#: builtin/merge.c:269
 #, c-format
 msgid "not a valid object: %s"
 msgstr "no és un objecte vàlid: %s"
 
-#: builtin/merge.c:287 builtin/merge.c:304
+#: builtin/merge.c:288 builtin/merge.c:305
 msgid "read-tree failed"
 msgstr "read-tree ha fallat"
 
-#: builtin/merge.c:334
+#: builtin/merge.c:335
 msgid " (nothing to squash)"
 msgstr " (res a fer «squash»)"
 
-#: builtin/merge.c:345
+#: builtin/merge.c:346
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Comissió «squash» -- no s'està actualitzant HEAD\n"
 
-#: builtin/merge.c:395
+#: builtin/merge.c:396
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Cap missatge de fusió -- no s'està actualitzant HEAD\n"
 
-#: builtin/merge.c:446
+#: builtin/merge.c:447
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' no assenyala una comissió"
 
-#: builtin/merge.c:536
+#: builtin/merge.c:537
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Cadena branch.%s.mergeoptions dolenta: %s"
 
-#: builtin/merge.c:656
+#: builtin/merge.c:657
 msgid "Not handling anything other than two heads merge."
 msgstr "No s'està gestionant res a part de la fusió de dos caps."
 
-#: builtin/merge.c:670
+#: builtin/merge.c:671
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Opció desconeguda de merge-recursive: -X%s"
 
-#: builtin/merge.c:685
+#: builtin/merge.c:686
 #, c-format
 msgid "unable to write %s"
 msgstr "no s'ha pogut escriure %s"
 
-#: builtin/merge.c:737
+#: builtin/merge.c:738
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "No s'ha pogut llegir de '%s'"
 
-#: builtin/merge.c:746
+#: builtin/merge.c:747
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
-msgstr "No s'està cometent la fusió; useu 'git commit' per a completar la fusió.\n"
+msgstr ""
+"No s'està cometent la fusió; useu 'git commit' per a completar la fusió.\n"
 
-#: builtin/merge.c:752
+#: builtin/merge.c:753
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -9768,73 +10163,70 @@ msgstr ""
 "S'ignoraran les línies que comencin amb '%c', i un missatge buit\n"
 "avorta la comissió.\n"
 
-#: builtin/merge.c:776
+#: builtin/merge.c:777
 msgid "Empty commit message."
 msgstr "El missatge de comissió és buit."
 
-#: builtin/merge.c:796
+#: builtin/merge.c:797
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Meravellós.\n"
 
-#: builtin/merge.c:851
+#: builtin/merge.c:850
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
-msgstr "La fusió automàtica ha fallat; arregleu els conflictes i després cometeu el resultat.\n"
+msgstr ""
+"La fusió automàtica ha fallat; arregleu els conflictes i després cometeu el "
+"resultat.\n"
 
-#: builtin/merge.c:890
+#: builtin/merge.c:889
 msgid "No current branch."
 msgstr "No hi ha cap branca actual."
 
-#: builtin/merge.c:892
+#: builtin/merge.c:891
 msgid "No remote for the current branch."
 msgstr "No hi ha cap remot per a la branca actual."
 
-#: builtin/merge.c:894
+#: builtin/merge.c:893
 msgid "No default upstream defined for the current branch."
 msgstr "No hi ha cap font per defecte definida per a la branca actual."
 
-#: builtin/merge.c:899
+#: builtin/merge.c:898
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "No hi ha cap branca amb seguiment remot per a %s de %s"
 
-#: builtin/merge.c:946
+#: builtin/merge.c:945
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Valor dolent '%s' en l'entorn '%s'"
 
-#: builtin/merge.c:1020
-#, c-format
-msgid "could not close '%s'"
-msgstr "no s'ha pogut tancar '%s'"
-
-#: builtin/merge.c:1047
+#: builtin/merge.c:1046
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "no és quelcom que puguem fusionar en %s: %s"
 
-#: builtin/merge.c:1081
+#: builtin/merge.c:1080
 msgid "not something we can merge"
 msgstr "no és quelcom que puguem fusionar"
 
-#: builtin/merge.c:1146
+#: builtin/merge.c:1145
 msgid "--abort expects no arguments"
 msgstr "--abort no accepta paràmetres"
 
-#: builtin/merge.c:1150
+#: builtin/merge.c:1149
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)."
 
-#: builtin/merge.c:1162
+#: builtin/merge.c:1161
 msgid "--continue expects no arguments"
 msgstr "--continue no accepta paràmetres"
 
-#: builtin/merge.c:1166
+#: builtin/merge.c:1165
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "No hi ha fusió en progrés (manca MERGE_HEAD)."
 
-#: builtin/merge.c:1182
+#: builtin/merge.c:1181
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -9842,7 +10234,7 @@ msgstr ""
 "No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n"
 "Si us plau, cometeu els vostres canvis abans de fusionar."
 
-#: builtin/merge.c:1189
+#: builtin/merge.c:1188
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -9850,192 +10242,198 @@ msgstr ""
 "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix).\n"
 "Si us plau, cometeu els vostres canvis abans de fusionar."
 
-#: builtin/merge.c:1192
+#: builtin/merge.c:1191
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix)."
 
-#: builtin/merge.c:1201
+#: builtin/merge.c:1200
 msgid "You cannot combine --squash with --no-ff."
 msgstr "No podeu combinar --squash amb --no-ff."
 
-#: builtin/merge.c:1209
+#: builtin/merge.c:1208
 msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr "No hi ha una comissió especificada i merge.defaultToUpstream no està establert."
+msgstr ""
+"No hi ha una comissió especificada i merge.defaultToUpstream no està "
+"establert."
 
-#: builtin/merge.c:1226
+#: builtin/merge.c:1225
 msgid "Squash commit into empty head not supported yet"
 msgstr "Una comissió «squash» a un HEAD buit encara no es permet"
 
-#: builtin/merge.c:1228
+#: builtin/merge.c:1227
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "Una comissió no d'avanç ràpid no té sentit a un HEAD buit"
 
-#: builtin/merge.c:1233
+#: builtin/merge.c:1232
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - no és una cosa que puguem fusionar"
 
-#: builtin/merge.c:1235
+#: builtin/merge.c:1234
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Es pot fusionar només una comissió a un HEAD buit"
 
-#: builtin/merge.c:1269
+#: builtin/merge.c:1268
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "La comissió %s té una signatura GPG no fiable, suposadament de %s."
 
-#: builtin/merge.c:1272
+#: builtin/merge.c:1271
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "La comissió %s té una signatura GPG dolenta suposadament de %s."
 
-#: builtin/merge.c:1275
+#: builtin/merge.c:1274
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "La comissió %s no té signatura GPG."
 
-#: builtin/merge.c:1278
+#: builtin/merge.c:1277
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "La comissió %s té una signatura GPG bona de %s\n"
 
-#: builtin/merge.c:1340
+#: builtin/merge.c:1339
 msgid "refusing to merge unrelated histories"
 msgstr "s'està refusant fusionar històries no relacionades"
 
-#: builtin/merge.c:1349
+#: builtin/merge.c:1348
 msgid "Already up-to-date."
 msgstr "Ja està al dia."
 
-#: builtin/merge.c:1359
+#: builtin/merge.c:1358
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "S'estan actualitzant %s..%s\n"
 
-#: builtin/merge.c:1400
+#: builtin/merge.c:1399
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "S'està intentant una fusió molt trivial en l'índex...\n"
 
-#: builtin/merge.c:1407
+#: builtin/merge.c:1406
 #, c-format
 msgid "Nope.\n"
 msgstr "No.\n"
 
-#: builtin/merge.c:1432
+#: builtin/merge.c:1431
 msgid "Already up-to-date. Yeeah!"
 msgstr "Ja està al dia. Estupend!"
 
-#: builtin/merge.c:1438
+#: builtin/merge.c:1437
 msgid "Not possible to fast-forward, aborting."
 msgstr "No és possible avançar ràpidament, s'està avortant."
 
-#: builtin/merge.c:1461 builtin/merge.c:1540
+#: builtin/merge.c:1460 builtin/merge.c:1539
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "S'està rebobinant l'arbre a la pristina...\n"
 
-#: builtin/merge.c:1465
+#: builtin/merge.c:1464
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "S'està intentant l'estratègia de fusió %s...\n"
 
-#: builtin/merge.c:1531
+#: builtin/merge.c:1530
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Cap estratègia de fusió ha gestionat la fusió.\n"
 
-#: builtin/merge.c:1533
+#: builtin/merge.c:1532
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "L'estratègia de fusió %s ha fallat.\n"
 
-#: builtin/merge.c:1542
+#: builtin/merge.c:1541
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "S'està usant el %s per a preparar la resolució a mà.\n"
 
-#: builtin/merge.c:1554
+#: builtin/merge.c:1553
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
-msgstr "La fusió automàtica ha sortit bé; s'ha aturat abans de cometre com s'havia demanat\n"
+msgstr ""
+"La fusió automàtica ha sortit bé; s'ha aturat abans de cometre com s'havia "
+"demanat\n"
 
-#: builtin/merge-base.c:29
+#: builtin/merge-base.c:30
 msgid "git merge-base [-a | --all] <commit> <commit>..."
 msgstr "git merge-base [-a | --all] <comissió> <comissió>..."
 
-#: builtin/merge-base.c:30
+#: builtin/merge-base.c:31
 msgid "git merge-base [-a | --all] --octopus <commit>..."
 msgstr "git merge-base [-a | --all] --octopus <comissió>..."
 
-#: builtin/merge-base.c:31
+#: builtin/merge-base.c:32
 msgid "git merge-base --independent <commit>..."
 msgstr "git merge-base --independent <comissió>..."
 
-#: builtin/merge-base.c:32
+#: builtin/merge-base.c:33
 msgid "git merge-base --is-ancestor <commit> <commit>"
 msgstr "git merge-base --is-ancestor <comissió> <comissió>"
 
-#: builtin/merge-base.c:33
+#: builtin/merge-base.c:34
 msgid "git merge-base --fork-point <ref> [<commit>]"
 msgstr "git merge-base --fork-point <referència> [<comissió>]"
 
-#: builtin/merge-base.c:217
+#: builtin/merge-base.c:218
 msgid "output all common ancestors"
 msgstr "emet tots els avantpassats comuns"
 
-#: builtin/merge-base.c:219
+#: builtin/merge-base.c:220
 msgid "find ancestors for a single n-way merge"
 msgstr "troba els avantpassats per a una sola fusió d'n vies"
 
-#: builtin/merge-base.c:221
+#: builtin/merge-base.c:222
 msgid "list revs not reachable from others"
 msgstr "llista les revisions no abastables d'altres"
 
-#: builtin/merge-base.c:223
+#: builtin/merge-base.c:224
 msgid "is the first one ancestor of the other?"
 msgstr "és la primera un avantpassat de l'altre?"
 
-#: builtin/merge-base.c:225
+#: builtin/merge-base.c:226
 msgid "find where <commit> forked from reflog of <ref>"
-msgstr "troba on <comissió> s'ha bifurcat del registre de referències de <referència>"
+msgstr ""
+"troba on <comissió> s'ha bifurcat del registre de referències de <referència>"
 
-#: builtin/merge-file.c:8
+#: builtin/merge-file.c:9
 msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> <orig-file> <file2>"
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
 msgstr ""
-"git merge-file [<opcions>] [-L <nom1> [-L <original> [-L <nom2>]]] <fitxer1> <fitxer-original> "
-"<fitxer2>"
+"git merge-file [<opcions>] [-L <nom1> [-L <original> [-L <nom2>]]] <fitxer1> "
+"<fitxer-original> <fitxer2>"
 
-#: builtin/merge-file.c:32
+#: builtin/merge-file.c:33
 msgid "send results to standard output"
 msgstr "envia els resultats a la sortida estàndard"
 
-#: builtin/merge-file.c:33
+#: builtin/merge-file.c:34
 msgid "use a diff3 based merge"
 msgstr "usa una fusió basada en diff3"
 
-#: builtin/merge-file.c:34
+#: builtin/merge-file.c:35
 msgid "for conflicts, use our version"
 msgstr "en conflictes, usa la nostra versió"
 
-#: builtin/merge-file.c:36
+#: builtin/merge-file.c:37
 msgid "for conflicts, use their version"
 msgstr "en conflictes, usa la seva versió"
 
-#: builtin/merge-file.c:38
+#: builtin/merge-file.c:39
 msgid "for conflicts, use a union version"
 msgstr "en conflictes, usa una versió d'unió"
 
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:42
 msgid "for conflicts, use this marker size"
 msgstr "en conflictes, usa aquesta mida de marcador"
 
-#: builtin/merge-file.c:42
+#: builtin/merge-file.c:43
 msgid "do not warn about conflicts"
 msgstr "no avisis de conflictes"
 
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:45
 msgid "set labels for file1/orig-file/file2"
 msgstr "estableix les etiquetes per a fitxer1/fitxer-original/fitxer2"
 
@@ -10074,416 +10472,429 @@ msgstr "S'està fusionant %s amb %s\n"
 msgid "git mktree [-z] [--missing] [--batch]"
 msgstr "git mktree [-z] [--missing] [--batch]"
 
-#: builtin/mktree.c:152
+#: builtin/mktree.c:153
 msgid "input is NUL terminated"
 msgstr "l'entrada és acabada amb NUL"
 
-#: builtin/mktree.c:153 builtin/write-tree.c:24
+#: builtin/mktree.c:154 builtin/write-tree.c:25
 msgid "allow missing objects"
 msgstr "permet els objectes absents"
 
-#: builtin/mktree.c:154
+#: builtin/mktree.c:155
 msgid "allow creation of more than one tree"
 msgstr "permet la creació de més d'un arbre"
 
-#: builtin/mv.c:16
+#: builtin/mv.c:17
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<opcions>] <font>... <destí>"
 
-#: builtin/mv.c:82
+#: builtin/mv.c:83
 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr "El directori %s és en l'índex i no hi ha cap submòdul?"
 
-#: builtin/mv.c:84 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:290
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
-"Si us plau, «stage» els vostres canvis a .gitmodules o feu «stage» dels mateixos per a procedir"
+"Si us plau, «stage» els vostres canvis a .gitmodules o feu «stage» dels "
+"mateixos per a procedir"
 
-#: builtin/mv.c:102
+#: builtin/mv.c:103
 #, c-format
 msgid "%.*s is in index"
 msgstr "%.*s és en l'índex"
 
-#: builtin/mv.c:124
+#: builtin/mv.c:125
 msgid "force move/rename even if target exists"
 msgstr "força el moviment / canvi de nom encara que el destí existeixi"
 
-#: builtin/mv.c:125
+#: builtin/mv.c:126
 msgid "skip move/rename errors"
 msgstr "omet els errors de moviment / canvi de nom"
 
-#: builtin/mv.c:167
+#: builtin/mv.c:168
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "el destí '%s' no és un directori"
 
-#: builtin/mv.c:178
+#: builtin/mv.c:179
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "S'està comprovant el canvi de nom de '%s' a '%s'\n"
 
-#: builtin/mv.c:182
+#: builtin/mv.c:183
 msgid "bad source"
 msgstr "font dolenta"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:186
 msgid "can not move directory into itself"
 msgstr "no es pot moure un directori a dins d'ell mateix"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:189
 msgid "cannot move directory over file"
 msgstr "no es pot moure un directori sobre un fitxer"
 
-#: builtin/mv.c:197
+#: builtin/mv.c:198
 msgid "source directory is empty"
 msgstr "el directori font està buit"
 
-#: builtin/mv.c:222
+#: builtin/mv.c:223
 msgid "not under version control"
 msgstr "no està sota control de versions"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:226
 msgid "destination exists"
 msgstr "el destí existeix"
 
-#: builtin/mv.c:233
+#: builtin/mv.c:234
 #, c-format
 msgid "overwriting '%s'"
 msgstr "s'està sobreescrivint '%s'"
 
-#: builtin/mv.c:236
+#: builtin/mv.c:237
 msgid "Cannot overwrite"
 msgstr "No es pot sobreescriure"
 
-#: builtin/mv.c:239
+#: builtin/mv.c:240
 msgid "multiple sources for the same target"
 msgstr "múltiples fonts per al mateix destí"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:242
 msgid "destination directory does not exist"
 msgstr "el directori destí no existeix"
 
-#: builtin/mv.c:248
+#: builtin/mv.c:249
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, origen=%s, destí=%s"
 
-#: builtin/mv.c:269
+#: builtin/mv.c:270
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "S'està canviant el nom de %s a %s\n"
 
-#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384
+#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "el canvi del nom de '%s' ha fallat"
 
-#: builtin/name-rev.c:289
+#: builtin/name-rev.c:338
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<opcions>] <comissió>..."
 
-#: builtin/name-rev.c:290
+#: builtin/name-rev.c:339
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<opcions>] --all"
 
-#: builtin/name-rev.c:291
+#: builtin/name-rev.c:340
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<opcions>] --stdin"
 
-#: builtin/name-rev.c:346
+#: builtin/name-rev.c:395
 msgid "print only names (no SHA-1)"
 msgstr "imprimeix només els noms (sense SHA-1)"
 
-#: builtin/name-rev.c:347
+#: builtin/name-rev.c:396
 msgid "only use tags to name the commits"
 msgstr "només usa les etiquetes per a anomenar les comissions"
 
-#: builtin/name-rev.c:349
+#: builtin/name-rev.c:398
 msgid "only use refs matching <pattern>"
 msgstr "només usa les referències que coincideixin amb <patró>"
 
-#: builtin/name-rev.c:351
+#: builtin/name-rev.c:400
 msgid "ignore refs matching <pattern>"
 msgstr "ignora les referències que coincideixin amb <patró>"
 
-#: builtin/name-rev.c:353
+#: builtin/name-rev.c:402
 msgid "list all commits reachable from all refs"
 msgstr "llista totes les comissions abastables de totes les referències"
 
-#: builtin/name-rev.c:354
+#: builtin/name-rev.c:403
 msgid "read from stdin"
 msgstr "llegeix d'stdin"
 
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:404
 msgid "allow to print `undefined` names (default)"
 msgstr "permet imprimir els noms `undefined` (per defecte)"
 
-#: builtin/name-rev.c:361
+#: builtin/name-rev.c:410
 msgid "dereference tags in the input (internal use)"
 msgstr "dereferencia les etiquetes en l'entrada (ús intern)"
 
-#: builtin/notes.c:25
+#: builtin/notes.c:26
 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
 msgstr "git notes [--ref <referència-de-notes>] [llista [<objecte>]]"
 
-#: builtin/notes.c:26
+#: builtin/notes.c:27
 msgid ""
-"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> | (-c | -C) "
-"<object>] [<object>]"
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"| (-c | -C) <object>] [<object>]"
 msgstr ""
-"git notes [--ref <referència-de-notes>] add [-f] [--allow-empty] [-m <missatge> | -F <fitxer> | "
-"(-c | -C) <objecte>] [<objecte>]"
+"git notes [--ref <referència-de-notes>] add [-f] [--allow-empty] [-m "
+"<missatge> | -F <fitxer> | (-c | -C) <objecte>] [<objecte>]"
 
-#: builtin/notes.c:27
+#: builtin/notes.c:28
 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
-msgstr "git notes [--ref <referència-de-notes>] copy [-f] <d'objecte> <a-objecte>"
+msgstr ""
+"git notes [--ref <referència-de-notes>] copy [-f] <d'objecte> <a-objecte>"
 
-#: builtin/notes.c:28
+#: builtin/notes.c:29
 msgid ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | (-c | -C) <object>] "
-"[<object>]"
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
 msgstr ""
-"git notes [--ref <referència-de-notes>] append [--allow-empty] [-m <missatge> | -F <fitxer> | (-"
-"c | -C) <objecte>] [<objecte>]"
+"git notes [--ref <referència-de-notes>] append [--allow-empty] [-m "
+"<missatge> | -F <fitxer> | (-c | -C) <objecte>] [<objecte>]"
 
-#: builtin/notes.c:29
+#: builtin/notes.c:30
 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
-msgstr "git notes [--ref <referència-de-notes>] edit [--allow-empty] [<objecte>]"
+msgstr ""
+"git notes [--ref <referència-de-notes>] edit [--allow-empty] [<objecte>]"
 
-#: builtin/notes.c:30
+#: builtin/notes.c:31
 msgid "git notes [--ref <notes-ref>] show [<object>]"
 msgstr "git notes [--ref <referència-de-notes>] show [<objecte>]"
 
-#: builtin/notes.c:31
-msgid "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+#: builtin/notes.c:32
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
 msgstr ""
-"git notes [--ref <referència-de-notes>] merge [-v | -q] [-s <estratègia>] <referència-de-notes>"
+"git notes [--ref <referència-de-notes>] merge [-v | -q] [-s <estratègia>] "
+"<referència-de-notes>"
 
-#: builtin/notes.c:32
+#: builtin/notes.c:33
 msgid "git notes merge --commit [-v | -q]"
 msgstr "git notes merge --commit [-v | -q]"
 
-#: builtin/notes.c:33
+#: builtin/notes.c:34
 msgid "git notes merge --abort [-v | -q]"
 msgstr "git notes merge --abort [-v | -q]"
 
-#: builtin/notes.c:34
+#: builtin/notes.c:35
 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
 msgstr "git notes [--ref <referència-de-notes>] remove [<objecte>...]"
 
-#: builtin/notes.c:35
+#: builtin/notes.c:36
 msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
 msgstr "git notes [--ref <referència-de-notes>] prune [-n | -v]"
 
-#: builtin/notes.c:36
+#: builtin/notes.c:37
 msgid "git notes [--ref <notes-ref>] get-ref"
 msgstr "git notes [--ref <referència-de-notes>] get-ref"
 
-#: builtin/notes.c:41
+#: builtin/notes.c:42
 msgid "git notes [list [<object>]]"
 msgstr "git notes [llista [<objecte>]]"
 
-#: builtin/notes.c:46
+#: builtin/notes.c:47
 msgid "git notes add [<options>] [<object>]"
 msgstr "git notes add [<opcions>] [<objecte>]"
 
-#: builtin/notes.c:51
+#: builtin/notes.c:52
 msgid "git notes copy [<options>] <from-object> <to-object>"
 msgstr "git notes copy [<opcions>] <d'objecte> <a-objecte>"
 
-#: builtin/notes.c:52
+#: builtin/notes.c:53
 msgid "git notes copy --stdin [<from-object> <to-object>]..."
 msgstr "git notes copy --stdin [<d'objecte> <a-objecte>]..."
 
-#: builtin/notes.c:57
+#: builtin/notes.c:58
 msgid "git notes append [<options>] [<object>]"
 msgstr "git notes append [<opcions>] [<objecte>]"
 
-#: builtin/notes.c:62
+#: builtin/notes.c:63
 msgid "git notes edit [<object>]"
 msgstr "git notes edit [<objecte>]"
 
-#: builtin/notes.c:67
+#: builtin/notes.c:68
 msgid "git notes show [<object>]"
 msgstr "git notes show [<objecte>]"
 
-#: builtin/notes.c:72
+#: builtin/notes.c:73
 msgid "git notes merge [<options>] <notes-ref>"
 msgstr "git notes merge [<opcions>] <referència-de-notes>"
 
-#: builtin/notes.c:73
+#: builtin/notes.c:74
 msgid "git notes merge --commit [<options>]"
 msgstr "git notes merge --commit [<opcions>]"
 
-#: builtin/notes.c:74
+#: builtin/notes.c:75
 msgid "git notes merge --abort [<options>]"
 msgstr "git notes merge --abort [<opcions>]"
 
-#: builtin/notes.c:79
+#: builtin/notes.c:80
 msgid "git notes remove [<object>]"
 msgstr "git notes remove [<objecte>]"
 
-#: builtin/notes.c:84
+#: builtin/notes.c:85
 msgid "git notes prune [<options>]"
 msgstr "git notes prune [<opcions>]"
 
-#: builtin/notes.c:89
+#: builtin/notes.c:90
 msgid "git notes get-ref"
 msgstr "git notes get-ref"
 
-#: builtin/notes.c:94
+#: builtin/notes.c:95
 msgid "Write/edit the notes for the following object:"
 msgstr "Escriviu/editeu les notes per l'objecte següent:"
 
-#: builtin/notes.c:147
+#: builtin/notes.c:148
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "no s'ha pogut iniciar 'show' per a l'objecte '%s'"
 
-#: builtin/notes.c:151
+#: builtin/notes.c:152
 msgid "could not read 'show' output"
 msgstr "no s'ha pogut llegir la sortida de 'show'"
 
-#: builtin/notes.c:159
+#: builtin/notes.c:160
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "S'ha produït un error en finalitzar 'show' per a l'objecte '%s'"
 
-#: builtin/notes.c:194
+#: builtin/notes.c:195
 msgid "please supply the note contents using either -m or -F option"
-msgstr "si us plau, proveïu els continguts de la nota fent servir l'opció -m o l'opció -F"
+msgstr ""
+"si us plau, proveïu els continguts de la nota fent servir l'opció -m o "
+"l'opció -F"
 
-#: builtin/notes.c:203
+#: builtin/notes.c:204
 msgid "unable to write note object"
 msgstr "no s'ha pogut escriure l'objecte de nota"
 
-#: builtin/notes.c:205
+#: builtin/notes.c:206
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr "s'han deixat els continguts de la nota en %s"
 
-#: builtin/notes.c:233 builtin/tag.c:516
+#: builtin/notes.c:234 builtin/tag.c:517
 #, c-format
 msgid "cannot read '%s'"
 msgstr "no es pot llegir '%s'"
 
-#: builtin/notes.c:235 builtin/tag.c:519
+#: builtin/notes.c:236 builtin/tag.c:520
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "no s'ha pogut obrir o llegir '%s'"
 
-#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307 builtin/notes.c:372
-#: builtin/notes.c:427 builtin/notes.c:513 builtin/notes.c:518 builtin/notes.c:596
-#: builtin/notes.c:658
+#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
+#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
+#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr "s'ha produït un error en resoldre '%s' com a referència vàlida."
 
-#: builtin/notes.c:257
+#: builtin/notes.c:258
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "s'ha produït un error en llegir l'objecte '%s'."
 
-#: builtin/notes.c:261
+#: builtin/notes.c:262
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr "no es pot llegir les dades de node de l'objecte no de blob '%s'."
 
-#: builtin/notes.c:301
+#: builtin/notes.c:302
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "línia d'entrada mal formada: '%s'."
 
-#: builtin/notes.c:316
+#: builtin/notes.c:317
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr "s'ha produït un error en copiar les notes de '%s' a '%s'"
 
-#. TRANSLATORS: the first %s will be replaced by a
-#. git notes command: 'add', 'merge', 'remove', etc.
-#: builtin/notes.c:345
+#. TRANSLATORS: the first %s will be replaced by a git
+#. notes command: 'add', 'merge', 'remove', etc.
+#.
+#: builtin/notes.c:348
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "s'està refusant %s les notes en %s (fora de refs/notes/)"
 
-#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496 builtin/notes.c:508
-#: builtin/notes.c:584 builtin/notes.c:651 builtin/notes.c:801 builtin/notes.c:948
-#: builtin/notes.c:969
+#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
+#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
+#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
 msgid "too many parameters"
 msgstr "massa paràmetres"
 
-#: builtin/notes.c:378 builtin/notes.c:664
+#: builtin/notes.c:381 builtin/notes.c:667
 #, c-format
 msgid "no note found for object %s."
 msgstr "no s'ha trobat cap nota per a l'objecte %s."
 
-#: builtin/notes.c:399 builtin/notes.c:562
+#: builtin/notes.c:402 builtin/notes.c:565
 msgid "note contents as a string"
 msgstr "anota els continguts com a cadena"
 
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:405 builtin/notes.c:568
 msgid "note contents in a file"
 msgstr "anota els continguts en un fitxer"
 
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:408 builtin/notes.c:571
 msgid "reuse and edit specified note object"
 msgstr "reusa i edita l'objecte de nota especificat"
 
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:411 builtin/notes.c:574
 msgid "reuse specified note object"
 msgstr "reusa l'objecte de nota especificat"
 
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:414 builtin/notes.c:577
 msgid "allow storing empty note"
 msgstr "permet l'emmagatzematge d'una nota buida"
 
-#: builtin/notes.c:412 builtin/notes.c:483
+#: builtin/notes.c:415 builtin/notes.c:486
 msgid "replace existing notes"
 msgstr "reemplaça les notes existents"
 
-#: builtin/notes.c:437
+#: builtin/notes.c:440
 #, c-format
-msgid "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite existing notes"
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
 msgstr ""
-"No es poden afegir les notes. S'han trobat notes existents de l'objecte %s. Useu '-f' per a "
-"sobreescriure les notes existents."
+"No es poden afegir les notes. S'han trobat notes existents de l'objecte %s. "
+"Useu '-f' per a sobreescriure les notes existents."
 
-#: builtin/notes.c:452 builtin/notes.c:531
+#: builtin/notes.c:455 builtin/notes.c:534
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "S'estan sobreescrivint les notes existents de l'objecte %s\n"
 
-#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888
+#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "S'està eliminant la nota de l'objecte %s\n"
 
-#: builtin/notes.c:484
+#: builtin/notes.c:487
 msgid "read objects from stdin"
 msgstr "llegeix els objectes des d'stdin"
 
-#: builtin/notes.c:486
+#: builtin/notes.c:489
 msgid "load rewriting config for <command> (implies --stdin)"
-msgstr "carrega la configuració de reescriptura per a <ordre> (implica --stdin)"
+msgstr ""
+"carrega la configuració de reescriptura per a <ordre> (implica --stdin)"
 
-#: builtin/notes.c:504
+#: builtin/notes.c:507
 msgid "too few parameters"
 msgstr "hi ha massa pocs paràmetres"
 
-#: builtin/notes.c:525
+#: builtin/notes.c:528
 #, c-format
-msgid "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite existing notes"
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
 msgstr ""
-"No es poden copiar les notes. S'han trobat notes existents de l'objecte %s. Useu '-f' per a "
-"sobreescriure les notes existents."
+"No es poden copiar les notes. S'han trobat notes existents de l'objecte %s. "
+"Useu '-f' per a sobreescriure les notes existents."
 
-#: builtin/notes.c:537
+#: builtin/notes.c:540
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "manquen notes a l'objecte font %s. No es pot copiar."
 
-#: builtin/notes.c:589
+#: builtin/notes.c:592
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -10492,318 +10903,342 @@ msgstr ""
 "Es desaconsellen les opcions -m/-F/-c/-C en favor de la subordre 'edit'.\n"
 "Si us plau, useu 'git notes add -f -m/-F/-c/-C' en lloc d'això.\n"
 
-#: builtin/notes.c:684
+#: builtin/notes.c:687
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:686
+#: builtin/notes.c:689
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_REF"
 
-#: builtin/notes.c:688
+#: builtin/notes.c:691
 msgid "failed to remove 'git notes merge' worktree"
-msgstr "s'ha produït un error en eliminar l'arbre de treball de 'git notes merge'"
+msgstr ""
+"s'ha produït un error en eliminar l'arbre de treball de 'git notes merge'"
 
-#: builtin/notes.c:708
+#: builtin/notes.c:711
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "s'ha produït un error en llegir la referència NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:710
+#: builtin/notes.c:713
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "no s'ha pogut trobar cap comissió de NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:712
+#: builtin/notes.c:715
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "no s'ha pogut analitzar la comissió de NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:725
+#: builtin/notes.c:728
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "s'ha produït un error en resoldre NOTES_MERGE_REF"
 
-#: builtin/notes.c:728
+#: builtin/notes.c:731
 msgid "failed to finalize notes merge"
 msgstr "s'ha produït un error en finalitzar la fusió de notes"
 
-#: builtin/notes.c:754
+#: builtin/notes.c:757
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "estratègia de fusió de notes desconeguda %s"
 
-#: builtin/notes.c:770
+#: builtin/notes.c:773
 msgid "General options"
 msgstr "Opcions generals"
 
-#: builtin/notes.c:772
+#: builtin/notes.c:775
 msgid "Merge options"
 msgstr "Opcions de fusió"
 
-#: builtin/notes.c:774
-msgid "resolve notes conflicts using the given strategy (manual/ours/theirs/union/cat_sort_uniq)"
+#: builtin/notes.c:777
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
 msgstr ""
-"resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/union/cat_sort_uniq)"
+"resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/"
+"union/cat_sort_uniq)"
 
-#: builtin/notes.c:776
+#: builtin/notes.c:779
 msgid "Committing unmerged notes"
 msgstr "S'estan cometent les notes sense fusionar"
 
-#: builtin/notes.c:778
+#: builtin/notes.c:781
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "finalitza la fusió de notes cometent les notes sense fusionar"
 
-#: builtin/notes.c:780
+#: builtin/notes.c:783
 msgid "Aborting notes merge resolution"
 msgstr "S'està avortant la resolució de fusió de notes"
 
-#: builtin/notes.c:782
+#: builtin/notes.c:785
 msgid "abort notes merge"
 msgstr "avorta la fusió de notes"
 
-#: builtin/notes.c:793
+#: builtin/notes.c:796
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "no es pot combinar --commit, --abort i -s/--strategy"
 
-#: builtin/notes.c:798
+#: builtin/notes.c:801
 msgid "must specify a notes ref to merge"
 msgstr "cal especificar una referència de notes a fusionar"
 
-#: builtin/notes.c:822
+#: builtin/notes.c:825
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "-s/--strategy desconeguda: %s"
 
-#: builtin/notes.c:859
+#: builtin/notes.c:862
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "una fusió de notes a %s ja està en curs a %s"
 
-#: builtin/notes.c:862
+#: builtin/notes.c:865
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
-msgstr "s'ha produït un error en emmagatzemar l'enllaç a la referència de notes actual (%s)"
+msgstr ""
+"s'ha produït un error en emmagatzemar l'enllaç a la referència de notes "
+"actual (%s)"
 
-#: builtin/notes.c:864
+#: builtin/notes.c:867
 #, c-format
 msgid ""
-"Automatic notes merge failed. Fix conflicts in %s and commit the result with 'git notes merge --"
-"commit', or abort the merge with 'git notes merge --abort'.\n"
+"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
+"'git notes merge --commit', or abort the merge with 'git notes merge --"
+"abort'.\n"
 msgstr ""
-"La fusió de notes automàtica ha fallat. Arregleu els conflictes en %s i cometeu el resultat amb "
-"'git notes merge --commit', o avorteu la fusió amb 'git notes merge --abort'.\n"
+"La fusió de notes automàtica ha fallat. Arregleu els conflictes en %s i "
+"cometeu el resultat amb 'git notes merge --commit', o avorteu la fusió amb "
+"'git notes merge --abort'.\n"
 
-#: builtin/notes.c:886
+#: builtin/notes.c:889
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "L'objecte %s no té cap nota\n"
 
-#: builtin/notes.c:898
+#: builtin/notes.c:901
 msgid "attempt to remove non-existent note is not an error"
 msgstr "l'intent d'eliminar una nota no existent no és un error"
 
-#: builtin/notes.c:901
+#: builtin/notes.c:904
 msgid "read object names from the standard input"
 msgstr "llegeix els noms d'objecte des de l'entrada estàndard"
 
-#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
 msgid "do not remove, show only"
 msgstr "no eliminis, només mostra"
 
-#: builtin/notes.c:940
+#: builtin/notes.c:943
 msgid "report pruned notes"
 msgstr "informa de notes podades"
 
-#: builtin/notes.c:982
+#: builtin/notes.c:985
 msgid "notes-ref"
 msgstr "referència de notes"
 
-#: builtin/notes.c:983
+#: builtin/notes.c:986
 msgid "use notes from <notes-ref>"
 msgstr "usa les notes de <referència-de-notes>"
 
-#: builtin/notes.c:1018
+#: builtin/notes.c:1021
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "subordre desconeguda: %s"
 
-#: builtin/pack-objects.c:29
-msgid "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+#: builtin/pack-objects.c:30
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
-"git pack-objects --stdout [<opcions>...] [< <llista-de-referències> | < <llista-de-objectes>]"
+"git pack-objects --stdout [<opcions>...] [< <llista-de-referències> | < "
+"<llista-de-objectes>]"
 
-#: builtin/pack-objects.c:30
-msgid "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+#: builtin/pack-objects.c:31
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
-"git pack-objects [<opcions>...] <nom-base> [< <llista-de-referències> | < <llista-de-objectes>]"
+"git pack-objects [<opcions>...] <nom-base> [< <llista-de-referències> | < "
+"<llista-de-objectes>]"
 
-#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
+#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
 #, c-format
 msgid "deflate error (%d)"
 msgstr "error de deflació (%d)"
 
-#: builtin/pack-objects.c:770
+#: builtin/pack-objects.c:776
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
-"s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets a causa de pack."
-"packSizeLimit"
+"s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets "
+"a causa de pack.packSizeLimit"
 
-#: builtin/pack-objects.c:783
+#: builtin/pack-objects.c:789
 msgid "Writing objects"
 msgstr "S'estan escrivint els objectes"
 
-#: builtin/pack-objects.c:1063
+#: builtin/pack-objects.c:1069
 msgid "disabling bitmap writing, as some objects are not being packed"
-msgstr "s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no s'empaqueten"
+msgstr ""
+"s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no "
+"s'empaqueten"
 
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2434
 msgid "Compressing objects"
 msgstr "S'estan comprimint objectes"
 
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2843
 #, c-format
 msgid "unsupported index version %s"
 msgstr "versió d'índex no compatible %s"
 
-#: builtin/pack-objects.c:2833
+#: builtin/pack-objects.c:2847
 #, c-format
 msgid "bad index version '%s'"
 msgstr "versió d'índex dolenta '%s'"
 
-#: builtin/pack-objects.c:2863
+#: builtin/pack-objects.c:2877
 msgid "do not show progress meter"
 msgstr "no mostris l'indicador de progrés"
 
-#: builtin/pack-objects.c:2865
+#: builtin/pack-objects.c:2879
 msgid "show progress meter"
 msgstr "mostra l'indicador de progrés"
 
-#: builtin/pack-objects.c:2867
+#: builtin/pack-objects.c:2881
 msgid "show progress meter during object writing phase"
 msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes"
 
-#: builtin/pack-objects.c:2870
+#: builtin/pack-objects.c:2884
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "similar a --all-progress quan l'indicador de progrés es mostra"
 
-#: builtin/pack-objects.c:2871
+#: builtin/pack-objects.c:2885
 msgid "version[,offset]"
 msgstr "versió[,desplaçament]"
 
-#: builtin/pack-objects.c:2872
+#: builtin/pack-objects.c:2886
 msgid "write the pack index file in the specified idx format version"
-msgstr "escriu el fitxer d'índex de paquet en la versió de format d'índex especificada"
+msgstr ""
+"escriu el fitxer d'índex de paquet en la versió de format d'índex "
+"especificada"
 
-#: builtin/pack-objects.c:2875
+#: builtin/pack-objects.c:2889
 msgid "maximum size of each output pack file"
 msgstr "mida màxima de cada fitxer de paquet de sortida"
 
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2891
 msgid "ignore borrowed objects from alternate object store"
-msgstr "ignora els objectes prestats d'un emmagatzemament d'objectes alternatiu"
+msgstr ""
+"ignora els objectes prestats d'un emmagatzemament d'objectes alternatiu"
 
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2893
 msgid "ignore packed objects"
 msgstr "ignora els objectes empaquetats"
 
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2895
 msgid "limit pack window by objects"
 msgstr "limita la finestra d'empaquetament per objectes"
 
-#: builtin/pack-objects.c:2883
+#: builtin/pack-objects.c:2897
 msgid "limit pack window by memory in addition to object limit"
-msgstr "limita la finestra d'empaquetament per memòria a més del límit d'objectes"
+msgstr ""
+"limita la finestra d'empaquetament per memòria a més del límit d'objectes"
 
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2899
 msgid "maximum length of delta chain allowed in the resulting pack"
-msgstr "longitud màxima de la cadena de diferències permesa en el paquet resultant"
+msgstr ""
+"longitud màxima de la cadena de diferències permesa en el paquet resultant"
 
-#: builtin/pack-objects.c:2887
+#: builtin/pack-objects.c:2901
 msgid "reuse existing deltas"
 msgstr "reusa les diferències existents"
 
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2903
 msgid "reuse existing objects"
 msgstr "reusa els objectes existents"
 
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2905
 msgid "use OFS_DELTA objects"
 msgstr "usa objectes OFS_DELTA"
 
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2907
 msgid "use threads when searching for best delta matches"
 msgstr "usa fils en cercar les millores coincidències de diferències"
 
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2909
 msgid "do not create an empty pack output"
 msgstr "no creïs una emissió de paquet buida"
 
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2911
 msgid "read revision arguments from standard input"
 msgstr "llegeix els paràmetres de revisió des de l'entrada estàndard"
 
-#: builtin/pack-objects.c:2899
+#: builtin/pack-objects.c:2913
 msgid "limit the objects to those that are not yet packed"
 msgstr "limita els objectes als quals encara no s'hagin empaquetat"
 
-#: builtin/pack-objects.c:2902
+#: builtin/pack-objects.c:2916
 msgid "include objects reachable from any reference"
 msgstr "inclou els objectes abastables de qualsevol referència"
 
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2919
 msgid "include objects referred by reflog entries"
-msgstr "inclou els objectes als quals facin referència les entrades del registre de referències"
+msgstr ""
+"inclou els objectes als quals facin referència les entrades del registre de "
+"referències"
 
-#: builtin/pack-objects.c:2908
+#: builtin/pack-objects.c:2922
 msgid "include objects referred to by the index"
 msgstr "inclou els objectes als quals faci referència l'índex"
 
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2925
 msgid "output pack to stdout"
 msgstr "emet el paquet a stdout"
 
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2927
 msgid "include tag objects that refer to objects to be packed"
-msgstr "inclou els objectes d'etiqueta que facin referència als objectes a empaquetar"
+msgstr ""
+"inclou els objectes d'etiqueta que facin referència als objectes a empaquetar"
 
-#: builtin/pack-objects.c:2915
+#: builtin/pack-objects.c:2929
 msgid "keep unreachable objects"
 msgstr "retén els objectes inabastables"
 
-#: builtin/pack-objects.c:2917
+#: builtin/pack-objects.c:2931
 msgid "pack loose unreachable objects"
 msgstr "empaqueta els objectes inabastables solts"
 
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2933
 msgid "unpack unreachable objects newer than <time>"
 msgstr "desempaqueta els objectes inabastables més nous que <hora>"
 
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:2936
 msgid "create thin packs"
 msgstr "crea paquets prims"
 
-#: builtin/pack-objects.c:2924
+#: builtin/pack-objects.c:2938
 msgid "create packs suitable for shallow fetches"
 msgstr "crea paquets adequats per a les obtencions superficials"
 
-#: builtin/pack-objects.c:2926
+#: builtin/pack-objects.c:2940
 msgid "ignore packs that have companion .keep file"
 msgstr "ignora els paquets que tinguin un fitxer .keep corresponent"
 
-#: builtin/pack-objects.c:2928
+#: builtin/pack-objects.c:2942
 msgid "pack compression level"
 msgstr "nivell de compressió de paquet"
 
-#: builtin/pack-objects.c:2930
+#: builtin/pack-objects.c:2944
 msgid "do not hide commits by grafts"
 msgstr "no amaguis les comissions per empelt"
 
-#: builtin/pack-objects.c:2932
+#: builtin/pack-objects.c:2946
 msgid "use a bitmap index if available to speed up counting objects"
-msgstr "usa un índex de mapa de bits, si està disponible, per a accelerar el recompte d'objectes"
+msgstr ""
+"usa un índex de mapa de bits, si està disponible, per a accelerar el "
+"recompte d'objectes"
 
-#: builtin/pack-objects.c:2934
+#: builtin/pack-objects.c:2948
 msgid "write a bitmap index together with the pack index"
 msgstr "escriu un índex de mapa de bits junt amb l'índex de paquet"
 
-#: builtin/pack-objects.c:3061
+#: builtin/pack-objects.c:3075
 msgid "Counting objects"
 msgstr "S'estan comptant els objectes"
 
@@ -10843,53 +11278,64 @@ msgstr "fes caducar els objectes més vells que <hora>"
 msgid "cannot prune in a precious-objects repo"
 msgstr "no es pot podar en un dipòsit d'objectes preciosos"
 
-#: builtin/pull.c:51 builtin/pull.c:53
+#: builtin/pull.c:54 builtin/pull.c:56
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "Valor no vàlid per a %s: %s"
 
-#: builtin/pull.c:73
+#: builtin/pull.c:76
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
 
-#: builtin/pull.c:121
+#: builtin/pull.c:124
+#, fuzzy
+msgid "control for recursive fetching of submodules"
+msgstr "controla l'obtenció recursiva de submòduls"
+
+#: builtin/pull.c:128
 msgid "Options related to merging"
 msgstr "Opcions relacionades amb fusionar"
 
-#: builtin/pull.c:124
+#: builtin/pull.c:131
 msgid "incorporate changes by rebasing rather than merging"
-msgstr "incorpora els canvis per rebasar en lloc de fusionar"
+msgstr "incorpora els canvis fent «rebase» en lloc de fusionar"
 
-#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120
+#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
 msgid "allow fast-forward"
 msgstr "permet l'avanç ràpid"
 
-#: builtin/pull.c:157
+#: builtin/pull.c:164
 msgid "automatically stash/stash pop before and after rebase"
 msgstr "automàticament emmagatzema/desempila abans i després de fer «rebase»"
 
-#: builtin/pull.c:173
+#: builtin/pull.c:180
 msgid "Options related to fetching"
 msgstr "Opcions relacionades amb obtenir"
 
-#: builtin/pull.c:195
+#: builtin/pull.c:198
 msgid "number of submodules pulled in parallel"
 msgstr "nombre de submòduls baixats en paral·lel"
 
-#: builtin/pull.c:284
+#: builtin/pull.c:287
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Valor no vàlid per a pull.ff: %s"
 
-#: builtin/pull.c:397
-msgid "There is no candidate for rebasing against among the refs that you just fetched."
-msgstr "No hi ha cap candidat sobre el qual rebasar entre les referències que acabeu d'obtenir."
-
 #: builtin/pull.c:399
-msgid "There are no candidates for merging among the refs that you just fetched."
-msgstr "No hi ha candidats per a fusionar entre les referències que acabeu d'obtenir."
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr ""
+"No hi ha cap candidat sobre el qual fer «rebase» entre les referències que "
+"acabeu d'obtenir."
+
+#: builtin/pull.c:401
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr ""
+"No hi ha candidats per a fusionar entre les referències que acabeu d'obtenir."
 
-#: builtin/pull.c:400
+#: builtin/pull.c:402
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -10897,7 +11343,7 @@ msgstr ""
 "Generalment això vol dir que heu proveït una especificació de\n"
 "referència de comodí que no tenia cap coincidència en el costat remot."
 
-#: builtin/pull.c:403
+#: builtin/pull.c:405
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -10908,40 +11354,44 @@ msgstr ""
 "Perquè aquest no és el remot configurat per defecte per a la vostra\n"
 "branca actual, heu d'especificar una branca en la línia d'ordres."
 
-#: builtin/pull.c:408 git-parse-remote.sh:73
+#: builtin/pull.c:410 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Actualment no sou en cap branca."
 
-#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
+#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "Si us plau, especifiqueu sobre què branca voleu fer «rebase»."
 
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
+#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "Si us plau, especifiqueu amb què branca voleu fusionar."
 
-#: builtin/pull.c:413 builtin/pull.c:428
+#: builtin/pull.c:415 builtin/pull.c:430
 msgid "See git-pull(1) for details."
 msgstr "Vegeu git-pull(1) per detalls."
 
-#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430 git-parse-remote.sh:64
+#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<remot>"
 
-#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456
+#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<branca>"
 
-#: builtin/pull.c:423 git-parse-remote.sh:75
+#: builtin/pull.c:425 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "No hi ha cap informació de seguiment per a la branca actual."
 
-#: builtin/pull.c:432 git-parse-remote.sh:95
-msgid "If you wish to set tracking information for this branch you can do so with:"
-msgstr "Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho amb:"
+#: builtin/pull.c:434 git-parse-remote.sh:95
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr ""
+"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho "
+"amb:"
 
-#: builtin/pull.c:437
+#: builtin/pull.c:439
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -10950,27 +11400,28 @@ msgstr ""
 "La vostra configuració especifica fusionar amb la referència '%s'\n"
 "del remot, però no s'ha obtingut tal referència."
 
-#: builtin/pull.c:754
+#: builtin/pull.c:792
 msgid "ignoring --verify-signatures for rebase"
 msgstr "s'està ignorant --verify-signatures en fer «rebase»"
 
-#: builtin/pull.c:801
+#: builtin/pull.c:840
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "l'opció --[no-]-autostash és vàlid només amb --rebase."
 
-#: builtin/pull.c:809
+#: builtin/pull.c:848
 msgid "Updating an unborn branch with changes added to the index."
-msgstr "S'està actualitzant una branca no nascuda amb canvis afegits a l'índex."
+msgstr ""
+"S'està actualitzant una branca no nascuda amb canvis afegits a l'índex."
 
-#: builtin/pull.c:812
+#: builtin/pull.c:851
 msgid "pull with rebase"
 msgstr "baixar fent «rebase»"
 
-#: builtin/pull.c:813
+#: builtin/pull.c:852
 msgid "please commit or stash them."
 msgstr "si us plau, cometeu-los o emmagatzemeu-los."
 
-#: builtin/pull.c:838
+#: builtin/pull.c:877
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -10981,7 +11432,7 @@ msgstr ""
 "s'està avançant ràpidament el vostre arbre de treball des de\n"
 "la comissió %s."
 
-#: builtin/pull.c:843
+#: builtin/pull.c:882
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -10992,41 +11443,47 @@ msgid ""
 "to recover."
 msgstr ""
 "No es pot avançar ràpidament el vostre arbre de treball.\n"
-"Després d'assegurar que hàgiu desat qualsevol cosa preciosa de la sortida de\n"
+"Després d'assegurar que hàgiu desat qualsevol cosa preciosa de la sortida "
+"de\n"
 "$ git diff %s\n"
 "executeu\n"
 "$ git reset --hard\n"
 "per a recuperar."
 
-#: builtin/pull.c:858
+#: builtin/pull.c:897
 msgid "Cannot merge multiple branches into empty head."
 msgstr "No es poden fusionar múltiples branques a un HEAD buit."
 
-#: builtin/pull.c:862
+#: builtin/pull.c:901
 msgid "Cannot rebase onto multiple branches."
 msgstr "No es pot fer «rebase» sobre múltiples branques."
 
-#: builtin/push.c:16
+#: builtin/pull.c:908
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr ""
+
+#: builtin/push.c:17
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
 
-#: builtin/push.c:89
+#: builtin/push.c:90
 msgid "tag shorthand without <tag>"
 msgstr "abreviatura d'etiqueta sense <tag>"
 
-#: builtin/push.c:99
+#: builtin/push.c:100
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete només accepta noms de referència de destí senzills"
 
-#: builtin/push.c:143
+#: builtin/push.c:144
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
 msgstr ""
 "\n"
-"Per a triar qualsevol opció permanentment, vegeu push.default a 'git help config'."
+"Per a triar qualsevol opció permanentment, vegeu push.default a 'git help "
+"config'."
 
-#: builtin/push.c:146
+#: builtin/push.c:147
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -11051,7 +11508,7 @@ msgstr ""
 "    git push %s %s\n"
 "%s"
 
-#: builtin/push.c:161
+#: builtin/push.c:162
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -11066,7 +11523,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<nom-de-branca-remota>\n"
 
-#: builtin/push.c:175
+#: builtin/push.c:176
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -11079,12 +11536,13 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:183
+#: builtin/push.c:184
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
-msgstr "La branca actual %s té múltiples branques fonts, s'està refusant pujar."
+msgstr ""
+"La branca actual %s té múltiples branques fonts, s'està refusant pujar."
 
-#: builtin/push.c:186
+#: builtin/push.c:187
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -11095,11 +11553,14 @@ msgstr ""
 "branca actual '%s', sense dir-me què pujar per a actualitzar\n"
 "quina branca remota."
 
-#: builtin/push.c:245
-msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr "No heu especificat cap especificació de referència a pujar, i push.default és \"nothing\"."
+#: builtin/push.c:246
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"No heu especificat cap especificació de referència a pujar, i push.default "
+"és \"nothing\"."
 
-#: builtin/push.c:252
+#: builtin/push.c:253
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -11111,7 +11572,7 @@ msgstr ""
 "els canvis remots (per exemple, 'git pull ...') abans de pujar de nou.\n"
 "Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls."
 
-#: builtin/push.c:258
+#: builtin/push.c:259
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -11124,7 +11585,7 @@ msgstr ""
 "abans de pujar de nou.\n"
 "Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls."
 
-#: builtin/push.c:264
+#: builtin/push.c:265
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -11139,11 +11600,12 @@ msgstr ""
 "pujar de nou.\n"
 "Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls."
 
-#: builtin/push.c:271
+#: builtin/push.c:272
 msgid "Updates were rejected because the tag already exists in the remote."
-msgstr "S'han rebutjat les actualitzacions perquè l'etiqueta ja existeix en el remot."
+msgstr ""
+"S'han rebutjat les actualitzacions perquè l'etiqueta ja existeix en el remot."
 
-#: builtin/push.c:274
+#: builtin/push.c:275
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -11154,25 +11616,26 @@ msgstr ""
 "fer que assenyali un objecte no de comissió, sense usar l'opció\n"
 "'--force'.\n"
 
-#: builtin/push.c:334
+#: builtin/push.c:335
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "S'està pujant a %s\n"
 
-#: builtin/push.c:338
+#: builtin/push.c:339
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "s'ha produït un error en pujar algunes referències a '%s'"
 
-#: builtin/push.c:369
+#: builtin/push.c:370
 #, c-format
 msgid "bad repository '%s'"
 msgstr "dipòsit dolent '%s'"
 
-#: builtin/push.c:370
+#: builtin/push.c:371
 msgid ""
 "No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote repository using\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
 "\n"
 "    git remote add <name> <url>\n"
 "\n"
@@ -11181,7 +11644,8 @@ msgid ""
 "    git push <name>\n"
 msgstr ""
 "No hi ha cap destí de pujada configurat.\n"
-"Especifiqueu l'URL des de la línia d'ordres o bé configureu un dipòsit remot fent servir\n"
+"Especifiqueu l'URL des de la línia d'ordres o bé configureu un dipòsit remot "
+"fent servir\n"
 "\n"
 "    git remote add <nom> <url>\n"
 "\n"
@@ -11189,205 +11653,206 @@ msgstr ""
 "\n"
 "    git push <nom>\n"
 
-#: builtin/push.c:388
+#: builtin/push.c:389
 msgid "--all and --tags are incompatible"
 msgstr "--all i --tags són incompatibles"
 
-#: builtin/push.c:389
+#: builtin/push.c:390
 msgid "--all can't be combined with refspecs"
 msgstr "--all no es pot combinar amb especificacions de referència"
 
-#: builtin/push.c:394
+#: builtin/push.c:395
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror i --tags són incompatibles"
 
-#: builtin/push.c:395
+#: builtin/push.c:396
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror no es pot combinar amb especificacions de referència"
 
-#: builtin/push.c:400
+#: builtin/push.c:401
 msgid "--all and --mirror are incompatible"
 msgstr "--all i --mirror són incompatibles"
 
-#: builtin/push.c:518
+#: builtin/push.c:523
 msgid "repository"
 msgstr "dipòsit"
 
-#: builtin/push.c:519 builtin/send-pack.c:162
+#: builtin/push.c:524 builtin/send-pack.c:163
 msgid "push all refs"
 msgstr "puja totes les referències"
 
-#: builtin/push.c:520 builtin/send-pack.c:164
+#: builtin/push.c:525 builtin/send-pack.c:165
 msgid "mirror all refs"
 msgstr "reflecteix totes les referències"
 
-#: builtin/push.c:522
+#: builtin/push.c:527
 msgid "delete refs"
 msgstr "suprimeix les referències"
 
-#: builtin/push.c:523
+#: builtin/push.c:528
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "puja les etiquetes (no es pot usar amb --all o --mirror)"
 
-#: builtin/push.c:526 builtin/send-pack.c:165
+#: builtin/push.c:531 builtin/send-pack.c:166
 msgid "force updates"
 msgstr "força les actualitzacions"
 
-#: builtin/push.c:528 builtin/send-pack.c:179
+#: builtin/push.c:533 builtin/send-pack.c:180
 msgid "refname>:<expect"
 msgstr "nom-de-referència>:<esperat"
 
-#: builtin/push.c:529 builtin/send-pack.c:180
+#: builtin/push.c:534 builtin/send-pack.c:181
 msgid "require old value of ref to be at this value"
 msgstr "requereix que el valor antic de la referència sigui d'aquest valor"
 
-#: builtin/push.c:532
+#: builtin/push.c:537
 msgid "control recursive pushing of submodules"
 msgstr "controla la pujada recursiva dels submòduls"
 
-#: builtin/push.c:534 builtin/send-pack.c:173
+#: builtin/push.c:539 builtin/send-pack.c:174
 msgid "use thin pack"
 msgstr "usa el paquet prim"
 
-#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159 builtin/send-pack.c:160
+#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
+#: builtin/send-pack.c:161
 msgid "receive pack program"
 msgstr "programa que rep els paquets"
 
-#: builtin/push.c:537
+#: builtin/push.c:542
 msgid "set upstream for git pull/status"
 msgstr "estableix la font per a git pull/status"
 
-#: builtin/push.c:540
+#: builtin/push.c:545
 msgid "prune locally removed refs"
 msgstr "poda les referències eliminades localment"
 
-#: builtin/push.c:542
+#: builtin/push.c:547
 msgid "bypass pre-push hook"
 msgstr "evita el ganxo de prepujada"
 
-#: builtin/push.c:543
+#: builtin/push.c:548
 msgid "push missing but relevant tags"
 msgstr "puja les etiquetes absents però rellevants"
 
-#: builtin/push.c:546 builtin/send-pack.c:167
+#: builtin/push.c:551 builtin/send-pack.c:168
 msgid "GPG sign the push"
 msgstr "signa la pujada amb GPG"
 
-#: builtin/push.c:548 builtin/send-pack.c:174
+#: builtin/push.c:553 builtin/send-pack.c:175
 msgid "request atomic transaction on remote side"
 msgstr "demana una transacció atòmica al costat remot"
 
-#: builtin/push.c:549 builtin/send-pack.c:170
+#: builtin/push.c:554 builtin/send-pack.c:171
 msgid "server-specific"
 msgstr "específic al servidor"
 
-#: builtin/push.c:549 builtin/send-pack.c:171
+#: builtin/push.c:554 builtin/send-pack.c:172
 msgid "option to transmit"
 msgstr "opció a transmetre"
 
-#: builtin/push.c:563
+#: builtin/push.c:568
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete és incompatible amb --all, --mirror i --tags"
 
-#: builtin/push.c:565
+#: builtin/push.c:570
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete no té sentit sense referències"
 
-#: builtin/push.c:584
+#: builtin/push.c:589
 msgid "push options must not have new line characters"
 msgstr "les opcions de pujada no han de tenir caràcters de línia nova"
 
 #: builtin/read-tree.c:40
 msgid ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) [-u [--exclude-per-"
-"directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
-"ish1> [<tree-ish2> [<tree-ish3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
+"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
+"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
 msgstr ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) [-u [--exclude-per-"
-"directory=<ignoral-de-git>] | -i]] [--no-sparse-checkout] [--index-output=<fitxer>] (--empty | "
-"<arbre1> [<arbre2> [<arbre3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
+"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
+"index-output=<fitxer>] (--empty | <arbre1> [<arbre2> [<arbre3>]])"
 
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:121
 msgid "write resulting index to <file>"
 msgstr "escriu l'índex resultant al <fitxer>"
 
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:124
 msgid "only empty the index"
 msgstr "només buida l'índex"
 
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:126
 msgid "Merging"
 msgstr "S'està fusionant"
 
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:128
 msgid "perform a merge in addition to a read"
 msgstr "realitza una fusió a més d'una lectura"
 
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:130
 msgid "3-way merge if no file level merging required"
 msgstr "fusió de 3 vies si no cal fusió a nivell de fitxers"
 
-#: builtin/read-tree.c:141
+#: builtin/read-tree.c:132
 msgid "3-way merge in presence of adds and removes"
 msgstr "fusió de 3 vies en presència d'afegiments i eliminacions"
 
-#: builtin/read-tree.c:143
+#: builtin/read-tree.c:134
 msgid "same as -m, but discard unmerged entries"
 msgstr "el mateix que -m, però descarta les entrades no fusionades"
 
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:135
 msgid "<subdirectory>/"
 msgstr "<subdirectori>/"
 
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:136
 msgid "read the tree into the index under <subdirectory>/"
 msgstr "llegiu l'arbre a l'índex sota <subdirectori>/"
 
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:139
 msgid "update working tree with merge result"
 msgstr "actualitza l'arbre de treball amb el resultat de fusió"
 
-#: builtin/read-tree.c:150
+#: builtin/read-tree.c:141
 msgid "gitignore"
 msgstr "gitignore"
 
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:142
 msgid "allow explicitly ignored files to be overwritten"
 msgstr "permet que els fitxers explícitament ignorats se sobreescriguin"
 
-#: builtin/read-tree.c:154
+#: builtin/read-tree.c:145
 msgid "don't check the working tree after merging"
 msgstr "no comprovis l'arbre de treball després de fusionar"
 
-#: builtin/read-tree.c:155
+#: builtin/read-tree.c:146
 msgid "don't update the index or the work tree"
 msgstr "no actualitzis l'índex ni l'arbre de treball"
 
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:148
 msgid "skip applying sparse checkout filter"
 msgstr "omet l'aplicació del filtre d'agafament parcial"
 
-#: builtin/read-tree.c:159
+#: builtin/read-tree.c:150
 msgid "debug unpack-trees"
 msgstr "depura unpack-trees"
 
-#: builtin/rebase--helper.c:7
+#: builtin/rebase--helper.c:8
 msgid "git rebase--helper [<options>]"
 msgstr "git rebase--helper [<opcions>]"
 
-#: builtin/rebase--helper.c:19
+#: builtin/rebase--helper.c:20
 msgid "continue rebase"
 msgstr "continua el «rebase»"
 
-#: builtin/rebase--helper.c:21
+#: builtin/rebase--helper.c:22
 msgid "abort rebase"
 msgstr "avorta el «rebase»"
 
-#: builtin/receive-pack.c:27
+#: builtin/receive-pack.c:28
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-dir>"
 
-#: builtin/receive-pack.c:795
+#: builtin/receive-pack.c:838
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -11418,7 +11883,7 @@ msgstr ""
 "predeterminat, establiu la variable de configuració\n"
 "'receive.denyCurrentBranch' a 'refuse'."
 
-#: builtin/receive-pack.c:815
+#: builtin/receive-pack.c:858
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -11440,110 +11905,112 @@ msgstr ""
 "\n"
 "Per a silenciar aquest missatge, podeu establir-la a 'refuse'."
 
-#: builtin/receive-pack.c:1888
+#: builtin/receive-pack.c:1933
 msgid "quiet"
 msgstr "silenciós"
 
-#: builtin/receive-pack.c:1902
+#: builtin/receive-pack.c:1947
 msgid "You must specify a directory."
 msgstr "Heu d'especificar un directori."
 
-#: builtin/reflog.c:423
+#: builtin/reflog.c:424
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "'%s' per a '%s' no és una marca de temps vàlida"
 
-#: builtin/reflog.c:540 builtin/reflog.c:545
+#: builtin/reflog.c:541 builtin/reflog.c:546
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' no és una marca de temps vàlida"
 
-#: builtin/remote.c:12
+#: builtin/remote.c:13
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
-#: builtin/remote.c:13
+#: builtin/remote.c:14
 msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] "
-"<name> <url>"
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <name> <url>"
 msgstr ""
-"git remote add [-t <branca>] [-m <mestra>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] "
-"<nom> <url>"
+"git remote add [-t <branca>] [-m <mestra>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <nom> <url>"
 
-#: builtin/remote.c:14 builtin/remote.c:34
+#: builtin/remote.c:15 builtin/remote.c:35
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename <antic> <nou>"
 
-#: builtin/remote.c:15 builtin/remote.c:39
+#: builtin/remote.c:16 builtin/remote.c:40
 msgid "git remote remove <name>"
 msgstr "git remote remove <nom>"
 
-#: builtin/remote.c:16 builtin/remote.c:44
+#: builtin/remote.c:17 builtin/remote.c:45
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branca>)"
 
-#: builtin/remote.c:17
+#: builtin/remote.c:18
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <nom>"
 
-#: builtin/remote.c:18
+#: builtin/remote.c:19
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <nom>"
 
-#: builtin/remote.c:19
-msgid "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
-msgstr "git remote [-v | --verbose] update [-p | --prune] [(<grup> | <remot>)...]"
-
 #: builtin/remote.c:20
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr ""
+"git remote [-v | --verbose] update [-p | --prune] [(<grup> | <remot>)...]"
+
+#: builtin/remote.c:21
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <nom> <branca>..."
 
-#: builtin/remote.c:21 builtin/remote.c:70
+#: builtin/remote.c:22 builtin/remote.c:71
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <nom>"
 
-#: builtin/remote.c:22 builtin/remote.c:75
+#: builtin/remote.c:23 builtin/remote.c:76
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <nom> <url-nou> [<url-antic>]"
 
-#: builtin/remote.c:23 builtin/remote.c:76
+#: builtin/remote.c:24 builtin/remote.c:77
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <nom> <url-nou>"
 
-#: builtin/remote.c:24 builtin/remote.c:77
+#: builtin/remote.c:25 builtin/remote.c:78
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <nom> <url>"
 
-#: builtin/remote.c:29
+#: builtin/remote.c:30
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<opcions>] <nom> <url>"
 
-#: builtin/remote.c:49
+#: builtin/remote.c:50
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <nom> <branca>..."
 
-#: builtin/remote.c:50
+#: builtin/remote.c:51
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <nom> <branca>..."
 
-#: builtin/remote.c:55
+#: builtin/remote.c:56
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<opcions>] <nom>"
 
-#: builtin/remote.c:60
+#: builtin/remote.c:61
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<opcions>] <nom>"
 
-#: builtin/remote.c:65
+#: builtin/remote.c:66
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<opcions>] [<grup> | <remot>]..."
 
-#: builtin/remote.c:94
+#: builtin/remote.c:95
 #, c-format
 msgid "Updating %s"
 msgstr "S'està actualitzant %s"
 
-#: builtin/remote.c:126
+#: builtin/remote.c:127
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -11552,107 +12019,110 @@ msgstr ""
 "\t plau, useu --mirror=fetch o\n"
 "\t --mirror=push en lloc d'això"
 
-#: builtin/remote.c:143
+#: builtin/remote.c:144
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "paràmetre de reflexió desconegut: %s"
 
-#: builtin/remote.c:159
+#: builtin/remote.c:160
 msgid "fetch the remote branches"
 msgstr "obtén les branques remotes"
 
-#: builtin/remote.c:161
+#: builtin/remote.c:162
 msgid "import all tags and associated objects when fetching"
 msgstr "en obtenir, importa totes les etiquetes i tots els objectes"
 
-#: builtin/remote.c:164
+#: builtin/remote.c:165
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "o no obtinguis cap etiqueta (--no-tags)"
 
-#: builtin/remote.c:166
+#: builtin/remote.c:167
 msgid "branch(es) to track"
 msgstr "branques a seguir"
 
-#: builtin/remote.c:167
+#: builtin/remote.c:168
 msgid "master branch"
 msgstr "branca mestra"
 
-#: builtin/remote.c:168
+#: builtin/remote.c:169
 msgid "push|fetch"
 msgstr "push|fetch"
 
-#: builtin/remote.c:169
+#: builtin/remote.c:170
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr "estableix el remot com a mirall al qual pujar o del qual obtenir"
 
-#: builtin/remote.c:181
+#: builtin/remote.c:182
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "especificar una branca mestra no té sentit amb --mirror"
 
-#: builtin/remote.c:183
+#: builtin/remote.c:184
 msgid "specifying branches to track makes sense only with fetch mirrors"
-msgstr "especificar les branques a seguir té sentit només amb miralls d'obtenció"
+msgstr ""
+"especificar les branques a seguir té sentit només amb miralls d'obtenció"
 
-#: builtin/remote.c:190 builtin/remote.c:629
+#: builtin/remote.c:191 builtin/remote.c:630
 #, c-format
 msgid "remote %s already exists."
 msgstr "el remot %s ja existeix."
 
-#: builtin/remote.c:194 builtin/remote.c:633
+#: builtin/remote.c:195 builtin/remote.c:634
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' no és un nom de remot vàlid"
 
-#: builtin/remote.c:234
+#: builtin/remote.c:235
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "No s'ha pogut configurar la mestra '%s'"
 
-#: builtin/remote.c:336
+#: builtin/remote.c:337
 #, c-format
 msgid "Could not get fetch map for refspec %s"
-msgstr "No s'ha pogut obtenir el mapa d'obtenció de l'especificació de referència %s"
+msgstr ""
+"No s'ha pogut obtenir el mapa d'obtenció de l'especificació de referència %s"
 
-#: builtin/remote.c:437 builtin/remote.c:445
+#: builtin/remote.c:438 builtin/remote.c:446
 msgid "(matching)"
 msgstr "(coincident)"
 
-#: builtin/remote.c:449
+#: builtin/remote.c:450
 msgid "(delete)"
 msgstr "(suprimir)"
 
-#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856
+#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
 #, c-format
 msgid "No such remote: %s"
 msgstr "No hi ha tal remot: %s"
 
-#: builtin/remote.c:639
+#: builtin/remote.c:640
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "No s'ha pogut canviar el nom de la secció de configuració '%s' a '%s'"
 
-#: builtin/remote.c:659
+#: builtin/remote.c:660
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
 "\t%s\n"
 "\tPlease update the configuration manually if necessary."
 msgstr ""
-"No s'està actualitzant l'especificació de referències d'obtenció no per defecte\n"
+"No s'està actualitzant l'especificació de referències d'obtenció no per "
+"defecte\n"
 "\t%s\n"
 "\tSi us plau, actualitzeu la configuració manualment si és necessari."
 
-#: builtin/remote.c:695
+#: builtin/remote.c:696
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "la supressió de '%s' ha fallat"
 
-#: builtin/remote.c:729
+#: builtin/remote.c:730
 #, c-format
 msgid "creating '%s' failed"
 msgstr "la creació de '%s' ha fallat"
 
-#: builtin/remote.c:794
+#: builtin/remote.c:795
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -11663,631 +12133,650 @@ msgstr[0] ""
 "Nota: Una branca fora de la jerarquia refs/remotes/ no s'ha eliminat;\n"
 "per a suprimir-la, useu:"
 msgstr[1] ""
-"Nota: Algunes branques fora de la jerarquia refs/remotes/ no s'han eliminat;\n"
+"Nota: Algunes branques fora de la jerarquia refs/remotes/ no s'han "
+"eliminat;\n"
 "per a suprimir-les, useu:"
 
-#: builtin/remote.c:808
+#: builtin/remote.c:809
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "No s'ha pogut eliminar la secció de configuració '%s'"
 
-#: builtin/remote.c:909
+#: builtin/remote.c:910
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " nou (la pròxima obtenció emmagatzemarà a remotes/%s)"
 
-#: builtin/remote.c:912
+#: builtin/remote.c:913
 msgid " tracked"
 msgstr " seguit"
 
-#: builtin/remote.c:914
+#: builtin/remote.c:915
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " estancat (useu 'git remote prune' per a eliminar)"
 
-#: builtin/remote.c:916
+#: builtin/remote.c:917
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:957
+#: builtin/remote.c:958
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "branch.%s.merge no vàlid; no es pot fer «rebase» sobre > 1 branca"
 
-#: builtin/remote.c:965
+#: builtin/remote.c:966
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "es fa «rebase» interactivament sobre el remot %s"
 
-#: builtin/remote.c:966
+#: builtin/remote.c:967
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "es fa «rebase» sobre el remot %s"
 
-#: builtin/remote.c:969
+#: builtin/remote.c:970
 #, c-format
 msgid " merges with remote %s"
 msgstr "es fusiona amb el remot %s"
 
-#: builtin/remote.c:972
+#: builtin/remote.c:973
 #, c-format
 msgid "merges with remote %s"
 msgstr "es fusiona amb el remot %s"
 
-#: builtin/remote.c:975
+#: builtin/remote.c:976
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    i amb el remot %s\n"
 
-#: builtin/remote.c:1018
+#: builtin/remote.c:1019
 msgid "create"
 msgstr "crea"
 
-#: builtin/remote.c:1021
+#: builtin/remote.c:1022
 msgid "delete"
 msgstr "suprimeix"
 
-#: builtin/remote.c:1025
+#: builtin/remote.c:1026
 msgid "up to date"
 msgstr "al dia"
 
-#: builtin/remote.c:1028
+#: builtin/remote.c:1029
 msgid "fast-forwardable"
 msgstr "avanç ràpid possible"
 
-#: builtin/remote.c:1031
+#: builtin/remote.c:1032
 msgid "local out of date"
 msgstr "local no actualitzat"
 
-#: builtin/remote.c:1038
+#: builtin/remote.c:1039
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s força a %-*s (%s)"
 
-#: builtin/remote.c:1041
+#: builtin/remote.c:1042
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s puja a %-*s (%s)"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1046
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s força a %s"
 
-#: builtin/remote.c:1048
+#: builtin/remote.c:1049
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s puja a %s"
 
-#: builtin/remote.c:1116
+#: builtin/remote.c:1117
 msgid "do not query remotes"
 msgstr "no consultis els remots"
 
-#: builtin/remote.c:1143
+#: builtin/remote.c:1144
 #, c-format
 msgid "* remote %s"
 msgstr "* remot %s"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL d'obtenció: %s"
 
-#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297
+#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
 msgid "(no URL)"
 msgstr "(sense URL)"
 
-#. TRANSLATORS: the colon ':' should align with
-#. the one in "  Fetch URL: %s" translation
-#: builtin/remote.c:1156 builtin/remote.c:1158
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#: builtin/remote.c:1160 builtin/remote.c:1162
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL de pujada: %s"
 
-#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164
+#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Branca de HEAD: %s"
 
-#: builtin/remote.c:1160
+#: builtin/remote.c:1164
 msgid "(not queried)"
 msgstr "(no consultat)"
 
-#: builtin/remote.c:1162
+#: builtin/remote.c:1166
 msgid "(unknown)"
 msgstr "(desconegut)"
 
-#: builtin/remote.c:1166
+#: builtin/remote.c:1170
 #, c-format
-msgid "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
-msgstr "  Branca de HEAD (el HEAD remot és ambigu, pot ser un dels següents):\n"
+msgid ""
+"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr ""
+"  Branca de HEAD (el HEAD remot és ambigu, pot ser un dels següents):\n"
 
-#: builtin/remote.c:1178
+#: builtin/remote.c:1182
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Branca remota:%s"
 msgstr[1] "  Branques remotes:%s"
 
-#: builtin/remote.c:1181 builtin/remote.c:1207
+#: builtin/remote.c:1185 builtin/remote.c:1211
 msgid " (status not queried)"
 msgstr " (estat no consultat)"
 
-#: builtin/remote.c:1190
+#: builtin/remote.c:1194
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Branca local configurada per a 'git pull':"
 msgstr[1] "  Branques locals configurades per a 'git pull':"
 
-#: builtin/remote.c:1198
+#: builtin/remote.c:1202
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  'git push' reflectirà les referències locals"
 
-#: builtin/remote.c:1204
+#: builtin/remote.c:1208
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Referència local configurada per a 'git push'%s:"
 msgstr[1] "  Referències locals configurades per a 'git push'%s:"
 
-#: builtin/remote.c:1225
+#: builtin/remote.c:1229
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "estableix refs/remotes/<name>/HEAD segons el remot"
 
-#: builtin/remote.c:1227
+#: builtin/remote.c:1231
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "suprimeix refs/remotes/<name>/HEAD"
 
-#: builtin/remote.c:1242
+#: builtin/remote.c:1246
 msgid "Cannot determine remote HEAD"
 msgstr "No es pot determinar el HEAD remot"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1248
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
-msgstr "Múltiples branques de HEAD remotes. Si us plau, trieu-ne una explícitament amb:"
+msgstr ""
+"Múltiples branques de HEAD remotes. Si us plau, trieu-ne una explícitament "
+"amb:"
 
-#: builtin/remote.c:1254
+#: builtin/remote.c:1258
 #, c-format
 msgid "Could not delete %s"
 msgstr "No s'ha pogut suprimir %s"
 
-#: builtin/remote.c:1262
+#: builtin/remote.c:1266
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "No és una referència vàlida: %s"
 
-#: builtin/remote.c:1264
+#: builtin/remote.c:1268
 #, c-format
 msgid "Could not setup %s"
 msgstr "No s'ha pogut configurar %s"
 
-#: builtin/remote.c:1282
+#: builtin/remote.c:1286
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s es tornarà penjant!"
 
-#: builtin/remote.c:1283
+#: builtin/remote.c:1287
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s s'ha tornat penjant!"
 
-#: builtin/remote.c:1293
+#: builtin/remote.c:1297
 #, c-format
 msgid "Pruning %s"
 msgstr "S'està podant %s"
 
-#: builtin/remote.c:1294
+#: builtin/remote.c:1298
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1314
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [podaria] %s"
 
-#: builtin/remote.c:1313
+#: builtin/remote.c:1317
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [podat] %s"
 
-#: builtin/remote.c:1358
+#: builtin/remote.c:1362
 msgid "prune remotes after fetching"
 msgstr "poda els remots després d'obtenir-los"
 
-#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
 #, c-format
 msgid "No such remote '%s'"
 msgstr "No hi ha tal remot '%s'"
 
-#: builtin/remote.c:1437
+#: builtin/remote.c:1441
 msgid "add branch"
 msgstr "afegeix branca"
 
-#: builtin/remote.c:1444
+#: builtin/remote.c:1448
 msgid "no remote specified"
 msgstr "cap remot especificat"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1465
 msgid "query push URLs rather than fetch URLs"
 msgstr "consulta els URL de pujada en lloc dels URL d'obtenció"
 
-#: builtin/remote.c:1463
+#: builtin/remote.c:1467
 msgid "return all URLs"
 msgstr "retorna tots els URL"
 
-#: builtin/remote.c:1491
+#: builtin/remote.c:1495
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "cap URL configurat per al remot '%s'"
 
-#: builtin/remote.c:1517
+#: builtin/remote.c:1521
 msgid "manipulate push URLs"
 msgstr "manipula els URL de pujada"
 
-#: builtin/remote.c:1519
+#: builtin/remote.c:1523
 msgid "add URL"
 msgstr "afegeix URL"
 
-#: builtin/remote.c:1521
+#: builtin/remote.c:1525
 msgid "delete URLs"
 msgstr "suprimeix URLs"
 
-#: builtin/remote.c:1528
+#: builtin/remote.c:1532
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete no té sentit"
 
-#: builtin/remote.c:1569
+#: builtin/remote.c:1573
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Patró d'URL antic no vàlid: %s"
 
-#: builtin/remote.c:1577
+#: builtin/remote.c:1581
 #, c-format
 msgid "No such URL found: %s"
 msgstr "No s'ha trobat tal URL: %s"
 
-#: builtin/remote.c:1579
+#: builtin/remote.c:1583
 msgid "Will not delete all non-push URLs"
 msgstr "No se suprimiran tots els URL no de pujada"
 
-#: builtin/remote.c:1593
+#: builtin/remote.c:1597
 msgid "be verbose; must be placed before a subcommand"
 msgstr "sigues detallat; s'ha de col·locar abans d'una subordre"
 
-#: builtin/remote.c:1624
+#: builtin/remote.c:1628
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Subordre desconeguda: %s"
 
-#: builtin/repack.c:17
+#: builtin/repack.c:18
 msgid "git repack [<options>]"
 msgstr "git repack [<opcions>]"
 
-#: builtin/repack.c:22
+#: builtin/repack.c:23
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
 msgstr ""
 
-#: builtin/repack.c:166
+#: builtin/repack.c:168
 msgid "pack everything in a single pack"
 msgstr "empaqueta-ho tot en un únic paquet"
 
-#: builtin/repack.c:168
+#: builtin/repack.c:170
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "el mateix que -a, i solta els objectes inabastables"
 
-#: builtin/repack.c:171
+#: builtin/repack.c:173
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "elimina els paquets redundants, i executeu git-prune-packed"
 
-#: builtin/repack.c:173
+#: builtin/repack.c:175
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "passa --no-reuse-delta a git-pack-objects"
 
-#: builtin/repack.c:175
+#: builtin/repack.c:177
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "passa --no-reuse-object a git-pack-objects"
 
-#: builtin/repack.c:177
+#: builtin/repack.c:179
 msgid "do not run git-update-server-info"
 msgstr "no executis git-update-server-info"
 
-#: builtin/repack.c:180
+#: builtin/repack.c:182
 msgid "pass --local to git-pack-objects"
 msgstr "passa --local a git-pack-objects"
 
-#: builtin/repack.c:182
+#: builtin/repack.c:184
 msgid "write bitmap index"
 msgstr "escriu índex de mapa de bits"
 
-#: builtin/repack.c:183
+#: builtin/repack.c:185
 msgid "approxidate"
 msgstr "data aproximada"
 
-#: builtin/repack.c:184
+#: builtin/repack.c:186
 msgid "with -A, do not loosen objects older than this"
 msgstr "amb -A, no soltis els objectes més vells que aquest"
 
-#: builtin/repack.c:186
+#: builtin/repack.c:188
 msgid "with -a, repack unreachable objects"
 msgstr "amb -a, reempaqueta els objectes inabastables"
 
-#: builtin/repack.c:188
+#: builtin/repack.c:190
 msgid "size of the window used for delta compression"
 msgstr "mida de la finestra que s'usa per a compressió de diferències"
 
-#: builtin/repack.c:189 builtin/repack.c:193
+#: builtin/repack.c:191 builtin/repack.c:197
 msgid "bytes"
 msgstr "octets"
 
-#: builtin/repack.c:190
+#: builtin/repack.c:192
 msgid "same as the above, but limit memory size instead of entries count"
-msgstr "el mateix que l'anterior, però limita la mida de memòria en lloc del nombre d'entrades"
+msgstr ""
+"el mateix que l'anterior, però limita la mida de memòria en lloc del nombre "
+"d'entrades"
 
-#: builtin/repack.c:192
+#: builtin/repack.c:194
 msgid "limits the maximum delta depth"
 msgstr "limita la profunditat màxima de les diferències"
 
-#: builtin/repack.c:194
+#: builtin/repack.c:196
+#, fuzzy
+msgid "limits the maximum number of threads"
+msgstr "limita la profunditat màxima de les diferències"
+
+#: builtin/repack.c:198
 msgid "maximum size of each packfile"
 msgstr "mida màxima de cada fitxer de paquet"
 
-#: builtin/repack.c:196
+#: builtin/repack.c:200
 msgid "repack objects in packs marked with .keep"
 msgstr "reempaqueta els objectes en paquets marcats amb .keep"
 
-#: builtin/repack.c:206
+#: builtin/repack.c:210
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "no es pot suprimir paquets en un dipòsit d'objectes preciosos"
 
-#: builtin/repack.c:210
+#: builtin/repack.c:214
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable i -A són incompatibles"
 
-#: builtin/repack.c:400 builtin/worktree.c:115
+#: builtin/repack.c:406 builtin/worktree.c:116
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "s'ha produït un error en eliminar '%s'"
 
-#: builtin/replace.c:19
+#: builtin/replace.c:20
 msgid "git replace [-f] <object> <replacement>"
 msgstr "git replace [-f] <objecte> <reemplaçament>"
 
-#: builtin/replace.c:20
+#: builtin/replace.c:21
 msgid "git replace [-f] --edit <object>"
 msgstr "git replace [-f] --edit <objecte>"
 
-#: builtin/replace.c:21
+#: builtin/replace.c:22
 msgid "git replace [-f] --graft <commit> [<parent>...]"
 msgstr "git replace [-f] --graft <comissió> [<mare>...]"
 
-#: builtin/replace.c:22
+#: builtin/replace.c:23
 msgid "git replace -d <object>..."
 msgstr "git replace -d <objecte>..."
 
-#: builtin/replace.c:23
+#: builtin/replace.c:24
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr "git replace [--format=<format>] [-l [<patró>]]"
 
-#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396
+#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
 #, c-format
 msgid "Not a valid object name: '%s'"
 msgstr "No és un nom d'objecte vàlid: '%s'"
 
-#: builtin/replace.c:360
+#: builtin/replace.c:361
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "etiqueta de fusió dolenta en la comissió '%s'"
 
-#: builtin/replace.c:362
+#: builtin/replace.c:363
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "etiqueta de fusió mal formada en la comissió '%s'"
 
-#: builtin/replace.c:373
+#: builtin/replace.c:374
 #, c-format
 msgid ""
-"original commit '%s' contains mergetag '%s' that is discarded; use --edit instead of --graft"
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
 msgstr ""
-"la comissió original '%s' conté l'etiqueta de fusió '%s' que es descarta; useu --edit en lloc de "
-"--graft"
+"la comissió original '%s' conté l'etiqueta de fusió '%s' que es descarta; "
+"useu --edit en lloc de --graft"
 
-#: builtin/replace.c:406
+#: builtin/replace.c:407
 #, c-format
 msgid "the original commit '%s' has a gpg signature."
 msgstr "la comissió original '%s' té una signatura gpg."
 
-#: builtin/replace.c:407
+#: builtin/replace.c:408
 msgid "the signature will be removed in the replacement commit!"
 msgstr "s'eliminarà la signatura en la comissió de reemplaçament!"
 
-#: builtin/replace.c:413
+#: builtin/replace.c:414
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "no s'ha pogut escriure la comissió de reemplaçament per a: '%s'"
 
-#: builtin/replace.c:437
+#: builtin/replace.c:438
 msgid "list replace refs"
 msgstr "llista les referències reemplaçades"
 
-#: builtin/replace.c:438
+#: builtin/replace.c:439
 msgid "delete replace refs"
 msgstr "suprimeix les referències reemplaçades"
 
-#: builtin/replace.c:439
+#: builtin/replace.c:440
 msgid "edit existing object"
 msgstr "edita un objecte existent"
 
-#: builtin/replace.c:440
+#: builtin/replace.c:441
 msgid "change a commit's parents"
 msgstr "canvia les mares d'una comissió"
 
-#: builtin/replace.c:441
+#: builtin/replace.c:442
 msgid "replace the ref if it exists"
 msgstr "reemplaça la referència si existeix"
 
-#: builtin/replace.c:442
+#: builtin/replace.c:443
 msgid "do not pretty-print contents for --edit"
 msgstr "no imprimeixis bellament els continguts per a --edit"
 
-#: builtin/replace.c:443
+#: builtin/replace.c:444
 msgid "use this format"
 msgstr "usa aquest format"
 
-#: builtin/rerere.c:12
+#: builtin/rerere.c:13
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr "git rerere [clear | forget <camí>... | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:58
+#: builtin/rerere.c:59
 msgid "register clean resolutions in index"
 msgstr "registra les resolucions netes en l'índex"
 
-#: builtin/reset.c:26
-msgid "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
-msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<comissió>]"
+#: builtin/reset.c:29
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<comissió>]"
 
-#: builtin/reset.c:27
+#: builtin/reset.c:30
 msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
 msgstr "git reset [-q] [<arbre>] [--] <camins>..."
 
-#: builtin/reset.c:28
+#: builtin/reset.c:31
 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
 msgstr "git reset --patch [<arbre>] [--] [<camins>...]"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:37
 msgid "mixed"
 msgstr "mixt"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:37
 msgid "soft"
 msgstr "suau"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:37
 msgid "hard"
 msgstr "dur"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:37
 msgid "merge"
 msgstr "fusió"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:37
 msgid "keep"
 msgstr "reteniment"
 
-#: builtin/reset.c:74
+#: builtin/reset.c:77
 msgid "You do not have a valid HEAD."
 msgstr "No teniu un HEAD vàlid."
 
-#: builtin/reset.c:76
+#: builtin/reset.c:79
 msgid "Failed to find tree of HEAD."
 msgstr "S'ha produït un error en trobar l'arbre de HEAD."
 
-#: builtin/reset.c:82
+#: builtin/reset.c:85
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "S'ha produït un error en cercar l'arbre de %s."
 
-#: builtin/reset.c:100
+#: builtin/reset.c:103
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD ara és a %s"
 
-#: builtin/reset.c:183
+#: builtin/reset.c:186
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "No es pot fer un restabliment de %s enmig d'una fusió."
 
-#: builtin/reset.c:276
+#: builtin/reset.c:286
 msgid "be quiet, only report errors"
 msgstr "sigues silenciós, només informa d'errors"
 
-#: builtin/reset.c:278
+#: builtin/reset.c:288
 msgid "reset HEAD and index"
 msgstr "restableix HEAD i l'índex"
 
-#: builtin/reset.c:279
+#: builtin/reset.c:289
 msgid "reset only HEAD"
 msgstr "restableix només HEAD"
 
-#: builtin/reset.c:281 builtin/reset.c:283
+#: builtin/reset.c:291 builtin/reset.c:293
 msgid "reset HEAD, index and working tree"
 msgstr "restableix HEAD, l'índex i l'arbre de treball"
 
-#: builtin/reset.c:285
+#: builtin/reset.c:295
 msgid "reset HEAD but keep local changes"
 msgstr "restableix HEAD però retén els canvis locals"
 
-#: builtin/reset.c:288
+#: builtin/reset.c:301
 msgid "record only the fact that removed paths will be added later"
 msgstr "registra només el fet de que els camins eliminats s'afegiran després"
 
-#: builtin/reset.c:305
+#: builtin/reset.c:320
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "S'ha produït un error en resoldre '%s' com a revisió vàlida."
 
-#: builtin/reset.c:313
+#: builtin/reset.c:328
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "S'ha produït un error en resoldre '%s' com a arbre vàlid."
 
-#: builtin/reset.c:322
+#: builtin/reset.c:337
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch és incompatible amb --{hard,mixed,soft}"
 
-#: builtin/reset.c:331
+#: builtin/reset.c:346
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
-msgstr "--mixed amb camins està en desús; useu 'git reset -- <camins>' en lloc d'això."
+msgstr ""
+"--mixed amb camins està en desús; useu 'git reset -- <camins>' en lloc "
+"d'això."
 
-#: builtin/reset.c:333
+#: builtin/reset.c:348
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "No es pot restablir de %s amb camins."
 
-#: builtin/reset.c:343
+#: builtin/reset.c:358
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "el restabliment de %s no es permet en un dipòsit nu"
 
-#: builtin/reset.c:347
+#: builtin/reset.c:362
 msgid "-N can only be used with --mixed"
 msgstr "-N només es pot usar amb --mixed"
 
-#: builtin/reset.c:364
+#: builtin/reset.c:379
 msgid "Unstaged changes after reset:"
 msgstr "Canvis «unstaged» després del restabliment:"
 
-#: builtin/reset.c:370
+#: builtin/reset.c:385
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "No s'ha pogut restablir el fitxer d'índex a la revisió '%s'."
 
-#: builtin/reset.c:374
+#: builtin/reset.c:389
 msgid "Could not write new index file."
 msgstr "No s'ha pogut escriure el fitxer d'índex nou."
 
-#: builtin/rev-list.c:354
+#: builtin/rev-list.c:358
 msgid "rev-list does not support display of notes"
 msgstr "el rev-list no permet mostrar notes"
 
-#: builtin/rev-parse.c:393
+#: builtin/rev-parse.c:394
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<opcions>] -- [<paràmetres>...]"
 
-#: builtin/rev-parse.c:398
+#: builtin/rev-parse.c:399
 msgid "keep the `--` passed as an arg"
 msgstr "retén el `--` passat com a paràmetre"
 
-#: builtin/rev-parse.c:400
+#: builtin/rev-parse.c:401
 msgid "stop parsing after the first non-option argument"
 msgstr "deixa d'analitzar després del primer paràmetre no d'opció"
 
-#: builtin/rev-parse.c:403
+#: builtin/rev-parse.c:404
 msgid "output in stuck long form"
 msgstr "emet en forma llarga enganxada"
 
-#: builtin/rev-parse.c:534
+#: builtin/rev-parse.c:535
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12299,98 +12788,99 @@ msgstr ""
 "   or: git rev-parse --sq-quote [<paràmetre>...]\n"
 "   or: git rev-parse [<opcions>] [<paràmetre>...]\n"
 "\n"
-"Executeu \"git rev-parse --parseopt -h\" per més informació sobre l'ús inicial."
+"Executeu \"git rev-parse --parseopt -h\" per més informació sobre l'ús "
+"inicial."
 
-#: builtin/revert.c:22
+#: builtin/revert.c:23
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<opcions>] <comissió>..."
 
-#: builtin/revert.c:23
+#: builtin/revert.c:24
 msgid "git revert <subcommand>"
 msgstr "git revert <subordre>"
 
-#: builtin/revert.c:28
+#: builtin/revert.c:29
 msgid "git cherry-pick [<options>] <commit-ish>..."
 msgstr "git cherry-pick [<opcions>] <comissió>..."
 
-#: builtin/revert.c:29
+#: builtin/revert.c:30
 msgid "git cherry-pick <subcommand>"
 msgstr "git cherry-pick <subordre>"
 
-#: builtin/revert.c:89
+#: builtin/revert.c:90
 #, c-format
 msgid "%s: %s cannot be used with %s"
 msgstr "%s: %s no es pot usar amb %s"
 
-#: builtin/revert.c:98
+#: builtin/revert.c:99
 msgid "end revert or cherry-pick sequence"
 msgstr "acaba la seqüència de reversió o el «cherry pick»"
 
-#: builtin/revert.c:99
+#: builtin/revert.c:100
 msgid "resume revert or cherry-pick sequence"
 msgstr "reprèn la seqüència de reversió o el «cherry pick»"
 
-#: builtin/revert.c:100
+#: builtin/revert.c:101
 msgid "cancel revert or cherry-pick sequence"
 msgstr "cancel·la la seqüència de reversió o el «cherry pick»"
 
-#: builtin/revert.c:101
+#: builtin/revert.c:102
 msgid "don't automatically commit"
 msgstr "no cometis automàticament"
 
-#: builtin/revert.c:102
+#: builtin/revert.c:103
 msgid "edit the commit message"
 msgstr "edita el missatge de comissió"
 
-#: builtin/revert.c:105
+#: builtin/revert.c:106
 msgid "parent-number"
 msgstr "número del pare"
 
-#: builtin/revert.c:106
+#: builtin/revert.c:107
 msgid "select mainline parent"
 msgstr "selecciona la línia principal del pare"
 
-#: builtin/revert.c:108
+#: builtin/revert.c:109
 msgid "merge strategy"
 msgstr "estratègia de fusió"
 
-#: builtin/revert.c:109
+#: builtin/revert.c:110
 msgid "option"
 msgstr "opció"
 
-#: builtin/revert.c:110
+#: builtin/revert.c:111
 msgid "option for merge strategy"
 msgstr "opció d'estratègia de fusió"
 
-#: builtin/revert.c:119
+#: builtin/revert.c:120
 msgid "append commit name"
 msgstr "nom de la comissió a annexar"
 
-#: builtin/revert.c:121
+#: builtin/revert.c:122
 msgid "preserve initially empty commits"
 msgstr "preserva les comissions inicialment buides"
 
-#: builtin/revert.c:122
+#: builtin/revert.c:123
 msgid "allow commits with empty messages"
 msgstr "permet les comissions amb missatges buits"
 
-#: builtin/revert.c:123
+#: builtin/revert.c:124
 msgid "keep redundant, empty commits"
 msgstr "retén les comissions redundants i buides"
 
-#: builtin/revert.c:211
+#: builtin/revert.c:212
 msgid "revert failed"
 msgstr "la reversió ha fallat"
 
-#: builtin/revert.c:224
+#: builtin/revert.c:225
 msgid "cherry-pick failed"
 msgstr "el «cherry pick» ha fallat"
 
-#: builtin/rm.c:17
+#: builtin/rm.c:18
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<opcions>] [--] <fitxer>..."
 
-#: builtin/rm.c:205
+#: builtin/rm.c:206
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -12404,7 +12894,7 @@ msgstr[1] ""
 "els fitxers següents tenen contingut «stage» diferent d'ambdós\n"
 "el fitxer i el HEAD:"
 
-#: builtin/rm.c:210
+#: builtin/rm.c:211
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -12412,13 +12902,13 @@ msgstr ""
 "\n"
 "(useu -f per a forçar l'eliminació)"
 
-#: builtin/rm.c:214
+#: builtin/rm.c:215
 msgid "the following file has changes staged in the index:"
 msgid_plural "the following files have changes staged in the index:"
 msgstr[0] "el fitxer següent té canvis «staged» en l'índex:"
 msgstr[1] "els fitxers següents tenen canvis «staged» en l'índex:"
 
-#: builtin/rm.c:218 builtin/rm.c:227
+#: builtin/rm.c:219 builtin/rm.c:228
 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
@@ -12426,29 +12916,29 @@ msgstr ""
 "\n"
 "(useu --cached per a retenir el fitxer, o -f per a forçar l'eliminació)"
 
-#: builtin/rm.c:224
+#: builtin/rm.c:225
 msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] "el fitxer següent té modificacions locals:"
 msgstr[1] "els fitxers següents tenen modificacions locals:"
 
-#: builtin/rm.c:242
+#: builtin/rm.c:243
 msgid "do not list removed files"
 msgstr "no llistis els fitxers eliminats"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:244
 msgid "only remove from the index"
 msgstr "només elimina de l'índex"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "override the up-to-date check"
 msgstr "passa per alt la comprovació d'actualitat"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "allow recursive removal"
 msgstr "permet l'eliminació recursiva"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "exit with a zero status even if nothing matched"
 msgstr "surt amb estat zero encara que res hagi coincidit"
 
@@ -12467,61 +12957,64 @@ msgstr "git rm: no s'ha pogut eliminar %s"
 msgid "could not remove '%s'"
 msgstr "no s'ha pogut suprimir '%s'"
 
-#: builtin/send-pack.c:18
+#: builtin/send-pack.c:19
 msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--"
-"verbose] [--thin] [--atomic] [<host>:]<directory> [<ref>...]\n"
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
+"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
+"[<ref>...]\n"
 "  --all and explicit <ref> specification are mutually exclusive."
 msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<paquet-del-git-receive>] "
-"[--verbose] [--thin] [--atomic] [<màquina>:]<directori> [<referència>...]\n"
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-"
+"pack=<paquet-del-git-receive>] [--verbose] [--thin] [--atomic] "
+"[<màquina>:]<directori> [<referència>...]\n"
 "  --all i especificació <referència> explícita són mutualment exclusius."
 
-#: builtin/send-pack.c:161
+#: builtin/send-pack.c:162
 msgid "remote name"
 msgstr "nom del remot"
 
-#: builtin/send-pack.c:175
+#: builtin/send-pack.c:176
 msgid "use stateless RPC protocol"
 msgstr "usa el protocol RPC sense estat"
 
-#: builtin/send-pack.c:176
+#: builtin/send-pack.c:177
 msgid "read refs from stdin"
 msgstr "llegeix les referències des d'stdin"
 
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:178
 msgid "print status from remote helper"
 msgstr "imprimeix l'estat des de l'ajudant remot"
 
-#: builtin/shortlog.c:13
+#: builtin/shortlog.c:14
 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
 msgstr "git shortlog [<opcions>] [<rang-de-revisions>] [[--] [<camí>...]]"
 
-#: builtin/shortlog.c:248
+#: builtin/shortlog.c:249
 msgid "Group by committer rather than author"
 msgstr ""
 
-#: builtin/shortlog.c:250
+#: builtin/shortlog.c:251
 msgid "sort output according to the number of commits per author"
 msgstr "ordena la sortida segons el nombre de comissions per autor"
 
-#: builtin/shortlog.c:252
+#: builtin/shortlog.c:253
 msgid "Suppress commit descriptions, only provides commit count"
-msgstr "Omet les descripcions de comissió, només proveeix el recompte de comissions"
+msgstr ""
+"Omet les descripcions de comissió, només proveeix el recompte de comissions"
 
-#: builtin/shortlog.c:254
+#: builtin/shortlog.c:255
 msgid "Show the email address of each author"
 msgstr "Mostra l'adreça de correu electrònic de cada autor"
 
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:256
 msgid "w[,i1[,i2]]"
 msgstr "w[,i1[,i2]]"
 
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:257
 msgid "Linewrap output"
 msgstr "Ajusta les línies de la sortida"
 
-#: builtin/show-branch.c:10
+#: builtin/show-branch.c:12
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -12533,134 +13026,136 @@ msgstr ""
 "\t\t       [--more=<n> | --list | --independent | --merge-base]\n"
 "\t\t       [--no-name | --sha1-name] [--topics] [(<revisió> | <glob>)...]"
 
-#: builtin/show-branch.c:14
+#: builtin/show-branch.c:16
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
 msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referència>]"
 
-#: builtin/show-branch.c:374
+#: builtin/show-branch.c:376
 #, c-format
 msgid "ignoring %s; cannot handle more than %d ref"
 msgid_plural "ignoring %s; cannot handle more than %d refs"
 msgstr[0] "s'està ignorant %s; no es pot gestionar més de %d referència"
 msgstr[1] "s'està ignorant %s; no es poden gestionar més de %d referències"
 
-#: builtin/show-branch.c:536
+#: builtin/show-branch.c:530
 #, c-format
 msgid "no matching refs with %s"
 msgstr "no hi ha referències coincidents amb %s"
 
-#: builtin/show-branch.c:632
+#: builtin/show-branch.c:626
 msgid "show remote-tracking and local branches"
 msgstr "mostra les branques amb seguiment remot i les locals"
 
-#: builtin/show-branch.c:634
+#: builtin/show-branch.c:628
 msgid "show remote-tracking branches"
 msgstr "mostra les branques amb seguiment remot"
 
-#: builtin/show-branch.c:636
+#: builtin/show-branch.c:630
 msgid "color '*!+-' corresponding to the branch"
 msgstr "colora '*!+-' corresponent a la branca"
 
-#: builtin/show-branch.c:638
+#: builtin/show-branch.c:632
 msgid "show <n> more commits after the common ancestor"
 msgstr "mostra <n> comissions després de l'avantpassat comú"
 
-#: builtin/show-branch.c:640
+#: builtin/show-branch.c:634
 msgid "synonym to more=-1"
 msgstr "sinònim de more=-1"
 
-#: builtin/show-branch.c:641
+#: builtin/show-branch.c:635
 msgid "suppress naming strings"
 msgstr "omet l'anomenar cadenes"
 
-#: builtin/show-branch.c:643
+#: builtin/show-branch.c:637
 msgid "include the current branch"
 msgstr "inclou la branca actual"
 
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:639
 msgid "name commits with their object names"
 msgstr "anomena les comissions amb els seus noms d'objecte"
 
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:641
 msgid "show possible merge bases"
 msgstr "mostra les bases de fusió possibles"
 
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:643
 msgid "show refs unreachable from any other ref"
 msgstr "mostra les referències inabastables de qualsevol altra referència"
 
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:645
 msgid "show commits in topological order"
 msgstr "mostra les comissions en ordre topològic"
 
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:648
 msgid "show only commits not on the first branch"
 msgstr "mostra només les comissions que no siguin en la primera branca"
 
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:650
 msgid "show merges reachable from only one tip"
 msgstr "mostra les fusions abastables de només una punta"
 
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:652
 msgid "topologically sort, maintaining date order where possible"
 msgstr "ordena topològicament, mantenint l'ordre de dates on sigui possible"
 
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:655
 msgid "<n>[,<base>]"
 msgstr "<n>[,<base>]"
 
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:656
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "mostra les <n> entrades més recents començant a la base"
 
-#: builtin/show-branch.c:696
-msgid "--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr "--reflog és incompatible amb --all, --remotes, --independent o --merge-base"
+#: builtin/show-branch.c:690
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr ""
+"--reflog és incompatible amb --all, --remotes, --independent o --merge-base"
 
-#: builtin/show-branch.c:720
+#: builtin/show-branch.c:714
 msgid "no branches given, and HEAD is not valid"
 msgstr "no s'ha donat cap branca, i HEAD no és vàlid"
 
-#: builtin/show-branch.c:723
+#: builtin/show-branch.c:717
 msgid "--reflog option needs one branch name"
 msgstr "l'opció --reflog necessita un nom de branca"
 
-#: builtin/show-branch.c:726
+#: builtin/show-branch.c:720
 #, c-format
 msgid "only %d entry can be shown at one time."
 msgid_plural "only %d entries can be shown at one time."
 msgstr[0] "es pot mostrar només %d entrada a la vegada."
 msgstr[1] "es poden mostrar només %d entrades a la vegada."
 
-#: builtin/show-branch.c:730
+#: builtin/show-branch.c:724
 #, c-format
 msgid "no such ref %s"
 msgstr "no hi ha tal referència %s"
 
-#: builtin/show-branch.c:814
+#: builtin/show-branch.c:808
 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
 msgstr[0] "no es pot gestionar més d'%d revisió."
 msgstr[1] "no es poden gestionar més de %d revisions."
 
-#: builtin/show-branch.c:818
+#: builtin/show-branch.c:812
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "'%s' no és una referència vàlida."
 
-#: builtin/show-branch.c:821
+#: builtin/show-branch.c:815
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "no es pot trobar la comissió %s (%s)"
 
 #: builtin/show-ref.c:10
 msgid ""
-"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] [--"
-"abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
 msgstr ""
-"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] [--"
-"abbrev[=<n>]] [--tags] [--heads] [--] [<patró>...]"
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patró>...]"
 
 #: builtin/show-ref.c:11
 msgid "git show-ref --exclude-existing[=<pattern>]"
@@ -12676,7 +13171,9 @@ msgstr "mostra només els caps (es pot combinar amb tags)"
 
 #: builtin/show-ref.c:161
 msgid "stricter reference checking, requires exact ref path"
-msgstr "comprovació de referència més estricta, requereix el camí de referència exacte"
+msgstr ""
+"comprovació de referència més estricta, requereix el camí de referència "
+"exacte"
 
 #: builtin/show-ref.c:164 builtin/show-ref.c:166
 msgid "show the HEAD reference, even if it would be filtered out"
@@ -12698,33 +13195,34 @@ msgstr "no imprimeixis els resultats a stdout (útil amb --verify)"
 msgid "show refs from stdin that aren't in local repository"
 msgstr "mostra les referències d'stdin que no siguin en el dipòsit local"
 
-#: builtin/stripspace.c:17
+#: builtin/stripspace.c:18
 msgid "git stripspace [-s | --strip-comments]"
 msgstr "git stripspace [-s | --strip-comments]"
 
-#: builtin/stripspace.c:18
+#: builtin/stripspace.c:19
 msgid "git stripspace [-c | --comment-lines]"
 msgstr "git stripspace [-c | --comment-lines]"
 
-#: builtin/stripspace.c:35
+#: builtin/stripspace.c:36
 msgid "skip and remove all lines starting with comment character"
-msgstr "omet i elimina totes les línies que comencin amb el caràcter de comentari"
+msgstr ""
+"omet i elimina totes les línies que comencin amb el caràcter de comentari"
 
-#: builtin/stripspace.c:38
+#: builtin/stripspace.c:39
 msgid "prepend comment character and space to each line"
 msgstr "anteposa el caràcter de comentari i un espai a cada línia"
 
-#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
 #, c-format
 msgid "No such ref: %s"
 msgstr "No hi ha tal referència: %s"
 
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "S'espera un nom de referència ple, s'ha rebut %s"
 
-#: builtin/submodule--helper.c:71
+#: builtin/submodule--helper.c:72
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "no es pot despullar un component de l'url '%s'"
@@ -12745,7 +13243,8 @@ msgstr "No s'ha trobat cap url per al camí de submòdul '%s' a .gitmodules"
 #: builtin/submodule--helper.c:395
 #, c-format
 msgid ""
-"could not lookup configuration '%s'. Assuming this repository is its own authoritative upstream."
+"could not lookup configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
 msgstr ""
 
 #: builtin/submodule--helper.c:406
@@ -12761,12 +13260,16 @@ msgstr "S'ha registrat el submòdul '%s' (%s) per al camí '%s'\n"
 #: builtin/submodule--helper.c:420
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
-msgstr "advertència: se suggereix el mode d'actualització per ordre per al submòdul '%s'\n"
+msgstr ""
+"advertència: se suggereix el mode d'actualització per ordre per al submòdul "
+"'%s'\n"
 
 #: builtin/submodule--helper.c:427
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
-msgstr "S'ha produït un error en registrar el mode d'actualització per al camí de submòdul '%s'"
+msgstr ""
+"S'ha produït un error en registrar el mode d'actualització per al camí de "
+"submòdul '%s'"
 
 #: builtin/submodule--helper.c:443
 msgid "Suppress output for initializing a submodule"
@@ -12822,11 +13325,11 @@ msgstr "força el progrés del clonatge"
 
 #: builtin/submodule--helper.c:653
 msgid ""
-"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference <repository>] [--name "
-"<name>] [--depth <depth>] --url <url> --path <path>"
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
 msgstr ""
-"git submodule--helper clone [--prefix=<camí>] [--quiet] [--reference <dipòsit>] [--name <nom>] "
-"[--depth <profunditat>] --url <url> --path <camí>"
+"git submodule--helper clone [--prefix=<camí>] [--quiet] [--reference "
+"<dipòsit>] [--name <nom>] [--depth <profunditat>] --url <url> --path <camí>"
 
 #: builtin/submodule--helper.c:684
 #, c-format
@@ -12906,11 +13409,11 @@ msgstr "valor dolent per al paràmetre update"
 #: builtin/submodule--helper.c:1079
 #, c-format
 msgid ""
-"Submodule (%s) branch configured to inherit branch from superproject, but the superproject is "
-"not on any branch"
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
 msgstr ""
-"La branca de submòdul (%s) està configurada per a heretar la branca del superprojecte, però el "
-"superprojecte no és en cap branca"
+"La branca de submòdul (%s) està configurada per a heretar la branca del "
+"superprojecte, però el superprojecte no és en cap branca"
 
 #: builtin/submodule--helper.c:1163
 msgid "recurse into submodules"
@@ -12920,81 +13423,81 @@ msgstr "inclou recursivament als submòduls"
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper embed-git-dir  [<camí>]"
 
-#: builtin/submodule--helper.c:1226
-msgid "submodule--helper subcommand must be called with a subcommand"
-msgstr "s'ha d'executar la subordre submodule--helper amb una subordre"
-
-#: builtin/submodule--helper.c:1233
+#: builtin/submodule--helper.c:1232
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s no admet --super-prefix"
 
-#: builtin/submodule--helper.c:1239
+#: builtin/submodule--helper.c:1238
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' no és una subordre vàlida de submodule--helper"
 
-#: builtin/symbolic-ref.c:7
+#: builtin/symbolic-ref.c:8
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
 msgstr "git symbolic-ref [<opcions>] <nom> [<referència>]"
 
-#: builtin/symbolic-ref.c:8
+#: builtin/symbolic-ref.c:9
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <nom>"
 
-#: builtin/symbolic-ref.c:40
+#: builtin/symbolic-ref.c:41
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr "omet el missatge d'error de referències no simbòliques (separades)"
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:42
 msgid "delete symbolic ref"
 msgstr "suprimeix la referència simbòlica"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:43
 msgid "shorten ref output"
 msgstr "escurça la sortida de referències"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
 msgid "reason"
 msgstr "raó"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
 msgid "reason of the update"
 msgstr "raó de l'actualització"
 
-#: builtin/tag.c:23
-msgid "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> [<head>]"
+#: builtin/tag.c:24
+msgid ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
+"[<head>]"
 msgstr ""
-"git tag [-a | -s | -u <id-de-clau>] [-f] [-m <missatge> | -F <fitxer>] <nom-d'etiqueta> [<cap>]"
+"git tag [-a | -s | -u <id-de-clau>] [-f] [-m <missatge> | -F <fitxer>] <nom-"
+"d'etiqueta> [<cap>]"
 
-#: builtin/tag.c:24
+#: builtin/tag.c:25
 msgid "git tag -d <tagname>..."
 msgstr "git tag -d <nom-d'etiqueta>..."
 
-#: builtin/tag.c:25
+#: builtin/tag.c:26
 msgid ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n"
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <object>]\n"
 "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
 msgstr ""
-"git tag -l [-n[<nombre>]] [--contains <comissió>] [--no-contains <comissió>] [--points-at "
-"<objecte>]\n"
+"git tag -l [-n[<nombre>]] [--contains <comissió>] [--no-contains <comissió>] "
+"[--points-at <objecte>]\n"
 "\t\t[--format=<format>] [--[no-]merged [<comissió>]] [<patró>...]"
 
-#: builtin/tag.c:27
+#: builtin/tag.c:28
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<format>] <nom-d'etiqueta>..."
 
-#: builtin/tag.c:83
+#: builtin/tag.c:84
 #, c-format
 msgid "tag '%s' not found."
 msgstr "no s'ha trobat l'etiqueta '%s'."
 
-#: builtin/tag.c:99
+#: builtin/tag.c:100
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "S'ha suprimit l'etiqueta '%s' (era %s)\n"
 
-#: builtin/tag.c:128
+#: builtin/tag.c:129
 #, c-format
 msgid ""
 "\n"
@@ -13007,605 +13510,626 @@ msgstr ""
 "  %s\n"
 "Les línies que comencin amb '%c' s'ignoraran.\n"
 
-#: builtin/tag.c:132
+#: builtin/tag.c:133
 #, c-format
 msgid ""
 "\n"
 "Write a message for tag:\n"
 "  %s\n"
-"Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n"
+"Lines starting with '%c' will be kept; you may remove them yourself if you "
+"want to.\n"
 msgstr ""
 "\n"
 "Escriviu el missatge de l'etiqueta:\n"
 "  %s\n"
-"Les línies que comencin amb '%c' es retindran; podeu eliminar-les per vós mateix si voleu.\n"
+"Les línies que comencin amb '%c' es retindran; podeu eliminar-les per vós "
+"mateix si voleu.\n"
 
-#: builtin/tag.c:210
+#: builtin/tag.c:211
 msgid "unable to sign the tag"
 msgstr "no s'ha pogut signar l'etiqueta"
 
-#: builtin/tag.c:212
+#: builtin/tag.c:213
 msgid "unable to write tag file"
 msgstr "no s'ha pogut escriure el fitxer d'etiqueta"
 
-#: builtin/tag.c:236
+#: builtin/tag.c:237
 msgid "bad object type."
 msgstr "el tipus d'objecte és dolent."
 
-#: builtin/tag.c:282
+#: builtin/tag.c:283
 msgid "no tag message?"
 msgstr "no hi ha cap missatge d'etiqueta?"
 
-#: builtin/tag.c:289
+#: builtin/tag.c:290
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "S'ha deixat el missatge de l'etiqueta en %s\n"
 
-#: builtin/tag.c:397
+#: builtin/tag.c:398
 msgid "list tag names"
 msgstr "llista els noms d'etiqueta"
 
-#: builtin/tag.c:399
+#: builtin/tag.c:400
 msgid "print <n> lines of each tag message"
 msgstr "imprimeix <n> línies de cada missatge d'etiqueta"
 
-#: builtin/tag.c:401
+#: builtin/tag.c:402
 msgid "delete tags"
 msgstr "suprimeix les etiquetes"
 
-#: builtin/tag.c:402
+#: builtin/tag.c:403
 msgid "verify tags"
 msgstr "verifica les etiquetes"
 
-#: builtin/tag.c:404
+#: builtin/tag.c:405
 msgid "Tag creation options"
 msgstr "Opcions de creació d'etiquetes"
 
-#: builtin/tag.c:406
+#: builtin/tag.c:407
 msgid "annotated tag, needs a message"
 msgstr "etiqueta anotada, necessita un missatge"
 
-#: builtin/tag.c:408
+#: builtin/tag.c:409
 msgid "tag message"
 msgstr "missatge d'etiqueta"
 
-#: builtin/tag.c:410
+#: builtin/tag.c:411
 msgid "annotated and GPG-signed tag"
 msgstr "etiqueta anotada i signada per GPG"
 
-#: builtin/tag.c:414
+#: builtin/tag.c:415
 msgid "use another key to sign the tag"
 msgstr "usa una altra clau per a signar l'etiqueta"
 
-#: builtin/tag.c:415
+#: builtin/tag.c:416
 msgid "replace the tag if exists"
 msgstr "reemplaça l'etiqueta si existeix"
 
-#: builtin/tag.c:416 builtin/update-ref.c:368
+#: builtin/tag.c:417 builtin/update-ref.c:369
 msgid "create a reflog"
 msgstr "crea un registre de referències"
 
-#: builtin/tag.c:418
+#: builtin/tag.c:419
 msgid "Tag listing options"
 msgstr "Opcions de llistat d'etiquetes"
 
-#: builtin/tag.c:419
+#: builtin/tag.c:420
 msgid "show tag list in columns"
 msgstr "mostra la llista d'etiquetes en columnes"
 
-#: builtin/tag.c:420 builtin/tag.c:422
+#: builtin/tag.c:421 builtin/tag.c:423
 msgid "print only tags that contain the commit"
 msgstr "imprimeix només les etiquetes que continguin la comissió"
 
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:422 builtin/tag.c:424
 msgid "print only tags that don't contain the commit"
 msgstr "imprimeix només les etiquetes que no continguin la comissió"
 
-#: builtin/tag.c:424
+#: builtin/tag.c:425
 msgid "print only tags that are merged"
 msgstr "imprimeix només les etiquetes que s'han fusionat"
 
-#: builtin/tag.c:425
+#: builtin/tag.c:426
 msgid "print only tags that are not merged"
 msgstr "imprimeix només les etiquetes que no s'han fusionat"
 
-#: builtin/tag.c:430
+#: builtin/tag.c:431
 msgid "print only tags of the object"
 msgstr "imprimeix només les etiquetes de l'objecte"
 
-#: builtin/tag.c:469
+#: builtin/tag.c:470
 msgid "--column and -n are incompatible"
 msgstr "--column i -n són incompatibles"
 
-#: builtin/tag.c:491
+#: builtin/tag.c:492
 msgid "-n option is only allowed in list mode"
 msgstr "es permet l'opció -n només amb mode llista"
 
-#: builtin/tag.c:493
+#: builtin/tag.c:494
 msgid "--contains option is only allowed in list mode"
 msgstr "es permet l'opció --contains només amb mode llista"
 
-#: builtin/tag.c:495
+#: builtin/tag.c:496
 msgid "--no-contains option is only allowed in list mode"
 msgstr "es permet l'opció --no-contains només amb mode llista"
 
-#: builtin/tag.c:497
+#: builtin/tag.c:498
 msgid "--points-at option is only allowed in list mode"
 msgstr "es permet --points-at option només amb mode llista"
 
-#: builtin/tag.c:499
+#: builtin/tag.c:500
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr "es permeten les opcions --merged i --no-merged només amb mode llista"
 
-#: builtin/tag.c:510
+#: builtin/tag.c:511
 msgid "only one -F or -m option is allowed."
 msgstr "només es permet una opció -F o -m."
 
-#: builtin/tag.c:529
+#: builtin/tag.c:530
 msgid "too many params"
 msgstr "massa paràmetres"
 
-#: builtin/tag.c:535
+#: builtin/tag.c:536
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' no és un nom d'etiqueta vàlid."
 
-#: builtin/tag.c:540
+#: builtin/tag.c:541
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "l'etiqueta '%s' ja existeix"
 
-#: builtin/tag.c:570
+#: builtin/tag.c:571
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Etiqueta '%s' actualitzada (era %s)\n"
 
-#: builtin/unpack-objects.c:493
+#: builtin/unpack-objects.c:494
 msgid "Unpacking objects"
 msgstr "S'estan desempaquetant els objectes"
 
-#: builtin/update-index.c:79
+#: builtin/update-index.c:80
 #, c-format
 msgid "failed to create directory %s"
 msgstr "s'ha produït un error en crear el directori %s"
 
-#: builtin/update-index.c:85
+#: builtin/update-index.c:86
 #, c-format
 msgid "failed to stat %s"
 msgstr "s'ha produït un error en fer stat a %s"
 
-#: builtin/update-index.c:95
+#: builtin/update-index.c:96
 #, c-format
 msgid "failed to create file %s"
 msgstr "s'ha produït un error en crear el fitxer %s"
 
-#: builtin/update-index.c:103
+#: builtin/update-index.c:104
 #, c-format
 msgid "failed to delete file %s"
 msgstr "s'ha produït un error en suprimir el fitxer %s"
 
-#: builtin/update-index.c:110 builtin/update-index.c:216
+#: builtin/update-index.c:111 builtin/update-index.c:217
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "s'ha produït un error en suprimir el directori %s"
 
-#: builtin/update-index.c:135
+#: builtin/update-index.c:136
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "S'està provant mtime en '%s' "
 
-#: builtin/update-index.c:149
+#: builtin/update-index.c:150
 msgid "directory stat info does not change after adding a new file"
-msgstr "la informació d'stat de directori no canvia després d'afegir un fitxer nou"
+msgstr ""
+"la informació d'stat de directori no canvia després d'afegir un fitxer nou"
 
-#: builtin/update-index.c:162
+#: builtin/update-index.c:163
 msgid "directory stat info does not change after adding a new directory"
-msgstr "la informació d'stat de directori no canvia després d'afegir un directori nou"
+msgstr ""
+"la informació d'stat de directori no canvia després d'afegir un directori nou"
 
-#: builtin/update-index.c:175
+#: builtin/update-index.c:176
 msgid "directory stat info changes after updating a file"
-msgstr "la informació d'stat de directori canvia després d'actualitzar un fitxer"
+msgstr ""
+"la informació d'stat de directori canvia després d'actualitzar un fitxer"
 
-#: builtin/update-index.c:186
+#: builtin/update-index.c:187
 msgid "directory stat info changes after adding a file inside subdirectory"
-msgstr "la informació d'stat de directori canvia després d'afegir un fitxer dins d'un subdirectori"
+msgstr ""
+"la informació d'stat de directori canvia després d'afegir un fitxer dins "
+"d'un subdirectori"
 
-#: builtin/update-index.c:197
+#: builtin/update-index.c:198
 msgid "directory stat info does not change after deleting a file"
-msgstr "la informació d'stat de directori no canvia després de suprimir un fitxer"
+msgstr ""
+"la informació d'stat de directori no canvia després de suprimir un fitxer"
 
-#: builtin/update-index.c:210
+#: builtin/update-index.c:211
 msgid "directory stat info does not change after deleting a directory"
-msgstr "la informació d'stat de directori no canvia després de suprimir un directori"
+msgstr ""
+"la informació d'stat de directori no canvia després de suprimir un directori"
 
-#: builtin/update-index.c:217
+#: builtin/update-index.c:218
 msgid " OK"
 msgstr " D'acord"
 
-#: builtin/update-index.c:568
+#: builtin/update-index.c:569
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<opcions>] [--] [<fitxer>...]"
 
-#: builtin/update-index.c:923
+#: builtin/update-index.c:924
 msgid "continue refresh even when index needs update"
-msgstr "continua l'actualització encara que l'índex necessiti una actualització"
+msgstr ""
+"continua l'actualització encara que l'índex necessiti una actualització"
 
-#: builtin/update-index.c:926
+#: builtin/update-index.c:927
 msgid "refresh: ignore submodules"
 msgstr "actualitza: ignora els submòduls"
 
-#: builtin/update-index.c:929
+#: builtin/update-index.c:930
 msgid "do not ignore new files"
 msgstr "no ignoris els fitxers nous"
 
-#: builtin/update-index.c:931
+#: builtin/update-index.c:932
 msgid "let files replace directories and vice-versa"
 msgstr "deixa que els fitxers reemplacin els directoris i viceversa"
 
-#: builtin/update-index.c:933
+#: builtin/update-index.c:934
 msgid "notice files missing from worktree"
 msgstr "tingues en compte els fitxers absents de l'arbre de treball"
 
-#: builtin/update-index.c:935
+#: builtin/update-index.c:936
 msgid "refresh even if index contains unmerged entries"
 msgstr "actualitza encara que l'índex contingui entrades no fusionades"
 
-#: builtin/update-index.c:938
+#: builtin/update-index.c:939
 msgid "refresh stat information"
 msgstr "actualitza la informació d'estadístiques"
 
-#: builtin/update-index.c:942
+#: builtin/update-index.c:943
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "com --refresh, però ignora l'ajust assume-unchanged"
 
-#: builtin/update-index.c:946
+#: builtin/update-index.c:947
 msgid "<mode>,<object>,<path>"
 msgstr "<mode>,<objecte>,<camí>"
 
-#: builtin/update-index.c:947
+#: builtin/update-index.c:948
 msgid "add the specified entry to the index"
 msgstr "afegeix l'entrada especificada a l'índex"
 
-#: builtin/update-index.c:956
+#: builtin/update-index.c:957
 msgid "mark files as \"not changing\""
 msgstr "marca els fitxers com a \"no canviant\""
 
-#: builtin/update-index.c:959
+#: builtin/update-index.c:960
 msgid "clear assumed-unchanged bit"
 msgstr "neteja el bit assumed-unchanged"
 
-#: builtin/update-index.c:962
+#: builtin/update-index.c:963
 msgid "mark files as \"index-only\""
 msgstr "marca els fitxers com a \"només índex\""
 
-#: builtin/update-index.c:965
+#: builtin/update-index.c:966
 msgid "clear skip-worktree bit"
 msgstr "neteja el bit skip-worktree"
 
-#: builtin/update-index.c:968
+#: builtin/update-index.c:969
 msgid "add to index only; do not add content to object database"
-msgstr "només afegeix a l'índex; no afegeixis el contingut a la base de dades d'objectes"
+msgstr ""
+"només afegeix a l'índex; no afegeixis el contingut a la base de dades "
+"d'objectes"
 
-#: builtin/update-index.c:970
+#: builtin/update-index.c:971
 msgid "remove named paths even if present in worktree"
-msgstr "elimina els camins anomenats encara que estiguin presents en l'arbre de treball"
+msgstr ""
+"elimina els camins anomenats encara que estiguin presents en l'arbre de "
+"treball"
 
-#: builtin/update-index.c:972
+#: builtin/update-index.c:973
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "amb --stdin: les línies d'entrada acaben amb octets nuls"
 
-#: builtin/update-index.c:974
+#: builtin/update-index.c:975
 msgid "read list of paths to be updated from standard input"
 msgstr "llegeix la llista de camins a actualitzar des de l'entrada estàndard"
 
-#: builtin/update-index.c:978
+#: builtin/update-index.c:979
 msgid "add entries from standard input to the index"
 msgstr "afegeix les entrades de l'entrada estàndard a l'índex"
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:983
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "reemplena les «stage» #2 i #3 per als camins llistats"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:987
 msgid "only update entries that differ from HEAD"
 msgstr "només actualitza les entrades que difereixin de HEAD"
 
-#: builtin/update-index.c:990
+#: builtin/update-index.c:991
 msgid "ignore files missing from worktree"
 msgstr "ignora els fitxers absents de l'arbre de treball"
 
-#: builtin/update-index.c:993
+#: builtin/update-index.c:994
 msgid "report actions to standard output"
 msgstr "informa de les accions en la sortida estàndard"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:996
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(per a porcellanes) oblida't dels conflictes no resolts ni desats"
 
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1000
 msgid "write index in this format"
 msgstr "escriu l'índex en aquest format"
 
-#: builtin/update-index.c:1001
+#: builtin/update-index.c:1002
 msgid "enable or disable split index"
 msgstr "habilita o inhabilita l'índex dividit"
 
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1004
 msgid "enable/disable untracked cache"
 msgstr "habilita/inhabilita la memòria cau no seguida"
 
-#: builtin/update-index.c:1005
+#: builtin/update-index.c:1006
 msgid "test if the filesystem supports untracked cache"
 msgstr "prova si el sistema de fitxers admet la memòria cau no seguida"
 
-#: builtin/update-index.c:1007
+#: builtin/update-index.c:1008
 msgid "enable untracked cache without testing the filesystem"
 msgstr "habilita la memòria cau no seguida sense provar el sistema de fitxers"
 
-#: builtin/update-index.c:1107
+#: builtin/update-index.c:1108
 msgid ""
-"core.splitIndex is set to false; remove or change it, if you really want to enable split index"
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
 msgstr ""
-"core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment voleu habilitar "
-"l'índex dividit"
+"core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment "
+"voleu habilitar l'índex dividit"
 
-#: builtin/update-index.c:1116
+#: builtin/update-index.c:1117
 msgid ""
-"core.splitIndex is set to true; remove or change it, if you really want to disable split index"
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
 msgstr ""
-"core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment voleu inhabilitar "
-"l'índex dividit"
+"core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment "
+"voleu inhabilitar l'índex dividit"
 
-#: builtin/update-index.c:1127
+#: builtin/update-index.c:1128
+#, fuzzy
 msgid ""
-"core.untrackedCache is set to true; remove or change it, if you e want to disable the untracked "
-"cache"
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
 msgstr ""
-"core.untrackedCache està establert a cert; elimineu-lo o canvieu-lo, si realment voleu "
-"inhabilitar el cau no seguit"
+"core.untrackedCache està establert a cert; elimineu-lo o canvieu-lo, si "
+"realment voleu inhabilitar el cau no seguit"
 
-#: builtin/update-index.c:1131
+#: builtin/update-index.c:1132
 msgid "Untracked cache disabled"
 msgstr "La memòria cau no seguida està inhabilitada"
 
-#: builtin/update-index.c:1139
+#: builtin/update-index.c:1140
 msgid ""
-"core.untrackedCache is set to false; remove or change it, if you really want to enable the "
-"untracked cache"
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
 msgstr ""
-"core.untrackedCache està establert a fals; elimineu-lo o canviar-lo, si realment voleu habilitar "
-"el cau no seguit"
+"core.untrackedCache està establert a fals; elimineu-lo o canviar-lo, si "
+"realment voleu habilitar el cau no seguit"
 
-#: builtin/update-index.c:1143
+#: builtin/update-index.c:1144
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "La memòria cau no seguida està habilitada per a '%s'"
 
-#: builtin/update-ref.c:9
+#: builtin/update-ref.c:10
 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
 msgstr "git update-ref [<opcions>] -d <nom-de-referència> [<valor-antic>]"
 
-#: builtin/update-ref.c:10
+#: builtin/update-ref.c:11
 msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
-msgstr "git update-ref [<opcions>]    <nom-de-referència> <valor-nou> [<valor-antic>]"
+msgstr ""
+"git update-ref [<opcions>]    <nom-de-referència> <valor-nou> [<valor-antic>]"
 
-#: builtin/update-ref.c:11
+#: builtin/update-ref.c:12
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<opcions>] --stdin [-z]"
 
-#: builtin/update-ref.c:363
+#: builtin/update-ref.c:364
 msgid "delete the reference"
 msgstr "suprimeix la referència"
 
-#: builtin/update-ref.c:365
+#: builtin/update-ref.c:366
 msgid "update <refname> not the one it points to"
 msgstr "actualitza <nom de referència>, no la que assenyali"
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:367
 msgid "stdin has NUL-terminated arguments"
 msgstr "stdin té paràmetres acabats amb NUL"
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:368
 msgid "read updates from stdin"
 msgstr "llegeix les actualitzacions des d'stdin"
 
-#: builtin/update-server-info.c:6
+#: builtin/update-server-info.c:7
 msgid "git update-server-info [--force]"
 msgstr "git update-server-info [--force]"
 
-#: builtin/update-server-info.c:14
+#: builtin/update-server-info.c:15
 msgid "update the info files from scratch"
 msgstr "actualitza els fitxers d'informació des de zero"
 
-#: builtin/verify-commit.c:17
+#: builtin/verify-commit.c:18
 msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr "git verify-commit [-v | --verbose] <comissió>..."
 
-#: builtin/verify-commit.c:72
+#: builtin/verify-commit.c:73
 msgid "print commit contents"
 msgstr "imprimeix els continguts de la comissió"
 
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:37
+#: builtin/verify-commit.c:74 builtin/verify-tag.c:38
 msgid "print raw gpg status output"
 msgstr "imprimeix la sortida crua de l'estat gpg"
 
-#: builtin/verify-pack.c:54
+#: builtin/verify-pack.c:55
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paquet>..."
 
-#: builtin/verify-pack.c:64
+#: builtin/verify-pack.c:65
 msgid "verbose"
 msgstr "detallat"
 
-#: builtin/verify-pack.c:66
+#: builtin/verify-pack.c:67
 msgid "show statistics only"
 msgstr "mostra només estadístiques"
 
-#: builtin/verify-tag.c:18
+#: builtin/verify-tag.c:19
 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
 msgstr "git verify-tag [-v | --verbose] [--format=<format>] <etiqueta>..."
 
-#: builtin/verify-tag.c:36
+#: builtin/verify-tag.c:37
 msgid "print tag contents"
 msgstr "imprimeix els continguts de l'etiqueta"
 
-#: builtin/worktree.c:15
+#: builtin/worktree.c:16
 msgid "git worktree add [<options>] <path> [<branch>]"
 msgstr "git worktree add [<opcions>] <camí> [<branca>]"
 
-#: builtin/worktree.c:16
+#: builtin/worktree.c:17
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<opcions>]"
 
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<opcions>] <camí>"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<opcions>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <camí>"
 
-#: builtin/worktree.c:43
+#: builtin/worktree.c:44
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Eliminació de worktrees/%s: no és un directori vàlid"
 
-#: builtin/worktree.c:49
+#: builtin/worktree.c:50
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Eliminació de worktrees/%s: el fitxer gitdir no existeix"
 
-#: builtin/worktree.c:54
+#: builtin/worktree.c:55
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "Eliminació de worktrees/%s: no s'ha pogut llegir el fitxer gitdir (%s)"
 
-#: builtin/worktree.c:65
+#: builtin/worktree.c:66
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Eliminació de worktrees/%s: fitxer gitdir no vàlid"
 
-#: builtin/worktree.c:81
+#: builtin/worktree.c:82
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr "Eliminació de worktrees/%s: el fitxer gitdir es refereix a una ubicació no existent"
+msgstr ""
+"Eliminació de worktrees/%s: el fitxer gitdir es refereix a una ubicació no "
+"existent"
 
-#: builtin/worktree.c:128
+#: builtin/worktree.c:129
 msgid "report pruned working trees"
 msgstr "informa dels arbres de treball podats"
 
-#: builtin/worktree.c:130
+#: builtin/worktree.c:131
 msgid "expire working trees older than <time>"
 msgstr "fes caducar els arbres de treball més vells que <hora>"
 
-#: builtin/worktree.c:204
+#: builtin/worktree.c:205
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' ja existeix"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:236
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "no s'ha pogut crear directori de '%s'"
 
-#: builtin/worktree.c:274
+#: builtin/worktree.c:275
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "S'està preparant %s (identificador %s)"
 
-#: builtin/worktree.c:328
+#: builtin/worktree.c:327
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "agafa <branca> encara que sigui agafada en altre arbre de treball"
 
-#: builtin/worktree.c:330
+#: builtin/worktree.c:329
 msgid "create a new branch"
 msgstr "crea una branca nova"
 
-#: builtin/worktree.c:332
+#: builtin/worktree.c:331
 msgid "create or reset a branch"
 msgstr "crea o restableix una branca"
 
-#: builtin/worktree.c:334
+#: builtin/worktree.c:333
 msgid "populate the new working tree"
 msgstr "emplena l'arbre de treball nou"
 
-#: builtin/worktree.c:335
+#: builtin/worktree.c:334
 msgid "keep the new working tree locked"
 msgstr "mantén l'arbre de treball nou bloquejat"
 
-#: builtin/worktree.c:343
+#: builtin/worktree.c:342
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B i --detach són mutualment exclusius"
 
-#: builtin/worktree.c:478
+#: builtin/worktree.c:479
 msgid "reason for locking"
 msgstr "raó per bloquejar"
 
-#: builtin/worktree.c:490 builtin/worktree.c:523
+#: builtin/worktree.c:491 builtin/worktree.c:524
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' no és un arbre de treball"
 
-#: builtin/worktree.c:492 builtin/worktree.c:525
+#: builtin/worktree.c:493 builtin/worktree.c:526
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "No es pot bloquejar ni desbloquejar l'arbre de treball principal"
 
-#: builtin/worktree.c:497
+#: builtin/worktree.c:498
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' ja està bloquejat, raó: '%s'"
 
-#: builtin/worktree.c:499
+#: builtin/worktree.c:500
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' ja està bloquejat"
 
-#: builtin/worktree.c:527
+#: builtin/worktree.c:528
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' no està bloquejat"
 
-#: builtin/write-tree.c:13
+#: builtin/write-tree.c:14
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 
-#: builtin/write-tree.c:26
+#: builtin/write-tree.c:27
 msgid "<prefix>/"
 msgstr "<prefix>/"
 
-#: builtin/write-tree.c:27
+#: builtin/write-tree.c:28
 msgid "write tree object for a subdirectory <prefix>"
 msgstr "escriu l'objecte d'arbre per a un subdirectori <prefix>"
 
-#: builtin/write-tree.c:30
+#: builtin/write-tree.c:31
 msgid "only useful for debugging"
 msgstr "només útil per a la depuració"
 
-#: upload-pack.c:22
+#: upload-pack.c:23
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<opcions>] <directori>"
 
-#: upload-pack.c:1040
+#: upload-pack.c:1041
 msgid "quit after a single request/response exchange"
 msgstr "surt després d'un sol intercanvi de sol·licitud/resposta"
 
-#: upload-pack.c:1042
+#: upload-pack.c:1043
 msgid "exit immediately after initial ref advertisement"
 msgstr "surt immediatament després de l'anunci inicial de referència"
 
-#: upload-pack.c:1044
+#: upload-pack.c:1045
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
-msgstr "no intentis <directori>/.git/ si <directori> no és cap directori del Git"
+msgstr ""
+"no intentis <directori>/.git/ si <directori> no és cap directori del Git"
 
-#: upload-pack.c:1046
+#: upload-pack.c:1047
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "interromp la transferència després de <n> segons d'inactivitat"
 
-#: credential-cache--daemon.c:223
+#: credential-cache--daemon.c:224
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -13619,11 +14143,11 @@ msgstr ""
 "\n"
 "\tchmod 0700 %s"
 
-#: credential-cache--daemon.c:271
+#: credential-cache--daemon.c:272
 msgid "print debugging messages to stderr"
 msgstr "imprimeix els missatges de depuració a stderr"
 
-#: git.c:14
+#: git.c:15
 msgid ""
 "'git help -a' and 'git help -g' list available subcommands and some\n"
 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
@@ -13633,20 +14157,20 @@ msgstr ""
 "algunes guies de concepte. Vegeu 'git help <ordre>' o\n"
 "'git help <concepte>' per a llegir sobre una subordre o concepte específic."
 
-#: http.c:336
+#: http.c:337
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr ""
 
-#: http.c:357
+#: http.c:358
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "No s'admet el control de delegació amb el cURL < 7.22.0"
 
-#: http.c:366
+#: http.c:367
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "No s'admet l'enganx de clau pública amb cURL < 7.44.0"
 
-#: http.c:1766
+#: http.c:1764
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -13657,7 +14181,7 @@ msgstr ""
 "  petició: %s\n"
 "   redirecció: %s"
 
-#: remote-curl.c:323
+#: remote-curl.c:324
 #, c-format
 msgid "redirecting to %s"
 msgstr "s'està redirigint a %s"
@@ -13708,7 +14232,8 @@ msgstr "Registra els canvis al dipòsit"
 
 #: common-cmds.h:23
 msgid "Show changes between commits, commit and working tree, etc"
-msgstr "Mostra els canvis entre comissions, la comissió i l'arbre de treball, etc."
+msgstr ""
+"Mostra els canvis entre comissions, la comissió i l'arbre de treball, etc."
 
 #: common-cmds.h:24
 msgid "Download objects and refs from another repository"
@@ -13740,7 +14265,8 @@ msgstr "Obtén i integra amb un altre dipòsit o una branca local"
 
 #: common-cmds.h:31
 msgid "Update remote refs along with associated objects"
-msgstr "Actualitza les referències remotes juntament amb els objectes associats"
+msgstr ""
+"Actualitza les referències remotes juntament amb els objectes associats"
 
 #: common-cmds.h:32
 msgid "Reapply commits on top of another base tip"
@@ -13764,7 +14290,8 @@ msgstr "Mostra l'estat de l'arbre de treball"
 
 #: common-cmds.h:37
 msgid "Create, list, delete or verify a tag object signed with GPG"
-msgstr "Crea, llista, suprimeix o verifica un objecte d'etiqueta signat amb GPG"
+msgstr ""
+"Crea, llista, suprimeix o verifica un objecte d'etiqueta signat amb GPG"
 
 #: parse-options.h:145
 msgid "expiry-date"
@@ -13788,7 +14315,8 @@ msgstr "usa <n> xifres per presentar els SHA-1"
 
 #: rerere.h:40
 msgid "update the index with reused conflict resolution if possible"
-msgstr "actualitza l'índex amb la resolució de conflicte reusada si és possible"
+msgstr ""
+"actualitza l'índex amb la resolució de conflicte reusada si és possible"
 
 #: git-bisect.sh:54
 msgid "You need to start by \"git bisect start\""
@@ -13817,8 +14345,11 @@ msgstr "HEAD dolent - Cal un HEAD"
 
 #: git-bisect.sh:167
 #, sh-format
-msgid "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
-msgstr "L'agafament de '$start_head' ha fallat. Proveu 'git bisect reset <branca-vàlida>'."
+msgid ""
+"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
+msgstr ""
+"L'agafament de '$start_head' ha fallat. Proveu 'git bisect reset <branca-"
+"vàlida>'."
 
 #: git-bisect.sh:177
 msgid "won't bisect on cg-seek'ed tree"
@@ -13969,7 +14500,8 @@ msgstr "no es pot canviar el significat del terme '$term'"
 #: git-bisect.sh:606
 #, sh-format
 msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
-msgstr "Ordre no vàlida: actualment esteu en una bisecció $TERM_BAD/$TERM_GOOD."
+msgstr ""
+"Ordre no vàlida: actualment esteu en una bisecció $TERM_BAD/$TERM_GOOD."
 
 #: git-bisect.sh:636
 msgid "no terms defined"
@@ -13985,8 +14517,12 @@ msgstr ""
 "Les opcions admeses són: --term-good|--term-old i --term-bad|--term-new."
 
 #: git-merge-octopus.sh:46
-msgid "Error: Your local changes to the following files would be overwritten by merge"
-msgstr "Error: Els vostres canvis locals als fitxers següents se sobreescriurien per fusionar"
+msgid ""
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
+msgstr ""
+"Error: Els vostres canvis locals als fitxers següents se sobreescriurien per "
+"fusionar"
 
 #: git-merge-octopus.sh:61
 msgid "Automated merge did not work."
@@ -14018,23 +14554,31 @@ msgstr "S'està intentant una fusió simple amb $pretty_name"
 
 #: git-merge-octopus.sh:102
 msgid "Simple merge did not work, trying automatic merge."
-msgstr "La fusió simple no ha funcionat, s'està intentant una fusió automàtica."
+msgstr ""
+"La fusió simple no ha funcionat, s'està intentant una fusió automàtica."
 
 #: git-rebase.sh:58
 msgid ""
 "When you have resolved this problem, run \"git rebase --continue\".\n"
 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
-"To check out the original branch and stop rebasing, run \"git rebase --abort\"."
+"To check out the original branch and stop rebasing, run \"git rebase --abort"
+"\"."
 msgstr ""
 "Quan hàgiu resolt aquest problema, executeu \"git rebase --continue\".\n"
-"Si preferiu ometre aquest pedaç, executeu \"git rebase --skip\" en lloc d'això.\n"
-"Per a agafar la branca original i deixar de fer «rebase», executeu \"git rebase --abort\"."
+"Si preferiu ometre aquest pedaç, executeu \"git rebase --skip\" en lloc "
+"d'això.\n"
+"Per a agafar la branca original i deixar de fer «rebase», executeu \"git "
+"rebase --abort\"."
 
 #: git-rebase.sh:158 git-rebase.sh:397
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "No s'ha pogut tornar a $head_name"
 
+#: git-rebase.sh:169
+msgid "Applied autostash."
+msgstr "S'ha aplicat el magatzem automàtic."
+
 #: git-rebase.sh:172
 #, sh-format
 msgid "Cannot store $stash_sha1"
@@ -14050,7 +14594,7 @@ msgstr "Sembla que git-am està en curs. No es pot fer «rebase»."
 
 #: git-rebase.sh:358
 msgid "No rebase in progress?"
-msgstr "No hi ha rebasament en curs?"
+msgstr "No hi ha un «rebase» en curs?"
 
 #: git-rebase.sh:369
 msgid "The --edit-todo action can only be used during interactive rebase."
@@ -14081,7 +14625,7 @@ msgid ""
 "valuable there."
 msgstr ""
 "Sembla que ja hi ha un directori $state_dir_base, i\n"
-"em pregunto si esteu enmig d'un altre rebasament. Si aquest és el\n"
+"em pregunto si esteu enmig d'un altre «rebase». Si aquest és el\n"
 "cas, si us plau, proveu\n"
 "\t$cmd_live_rebase\n"
 "Si no és el cas, si us plau,\n"
@@ -14144,46 +14688,48 @@ msgstr "Canvis de $mb a $onto:"
 
 #: git-rebase.sh:615
 msgid "First, rewinding head to replay your work on top of it..."
-msgstr "Primer, s'està rebobinant el cap per a reproduir el vostre treball al damunt..."
+msgstr ""
+"Primer, s'està rebobinant el cap per a reproduir el vostre treball al "
+"damunt..."
 
 #: git-rebase.sh:625
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "S'ha avançat $branch_name ràpidament a $onto_name."
 
-#: git-stash.sh:53
+#: git-stash.sh:54
 msgid "git stash clear with parameters is unimplemented"
 msgstr "git stash clear amb paràmetres no està implementat"
 
-#: git-stash.sh:94
+#: git-stash.sh:95
 msgid "You do not have the initial commit yet"
 msgstr "Encara no teniu la comissió inicial"
 
-#: git-stash.sh:109
+#: git-stash.sh:110
 msgid "Cannot save the current index state"
 msgstr "No es pot desar l'estat d'índex actual"
 
-#: git-stash.sh:124
+#: git-stash.sh:125
 msgid "Cannot save the untracked files"
 msgstr "No es pot desar els fitxers no seguits"
 
-#: git-stash.sh:144 git-stash.sh:157
+#: git-stash.sh:145 git-stash.sh:158
 msgid "Cannot save the current worktree state"
 msgstr "No es pot desar l'estat d'arbre de treball actual"
 
-#: git-stash.sh:161
+#: git-stash.sh:162
 msgid "No changes selected"
 msgstr "No hi ha canvis seleccionats"
 
-#: git-stash.sh:164
+#: git-stash.sh:165
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "No es pot eliminar l'índex temporal (això no pot passar)"
 
-#: git-stash.sh:177
+#: git-stash.sh:178
 msgid "Cannot record working tree state"
 msgstr "No es pot registrar l'estat de l'arbre de treball"
 
-#: git-stash.sh:209
+#: git-stash.sh:210
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr "No es pot actualitzar $ref_stash amb $w_commit"
@@ -14198,7 +14744,7 @@ msgstr "No es pot actualitzar $ref_stash amb $w_commit"
 #. $ git stash save --blah-blah 2>&1 | head -n 2
 #. error: unknown option for 'stash save': --blah-blah
 #. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:265
+#: git-stash.sh:266
 #, sh-format
 msgid ""
 "error: unknown option for 'stash save': $option\n"
@@ -14207,113 +14753,118 @@ msgstr ""
 "error: opció desconeguda de 'stash save': $option\n"
 "       Per a proveir un missatge, useu git stash save -- '$option'"
 
-#: git-stash.sh:278
+#: git-stash.sh:281
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "No es poden usar --patch i --include-untracked o --all a la vegada."
 
-#: git-stash.sh:286
+#: git-stash.sh:289
 msgid "No local changes to save"
 msgstr "No hi ha canvis locals a desar"
 
-#: git-stash.sh:291
+#: git-stash.sh:294
 msgid "Cannot initialize stash"
 msgstr "No es pot inicialitzar el magatzem"
 
-#: git-stash.sh:295
+#: git-stash.sh:298
 msgid "Cannot save the current status"
 msgstr "No es pot desar l'estat actual"
 
-#: git-stash.sh:296
+#: git-stash.sh:299
 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr "S'han desat el directori de treball i l'estat d'índex $stash_msg"
 
-#: git-stash.sh:323
+#: git-stash.sh:326
 msgid "Cannot remove worktree changes"
 msgstr "No es poden eliminar els canvis de l'arbre de treball"
 
-#: git-stash.sh:471
+#: git-stash.sh:474
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "opció desconeguda: $opt"
 
-#: git-stash.sh:484
-msgid "No stash found."
+#: git-stash.sh:487
+#, fuzzy
+msgid "No stash entries found."
 msgstr "No s'ha trobat cap magatzem."
 
-#: git-stash.sh:491
+#: git-stash.sh:494
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "S'han especificat massa revisions: $REV"
 
-#: git-stash.sh:506
+#: git-stash.sh:509
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference no és una referència vàlida"
 
-#: git-stash.sh:534
+#: git-stash.sh:537
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "'$args' no és una comissió de tipus magatzem"
 
-#: git-stash.sh:545
+#: git-stash.sh:548
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "'$args' no és una referència de magatzem"
 
-#: git-stash.sh:553
+#: git-stash.sh:556
 msgid "unable to refresh index"
 msgstr "no s'ha pogut actualitzar l'índex"
 
-#: git-stash.sh:557
+#: git-stash.sh:560
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "No es pot aplicar un magatzem enmig d'una fusió"
 
-#: git-stash.sh:565
+#: git-stash.sh:568
 msgid "Conflicts in index. Try without --index."
 msgstr "Hi ha conflictes en l'índex. Proveu-ho sense --index."
 
-#: git-stash.sh:567
+#: git-stash.sh:570
 msgid "Could not save index tree"
 msgstr "No s'ha pogut desar l'arbre d'índex"
 
-#: git-stash.sh:576
-msgid "Could not restore untracked files from stash"
+#: git-stash.sh:579
+#, fuzzy
+msgid "Could not restore untracked files from stash entry"
 msgstr "No s'ha pogut restaurar els fitxers no seguits des d'emmagatzematge"
 
-#: git-stash.sh:601
+#: git-stash.sh:604
 msgid "Cannot unstage modified files"
 msgstr "No es pot fer «unstage» dels fitxers modificats"
 
-#: git-stash.sh:616
+#: git-stash.sh:619
 msgid "Index was not unstashed."
 msgstr "L'índex no estava sense emmagatzemar."
 
-#: git-stash.sh:630
-msgid "The stash is kept in case you need it again."
+#: git-stash.sh:633
+#, fuzzy
+msgid "The stash entry is kept in case you need it again."
 msgstr "Es conserva el magatzem en cas de que el necessiteu altra vegada."
 
-#: git-stash.sh:639
+#: git-stash.sh:642
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "${REV} ($s) descartada"
 
-#: git-stash.sh:640
+#: git-stash.sh:643
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem"
 
-#: git-stash.sh:648
+#: git-stash.sh:651
 msgid "No branch name specified"
 msgstr "Cap nom de branca especificat"
 
-#: git-stash.sh:727
+#: git-stash.sh:730
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Per restaurar-les teclegeu \"git stash apply\")"
 
 #: git-submodule.sh:181
 msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr "El camí relatiu només es pot usar des del nivell superior de l'arbre de treball"
+msgstr ""
+"El camí relatiu només es pot usar des del nivell superior de l'arbre de "
+"treball"
 
 #: git-submodule.sh:191
 #, sh-format
@@ -14330,7 +14881,7 @@ msgstr "'$sm_path' ja existeix en l'índex"
 msgid "'$sm_path' already exists in the index and is not a submodule"
 msgstr "'$sm_path' ja existeix en l'índex i no és submòdul"
 
-#: git-submodule.sh:218
+#: git-submodule.sh:219
 #, sh-format
 msgid ""
 "The following path is ignored by one of your .gitignore files:\n"
@@ -14341,75 +14892,82 @@ msgstr ""
 "$sm_path\n"
 "Useu -f si realment voleu afegir-lo."
 
-#: git-submodule.sh:236
+#: git-submodule.sh:237
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "S'està afegint el dipòsit existent a '$sm_path' a l'índex"
 
-#: git-submodule.sh:238
+#: git-submodule.sh:239
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "'$sm_path' ja existeix i no és un dipòsit de git vàlid"
 
-#: git-submodule.sh:246
+#: git-submodule.sh:247
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr "Es troba un directori de git per a '$sm_name' localment amb els remots:"
+msgstr ""
+"Es troba un directori de git per a '$sm_name' localment amb els remots:"
 
-#: git-submodule.sh:248
+#: git-submodule.sh:249
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
 "  $realrepo\n"
-"use the '--force' option. If the local git directory is not the correct repo\n"
-"or you are unsure what this means choose another name with the '--name' option."
+"use the '--force' option. If the local git directory is not the correct "
+"repo\n"
+"or you are unsure what this means choose another name with the '--name' "
+"option."
 msgstr ""
 "Si voleu reusar aquest directori de git local en lloc de clonar de nou de\n"
 "  $realrepo\n"
-"useu l'opció '--force'. Si el directori de git local no és el dipòsit correcte\n"
-"o no esteu segur de què vol dir això, trieu un altre nom amb l'opció '--name'."
+"useu l'opció '--force'. Si el directori de git local no és el dipòsit "
+"correcte\n"
+"o no esteu segur de què vol dir això, trieu un altre nom amb l'opció '--"
+"name'."
 
-#: git-submodule.sh:254
+#: git-submodule.sh:255
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr "S'està reactivant el directori de git local per al submòdul '$sm_name'."
+msgstr ""
+"S'està reactivant el directori de git local per al submòdul '$sm_name'."
 
-#: git-submodule.sh:266
+#: git-submodule.sh:267
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "No s'ha pogut agafar el submòdul '$sm_path'"
 
-#: git-submodule.sh:271
+#: git-submodule.sh:272
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "S'ha produït un error en afegir el submòdul '$sm_path'"
 
-#: git-submodule.sh:280
+#: git-submodule.sh:281
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "S'ha produït un error en registrar el submòdul '$sm_path'"
 
-#: git-submodule.sh:341
+#: git-submodule.sh:342
 #, sh-format
 msgid "Entering '$displaypath'"
 msgstr "S'està entrant '$displaypath'"
 
-#: git-submodule.sh:361
+#: git-submodule.sh:362
 #, sh-format
 msgid "Stopping at '$displaypath'; script returned non-zero status."
-msgstr "S'està aturant a '$displaypath'; l'script ha retornat un estat no zero."
+msgstr ""
+"S'està aturant a '$displaypath'; l'script ha retornat un estat no zero."
 
-#: git-submodule.sh:432
+#: git-submodule.sh:433
 #, sh-format
 msgid "pathspec and --all are incompatible"
 msgstr "--pathspec i --all són incompatibles"
 
-#: git-submodule.sh:437
+#: git-submodule.sh:438
 #, sh-format
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "Useu '--all' si realment voleu desinicialitzar tots els submòduls"
 
-#: git-submodule.sh:457
+#: git-submodule.sh:458
 #, sh-format
 msgid ""
 "Submodule work tree '$displaypath' contains a .git directory\n"
@@ -14418,139 +14976,150 @@ msgstr ""
 "L'arbre de treball de submòdul '$displaypath' conté un directori .git\n"
 "(useu 'rm -rf' si realment voleu eliminar-lo, incloent tota la seva història)"
 
-#: git-submodule.sh:465
+#: git-submodule.sh:466
 #, sh-format
-msgid "Submodule work tree '$displaypath' contains local modifications; use '-f' to discard them"
+msgid ""
+"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
+"discard them"
 msgstr ""
-"L'arbre de treball de submòdul '$displaypath' conté modificacions locals; useu '-f' per a "
-"descartar-les"
+"L'arbre de treball de submòdul '$displaypath' conté modificacions locals; "
+"useu '-f' per a descartar-les"
 
-#: git-submodule.sh:468
+#: git-submodule.sh:469
 #, sh-format
 msgid "Cleared directory '$displaypath'"
 msgstr "S'ha netejat el directori '$displaypath'"
 
-#: git-submodule.sh:469
+#: git-submodule.sh:470
 #, sh-format
 msgid "Could not remove submodule work tree '$displaypath'"
 msgstr "No s'ha pogut eliminar l'arbre de treball de submòdul '$displaypath'"
 
-#: git-submodule.sh:472
+#: git-submodule.sh:473
 #, sh-format
 msgid "Could not create empty submodule directory '$displaypath'"
 msgstr "No s'ha pogut crear el directori de submòdul buit '$displaypath'"
 
-#: git-submodule.sh:481
+#: git-submodule.sh:482
 #, sh-format
 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
 msgstr "Submòdul '$name' ($url) no registrat per al camí '$displaypath'"
 
-#: git-submodule.sh:637
+#: git-submodule.sh:638
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
-msgstr "No s'ha pogut trobar la revisió actual en el camí de submòdul '$displaypath'"
+msgstr ""
+"No s'ha pogut trobar la revisió actual en el camí de submòdul '$displaypath'"
 
-#: git-submodule.sh:647
+#: git-submodule.sh:648
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "No s'ha pogut obtenir en el camí de submòdul '$sm_path'"
 
-#: git-submodule.sh:652
+#: git-submodule.sh:653
 #, sh-format
-msgid "Unable to find current ${remote_name}/${branch} revision in submodule path '$sm_path'"
-msgstr ""
-"No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el camí de submòdul "
+msgid ""
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
 "'$sm_path'"
+msgstr ""
+"No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el "
+"camí de submòdul '$sm_path'"
 
-#: git-submodule.sh:670
+#: git-submodule.sh:671
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "No s'ha pogut obtenir en el camí de submòdul '$displaypath'"
 
-#: git-submodule.sh:676
+#: git-submodule.sh:677
 #, sh-format
 msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. Direct fetching of that "
-"commit failed."
+"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
+"Direct fetching of that commit failed."
 msgstr ""
-"S'ha obtingut en el camí de submòdul '$displaypath', però no contenia $sha1. L'obtenció directa "
-"d'aquella comissió ha fallat."
+"S'ha obtingut en el camí de submòdul '$displaypath', però no contenia $sha1. "
+"L'obtenció directa d'aquella comissió ha fallat."
 
-#: git-submodule.sh:683
+#: git-submodule.sh:684
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "No s'ha pogut agafar '$sha1' en el camí de submòdul '$displaypath'"
 
-#: git-submodule.sh:684
+#: git-submodule.sh:685
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Camí de submòdul '$displaypath': s'ha agafat '$sha1'"
 
-#: git-submodule.sh:688
+#: git-submodule.sh:689
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr "No s'ha pogut fer «rebase» '$sha1' en el camí de submòdul '$displaypath'"
+msgstr ""
+"No s'ha pogut fer «rebase» '$sha1' en el camí de submòdul '$displaypath'"
 
-#: git-submodule.sh:689
+#: git-submodule.sh:690
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Camí de submòdul '$displaypath': s'ha fet «rebase» en '$sha1'"
 
-#: git-submodule.sh:694
+#: git-submodule.sh:695
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "No s'ha pogut fusionar '$sha1' en el camí de submòdul '$displaypath'"
 
-#: git-submodule.sh:695
+#: git-submodule.sh:696
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Camí de submòdul '$displaypath': s'ha fusionat en '$sha1'"
 
-#: git-submodule.sh:700
+#: git-submodule.sh:701
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr "L'execució de '$command $sha1' ha fallat en el camí de submòdul '$displaypath'"
+msgstr ""
+"L'execució de '$command $sha1' ha fallat en el camí de submòdul "
+"'$displaypath'"
 
-#: git-submodule.sh:701
+#: git-submodule.sh:702
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Camí de submòdul '$displaypath': '$command $sha1'"
 
-#: git-submodule.sh:732
+#: git-submodule.sh:733
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
-msgstr "S'ha produït un error en recorre recursivament dins del camí de submòdul '$displaypath'"
+msgstr ""
+"S'ha produït un error en recorre recursivament dins del camí de submòdul "
+"'$displaypath'"
 
-#: git-submodule.sh:840
+#: git-submodule.sh:841
 msgid "The --cached option cannot be used with the --files option"
 msgstr "L'opció --cached no es pot usar amb l'opció --files"
 
-#: git-submodule.sh:892
+#: git-submodule.sh:893
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "mode inesperat $mod_dst"
 
-#: git-submodule.sh:912
+#: git-submodule.sh:913
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Avís: $display_name no conté la comissió $sha1_src"
 
-#: git-submodule.sh:915
+#: git-submodule.sh:916
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Avís: $display_name no conté la comissió $sha1_dst"
 
-#: git-submodule.sh:918
+#: git-submodule.sh:919
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr "  Avís: $display_name no conté les comissions $sha1_src i $sha1_dst"
 
-#: git-submodule.sh:1064
+#: git-submodule.sh:1065
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
-msgstr "S'ha produït un error en cercar recursivament al camí de submòdul '$sm_path'"
+msgstr ""
+"S'ha produït un error en cercar recursivament al camí de submòdul '$sm_path'"
 
-#: git-submodule.sh:1136
+#: git-submodule.sh:1137
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr "S'està sincronitzant l'url de submòdul per a '$displaypath'"
@@ -14585,8 +15154,10 @@ msgstr ""
 " r, reword = usa la comissió, però edita el missatge de comissió\n"
 " e, edit = usa la comissió, però atura't per a esmenar\n"
 " s, squash = usa la comissió, però fusiona'l a la comissió prèvia\n"
-" f, fixup = com \"squash\", però descarta el missatge de registre d'aquesta comissió\n"
-" x, exec = executa l'ordre (el reste de la línia) usant l'intèrpret d'ordres\n"
+" f, fixup = com \"squash\", però descarta el missatge de registre d'aquesta "
+"comissió\n"
+" x, exec = executa l'ordre (el reste de la línia) usant l'intèrpret "
+"d'ordres\n"
 " d, drop = elimina la comissió\n"
 "\n"
 "Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n"
@@ -14597,7 +15168,8 @@ msgid ""
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
 msgstr ""
 "\n"
-"No elimineu cap línia. Useu 'drop' explícitament per a eliminar una comissió.\n"
+"No elimineu cap línia. Useu 'drop' explícitament per a eliminar una "
+"comissió.\n"
 
 #: git-rebase--interactive.sh:175
 msgid ""
@@ -14696,7 +15268,8 @@ msgstr "No es pot escriure $fixup_msg"
 msgid "This is a combination of 2 commits."
 msgstr "Això és una combinació de 2 comissions."
 
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528 git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
+#: git-rebase--interactive.sh:531
 #, sh-format
 msgid "Could not apply $sha1... $rest"
 msgstr "No s'ha pogut aplicar $sha1... $rest"
@@ -14706,10 +15279,12 @@ msgstr "No s'ha pogut aplicar $sha1... $rest"
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
 "This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue before\n"
+"failed. If the pre-commit hook failed, you may need to resolve the issue "
+"before\n"
 "you are able to reword the commit."
 msgstr ""
-"No s'ha pogut esmenar la comissió després d'escollir amb èxit $sha1... $rest\n"
+"No s'ha pogut esmenar la comissió després d'escollir amb èxit $sha1... "
+"$rest\n"
 "Això és probablement a causa d'un missatge de comissió buit, o el ganxo de\n"
 "precomissió ha fallat. Si el ganxo de precomissió ha fallat, pot ser que\n"
 "necessiteu resoldre el problema abans que pugueu canviar el missatge de\n"
@@ -14777,7 +15352,7 @@ msgstr "Si us plau, arregleu això usant 'git rebase --edit-todo'."
 #: git-rebase--interactive.sh:703
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
-msgstr "S'ha rebasat i actualitzat $head_name amb èxit."
+msgstr "S'ha fet «rebase» i actualitzat $head_name amb èxit."
 
 #: git-rebase--interactive.sh:750
 msgid "Could not skip unnecessary pick commands"
@@ -14810,34 +15385,45 @@ msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
 "Dropped commits (newer to older):"
 msgstr ""
-"Advertència: pot ser que algunes comissions s'hagin descartat accidentalment.\n"
+"Advertència: pot ser que algunes comissions s'hagin descartat "
+"accidentalment.\n"
 "Les comissions descartades (més nova a més vella):"
 
 #: git-rebase--interactive.sh:1026
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
 "\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of warnings.\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
 "The possible behaviours are: ignore, warn, error."
 msgstr ""
-"Per a evitar aquest missatge, useu \"drop\" per a eliminar explícitament una comissió.\n"
+"Per a evitar aquest missatge, useu \"drop\" per a eliminar explícitament una "
+"comissió.\n"
 "\n"
-"Useu 'git config rebase.missingCommitsCheck' per a canviar el nivell d'advertències.\n"
+"Useu 'git config rebase.missingCommitsCheck' per a canviar el nivell "
+"d'advertències.\n"
 "Els comportaments possibles són: ignore, warn, error."
 
 #: git-rebase--interactive.sh:1037
 #, sh-format
-msgid "Unrecognized setting $check_level for option rebase.missingCommitsCheck. Ignoring."
+msgid ""
+"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
+"Ignoring."
 msgstr ""
-"No s'ha reconegut l'ajust $check_level per a l'opció rebase.missingCommitsCheck. S'està ignorant."
+"No s'ha reconegut l'ajust $check_level per a l'opció rebase."
+"missingCommitsCheck. S'està ignorant."
 
 #: git-rebase--interactive.sh:1054
-msgid "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'."
-msgstr "Podeu arreglar això amb 'git rebase --edit-todo' i després 'git rebase --continue'."
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'."
+msgstr ""
+"Podeu arreglar això amb 'git rebase --edit-todo' i després 'git rebase --"
+"continue'."
 
 #: git-rebase--interactive.sh:1055
 msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr "O podeu avortar el rebasament amb 'git rebase --abort'."
+msgstr "O podeu avortar el «rebase» amb 'git rebase --abort'."
 
 #: git-rebase--interactive.sh:1083
 msgid "Could not remove CHERRY_PICK_HEAD"
@@ -14876,7 +15462,9 @@ msgstr ""
 
 #: git-rebase--interactive.sh:1105
 msgid "Error trying to find the author identity to amend commit"
-msgstr "Hi ha hagut un error en intentar trobar la identitat d'autor per a esmenar la comissió"
+msgstr ""
+"Hi ha hagut un error en intentar trobar la identitat d'autor per a esmenar "
+"la comissió"
 
 #: git-rebase--interactive.sh:1110
 msgid ""
@@ -14899,8 +15487,8 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Esteu editant el fitxer de coses a fer d'un rebasament interactiu en marxa.\n"
-"Per a continuar el rebasament després d'editar, executeu:\n"
+"Esteu editant el fitxer de coses a fer d'un «rebase» interactiu en marxa.\n"
+"Per a continuar el «rebase» després d'editar, executeu:\n"
 "    git rebase --continue\n"
 "\n"
 
@@ -14944,7 +15532,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"No obstant, si elimineu tot, s'avortarà el rebasament.\n"
+"No obstant, si elimineu tot, s'avortarà el «rebase».\n"
 "\n"
 
 #: git-rebase--interactive.sh:1303
@@ -14959,7 +15547,9 @@ msgstr "ús: $dashless $USAGE"
 #: git-sh-setup.sh:190
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
-msgstr "No es pot canviar de directori a $cdup, el nivell superior de l'arbre de treball"
+msgstr ""
+"No es pot canviar de directori a $cdup, el nivell superior de l'arbre de "
+"treball"
 
 #: git-sh-setup.sh:199 git-sh-setup.sh:206
 #, sh-format
@@ -14968,7 +15558,7 @@ msgstr "fatal: no es pot usar $program_name sense un arbre de treball."
 
 #: git-sh-setup.sh:220
 msgid "Cannot rebase: You have unstaged changes."
-msgstr "No es pot rebasar: Teniu canvis «unstaged»."
+msgstr "No es pot fer «rebase»: teniu canvis «unstaged»."
 
 #: git-sh-setup.sh:223
 msgid "Cannot rewrite branches: You have unstaged changes."
@@ -14989,7 +15579,8 @@ msgstr "No es pot fer «rebase»: El vostre índex conté canvis sense cometre."
 
 #: git-sh-setup.sh:245
 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr "No es pot baixar fent «rebase»: El vostre índex conté canvis sense cometre."
+msgstr ""
+"No es pot baixar fent «rebase»: El vostre índex conté canvis sense cometre."
 
 #: git-sh-setup.sh:248
 #, sh-format
@@ -15002,88 +15593,89 @@ msgstr "Addicionalment, el vostre índex conté canvis sense cometre."
 
 #: git-sh-setup.sh:372
 msgid "You need to run this command from the toplevel of the working tree."
-msgstr "Heu d'executar aquesta ordre des del nivell superior de l'arbre de treball."
+msgstr ""
+"Heu d'executar aquesta ordre des del nivell superior de l'arbre de treball."
 
 #: git-sh-setup.sh:377
 msgid "Unable to determine absolute path of git directory"
 msgstr "No s'ha pogut determinar el camí absolut del directori de git"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:238
+#: git-add--interactive.perl:196
 #, perl-format
 msgid "%12s %12s %s"
 msgstr ""
 
-#: git-add--interactive.perl:239
+#: git-add--interactive.perl:197
 msgid "staged"
 msgstr "staged"
 
-#: git-add--interactive.perl:239
+#: git-add--interactive.perl:197
 msgid "unstaged"
 msgstr "unstaged"
 
-#: git-add--interactive.perl:288 git-add--interactive.perl:313
+#: git-add--interactive.perl:246 git-add--interactive.perl:271
 msgid "binary"
 msgstr "binari"
 
-#: git-add--interactive.perl:297 git-add--interactive.perl:351
+#: git-add--interactive.perl:255 git-add--interactive.perl:309
 msgid "nothing"
 msgstr "res"
 
-#: git-add--interactive.perl:333 git-add--interactive.perl:348
+#: git-add--interactive.perl:291 git-add--interactive.perl:306
 msgid "unchanged"
 msgstr "sense canvis"
 
-#: git-add--interactive.perl:644
+#: git-add--interactive.perl:602
 #, perl-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
 msgstr[0] "afegit %d camí\n"
 msgstr[1] "afegits %d camins\n"
 
-#: git-add--interactive.perl:647
+#: git-add--interactive.perl:605
 #, perl-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
 msgstr[0] "actualitzat %d camí\n"
 msgstr[1] "actualitzats %d camins\n"
 
-#: git-add--interactive.perl:650
+#: git-add--interactive.perl:608
 #, perl-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
 msgstr[0] "revertit %d camí\n"
 msgstr[1] "revertits %d camins\n"
 
-#: git-add--interactive.perl:653
+#: git-add--interactive.perl:611
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "modificat %d camí\n"
 msgstr[1] "modificat %d camins\n"
 
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:620
 msgid "Update"
 msgstr "Actualitza"
 
-#: git-add--interactive.perl:674
+#: git-add--interactive.perl:632
 msgid "Revert"
 msgstr "Reverteix"
 
-#: git-add--interactive.perl:697
+#: git-add--interactive.perl:655
 #, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr "nota: %s està ara sense seguiment.\n"
 
-#: git-add--interactive.perl:708
+#: git-add--interactive.perl:666
 msgid "Add untracked"
 msgstr "Afegeix sense seguiment"
 
-#: git-add--interactive.perl:714
+#: git-add--interactive.perl:672
 msgid "No untracked files.\n"
 msgstr "Sense fitxers no seguits.\n"
 
-#: git-add--interactive.perl:1030
+#: git-add--interactive.perl:985
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -15091,7 +15683,7 @@ msgstr ""
 "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
 "per «staging»."
 
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:988
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -15099,7 +15691,7 @@ msgstr ""
 "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
 "per «stashing»."
 
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:991
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -15107,7 +15699,7 @@ msgstr ""
 "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
 "per «unstaging»."
 
-#: git-add--interactive.perl:1039 git-add--interactive.perl:1048
+#: git-add--interactive.perl:994 git-add--interactive.perl:1003
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -15115,7 +15707,7 @@ msgstr ""
 "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
 "per aplicar-se."
 
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1045
+#: git-add--interactive.perl:997 git-add--interactive.perl:1000
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -15123,16 +15715,17 @@ msgstr ""
 "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
 "per descartar-se."
 
-#: git-add--interactive.perl:1058
+#: git-add--interactive.perl:1013
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "s'ha produït un error en escriure al fitxer d'edició del tros: %s"
 
-#: git-add--interactive.perl:1059
+#: git-add--interactive.perl:1014
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr "Mode d'edició de trossos manual - vegeu més avall per una guia ràpida.\n"
+msgstr ""
+"Mode d'edició de trossos manual - vegeu més avall per una guia ràpida.\n"
 
-#: git-add--interactive.perl:1065
+#: git-add--interactive.perl:1020
 #, perl-format
 msgid ""
 "---\n"
@@ -15146,17 +15739,18 @@ msgstr ""
 "Les línies que comencin per %s seran suprimides.\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1073
+#: git-add--interactive.perl:1028
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
 "aborted and the hunk is left unchanged.\n"
 msgstr ""
 "Si no s'aplica correctament, tindreu una oportunitat per editar-lo\n"
-"de nou. Si totes les línies del tros se suprimeixen, llavors l'edició s'avorta\n"
+"de nou. Si totes les línies del tros se suprimeixen, llavors l'edició "
+"s'avorta\n"
 "i el tros es deixa sense cap canvi.\n"
 
-#: git-add--interactive.perl:1087
+#: git-add--interactive.perl:1042
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "s'ha produït un error en llegir al fitxer d'edició del tros: %s"
@@ -15167,11 +15761,14 @@ msgstr "s'ha produït un error en llegir al fitxer d'edició del tros: %s"
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: git-add--interactive.perl:1178
-msgid "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr "El tros editat no s'aplica. Editeu-lo de nou (si responeu \"no\" es descartarà) [y/n]? "
+#: git-add--interactive.perl:1134
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+"El tros editat no s'aplica. Editeu-lo de nou (si responeu \"no\" es "
+"descartarà) [y/n]? "
 
-#: git-add--interactive.perl:1187
+#: git-add--interactive.perl:1143
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -15185,7 +15782,7 @@ msgstr ""
 "a - fes «stage» d'aquest tros i tota la resta de trossos del fitxer\n"
 "d - no facis «stage» d'aquest tros o de cap altre restant del fitxer"
 
-#: git-add--interactive.perl:1193
+#: git-add--interactive.perl:1149
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -15199,7 +15796,7 @@ msgstr ""
 "a - fes «stash» d'aquest tros i tota la resta de trossos del fitxer\n"
 "d - no facis «stash» d'aquest tros o de cap altre restant del fitxer"
 
-#: git-add--interactive.perl:1199
+#: git-add--interactive.perl:1155
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -15213,7 +15810,7 @@ msgstr ""
 "a - fes «unstage» d'aquest tros i tota la resta de trossos del fitxer\n"
 "d - no facis «unstage» d'aquest tros o de cap altre restant del fitxer"
 
-#: git-add--interactive.perl:1205
+#: git-add--interactive.perl:1161
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -15222,7 +15819,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1211
+#: git-add--interactive.perl:1167
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -15231,7 +15828,7 @@ msgid ""
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1217
+#: git-add--interactive.perl:1173
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -15240,7 +15837,7 @@ msgid ""
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1223
+#: git-add--interactive.perl:1179
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -15249,7 +15846,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1232
+#: git-add--interactive.perl:1188
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -15262,280 +15859,289 @@ msgid ""
 "? - print help\n"
 msgstr ""
 
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1219
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Els trossos seleccionats no apliquen a l'índex\n"
 
-#: git-add--interactive.perl:1264
+#: git-add--interactive.perl:1220
 msgid "Apply them to the worktree anyway? "
 msgstr "Voleu aplicar-los igualment a l'arbre de treball"
 
-#: git-add--interactive.perl:1267
+#: git-add--interactive.perl:1223
 msgid "Nothing was applied.\n"
 msgstr "No s'ha aplicat res.\n"
 
-#: git-add--interactive.perl:1278
+#: git-add--interactive.perl:1234
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "s'està ignorant %s no fusionat\n"
 
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1243
 msgid "Only binary files changed.\n"
 msgstr "Només s'han canviat els fitxers binaris.\n"
 
-#: git-add--interactive.perl:1289
+#: git-add--interactive.perl:1245
 msgid "No changes.\n"
 msgstr "Sense canvis.\n"
 
-#: git-add--interactive.perl:1297
+#: git-add--interactive.perl:1253
 msgid "Patch update"
 msgstr "Actualització del pedaç"
 
-#: git-add--interactive.perl:1349
+#: git-add--interactive.perl:1305
 #, perl-format
 msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
 msgstr "Canvia el mode de «stage» [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1350
+#: git-add--interactive.perl:1306
 #, perl-format
 msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
 msgstr "Suprimeix «stage» [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1351
+#: git-add--interactive.perl:1307
 #, perl-format
 msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
 msgstr "Fer un «stage» d'aquest tros [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1354
+#: git-add--interactive.perl:1310
 #, perl-format
 msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
 msgstr "Canvia el mode de «stash» [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1311
 #, perl-format
 msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
 msgstr "Suprimeix «stage» [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1356
+#: git-add--interactive.perl:1312
 #, perl-format
 msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
 msgstr "Fer un «stash» d'aquest tros [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1359
+#: git-add--interactive.perl:1315
 #, perl-format
 msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
 msgstr "Canvia el mode de «unstage» [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1316
 #, perl-format
 msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
 msgstr "Suprimeix «Unstage» [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1361
+#: git-add--interactive.perl:1317
 #, perl-format
 msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
 msgstr "Fer un «unstage» d'aquest tros [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1364
+#: git-add--interactive.perl:1320
 #, perl-format
 msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
 msgstr "Aplica el canvi de mode a l'índex [y,n,q,a,d,/%s,?]?"
 
-#: git-add--interactive.perl:1365
+#: git-add--interactive.perl:1321
 #, perl-format
 msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
 msgstr "Aplica l'esborrat a l'índex [y,n,q,a,d,/%s,?]?"
 
-#: git-add--interactive.perl:1366
+#: git-add--interactive.perl:1322
 #, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
 msgstr "Aplica aquest tros a l'índex [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1369
+#: git-add--interactive.perl:1325
 #, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Descarta el canvi de mode des de l'arbre de treball [y,n,q,a,d,/%s,?]? "
+msgstr ""
+"Descarta el canvi de mode des de l'arbre de treball [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1370
+#: git-add--interactive.perl:1326
 #, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
 msgstr "Descarta l'esborrat des de l'arbre de treball [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1371
+#: git-add--interactive.perl:1327
 #, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
 msgstr "Descarta aquest tros des de l'arbre de treball  [y,n,q,a,d,/%s,?]?"
 
-#: git-add--interactive.perl:1374
+#: git-add--interactive.perl:1330
 #, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Descarta el canvi de mode des de l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? "
+msgstr ""
+"Descarta el canvi de mode des de l'índex i l'arbre de treball [y,n,q,a,d,/"
+"%s,?]? "
 
-#: git-add--interactive.perl:1375
+#: git-add--interactive.perl:1331
 #, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Descarta la supressió des de l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? "
+msgstr ""
+"Descarta la supressió des de l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1376
+#: git-add--interactive.perl:1332
 #, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Descarta aquest tros des de l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? "
+msgstr ""
+"Descarta aquest tros des de l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1379
+#: git-add--interactive.perl:1335
 #, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Aplica el canvi de mode a l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? "
+msgstr ""
+"Aplica el canvi de mode a l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1380
+#: git-add--interactive.perl:1336
 #, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr "Aplica la supressió a l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1381
+#: git-add--interactive.perl:1337
 #, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr "Aplica aquest tros a l'índex i l'arbre de treball [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1484
+#: git-add--interactive.perl:1440
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "vés a quin tros (<ret> per veure'n més)? "
 
-#: git-add--interactive.perl:1486
+#: git-add--interactive.perl:1442
 msgid "go to which hunk? "
 msgstr "vés a quin tros? "
 
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1451
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Número no vàlid: '%s'\n"
 
-#: git-add--interactive.perl:1500
+#: git-add--interactive.perl:1456
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Només %d tros disponible.\n"
 msgstr[1] "Només %d trossos disponibles.\n"
 
-#: git-add--interactive.perl:1526
+#: git-add--interactive.perl:1482
 msgid "search for regex? "
 msgstr "Cerca per expressió regular? "
 
-#: git-add--interactive.perl:1539
+#: git-add--interactive.perl:1495
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Expressió regular de cerca mal formada %s: %s\n"
 
-#: git-add--interactive.perl:1549
+#: git-add--interactive.perl:1505
 msgid "No hunk matches the given pattern\n"
 msgstr "No hi ha trossos que coincideixin amb el patró donat\n"
 
-#: git-add--interactive.perl:1561 git-add--interactive.perl:1583
+#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
 msgid "No previous hunk\n"
 msgstr "Sense tros previ\n"
 
-#: git-add--interactive.perl:1570 git-add--interactive.perl:1589
+#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
 msgid "No next hunk\n"
 msgstr "No hi ha tros següent\n"
 
-#: git-add--interactive.perl:1597
+#: git-add--interactive.perl:1553
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Divideix en %d tros.\n"
 msgstr[1] "Divideix en %d trossos.\n"
 
-#: git-add--interactive.perl:1649
+#: git-add--interactive.perl:1605
 msgid "Review diff"
 msgstr "Reviseu les diferències"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1668
+#: git-add--interactive.perl:1624
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
 "revert        - revert staged set of changes back to the HEAD version\n"
 "patch         - pick hunks and update selectively\n"
 "diff          - view diff between HEAD and index\n"
-"add untracked - add contents of untracked files to the staged set of changes\n"
+"add untracked - add contents of untracked files to the staged set of "
+"changes\n"
 msgstr ""
 
-#: git-add--interactive.perl:1685 git-add--interactive.perl:1690 git-add--interactive.perl:1693
-#: git-add--interactive.perl:1700 git-add--interactive.perl:1704 git-add--interactive.perl:1710
+#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
+#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
+#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
 msgid "missing --"
 msgstr "manca --"
 
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1662
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "desconegut --patch mode: %s"
 
-#: git-add--interactive.perl:1712 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "argument %s no vàlid, s'esperava --"
 
-#: git-send-email.perl:121
+#: git-send-email.perl:126
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "la zona local difereix de GMT per un interval que no és de minuts\n"
 
-#: git-send-email.perl:128 git-send-email.perl:134
+#: git-send-email.perl:133 git-send-email.perl:139
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "el desplaçament de la zona local és més gran o igual a 24 hores\n"
 
-#: git-send-email.perl:202 git-send-email.perl:208
+#: git-send-email.perl:208 git-send-email.perl:214
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "l'editor no ha sortit correctament, avortant-ho tot"
 
-#: git-send-email.perl:282
+#: git-send-email.perl:291
 #, perl-format
-msgid "'%s' contains an intermediate version of the email you were composing.\n"
+msgid ""
+"'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "'%s' conté una versió intermèdia del correu que estàveu redactant.\n"
 
-#: git-send-email.perl:287
+#: git-send-email.perl:296
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' conté el correu redactat.\n"
 
-#: git-send-email.perl:305
+#: git-send-email.perl:314
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases és incompatible amb altres opcions\n"
 
-#: git-send-email.perl:368 git-send-email.perl:623
+#: git-send-email.perl:379 git-send-email.perl:634
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "No es pot executar git format-patch des de fora del dipòsit\n"
 
-#: git-send-email.perl:437
+#: git-send-email.perl:448
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Camp --suppress-cc desconegut: '%s'\n"
 
-#: git-send-email.perl:466
+#: git-send-email.perl:477
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "--confirm setting desconegut: '%s'\n"
 
-#: git-send-email.perl:498
+#: git-send-email.perl:509
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "avís: el sobrenom de sendmail amb cometes no està suportat: %s\n"
 
-#: git-send-email.perl:500
+#: git-send-email.perl:511
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "avís: `:include:` no està suportat: %s\n"
 
-#: git-send-email.perl:502
+#: git-send-email.perl:513
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "avís: les redireccions `/file` or `|pipe no són admeses: %s\n"
 
-#: git-send-email.perl:507
+#: git-send-email.perl:518
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "avís: no es pot reconèixer la línia sendmail: %s\n"
 
-#: git-send-email.perl:589
+#: git-send-email.perl:600
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -15550,12 +16156,12 @@ msgstr ""
 "    * Dient \"./%s\" si volíeu especificar aquest fitxer; o\n"
 "    * Proporcionant l'opció --format-patch si volíeu especificar un rang.\n"
 
-#: git-send-email.perl:610
+#: git-send-email.perl:621
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "S'ha produït un error a l'obrir el directori %s: %s"
 
-#: git-send-email.perl:634
+#: git-send-email.perl:645
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
@@ -15564,7 +16170,7 @@ msgstr ""
 "fatal: %s: %s\n"
 "avís: no s'han enviat pedaços\n"
 
-#: git-send-email.perl:645
+#: git-send-email.perl:656
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -15574,17 +16180,17 @@ msgstr ""
 "No s'han especificat fitxers de pedaç\n"
 "\n"
 
-#: git-send-email.perl:658
+#: git-send-email.perl:669
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Sense assumpte a %s?"
 
-#: git-send-email.perl:668
+#: git-send-email.perl:679
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "S'ha produït un error en obrir per escriptura %s: %s"
 
-#: git-send-email.perl:678
+#: git-send-email.perl:689
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -15598,60 +16204,68 @@ msgstr ""
 "\n"
 "Netegeu el contingut del cos si no voleu enviar un resum.\n"
 
-#: git-send-email.perl:701
+#: git-send-email.perl:712
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "S'ha produït un error en obrir %s.final: %s"
 
-#: git-send-email.perl:704
+#: git-send-email.perl:715
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "S'ha produït un error en obrir %s: %s"
 
-#: git-send-email.perl:739
+#: git-send-email.perl:750
 msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
 msgstr "Els camps A/Cc/Bcc no s'interpreten encara, s'ignoraran\n"
 
-#: git-send-email.perl:748
+#: git-send-email.perl:759
 msgid "Summary email is empty, skipping it\n"
 msgstr "El correu electrònic de resum està buit, s'omet\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:780
+#: git-send-email.perl:791
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "Esteu segur que voleu usar <%s> [y/N]? "
 
-#: git-send-email.perl:809
-msgid "The following files are 8bit, but do not declare a Content-Transfer-Encoding.\n"
-msgstr "Els fitxers següents són 8bit, però no declaren un Content-Transfer-Encoding.\n"
+#: git-send-email.perl:820
+msgid ""
+"The following files are 8bit, but do not declare a Content-Transfer-"
+"Encoding.\n"
+msgstr ""
+"Els fitxers següents són 8bit, però no declaren un Content-Transfer-"
+"Encoding.\n"
 
-#: git-send-email.perl:814
+#: git-send-email.perl:825
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Quina codificació de 8 bits hauria de declarar [UTF-8]? "
 
-#: git-send-email.perl:822
+#: git-send-email.perl:833
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
 "\t%s\n"
-"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really want to send.\n"
+"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
+"want to send.\n"
 msgstr ""
 
-#: git-send-email.perl:841
+#: git-send-email.perl:852
 msgid "To whom should the emails be sent (if anyone)?"
-msgstr "A qui s'haurien d'enviar els correus electrònics (si s'han d'enviar a algú)?"
+msgstr ""
+"A qui s'haurien d'enviar els correus electrònics (si s'han d'enviar a algú)?"
 
-#: git-send-email.perl:859
+#: git-send-email.perl:870
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "fatal: l'àlias '%s' s'espandeix a si mateix\n"
 
-#: git-send-email.perl:871
+#: git-send-email.perl:882
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
-msgstr "S'ha d'usar el Message-ID com a In-Reply-To pel primer correu (si n'hi ha cap)? "
+msgstr ""
+"S'ha d'usar el Message-ID com a In-Reply-To pel primer correu (si n'hi ha "
+"cap)? "
 
-#: git-send-email.perl:921 git-send-email.perl:929
+#: git-send-email.perl:932 git-send-email.perl:940
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "error: no s'ha pogut extreure una adreça vàlida de: %s\n"
@@ -15659,16 +16273,16 @@ msgstr "error: no s'ha pogut extreure una adreça vàlida de: %s\n"
 #. TRANSLATORS: Make sure to include [q] [d] [e] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:933
+#: git-send-email.perl:944
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "Què fer amb aquesta adreça? ([q]surt|[d]escarta|[e]dita): "
 
-#: git-send-email.perl:1234
+#: git-send-email.perl:1245
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "el camí CA \"%s\" no existeix"
 
-#: git-send-email.perl:1309
+#: git-send-email.perl:1320
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -15695,128 +16309,175 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1324
+#: git-send-email.perl:1335
 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
 msgstr "Voleu enviar aquest correu electrònic? ([y]sí|[n]o|[q]surt|[a]tot): "
 
-#: git-send-email.perl:1327
+#: git-send-email.perl:1338
 msgid "Send this email reply required"
 msgstr "Requereix contestació a l'enviar correu"
 
-#: git-send-email.perl:1353
+#: git-send-email.perl:1364
 msgid "The required SMTP server is not properly defined."
 msgstr "El servidor SMTP requerit no està correctament definit."
 
-#: git-send-email.perl:1397
+#: git-send-email.perl:1411
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "El servidor no admet STARTTLS! %s"
 
-#: git-send-email.perl:1403
+#: git-send-email.perl:1416 git-send-email.perl:1420
+#, perl-format
+msgid "STARTTLS failed! %s"
+msgstr ""
+
+#: git-send-email.perl:1430
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
-"No s'ha pogut inicialitzar SMTP correctament. Comproveu-ho la configuració i useu --smtp-debug."
+"No s'ha pogut inicialitzar SMTP correctament. Comproveu-ho la configuració i "
+"useu --smtp-debug."
 
-#: git-send-email.perl:1421
+#: git-send-email.perl:1448
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "S'ha produït un error en enviar %s\n"
 
-#: git-send-email.perl:1424
+#: git-send-email.perl:1451
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Simulació d'enviament %s\n"
 
-#: git-send-email.perl:1424
+#: git-send-email.perl:1451
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Enviat %s\n"
 
-#: git-send-email.perl:1426
+#: git-send-email.perl:1453
 msgid "Dry-OK. Log says:\n"
 msgstr "Simulació de correcte. El registre diu:\n"
 
-#: git-send-email.perl:1426
+#: git-send-email.perl:1453
 msgid "OK. Log says:\n"
 msgstr "Correcte. El registre diu: \n"
 
-#: git-send-email.perl:1438
+#: git-send-email.perl:1465
 msgid "Result: "
 msgstr "Resultat: "
 
-#: git-send-email.perl:1441
+#: git-send-email.perl:1468
 msgid "Result: OK\n"
 msgstr "Resultat: correcte\n"
 
-#: git-send-email.perl:1454
+#: git-send-email.perl:1481
 #, perl-format
 msgid "can't open file %s"
 msgstr "no es pot obrir el fitxer %s"
 
-#: git-send-email.perl:1501 git-send-email.perl:1521
+#: git-send-email.perl:1528 git-send-email.perl:1548
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) S'està afegint cc: %s des de la línia '%s'\n"
 
-#: git-send-email.perl:1507
+#: git-send-email.perl:1534
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) S'està afegint a: %s des de la línia '%s'\n"
 
-#: git-send-email.perl:1555
+#: git-send-email.perl:1582
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) S'està afegint cc: %s des de la línia '%s'\n"
 
-#: git-send-email.perl:1578
+#: git-send-email.perl:1605
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(cos) S'està afegint cc: %s des de la línia '%s'\n"
 
-#: git-send-email.perl:1676
+#: git-send-email.perl:1711
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) no s'ha pogut executar '%s'"
 
-#: git-send-email.perl:1683
+#: git-send-email.perl:1718
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) S'està afegint %s: %s des de: '%s'\n"
 
-#: git-send-email.perl:1687
+#: git-send-email.perl:1722
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) s'ha produït un error en tancar el conducte '%s'"
 
-#: git-send-email.perl:1714
+#: git-send-email.perl:1749
 msgid "cannot send message as 7bit"
 msgstr "no es pot enviar el missatge en 7 bits"
 
-#: git-send-email.perl:1722
+#: git-send-email.perl:1757
 msgid "invalid transfer encoding"
 msgstr "codificació de transferència invàlida"
 
-#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802
+#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "no s'ha pogut obrir %s: %s\n"
 
-#: git-send-email.perl:1744
+#: git-send-email.perl:1798
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr "%s: el pedaç conté una línia més gran de 998 caràcters"
 
-#: git-send-email.perl:1760
+#: git-send-email.perl:1814
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr "S'està ometent %s amb el sufix de còpia de seguretat '%s'.\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1764
+#: git-send-email.perl:1818
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Esteu segur que voleu enviar %s? [y|N]: "
 
+#~ msgid "Could not open file '%s'"
+#~ msgstr "No s'ha pogut obrir el fitxer '%s'"
+
+#~ msgid "in %0.1f seconds automatically..."
+#~ msgstr "en %0.1f segons automàticament..."
+
+#~ msgid "dup2(%d,%d) failed"
+#~ msgstr "dup2(%d,%d) ha fallat"
+
+#~ msgid "Initial commit on "
+#~ msgstr "Comissió inicial en "
+
+#~ msgid "Patch is empty. Was it split wrong?"
+#~ msgstr "El pedaç és buit. S'ha dividit malament?"
+
+#~ msgid ""
+#~ "You still have unmerged paths in your index.\n"
+#~ "Did you forget to use 'git add'?"
+#~ msgstr ""
+#~ "Encara teniu camins sense fusionar en el vostre índex.\n"
+#~ "Heu oblidat d'usar 'git add'?"
+
+#~ msgid ""
+#~ "Cannot update paths and switch to branch '%s' at the same time.\n"
+#~ "Did you intend to checkout '%s' which can not be resolved as commit?"
+#~ msgstr ""
+#~ "No es poden actualitzar els camins i canviar a la branca '%s' a la "
+#~ "vegada.\n"
+#~ "Volíeu agafar '%s', la qual no es pot resoldre com a comissió?"
+
+#~ msgid "Explicit paths specified without -i or -o; assuming --only paths..."
+#~ msgstr ""
+#~ "S'han especificat camins explícits sense -i o -o; s'està presumint --only "
+#~ "camins..."
+
+#~ msgid "default mode for recursion"
+#~ msgstr "mode de recursivitat per defecte"
+
+#~ msgid "submodule--helper subcommand must be called with a subcommand"
+#~ msgstr "s'ha d'executar la subordre submodule--helper amb una subordre"
+
 #, fuzzy
 #~ msgid "object of unknown type"
 #~ msgstr "tipus d'objecte"
@@ -15899,11 +16560,14 @@ msgstr "Esteu segur que voleu enviar %s? [y|N]: "
 #~ "If the patch applies cleanly, the edited hunk will immediately be\n"
 #~ "marked for discarding"
 #~ msgstr ""
-#~ "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
+#~ "Si el pedaç s'aplica correctament, el tros editat es marcarà "
+#~ "immediatament\n"
 #~ "per descartar-se."
 
 #~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
-#~ msgstr "Usa un heurístic experimental basat en línies en blanc per a millorar les diferències"
+#~ msgstr ""
+#~ "Usa un heurístic experimental basat en línies en blanc per a millorar les "
+#~ "diferències"
 
 #~ msgid "Clever... amending the last one with dirty index."
 #~ msgstr "Intel·ligent... s'està esmenant l'últim amb índex brut."
@@ -15923,7 +16587,9 @@ msgstr "Esteu segur que voleu enviar %s? [y|N]: "
 
 #~ msgid ""
 #~ "\n"
-#~ "(use 'rm -rf' if you really want to remove it including all of its history)"
+#~ "(use 'rm -rf' if you really want to remove it including all of its "
+#~ "history)"
 #~ msgstr ""
 #~ "\n"
-#~ "(useu 'rm -rf' si realment voleu eliminar-lo, incloent tota la seva història)"
+#~ "(useu 'rm -rf' si realment voleu eliminar-lo, incloent tota la seva "
+#~ "història)"
diff --git a/po/de.po b/po/de.po
index 42c4508ed6..362ebb6bbb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-05-05 09:35+0800\n"
+"POT-Creation-Date: 2017-07-24 21:54+0800\n"
 "PO-Revision-Date: 2016-11-28 18:10+0100\n"
 "Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n"
 "Language-Team: German <>\n"
@@ -17,43 +17,43 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: advice.c:55
+#: advice.c:58
 #, c-format
 msgid "hint: %.*s\n"
 msgstr "Hinweis: %.*s\n"
 
-#: advice.c:83
+#: advice.c:86
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr ""
 "Cherry-Picken ist nicht möglich, weil Sie nicht zusammengeführte Dateien "
 "haben."
 
-#: advice.c:85
+#: advice.c:88
 msgid "Committing is not possible because you have unmerged files."
 msgstr ""
 "Committen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
 
-#: advice.c:87
+#: advice.c:90
 msgid "Merging is not possible because you have unmerged files."
 msgstr ""
 "Mergen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
 
-#: advice.c:89
+#: advice.c:92
 msgid "Pulling is not possible because you have unmerged files."
 msgstr ""
 "Pullen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
 
-#: advice.c:91
+#: advice.c:94
 msgid "Reverting is not possible because you have unmerged files."
 msgstr ""
 "Reverten ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
 
-#: advice.c:93
+#: advice.c:96
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "%s ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
 
-#: advice.c:101
+#: advice.c:104
 msgid ""
 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 "as appropriate to mark resolution and make a commit."
@@ -62,23 +62,23 @@ msgstr ""
 "dann 'git add/rm <Datei>', um die Auflösung entsprechend zu markieren\n"
 "und zu committen."
 
-#: advice.c:109
+#: advice.c:112
 msgid "Exiting because of an unresolved conflict."
 msgstr "Beende wegen unaufgelöstem Konflikt."
 
-#: advice.c:114 builtin/merge.c:1185
+#: advice.c:117 builtin/merge.c:1184
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)."
 
-#: advice.c:116
+#: advice.c:119
 msgid "Please, commit your changes before merging."
 msgstr "Bitte committen Sie Ihre Änderungen, bevor Sie mergen."
 
-#: advice.c:117
+#: advice.c:120
 msgid "Exiting because of unfinished merge."
 msgstr "Beende wegen nicht abgeschlossenem Merge."
 
-#: advice.c:123
+#: advice.c:126
 #, c-format
 msgid ""
 "Note: checking out '%s'.\n"
@@ -109,89 +109,99 @@ msgstr ""
 "  git checkout -b <neuer-Branchname>\n"
 "\n"
 
-#: apply.c:57
+#: apply.c:58
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "nicht erkannte Whitespace-Option: '%s'"
 
-#: apply.c:73
+#: apply.c:74
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "nicht erkannte Option zum Ignorieren von Whitespace: '%s'"
 
-#: apply.c:125
+#: apply.c:126
 msgid "--reject and --3way cannot be used together."
 msgstr "--reject und --3way können nicht gemeinsam verwendet werden."
 
-#: apply.c:127
+#: apply.c:128
 msgid "--cached and --3way cannot be used together."
 msgstr "--cached und --3way können nicht gemeinsam verwendet werden."
 
-#: apply.c:130
+#: apply.c:131
 msgid "--3way outside a repository"
 msgstr ""
 "Die Option --3way kann nicht außerhalb eines Repositories verwendet werden."
 
-#: apply.c:141
+#: apply.c:142
 msgid "--index outside a repository"
 msgstr ""
 "Die Option --index kann nicht außerhalb eines Repositories verwendet werden."
 
-#: apply.c:144
+#: apply.c:145
 msgid "--cached outside a repository"
 msgstr ""
 "Die Option --cached kann nicht außerhalb eines Repositories verwendet werden."
 
-#: apply.c:845
+#: apply.c:836
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "Kann regulären Ausdruck für Zeitstempel %s nicht verarbeiten"
 
-#: apply.c:854
+#: apply.c:845
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s"
 
-#: apply.c:938
+#: apply.c:929
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden."
 
-#: apply.c:977
+#: apply.c:967
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 "git apply: ungültiges 'git-diff' - erwartete /dev/null, erhielt %s in Zeile "
 "%d"
 
-#: apply.c:983
+#: apply.c:973
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 "git apply: ungültiges 'git-diff' - Inkonsistenter neuer Dateiname in Zeile %d"
 
-#: apply.c:984
+#: apply.c:974
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 "git apply: ungültiges 'git-diff' - Inkonsistenter alter Dateiname in Zeile %d"
 
-#: apply.c:990
+#: apply.c:979
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: ungültiges 'git-diff' - erwartete /dev/null in Zeile %d"
 
-#: apply.c:1488
+#: apply.c:1008
+#, c-format
+msgid "invalid mode on line %d: %s"
+msgstr "Ungültiger Modus in Zeile %d: %s"
+
+#: apply.c:1326
+#, c-format
+msgid "inconsistent header lines %d and %d"
+msgstr "Inkonsistente Kopfzeilen %d und %d."
+
+#: apply.c:1498
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount: unerwartete Zeile: %.*s"
 
-#: apply.c:1557
+#: apply.c:1567
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s"
 
-#: apply.c:1577
+#: apply.c:1587
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -206,72 +216,72 @@ msgstr[1] ""
 "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn "
 "%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)"
 
-#: apply.c:1589
+#: apply.c:1600
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr ""
 "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen (Zeile "
 "%d)"
 
-#: apply.c:1759
+#: apply.c:1770
 msgid "new file depends on old contents"
 msgstr "neue Datei hängt von alten Inhalten ab"
 
-#: apply.c:1761
+#: apply.c:1772
 msgid "deleted file still has contents"
 msgstr "entfernte Datei hat noch Inhalte"
 
-#: apply.c:1795
+#: apply.c:1806
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "fehlerhafter Patch bei Zeile %d"
 
-#: apply.c:1832
+#: apply.c:1843
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "neue Datei %s hängt von alten Inhalten ab"
 
-#: apply.c:1834
+#: apply.c:1845
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "entfernte Datei %s hat noch Inhalte"
 
-#: apply.c:1837
+#: apply.c:1848
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt."
 
-#: apply.c:1984
+#: apply.c:1995
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s"
 
-#: apply.c:2021
+#: apply.c:2032
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "nicht erkannter Binär-Patch bei Zeile %d"
 
-#: apply.c:2182
+#: apply.c:2193
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "Patch mit nutzlosen Informationen bei Zeile %d"
 
-#: apply.c:2265
+#: apply.c:2276
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "konnte symbolische Verknüpfung %s nicht lesen"
 
-#: apply.c:2269
+#: apply.c:2280
 #, c-format
 msgid "unable to open or read %s"
 msgstr "konnte %s nicht öffnen oder lesen"
 
-#: apply.c:2922
+#: apply.c:2933
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "Ungültiger Zeilenanfang: '%c'"
 
-#: apply.c:3041
+#: apply.c:3052
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -279,12 +289,12 @@ msgstr[0] "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeile versetzt)"
 msgstr[1] ""
 "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)"
 
-#: apply.c:3053
+#: apply.c:3064
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Kontext reduziert zu (%ld/%ld), um Patch-Bereich bei %d anzuwenden"
 
-#: apply.c:3059
+#: apply.c:3070
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -293,25 +303,25 @@ msgstr ""
 "bei der Suche nach:\n"
 "%.*s"
 
-#: apply.c:3081
+#: apply.c:3092
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "keine Daten in Binär-Patch für '%s'"
 
-#: apply.c:3089
+#: apply.c:3100
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 "kann binären Patch nicht in umgekehrter Reihenfolge anwenden ohne einen\n"
 "umgekehrten Patch-Block auf '%s'"
 
-#: apply.c:3135
+#: apply.c:3146
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 "kann binären Patch auf '%s' nicht ohne eine vollständige Index-Zeile anwenden"
 
-#: apply.c:3145
+#: apply.c:3156
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
@@ -319,558 +329,558 @@ msgstr ""
 "der Patch wird angewendet auf '%s' (%s), was nicht den aktuellen Inhalten\n"
 "entspricht"
 
-#: apply.c:3153
+#: apply.c:3164
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "der Patch wird auf ein leeres '%s' angewendet, was aber nicht leer ist"
 
-#: apply.c:3171
+#: apply.c:3182
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "das erforderliche Postimage %s für '%s' kann nicht gelesen werden"
 
-#: apply.c:3184
+#: apply.c:3195
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "Konnte Binär-Patch nicht auf '%s' anwenden"
 
-#: apply.c:3190
+#: apply.c:3201
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "Binär-Patch für '%s' erzeugt falsches Ergebnis (erwartete %s, bekam %s)"
 
-#: apply.c:3211
+#: apply.c:3222
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld"
 
-#: apply.c:3333
+#: apply.c:3344
 #, c-format
 msgid "cannot checkout %s"
 msgstr "kann %s nicht auschecken"
 
-#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253
+#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
 #, c-format
 msgid "failed to read %s"
 msgstr "Fehler beim Lesen von %s"
 
-#: apply.c:3389
+#: apply.c:3400
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "'%s' ist hinter einer symbolischen Verknüpfung"
 
-#: apply.c:3418 apply.c:3658
+#: apply.c:3429 apply.c:3669
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "Pfad %s wurde umbenannt/gelöscht"
 
-#: apply.c:3501 apply.c:3672
+#: apply.c:3512 apply.c:3683
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s ist nicht im Index"
 
-#: apply.c:3510 apply.c:3680
+#: apply.c:3521 apply.c:3691
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s entspricht nicht der Version im Index"
 
-#: apply.c:3545
+#: apply.c:3556
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr ""
 "Dem Repository fehlt der notwendige Blob, um auf einen 3-Wege-Merge\n"
 "zurückzufallen."
 
-#: apply.c:3548
+#: apply.c:3559
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "Falle zurück auf 3-Wege-Merge ...\n"
 
-#: apply.c:3564 apply.c:3568
+#: apply.c:3575 apply.c:3579
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "kann aktuelle Inhalte von '%s' nicht lesen"
 
-#: apply.c:3580
+#: apply.c:3591
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "Fehler beim Zurückfallen auf 3-Wege-Merge...\n"
 
-#: apply.c:3594
+#: apply.c:3605
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Patch auf '%s' mit Konflikten angewendet.\n"
 
-#: apply.c:3599
+#: apply.c:3610
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Patch auf '%s' sauber angewendet.\n"
 
-#: apply.c:3625
+#: apply.c:3636
 msgid "removal patch leaves file contents"
 msgstr "Lösch-Patch hinterlässt Dateiinhalte"
 
-#: apply.c:3697
+#: apply.c:3708
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: falscher Typ"
 
-#: apply.c:3699
+#: apply.c:3710
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s ist vom Typ %o, erwartete %o"
 
-#: apply.c:3850 apply.c:3852
+#: apply.c:3860 apply.c:3862
 #, c-format
 msgid "invalid path '%s'"
 msgstr "Ungültiger Pfad '%s'"
 
-#: apply.c:3908
+#: apply.c:3918
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s ist bereits bereitgestellt"
 
-#: apply.c:3911
+#: apply.c:3921
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s existiert bereits im Arbeitsverzeichnis"
 
-#: apply.c:3931
+#: apply.c:3941
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o)"
 
-#: apply.c:3936
+#: apply.c:3946
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o) von %s"
 
-#: apply.c:3956
+#: apply.c:3966
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung"
 
-#: apply.c:3960
+#: apply.c:3970
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: Patch konnte nicht angewendet werden"
 
-#: apply.c:3975
+#: apply.c:3985
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Prüfe Patch %s ..."
 
-#: apply.c:4066
+#: apply.c:4076
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "SHA-1 Information fehlt oder ist unbrauchbar für Submodul %s"
 
-#: apply.c:4073
+#: apply.c:4083
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "Modusänderung für %s, was sich nicht im aktuellen HEAD befindet"
 
-#: apply.c:4076
+#: apply.c:4086
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "SHA-1 Information fehlt oder ist unbrauchbar (%s)."
 
-#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135
+#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen"
 
-#: apply.c:4085
+#: apply.c:4095
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "konnte %s nicht zum temporären Index hinzufügen"
 
-#: apply.c:4095
+#: apply.c:4105
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "konnte temporären Index nicht nach %s schreiben"
 
-#: apply.c:4233
+#: apply.c:4243
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "konnte %s nicht aus dem Index entfernen"
 
-#: apply.c:4268
+#: apply.c:4278
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "fehlerhafter Patch für Submodul %s"
 
-#: apply.c:4274
+#: apply.c:4284
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "konnte neu erstellte Datei '%s' nicht lesen"
 
-#: apply.c:4282
+#: apply.c:4292
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "kann internen Speicher für eben erstellte Datei %s nicht erzeugen"
 
-#: apply.c:4288 apply.c:4432
+#: apply.c:4298 apply.c:4442
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen"
 
-#: apply.c:4329
+#: apply.c:4339
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "Fehler beim Schreiben nach '%s'"
 
-#: apply.c:4333
+#: apply.c:4343
 #, c-format
 msgid "closing file '%s'"
 msgstr "schließe Datei '%s'"
 
-#: apply.c:4403
+#: apply.c:4413
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "konnte Datei '%s' mit Modus %o nicht schreiben"
 
-#: apply.c:4501
+#: apply.c:4511
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Patch %s sauber angewendet"
 
-#: apply.c:4509
+#: apply.c:4519
 msgid "internal error"
 msgstr "interner Fehler"
 
-#: apply.c:4512
+#: apply.c:4522
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "Wende Patch %%s mit %d Zurückweisung an..."
 msgstr[1] "Wende Patch %%s mit %d Zurückweisungen an..."
 
-#: apply.c:4523
+#: apply.c:4533
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "Verkürze Name von .rej Datei zu %.*s.rej"
 
-#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988
+#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
 #, c-format
 msgid "cannot open %s"
 msgstr "kann '%s' nicht öffnen"
 
-#: apply.c:4545
+#: apply.c:4555
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Patch-Bereich #%d sauber angewendet."
 
-#: apply.c:4549
+#: apply.c:4559
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Patch-Block #%d zurückgewiesen."
 
-#: apply.c:4659
+#: apply.c:4669
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Patch '%s' ausgelassen."
 
-#: apply.c:4667
+#: apply.c:4677
 msgid "unrecognized input"
 msgstr "nicht erkannte Eingabe"
 
-#: apply.c:4686
+#: apply.c:4696
 msgid "unable to read index file"
 msgstr "Konnte Index-Datei nicht lesen"
 
-#: apply.c:4823
+#: apply.c:4833
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "kann Patch '%s' nicht öffnen: %s"
 
-#: apply.c:4850
+#: apply.c:4860
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "unterdrückte %d Whitespace-Fehler"
 msgstr[1] "unterdrückte %d Whitespace-Fehler"
 
-#: apply.c:4856 apply.c:4871
+#: apply.c:4866 apply.c:4881
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d Zeile fügt Whitespace-Fehler hinzu."
 msgstr[1] "%d Zeilen fügen Whitespace-Fehler hinzu."
 
-#: apply.c:4864
+#: apply.c:4874
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] "%d Zeile nach Behebung von Whitespace-Fehlern angewendet."
 msgstr[1] "%d Zeilen nach Behebung von Whitespace-Fehlern angewendet."
 
-#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
+#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
 msgid "Unable to write new index file"
 msgstr "Konnte neue Index-Datei nicht schreiben."
 
-#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279
-#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180
+#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
+#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
 #: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
 #: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
 #: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
-#: git-add--interactive.perl:239
+#: git-add--interactive.perl:197
 msgid "path"
 msgstr "Pfad"
 
-#: apply.c:4912
+#: apply.c:4922
 msgid "don't apply changes matching the given path"
 msgstr "keine Änderungen im angegebenen Pfad anwenden"
 
-#: apply.c:4915
+#: apply.c:4925
 msgid "apply changes matching the given path"
 msgstr "Änderungen nur im angegebenen Pfad anwenden"
 
-#: apply.c:4917 builtin/am.c:2285
+#: apply.c:4927 builtin/am.c:2266
 msgid "num"
 msgstr "Anzahl"
 
-#: apply.c:4918
+#: apply.c:4928
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr ""
 "<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden "
 "entfernen"
 
-#: apply.c:4921
+#: apply.c:4931
 msgid "ignore additions made by the patch"
 msgstr "hinzugefügte Zeilen des Patches ignorieren"
 
-#: apply.c:4923
+#: apply.c:4933
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr ""
 "anstatt der Anwendung des Patches, den \"diffstat\" für die Eingabe "
 "ausgegeben"
 
-#: apply.c:4927
+#: apply.c:4937
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 "die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen"
 
-#: apply.c:4929
+#: apply.c:4939
 msgid "instead of applying the patch, output a summary for the input"
 msgstr ""
 "anstatt der Anwendung des Patches, eine Zusammenfassung für die Eingabe "
 "ausgeben"
 
-#: apply.c:4931
+#: apply.c:4941
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr ""
 "anstatt der Anwendung des Patches, zeige ob Patch angewendet werden kann"
 
-#: apply.c:4933
+#: apply.c:4943
 msgid "make sure the patch is applicable to the current index"
 msgstr ""
 "sicherstellen, dass der Patch mit dem aktuellen Index angewendet werden kann"
 
-#: apply.c:4935
+#: apply.c:4945
 msgid "apply a patch without touching the working tree"
 msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen"
 
-#: apply.c:4937
+#: apply.c:4947
 msgid "accept a patch that touches outside the working area"
 msgstr ""
 "Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt"
 
-#: apply.c:4939
+#: apply.c:4949
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)"
 
-#: apply.c:4941
+#: apply.c:4951
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "versuche 3-Wege-Merge, wenn der Patch nicht angewendet werden konnte"
 
-#: apply.c:4943
+#: apply.c:4953
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "einen temporären Index, basierend auf den integrierten Index-Informationen, "
 "erstellen"
 
-#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515
+#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
 msgid "paths are separated with NUL character"
 msgstr "Pfade sind getrennt durch NUL Zeichen"
 
-#: apply.c:4948
+#: apply.c:4958
 msgid "ensure at least <n> lines of context match"
 msgstr ""
 "sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen"
 
-#: apply.c:4949 builtin/am.c:2264
+#: apply.c:4959 builtin/am.c:2245
 msgid "action"
 msgstr "Aktion"
 
-#: apply.c:4950
+#: apply.c:4960
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln"
 
-#: apply.c:4953 apply.c:4956
+#: apply.c:4963 apply.c:4966
 msgid "ignore changes in whitespace when finding context"
 msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren"
 
-#: apply.c:4959
+#: apply.c:4969
 msgid "apply the patch in reverse"
 msgstr "den Patch in umgekehrter Reihenfolge anwenden"
 
-#: apply.c:4961
+#: apply.c:4971
 msgid "don't expect at least one line of context"
 msgstr "keinen Kontext erwarten"
 
-#: apply.c:4963
+#: apply.c:4973
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr ""
 "zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen"
 
-#: apply.c:4965
+#: apply.c:4975
 msgid "allow overlapping hunks"
 msgstr "sich überlappende Patch-Blöcke erlauben"
 
-#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19
-#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651
-#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134
+#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
+#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
+#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
 msgid "be verbose"
 msgstr "erweiterte Ausgaben"
 
-#: apply.c:4968
+#: apply.c:4978
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren"
 
-#: apply.c:4971
+#: apply.c:4981
 msgid "do not trust the line counts in the hunk headers"
 msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen"
 
-#: apply.c:4973 builtin/am.c:2273
+#: apply.c:4983 builtin/am.c:2254
 msgid "root"
 msgstr "Wurzelverzeichnis"
 
-#: apply.c:4974
+#: apply.c:4984
 msgid "prepend <root> to all filenames"
 msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen"
 
-#: archive.c:12
+#: archive.c:13
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<Optionen>] <Commit-Referenz> [<Pfad>...]"
 
-#: archive.c:13
+#: archive.c:14
 msgid "git archive --list"
 msgstr "git archive --list"
 
-#: archive.c:14
+#: archive.c:15
 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 msgstr ""
 "git archive --remote <Repository> [--exec <Programm>] [<Optionen>] <Commit-"
 "Referenz> [<Pfad>...]"
 
-#: archive.c:15
+#: archive.c:16
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <Repository> [--exec <Programm>] --list"
 
-#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
+#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein"
 
-#: archive.c:417
+#: archive.c:418
 msgid "fmt"
 msgstr "Format"
 
-#: archive.c:417
+#: archive.c:418
 msgid "archive format"
 msgstr "Archivformat"
 
-#: archive.c:418 builtin/log.c:1436
+#: archive.c:419 builtin/log.c:1446
 msgid "prefix"
 msgstr "Präfix"
 
-#: archive.c:419
+#: archive.c:420
 msgid "prepend prefix to each pathname in the archive"
 msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen"
 
-#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60
-#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061
-#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129
+#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
+#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
+#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
+#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
 #: parse-options.h:153
 msgid "file"
 msgstr "Datei"
 
-#: archive.c:421 builtin/archive.c:89
+#: archive.c:422 builtin/archive.c:89
 msgid "write the archive to this file"
 msgstr "das Archiv in diese Datei schreiben"
 
-#: archive.c:423
+#: archive.c:424
 msgid "read .gitattributes in working directory"
 msgstr ".gitattributes aus dem Arbeitsverzeichnis lesen"
 
-#: archive.c:424
+#: archive.c:425
 msgid "report archived files on stderr"
 msgstr "archivierte Dateien in der Standard-Fehlerausgabe ausgeben"
 
-#: archive.c:425
+#: archive.c:426
 msgid "store only"
 msgstr "nur speichern"
 
-#: archive.c:426
+#: archive.c:427
 msgid "compress faster"
 msgstr "schneller komprimieren"
 
-#: archive.c:434
+#: archive.c:435
 msgid "compress better"
 msgstr "besser komprimieren"
 
-#: archive.c:437
+#: archive.c:438
 msgid "list supported archive formats"
 msgstr "unterstützte Archivformate auflisten"
 
-#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106
+#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
 #: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
 msgid "repo"
 msgstr "Repository"
 
-#: archive.c:440 builtin/archive.c:91
+#: archive.c:441 builtin/archive.c:91
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "Archiv vom Remote-Repository <Repository> abrufen"
 
-#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485
+#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
 msgid "command"
 msgstr "Programm"
 
-#: archive.c:442 builtin/archive.c:93
+#: archive.c:443 builtin/archive.c:93
 msgid "path to the remote git-upload-archive command"
 msgstr "Pfad zum externen \"git-upload-archive\"-Programm"
 
-#: archive.c:449
+#: archive.c:450
 msgid "Unexpected option --remote"
 msgstr "Unerwartete Option --remote"
 
-#: archive.c:451
+#: archive.c:452
 msgid "Option --exec can only be used together with --remote"
 msgstr "Die Option --exec kann nur zusammen mit --remote verwendet werden."
 
-#: archive.c:453
+#: archive.c:454
 msgid "Unexpected option --output"
 msgstr "Unerwartete Option --output"
 
-#: archive.c:475
+#: archive.c:476
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Unbekanntes Archivformat '%s'"
 
-#: archive.c:482
+#: archive.c:483
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argument für Format '%s' nicht unterstützt: -%d"
 
-#: attr.c:212
+#: attr.c:214
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s ist kein gültiger Attributname"
 
-#: attr.c:408
+#: attr.c:410
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -878,27 +888,22 @@ msgstr ""
 "Verneinende Muster werden in Git-Attributen ignoriert.\n"
 "Benutzen Sie '\\!' für führende Ausrufezeichen."
 
-#: bisect.c:444
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "Konnte Datei '%s' nicht öffnen"
-
-#: bisect.c:449
+#: bisect.c:447
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Ungültiger Inhalt bzgl. Anführungsstriche in Datei '%s': %s"
 
-#: bisect.c:657
+#: bisect.c:655
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Keine binäre Suche mehr möglich!\n"
 
-#: bisect.c:710
+#: bisect.c:708
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "%s ist kein gültiger Commit-Name"
 
-#: bisect.c:734
+#: bisect.c:732
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -907,7 +912,7 @@ msgstr ""
 "Die Merge-Basis %s ist fehlerhaft.\n"
 "Das bedeutet, der Fehler wurde zwischen %s und [%s] behoben.\n"
 
-#: bisect.c:739
+#: bisect.c:737
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -916,7 +921,7 @@ msgstr ""
 "Die Merge-Basis %s ist neu.\n"
 "Das bedeutet, die Eigenschaft hat sich zwischen %s und [%s] geändert.\n"
 
-#: bisect.c:744
+#: bisect.c:742
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -925,7 +930,7 @@ msgstr ""
 "Die Merge-Basis %s ist %s.\n"
 "Das bedeutet, der erste '%s' Commit befindet sich zwischen %s und [%s].\n"
 
-#: bisect.c:752
+#: bisect.c:750
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -936,7 +941,7 @@ msgstr ""
 "git bisect kann in diesem Fall nicht richtig arbeiten.\n"
 "Vielleicht verwechselten Sie %s und %s Commits?\n"
 
-#: bisect.c:765
+#: bisect.c:763
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -948,36 +953,36 @@ msgstr ""
 "erste %s Commit zwischen %s und %s befindet.\n"
 "Es wird dennoch fortgesetzt."
 
-#: bisect.c:800
+#: bisect.c:798
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "binäre Suche: eine Merge-Basis muss geprüft werden\n"
 
-#: bisect.c:851
+#: bisect.c:849
 #, c-format
 msgid "a %s revision is needed"
 msgstr "ein %s Commit wird benötigt"
 
-#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255
+#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
 #, c-format
 msgid "could not create file '%s'"
 msgstr "konnte Datei '%s' nicht erstellen"
 
-#: bisect.c:919
+#: bisect.c:917
 #, c-format
 msgid "could not read file '%s'"
 msgstr "Konnte Datei '%s' nicht lesen"
 
-#: bisect.c:949
+#: bisect.c:947
 msgid "reading bisect refs failed"
 msgstr "Lesen von Referenzen für binäre Suche fehlgeschlagen"
 
-#: bisect.c:969
+#: bisect.c:967
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s war sowohl %s als auch %s\n"
 
-#: bisect.c:977
+#: bisect.c:975
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -986,15 +991,16 @@ msgstr ""
 "Kein testbarer Commit gefunden.\n"
 "Vielleicht starteten Sie mit falschen Pfad-Parametern?\n"
 
-#: bisect.c:996
+#: bisect.c:994
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
 msgstr[0] "(ungefähr %d Schritt)"
 msgstr[1] "(ungefähr %d Schritte)"
 
-#. TRANSLATORS: the last %s will be replaced with
-#. "(roughly %d steps)" translation
+#. TRANSLATORS: the last %s will be replaced with "(roughly %d
+#. steps)" translation.
+#.
 #: bisect.c:1000
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
@@ -1002,6 +1008,46 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "binäre Suche: danach noch %d Commit zum Testen übrig %s\n"
 msgstr[1] "binäre Suche: danach noch %d Commits zum Testen übrig %s\n"
 
+#: blame.c:1757
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents und --reverse funktionieren gemeinsam nicht."
+
+#: blame.c:1768
+msgid "cannot use --contents with final commit object name"
+msgstr ""
+"kann --contents nicht mit endgültigem Namen des Commit-Objektes benutzen"
+
+#: blame.c:1788
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+"--reverse und --first-parent zusammen erfordern die Angabe eines "
+"endgültigen\n"
+"Commits"
+
+#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
+#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
+#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
+#: builtin/shortlog.c:177
+msgid "revision walk setup failed"
+msgstr "Einrichtung des Revisionsgangs fehlgeschlagen"
+
+#: blame.c:1815
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr ""
+"--reverse und --first-parent zusammen erfordern einen Bereich entlang der\n"
+"\"first-parent\"-Kette"
+
+#: blame.c:1826
+#, c-format
+msgid "no such path %s in %s"
+msgstr "Pfad %s nicht in %s"
+
+#: blame.c:1837
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "kann Blob %s für Pfad '%s' nicht lesen"
+
 #: branch.c:53
 #, c-format
 msgid ""
@@ -1141,7 +1187,7 @@ msgstr "Ungültiger Branchpunkt: '%s'"
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' ist bereits in '%s' ausgecheckt"
 
-#: branch.c:364
+#: branch.c:366
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert."
@@ -1151,92 +1197,85 @@ msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert."
 msgid "'%s' does not look like a v2 bundle file"
 msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus"
 
-#: bundle.c:61
+#: bundle.c:62
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "nicht erkannter Kopfbereich: %s%s (%d)"
 
-#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777
+#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
 #, c-format
 msgid "could not open '%s'"
 msgstr "Konnte '%s' nicht öffnen"
 
-#: bundle.c:139
+#: bundle.c:140
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:"
 
-#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321
-#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353
-#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916
-#: builtin/merge.c:359 builtin/shortlog.c:176
-msgid "revision walk setup failed"
-msgstr "Einrichtung des Revisionsgangs fehlgeschlagen"
-
-#: bundle.c:185
+#: bundle.c:186
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "Das Paket enthält diese Referenz:"
 msgstr[1] "Das Paket enthält diese %d Referenzen:"
 
-#: bundle.c:192
+#: bundle.c:193
 msgid "The bundle records a complete history."
 msgstr "Das Paket speichert eine komplette Historie."
 
-#: bundle.c:194
+#: bundle.c:195
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "Das Paket benötigt diese Referenz:"
 msgstr[1] "Das Paket benötigt diese %d Referenzen:"
 
-#: bundle.c:253
+#: bundle.c:254
 msgid "Could not spawn pack-objects"
 msgstr "Konnte Paketobjekte nicht erstellen"
 
-#: bundle.c:264
+#: bundle.c:265
 msgid "pack-objects died"
 msgstr "Erstellung der Paketobjekte abgebrochen"
 
-#: bundle.c:304
+#: bundle.c:307
 msgid "rev-list died"
 msgstr "\"rev-list\" abgebrochen"
 
-#: bundle.c:353
+#: bundle.c:356
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen"
 
-#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281
+#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "nicht erkanntes Argument: %s"
 
-#: bundle.c:451
+#: bundle.c:454
 msgid "Refusing to create empty bundle."
 msgstr "Erstellung eines leeren Pakets zurückgewiesen."
 
-#: bundle.c:463
+#: bundle.c:466
 #, c-format
 msgid "cannot create '%s'"
 msgstr "kann '%s' nicht erstellen"
 
-#: bundle.c:491
+#: bundle.c:494
 msgid "index-pack died"
 msgstr "Erstellung der Paketindexdatei abgebrochen"
 
-#: color.c:300
+#: color.c:301
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "Ungültiger Farbwert: %.*s"
 
-#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455
-#: builtin/am.c:1489 builtin/am.c:2126
+#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
+#: builtin/am.c:1469 builtin/am.c:2107
 #, c-format
 msgid "could not parse %s"
 msgstr "konnte %s nicht parsen"
 
-#: commit.c:42
+#: commit.c:43
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s ist kein Commit!"
@@ -1248,7 +1287,7 @@ msgid ""
 "variable i18n.commitencoding to the encoding your project uses.\n"
 msgstr ""
 "Warnung: Die Commit-Beschreibung ist nicht UTF-8 konform.\n"
-"Sie können das Nachbessern, nachdem Sie die Beschreibung korrigiert haben,\n"
+"Sie können das nachbessern, nachdem Sie die Beschreibung korrigiert haben,\n"
 "oder Sie setzen die Konfigurationsvariable i18n.commitencoding auf das "
 "Encoding,\n"
 "welches von ihrem Projekt verwendet wird.\n"
@@ -1257,178 +1296,178 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "Speicher verbraucht"
 
-#: config.c:191
+#: config.c:186
 msgid "relative config include conditionals must come from files"
 msgstr ""
 "Bedingungen für das Einbinden von Konfigurationen aus relativen Pfaden "
 "müssen\n"
 "aus Dateien kommen."
 
-#: config.c:711
+#: config.c:720
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "Ungültige Konfigurationszeile %d in Blob %s"
 
-#: config.c:715
+#: config.c:724
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "Ungültige Konfigurationszeile %d in Datei %s"
 
-#: config.c:719
+#: config.c:728
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "Ungültige Konfigurationszeile %d in Standard-Eingabe"
 
-#: config.c:723
+#: config.c:732
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "Ungültige Konfigurationszeile %d in Submodul-Blob %s"
 
-#: config.c:727
+#: config.c:736
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "Ungültige Konfigurationszeile %d in Kommandozeile %s"
 
-#: config.c:731
+#: config.c:740
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "Ungültige Konfigurationszeile %d in %s"
 
-#: config.c:859
+#: config.c:868
 msgid "out of range"
 msgstr "Außerhalb des Bereichs"
 
-#: config.c:859
+#: config.c:868
 msgid "invalid unit"
 msgstr "Ungültige Einheit"
 
-#: config.c:865
+#: config.c:874
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s"
 
-#: config.c:870
+#: config.c:879
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Blob %s: %s"
 
-#: config.c:873
+#: config.c:882
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr ""
 "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Datei %s: %s"
 
-#: config.c:876
+#: config.c:885
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr ""
 "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Standard-Eingabe: "
 "%s"
 
-#: config.c:879
+#: config.c:888
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
 "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Submodul-Blob %s: "
 "%s"
 
-#: config.c:882
+#: config.c:891
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr ""
 "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Befehlszeile %s: "
 "%s"
 
-#: config.c:885
+#: config.c:894
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in %s: %s"
 
-#: config.c:980
+#: config.c:989
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'"
 
-#: config.c:1075 config.c:1086
+#: config.c:1084 config.c:1095
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "ungültiger zlib Komprimierungsgrad %d"
 
-#: config.c:1203
+#: config.c:1212
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "Ungültiger Modus für Objekterstellung: %s"
 
-#: config.c:1359
+#: config.c:1368
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "ungültiger Komprimierungsgrad (%d) für Paketierung"
 
-#: config.c:1557
+#: config.c:1564
 msgid "unable to parse command-line config"
 msgstr ""
 "Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen."
 
-#: config.c:1611
+#: config.c:1894
 msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 "Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf."
 
-#: config.c:1970
+#: config.c:2064
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "Ungültiger %s: '%s'"
 
-#: config.c:1991
+#: config.c:2085
 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr ""
 "Unbekannter Wert '%s' in core.untrackedCache; benutze Standardwert 'keep'"
 
-#: config.c:2017
+#: config.c:2111
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 "Der Wert '%d' von splitIndex.maxPercentChange sollte zwischen 0 und 100 "
 "liegen."
 
-#: config.c:2028
+#: config.c:2122
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr ""
 "Konnte Wert '%s' aus der über die Befehlszeile angegebenen Konfiguration\n"
 "nicht parsen."
 
-#: config.c:2030
+#: config.c:2124
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "ungültige Konfigurationsvariable '%s' in Datei '%s' bei Zeile %d"
 
-#: config.c:2089
+#: config.c:2183
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s hat mehrere Werte"
 
-#: config.c:2423 config.c:2648
+#: config.c:2517 config.c:2745
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat auf %s fehlgeschlagen"
 
-#: config.c:2541
+#: config.c:2635
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "Konnte '%s' nicht zu '%s' setzen."
 
-#: config.c:2543 builtin/remote.c:774
+#: config.c:2637 builtin/remote.c:775
 #, c-format
 msgid "could not unset '%s'"
 msgstr "Konnte '%s' nicht aufheben."
 
-#: connect.c:49
+#: connect.c:50
 msgid "The remote end hung up upon initial contact"
-msgstr "Die Gegenseite hat sich nach dem erstmaligen Kontakt aufgehangen."
+msgstr "Die Gegenseite hat nach dem ersten Kontakt abgebrochen."
 
-#: connect.c:51
+#: connect.c:52
 msgid ""
 "Could not read from remote repository.\n"
 "\n"
@@ -1441,7 +1480,7 @@ msgstr ""
 "bestehen\n"
 "und das Repository existiert."
 
-#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140
+#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
 msgid "Checking connectivity"
 msgstr "Prüfe Konnektivität"
 
@@ -1457,7 +1496,7 @@ msgstr "Fehler beim Schreiben nach rev-list"
 msgid "failed to close rev-list's stdin"
 msgstr "Fehler beim Schließen von rev-list's Standard-Eingabe"
 
-#: convert.c:201
+#: convert.c:205
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
@@ -1467,12 +1506,12 @@ msgstr ""
 "Die Datei wird ihre ursprünglichen Zeilenenden im Arbeitsverzeichnis "
 "behalten."
 
-#: convert.c:205
+#: convert.c:209
 #, c-format
 msgid "CRLF would be replaced by LF in %s."
 msgstr "CRLF würde in %s durch LF ersetzt werden."
 
-#: convert.c:211
+#: convert.c:215
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -1482,78 +1521,78 @@ msgstr ""
 "Die Datei wird ihre ursprünglichen Zeilenenden im Arbeitsverzeichnis "
 "behalten."
 
-#: convert.c:215
+#: convert.c:219
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr "LF würde in %s durch CRLF ersetzt werden."
 
-#: date.c:97
+#: date.c:116
 msgid "in the future"
 msgstr "in der Zukunft"
 
-#: date.c:103
+#: date.c:122
 #, c-format
-msgid "%lu second ago"
-msgid_plural "%lu seconds ago"
-msgstr[0] "vor %lu Sekunde"
-msgstr[1] "vor %lu Sekunden"
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "vor %<PRIuMAX> Sekunde"
+msgstr[1] "vor %<PRIuMAX> Sekunden"
 
-#: date.c:110
+#: date.c:129
 #, c-format
-msgid "%lu minute ago"
-msgid_plural "%lu minutes ago"
-msgstr[0] "vor %lu Minute"
-msgstr[1] "vor %lu Minuten"
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "vor %<PRIuMAX> Minute"
+msgstr[1] "vor %<PRIuMAX> Minuten"
 
-#: date.c:117
+#: date.c:136
 #, c-format
-msgid "%lu hour ago"
-msgid_plural "%lu hours ago"
-msgstr[0] "vor %lu Stunde"
-msgstr[1] "vor %lu Stunden"
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "vor %<PRIuMAX> Stunde"
+msgstr[1] "vor %<PRIuMAX> Stunden"
 
-#: date.c:124
+#: date.c:143
 #, c-format
-msgid "%lu day ago"
-msgid_plural "%lu days ago"
-msgstr[0] "vor %lu Tag"
-msgstr[1] "vor %lu Tagen"
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "vor %<PRIuMAX> Tag"
+msgstr[1] "vor %<PRIuMAX> Tagen"
 
-#: date.c:130
+#: date.c:149
 #, c-format
-msgid "%lu week ago"
-msgid_plural "%lu weeks ago"
-msgstr[0] "vor %lu Woche"
-msgstr[1] "vor %lu Wochen"
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "vor %<PRIuMAX> Woche"
+msgstr[1] "vor %<PRIuMAX> Wochen"
 
-#: date.c:137
+#: date.c:156
 #, c-format
-msgid "%lu month ago"
-msgid_plural "%lu months ago"
-msgstr[0] "vor %lu Monat"
-msgstr[1] "vor %lu Monaten"
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "vor %<PRIuMAX> Monat"
+msgstr[1] "vor %<PRIuMAX> Monaten"
 
-#: date.c:148
+#: date.c:167
 #, c-format
-msgid "%lu year"
-msgid_plural "%lu years"
-msgstr[0] "vor %lu Jahr"
-msgstr[1] "vor %lu Jahren"
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "vor %<PRIuMAX> Jahr"
+msgstr[1] "vor %<PRIuMAX> Jahren"
 
 #. TRANSLATORS: "%s" is "<n> years"
-#: date.c:151
+#: date.c:170
 #, c-format
-msgid "%s, %lu month ago"
-msgid_plural "%s, %lu months ago"
-msgstr[0] "%s, und %lu Monat"
-msgstr[1] "%s, und %lu Monaten"
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "%s, und %<PRIuMAX> Monat"
+msgstr[1] "%s, und %<PRIuMAX> Monaten"
 
-#: date.c:156 date.c:161
+#: date.c:175 date.c:180
 #, c-format
-msgid "%lu year ago"
-msgid_plural "%lu years ago"
-msgstr[0] "vor %lu Jahr"
-msgstr[1] "vor %lu Jahren"
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "vor %<PRIuMAX> Jahr"
+msgstr[1] "vor %<PRIuMAX> Jahren"
 
 #: diffcore-order.c:24
 #, c-format
@@ -1564,28 +1603,28 @@ msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'."
 msgid "Performing inexact rename detection"
 msgstr "Führe Erkennung für ungenaue Umbenennung aus"
 
-#: diff.c:62
+#: diff.c:63
 #, c-format
 msgid "option '%s' requires a value"
 msgstr "Option '%s' erfordert einen Wert."
 
-#: diff.c:124
+#: diff.c:125
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr ""
 "  Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n"
 
-#: diff.c:129
+#: diff.c:130
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Unbekannter \"dirstat\" Parameter '%s'\n"
 
-#: diff.c:281
+#: diff.c:282
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.dirstat': '%s'"
 
-#: diff.c:344
+#: diff.c:342
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -1594,21 +1633,21 @@ msgstr ""
 "Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n"
 "%s"
 
-#: diff.c:3102
+#: diff.c:3101
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s"
 
-#: diff.c:3428
+#: diff.c:3427
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr ""
 "--name-only, --name-status, --check und -s schließen sich gegenseitig aus"
 
-#: diff.c:3518
+#: diff.c:3517
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow erfordert genau eine Pfadspezifikation"
 
-#: diff.c:3681
+#: diff.c:3680
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -1617,22 +1656,22 @@ msgstr ""
 "Fehler beim Parsen des --dirstat/-X Optionsparameters:\n"
 "%s"
 
-#: diff.c:3695
+#: diff.c:3694
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'"
 
-#: diff.c:4719
+#: diff.c:4716
 msgid "inexact rename detection was skipped due to too many files."
 msgstr ""
 "Ungenaue Erkennung für Umbenennungen wurde aufgrund zu vieler Dateien\n"
 "übersprungen."
 
-#: diff.c:4722
+#: diff.c:4719
 msgid "only found copies from modified paths due to too many files."
 msgstr "nur Kopien von geänderten Pfaden, aufgrund zu vieler Dateien, gefunden"
 
-#: diff.c:4725
+#: diff.c:4722
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -1640,260 +1679,260 @@ msgstr ""
 "Sie könnten die Variable %s auf mindestens %d setzen und den Befehl\n"
 "erneut versuchen."
 
-#: dir.c:1899
+#: dir.c:1948
 msgid "failed to get kernel name and information"
 msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel"
 
-#: dir.c:2018
+#: dir.c:2067
 msgid "Untracked cache is disabled on this system or location."
 msgstr ""
 "Cache für unversionierte Dateien ist auf diesem System oder\n"
 "für dieses Verzeichnis deaktiviert."
 
-#: dir.c:2776 dir.c:2781
+#: dir.c:2846 dir.c:2851
 #, c-format
 msgid "could not create directories for %s"
 msgstr "Konnte Verzeichnisse für '%s' nicht erstellen."
 
-#: dir.c:2806
+#: dir.c:2876
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren."
 
-#: entry.c:280
+#: entry.c:281
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "konnte Datei '%s' nicht lesen"
 
-#: fetch-pack.c:249
+#: fetch-pack.c:251
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: erwartete shallow-Liste"
 
-#: fetch-pack.c:261
+#: fetch-pack.c:263
 msgid "git fetch-pack: expected ACK/NAK, got EOF"
 msgstr "git fetch-pack: ACK/NAK erwartet, EOF bekommen"
 
-#: fetch-pack.c:280 builtin/archive.c:63
+#: fetch-pack.c:282 builtin/archive.c:63
 #, c-format
 msgid "remote error: %s"
 msgstr "Fehler am anderen Ende: %s"
 
-#: fetch-pack.c:281
+#: fetch-pack.c:283
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: ACK/NAK erwartet, '%s' bekommen"
 
-#: fetch-pack.c:333
+#: fetch-pack.c:335
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc benötigt multi_ack_detailed"
 
-#: fetch-pack.c:419
+#: fetch-pack.c:421
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "Ungültige shallow-Zeile: %s"
 
-#: fetch-pack.c:425
+#: fetch-pack.c:427
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "Ungültige unshallow-Zeile: %s"
 
-#: fetch-pack.c:427
+#: fetch-pack.c:429
 #, c-format
 msgid "object not found: %s"
 msgstr "Objekt nicht gefunden: %s"
 
-#: fetch-pack.c:430
+#: fetch-pack.c:432
 #, c-format
 msgid "error in object: %s"
 msgstr "Fehler in Objekt: %s"
 
-#: fetch-pack.c:432
+#: fetch-pack.c:434
 #, c-format
 msgid "no shallow found: %s"
 msgstr "Kein shallow-Objekt gefunden: %s"
 
-#: fetch-pack.c:435
+#: fetch-pack.c:437
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "shallow/unshallow erwartet, %s bekommen"
 
-#: fetch-pack.c:474
+#: fetch-pack.c:476
 #, c-format
 msgid "got %s %d %s"
 msgstr "%s %d %s bekommen"
 
-#: fetch-pack.c:488
+#: fetch-pack.c:490
 #, c-format
 msgid "invalid commit %s"
 msgstr "Ungültiger Commit %s"
 
-#: fetch-pack.c:521
+#: fetch-pack.c:523
 msgid "giving up"
 msgstr "Gebe auf"
 
-#: fetch-pack.c:531 progress.c:235
+#: fetch-pack.c:533 progress.c:237
 msgid "done"
 msgstr "Fertig"
 
-#: fetch-pack.c:543
+#: fetch-pack.c:545
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "%s (%d) %s bekommen"
 
-#: fetch-pack.c:589
+#: fetch-pack.c:591
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Markiere %s als vollständig"
 
-#: fetch-pack.c:737
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr "habe %s (%s) bereits"
 
-#: fetch-pack.c:775
+#: fetch-pack.c:813
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: Fehler beim Starten des sideband demultiplexer"
 
-#: fetch-pack.c:783
+#: fetch-pack.c:821
 msgid "protocol error: bad pack header"
 msgstr "Protokollfehler: ungültiger Pack-Header"
 
-#: fetch-pack.c:839
+#: fetch-pack.c:877
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: konnte %s nicht starten"
 
-#: fetch-pack.c:855
+#: fetch-pack.c:893
 #, c-format
 msgid "%s failed"
 msgstr "%s fehlgeschlagen"
 
-#: fetch-pack.c:857
+#: fetch-pack.c:895
 msgid "error in sideband demultiplexer"
 msgstr "Fehler in sideband demultiplexer"
 
-#: fetch-pack.c:884
+#: fetch-pack.c:922
 msgid "Server does not support shallow clients"
 msgstr "Server unterstützt keine shallow-Clients"
 
-#: fetch-pack.c:888
+#: fetch-pack.c:926
 msgid "Server supports multi_ack_detailed"
 msgstr "Server unterstützt multi_ack_detailed"
 
-#: fetch-pack.c:891
+#: fetch-pack.c:929
 msgid "Server supports no-done"
 msgstr "Server unterstützt no-done"
 
-#: fetch-pack.c:897
+#: fetch-pack.c:935
 msgid "Server supports multi_ack"
 msgstr "Server unterstützt multi_ack"
 
-#: fetch-pack.c:901
+#: fetch-pack.c:939
 msgid "Server supports side-band-64k"
 msgstr "Server unterstützt side-band-64k"
 
-#: fetch-pack.c:905
+#: fetch-pack.c:943
 msgid "Server supports side-band"
 msgstr "Server unterstützt side-band"
 
-#: fetch-pack.c:909
+#: fetch-pack.c:947
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "Server unterstützt allow-tip-sha1-in-want"
 
-#: fetch-pack.c:913
+#: fetch-pack.c:951
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "Server unterstützt allow-reachable-sha1-in-want"
 
-#: fetch-pack.c:923
+#: fetch-pack.c:961
 msgid "Server supports ofs-delta"
 msgstr "Server unterstützt ofs-delta"
 
-#: fetch-pack.c:930
+#: fetch-pack.c:968
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Server-Version ist %.*s"
 
-#: fetch-pack.c:936
+#: fetch-pack.c:974
 msgid "Server does not support --shallow-since"
 msgstr "Server unterstützt kein --shallow-since"
 
-#: fetch-pack.c:940
+#: fetch-pack.c:978
 msgid "Server does not support --shallow-exclude"
 msgstr "Server unterstützt kein --shallow-exclude"
 
-#: fetch-pack.c:942
+#: fetch-pack.c:980
 msgid "Server does not support --deepen"
 msgstr "Server unterstützt kein --deepen"
 
-#: fetch-pack.c:953
+#: fetch-pack.c:991
 msgid "no common commits"
 msgstr "keine gemeinsamen Commits"
 
-#: fetch-pack.c:965
+#: fetch-pack.c:1003
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: Abholen fehlgeschlagen."
 
-#: fetch-pack.c:1127
+#: fetch-pack.c:1165
 msgid "no matching remote head"
 msgstr "kein übereinstimmender Remote-Branch"
 
-#: fetch-pack.c:1149
+#: fetch-pack.c:1187
 #, c-format
 msgid "no such remote ref %s"
 msgstr "keine solche Remote-Referenz %s"
 
-#: fetch-pack.c:1152
+#: fetch-pack.c:1190
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "Der Server lehnt Anfrage nach nicht angebotenem Objekt %s ab."
 
-#: gpg-interface.c:185
+#: gpg-interface.c:181
 msgid "gpg failed to sign the data"
 msgstr "gpg beim Signieren der Daten fehlgeschlagen"
 
-#: gpg-interface.c:215
+#: gpg-interface.c:211
 msgid "could not create temporary file"
 msgstr "konnte temporäre Datei nicht erstellen"
 
-#: gpg-interface.c:217
+#: gpg-interface.c:213
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'"
 
-#: graph.c:96
+#: graph.c:97
 #, c-format
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "Ignoriere ungültige Farbe '%.*s' in log.graphColors"
 
-#: grep.c:1796
+#: grep.c:1981
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s': konnte %s nicht lesen"
 
-#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133
+#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "Konnte '%s' nicht lesen"
 
-#: grep.c:1824
+#: grep.c:2009
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s': read() zu kurz"
 
-#: help.c:218
+#: help.c:179
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "Vorhandene Git-Befehle in '%s'"
 
-#: help.c:225
+#: help.c:186
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "Vorhandene Git-Befehle anderswo in Ihrem $PATH"
 
-#: help.c:256
+#: help.c:217
 msgid "These are common Git commands used in various situations:"
 msgstr "Allgemeine Git-Befehle, verwendet in verschiedenen Situationen:"
 
-#: help.c:321
+#: help.c:281
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -1902,30 +1941,50 @@ msgstr ""
 "'%s' scheint ein git-Befehl zu sein, konnte aber\n"
 "nicht ausgeführt werden. Vielleicht ist git-%s fehlerhaft?"
 
-#: help.c:376
+#: help.c:336
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "Uh oh. Keine Git-Befehle auf Ihrem System vorhanden."
 
-#: help.c:398
+#: help.c:358
 #, c-format
-msgid ""
-"WARNING: You called a Git command named '%s', which does not exist.\n"
-"Continuing under the assumption that you meant '%s'"
-msgstr ""
-"Warnung: Sie haben den nicht existierenden Git-Befehl '%s' ausgeführt.\n"
-"Setze fort unter der Annahme, dass Sie '%s' gemeint haben."
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr "WARNUNG: Sie haben Git-Befehl '%s' ausgeführt, welcher nicht existiert."
+
+#: help.c:363
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "Setze fort unter der Annahme, dass Sie '%s' meinten."
 
-#: help.c:403
+#: help.c:368
 #, c-format
-msgid "in %0.1f seconds automatically..."
-msgstr "Automatische Ausführung in %0.1f Sekunden ..."
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr "Setze in %0.1f Sekunden fort unter der Annahme, dass Sie '%s' meinten."
 
-#: help.c:410
+#: help.c:376
 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr "git: '%s' ist kein Git-Befehl. Siehe 'git --help'."
 
-#: help.c:414 help.c:480
+#: help.c:380
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] "\nDer ähnlichste Befehl ist"
+msgstr[1] "\nDie ähnlichsten Befehle sind"
+
+#: help.c:395
+msgid "git version [<options>]"
+msgstr "git version [<Optionen>]"
+
+#: help.c:456
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
+
+#: help.c:460
 msgid ""
 "\n"
 "Did you mean this?"
@@ -1939,12 +1998,7 @@ msgstr[1] ""
 "\n"
 "Haben Sie eines von diesen gemeint?"
 
-#: help.c:476
-#, c-format
-msgid "%s: %s - %s"
-msgstr "%s: %s - %s"
-
-#: ident.c:343
+#: ident.c:342
 msgid ""
 "\n"
 "*** Please tell me who you are.\n"
@@ -1970,35 +2024,35 @@ msgstr ""
 "Lassen Sie die Option \"--global\" weg, um die Identität nur\n"
 "für dieses Repository zu setzen.\n"
 
-#: ident.c:367
+#: ident.c:366
 msgid "no email was given and auto-detection is disabled"
 msgstr "keine E-Mail angegeben und automatische Erkennung ist deaktiviert"
 
-#: ident.c:372
+#: ident.c:371
 #, c-format
 msgid "unable to auto-detect email address (got '%s')"
 msgstr "Konnte die E-Mail-Adresse nicht automatisch erkennen ('%s' erhalten)"
 
-#: ident.c:382
+#: ident.c:381
 msgid "no name was given and auto-detection is disabled"
 msgstr "kein Name angegeben und automatische Erkennung ist deaktiviert"
 
-#: ident.c:388
+#: ident.c:387
 #, c-format
 msgid "unable to auto-detect name (got '%s')"
 msgstr "konnte Namen nicht automatisch erkennen ('%s' erhalten)"
 
-#: ident.c:396
+#: ident.c:395
 #, c-format
 msgid "empty ident name (for <%s>) not allowed"
 msgstr "Leerer Name in Identifikation (für <%s>) nicht erlaubt."
 
-#: ident.c:402
+#: ident.c:401
 #, c-format
 msgid "name consists only of disallowed characters: %s"
 msgstr "Name besteht nur aus nicht erlaubten Zeichen: %s"
 
-#: ident.c:417 builtin/commit.c:611
+#: ident.c:416 builtin/commit.c:612
 #, c-format
 msgid "invalid date format: %s"
 msgstr "Ungültiges Datumsformat: %s"
@@ -2032,78 +2086,78 @@ msgstr "Konnte '%s.lock' nicht erstellen: %s"
 msgid "failed to read the cache"
 msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
 
-#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393
-#: builtin/checkout.c:607 builtin/clone.c:749
+#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
+#: builtin/checkout.c:591 builtin/clone.c:753
 msgid "unable to write new index file"
 msgstr "Konnte neue Index-Datei nicht schreiben."
 
-#: merge-recursive.c:209
+#: merge-recursive.c:210
 msgid "(bad commit)\n"
 msgstr "(ungültiger Commit)\n"
 
-#: merge-recursive.c:231 merge-recursive.c:239
+#: merge-recursive.c:232 merge-recursive.c:240
 #, c-format
 msgid "addinfo_cache failed for path '%s'"
 msgstr "addinfo_cache für Pfad '%s' fehlgeschlagen"
 
-#: merge-recursive.c:303
+#: merge-recursive.c:304
 msgid "error building trees"
 msgstr "Fehler beim Erstellen der \"Tree\"-Objekte"
 
-#: merge-recursive.c:727
+#: merge-recursive.c:728
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "Fehler beim Erstellen des Pfades '%s'%s"
 
-#: merge-recursive.c:738
+#: merge-recursive.c:739
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Entferne %s, um Platz für Unterverzeichnis zu schaffen\n"
 
-#: merge-recursive.c:752 merge-recursive.c:771
+#: merge-recursive.c:753 merge-recursive.c:772
 msgid ": perhaps a D/F conflict?"
 msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?"
 
-#: merge-recursive.c:761
+#: merge-recursive.c:762
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "verweigere, da unversionierte Dateien in '%s' verloren gehen würden"
 
-#: merge-recursive.c:803 builtin/cat-file.c:34
+#: merge-recursive.c:804 builtin/cat-file.c:36
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "kann Objekt %s '%s' nicht lesen"
 
-#: merge-recursive.c:805
+#: merge-recursive.c:806
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "Blob erwartet für %s '%s'"
 
-#: merge-recursive.c:829
+#: merge-recursive.c:830
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "Fehler beim Öffnen von '%s': %s"
 
-#: merge-recursive.c:840
+#: merge-recursive.c:841
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s': %s"
 
-#: merge-recursive.c:845
+#: merge-recursive.c:846
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "weiß nicht was mit %06o %s '%s' zu machen ist"
 
-#: merge-recursive.c:985
+#: merge-recursive.c:986
 msgid "Failed to execute internal merge"
 msgstr "Fehler bei Ausführung des internen Merges"
 
-#: merge-recursive.c:989
+#: merge-recursive.c:990
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "Konnte %s nicht zur Datenbank hinzufügen"
 
-#: merge-recursive.c:1092
+#: merge-recursive.c:1093
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2112,7 +2166,7 @@ msgstr ""
 "KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
 "im Arbeitsbereich gelassen."
 
-#: merge-recursive.c:1097
+#: merge-recursive.c:1098
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2121,7 +2175,7 @@ msgstr ""
 "KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von "
 "%s wurde im Arbeitsbereich gelassen."
 
-#: merge-recursive.c:1104
+#: merge-recursive.c:1105
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2130,7 +2184,7 @@ msgstr ""
 "KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
 "im Arbeitsbereich bei %s gelassen."
 
-#: merge-recursive.c:1109
+#: merge-recursive.c:1110
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2139,20 +2193,20 @@ msgstr ""
 "KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von "
 "%s wurde im Arbeitsbereich bei %s gelassen."
 
-#: merge-recursive.c:1143
+#: merge-recursive.c:1144
 msgid "rename"
 msgstr "umbenennen"
 
-#: merge-recursive.c:1143
+#: merge-recursive.c:1144
 msgid "renamed"
 msgstr "umbenannt"
 
-#: merge-recursive.c:1200
+#: merge-recursive.c:1201
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s ist ein Verzeichnis in %s, füge es stattdessen als %s hinzu"
 
-#: merge-recursive.c:1225
+#: merge-recursive.c:1226
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2161,139 +2215,139 @@ msgstr ""
 "KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" "
 "und \"%s\"->\"%s\" in Branch \"%s\"%s"
 
-#: merge-recursive.c:1230
+#: merge-recursive.c:1231
 msgid " (left unresolved)"
 msgstr " (bleibt unaufgelöst)"
 
-#: merge-recursive.c:1292
+#: merge-recursive.c:1293
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "KONFLIKT (umbenennen/umbenennen): Benenne um %s->%s in %s. Benenne um %s->%s "
 "in %s"
 
-#: merge-recursive.c:1325
+#: merge-recursive.c:1326
 #, c-format
 msgid "Renaming %s to %s and %s to %s instead"
 msgstr "Benenne stattdessen %s nach %s und %s nach %s um"
 
-#: merge-recursive.c:1528
+#: merge-recursive.c:1529
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 msgstr ""
 "KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s hinzugefügt in "
 "%s"
 
-#: merge-recursive.c:1543
+#: merge-recursive.c:1544
 #, c-format
 msgid "Adding merged %s"
 msgstr "Füge zusammengeführte Datei %s hinzu"
 
-#: merge-recursive.c:1550 merge-recursive.c:1780
+#: merge-recursive.c:1551 merge-recursive.c:1781
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Füge stattdessen als %s hinzu"
 
-#: merge-recursive.c:1607
+#: merge-recursive.c:1608
 #, c-format
 msgid "cannot read object %s"
 msgstr "kann Objekt %s nicht lesen"
 
-#: merge-recursive.c:1610
+#: merge-recursive.c:1611
 #, c-format
 msgid "object %s is not a blob"
 msgstr "Objekt %s ist kein Blob"
 
-#: merge-recursive.c:1679
+#: merge-recursive.c:1680
 msgid "modify"
 msgstr "ändern"
 
-#: merge-recursive.c:1679
+#: merge-recursive.c:1680
 msgid "modified"
 msgstr "geändert"
 
-#: merge-recursive.c:1689
+#: merge-recursive.c:1690
 msgid "content"
 msgstr "Inhalt"
 
-#: merge-recursive.c:1696
+#: merge-recursive.c:1697
 msgid "add/add"
 msgstr "hinzufügen/hinzufügen"
 
-#: merge-recursive.c:1732
+#: merge-recursive.c:1733
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)"
 
-#: merge-recursive.c:1746
+#: merge-recursive.c:1747
 #, c-format
 msgid "Auto-merging %s"
 msgstr "automatischer Merge von %s"
 
-#: merge-recursive.c:1750 git-submodule.sh:944
+#: merge-recursive.c:1751 git-submodule.sh:945
 msgid "submodule"
 msgstr "Submodul"
 
-#: merge-recursive.c:1751
+#: merge-recursive.c:1752
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "KONFLIKT (%s): Merge-Konflikt in %s"
 
-#: merge-recursive.c:1845
+#: merge-recursive.c:1846
 #, c-format
 msgid "Removing %s"
 msgstr "Entferne %s"
 
-#: merge-recursive.c:1871
+#: merge-recursive.c:1872
 msgid "file/directory"
 msgstr "Datei/Verzeichnis"
 
-#: merge-recursive.c:1877
+#: merge-recursive.c:1878
 msgid "directory/file"
 msgstr "Verzeichnis/Datei"
 
-#: merge-recursive.c:1883
+#: merge-recursive.c:1884
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. Füge %s als %s "
 "hinzu."
 
-#: merge-recursive.c:1892
+#: merge-recursive.c:1893
 #, c-format
 msgid "Adding %s"
 msgstr "Füge %s hinzu"
 
-#: merge-recursive.c:1929
+#: merge-recursive.c:1930
 msgid "Already up-to-date!"
 msgstr "Bereits aktuell!"
 
-#: merge-recursive.c:1938
+#: merge-recursive.c:1939
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen"
 
-#: merge-recursive.c:2021
+#: merge-recursive.c:2022
 msgid "Merging:"
 msgstr "Merge:"
 
-#: merge-recursive.c:2034
+#: merge-recursive.c:2035
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "%u gemeinsamen Vorgänger-Commit gefunden"
 msgstr[1] "%u gemeinsame Vorgänger-Commits gefunden"
 
-#: merge-recursive.c:2073
+#: merge-recursive.c:2074
 msgid "merge returned no commit"
 msgstr "Merge hat keinen Commit zurückgegeben"
 
-#: merge-recursive.c:2136
+#: merge-recursive.c:2137
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Konnte Objekt '%s' nicht parsen."
 
-#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792
+#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
 msgid "Unable to write index."
 msgstr "Konnte Index nicht schreiben."
 
@@ -2317,25 +2371,27 @@ msgstr ""
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr "Sie haben Ihren Merge von Notizen nicht abgeschlossen (%s existiert)."
 
-#: notes-utils.c:41
+#: notes-utils.c:42
 msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr ""
 "Kann uninitialisiertes/unreferenzierte Notiz-Verzeichnis nicht committen."
 
-#: notes-utils.c:100
+#: notes-utils.c:101
 #, c-format
 msgid "Bad notes.rewriteMode value: '%s'"
 msgstr "Ungültiger notes.rewriteMode Wert: '%s'"
 
-#: notes-utils.c:110
+#: notes-utils.c:111
 #, c-format
 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr ""
 "Umschreiben der Notizen in %s zurückgewiesen (außerhalb von refs/notes/)"
 
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: notes-utils.c:137
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#: notes-utils.c:141
 #, c-format
 msgid "Bad %s value: '%s'"
 msgstr "Ungültiger %s Wert: '%s'"
@@ -2345,28 +2401,29 @@ msgstr "Ungültiger %s Wert: '%s'"
 msgid "unable to parse object: %s"
 msgstr "Konnte Objekt '%s' nicht parsen."
 
-#: parse-options.c:572
+#: parse-options.c:573
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:590
+#: parse-options.c:591
 #, c-format
 msgid "usage: %s"
 msgstr "Verwendung: %s"
 
 #. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation
-#: parse-options.c:594
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:597
 #, c-format
 msgid "   or: %s"
 msgstr "      oder: %s"
 
-#: parse-options.c:597
+#: parse-options.c:600
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:631
+#: parse-options.c:634
 msgid "-NUM"
 msgstr "-NUM"
 
@@ -2375,35 +2432,35 @@ msgstr "-NUM"
 msgid "malformed object name '%s'"
 msgstr "fehlerhafter Objekt-Name '%s'"
 
-#: path.c:810
+#: path.c:890
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Konnte Gruppenschreibrecht für %s nicht setzen."
 
-#: pathspec.c:125
+#: pathspec.c:129
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr "Escape-Zeichen '\\' als letztes Zeichen in Attributwert nicht erlaubt"
 
-#: pathspec.c:143
+#: pathspec.c:147
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Es ist nur eine Angabe von 'attr:' erlaubt."
 
-#: pathspec.c:146
+#: pathspec.c:150
 msgid "attr spec must not be empty"
 msgstr "Angabe von 'attr:' darf nicht leer sein"
 
-#: pathspec.c:189
+#: pathspec.c:193
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "Ungültiger Attributname %s"
 
-#: pathspec.c:254
+#: pathspec.c:258
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 "Globale Einstellungen zur Pfadspezifikation 'glob' und 'noglob' sind "
 "inkompatibel."
 
-#: pathspec.c:261
+#: pathspec.c:265
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -2411,52 +2468,47 @@ msgstr ""
 "Globale Einstellung zur Pfadspezifikation 'literal' ist inkompatibel\n"
 "mit allen anderen Optionen."
 
-#: pathspec.c:301
+#: pathspec.c:305
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "ungültiger Parameter für Pfadspezifikationsangabe 'prefix'"
 
-#: pathspec.c:322
+#: pathspec.c:326
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "ungültige Pfadspezifikationsangabe '%.*s' in '%s'"
 
-#: pathspec.c:327
+#: pathspec.c:331
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "Fehlendes ')' am Ende der Pfadspezifikationsangabe in '%s'"
 
-#: pathspec.c:365
+#: pathspec.c:369
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "nicht unterstützte Pfadspezifikationsangabe '%c' in '%s'"
 
-#: pathspec.c:421 pathspec.c:443
-#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'"
-
-#: pathspec.c:483
+#: pathspec.c:428
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: 'literal' und 'glob' sind inkompatibel"
 
-#: pathspec.c:496
+#: pathspec.c:441
 #, c-format
 msgid "%s: '%s' is outside repository"
 msgstr "%s: '%s' liegt außerhalb des Repositories"
 
-#: pathspec.c:584
+#: pathspec.c:515
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s' (Kürzel: '%c')"
 
-#: pathspec.c:594
+#: pathspec.c:525
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr ""
 "%s: Pfadspezifikationsangabe wird von diesem Befehl nicht unterstützt: %s"
 
-#: pathspec.c:644
+#: pathspec.c:575
 msgid ""
 "empty strings as pathspecs will be made invalid in upcoming releases. please "
 "use . instead if you meant to match all paths"
@@ -2465,16 +2517,16 @@ msgstr ""
 "ungültig.\n"
 "Bitte benutzen Sie stattdessen . wenn Sie alle Pfade meinen."
 
-#: pathspec.c:668
+#: pathspec.c:599
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknüpfung"
 
-#: pretty.c:982
+#: pretty.c:963
 msgid "unable to parse --pretty format"
 msgstr "Konnte --pretty Format nicht parsen."
 
-#: read-cache.c:1442
+#: read-cache.c:1443
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -2483,7 +2535,7 @@ msgstr ""
 "index.version gesetzt, aber Wert ungültig.\n"
 "Verwende Version %i"
 
-#: read-cache.c:1452
+#: read-cache.c:1453
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2492,46 +2544,53 @@ msgstr ""
 "GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n"
 "Verwende Version %i"
 
-#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048
+#: read-cache.c:2308 builtin/merge.c:1019
+#, c-format
+msgid "could not close '%s'"
+msgstr "Konnte '%s' nicht schließen"
+
+#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
 #, c-format
 msgid "could not stat '%s'"
 msgstr "Konnte '%s' nicht lesen."
 
-#: read-cache.c:2388
+#: read-cache.c:2396
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "konnte Git-Verzeichnis nicht öffnen: %s"
 
-#: read-cache.c:2400
+#: read-cache.c:2408
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "Konnte '%s' nicht entfernen."
 
-#: refs.c:620 builtin/merge.c:844
+#: refs.c:622
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "Konnte '%s' nicht zum Schreiben öffnen."
 
-#: refs.c:1667
+#: refs.c:1769
 msgid "ref updates forbidden inside quarantine environment"
-msgstr "Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung verboten."
+msgstr ""
+"Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung "
+"verboten."
 
-#: refs/files-backend.c:1631
+#: refs/files-backend.c:1664
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "Konnte Referenz %s nicht entfernen: %s"
 
-#: refs/files-backend.c:1634
+#: refs/files-backend.c:1667
 #, c-format
 msgid "could not delete references: %s"
 msgstr "Konnte Referenzen nicht entfernen: %s"
 
-#: refs/files-backend.c:1643
+#: refs/files-backend.c:1676
 #, c-format
 msgid "could not remove reference %s"
 msgstr "Konnte Referenz %s nicht löschen"
 
-#: ref-filter.c:35 wt-status.c:1780
+#: ref-filter.c:35 wt-status.c:1811
 msgid "gone"
 msgstr "entfernt"
 
@@ -2550,304 +2609,306 @@ msgstr "%d hinterher"
 msgid "ahead %d, behind %d"
 msgstr "%d voraus, %d hinterher"
 
-#: ref-filter.c:104
+#: ref-filter.c:105
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "Erwartetes Format: %%(color:<Farbe>)"
 
-#: ref-filter.c:106
+#: ref-filter.c:107
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "nicht erkannte Farbe: %%(color:%s)"
 
-#: ref-filter.c:120
+#: ref-filter.c:121
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Positiver Wert erwartet refname:lstrip=%s"
 
-#: ref-filter.c:124
+#: ref-filter.c:125
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Positiver Wert erwartet refname:rstrip=%s"
 
-#: ref-filter.c:126
+#: ref-filter.c:127
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "nicht erkanntes %%(%s) Argument: %s"
 
-#: ref-filter.c:166
+#: ref-filter.c:167
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) akzeptiert keine Argumente"
 
-#: ref-filter.c:173
+#: ref-filter.c:174
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "%%(subject) akzeptiert keine Argumente"
 
-#: ref-filter.c:180
+#: ref-filter.c:181
 #, c-format
 msgid "%%(trailers) does not take arguments"
 msgstr "%%(trailers) akzeptiert keine Argumente"
 
-#: ref-filter.c:199
+#: ref-filter.c:200
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "Positiver Wert erwartet contents:lines=%s"
 
-#: ref-filter.c:201
+#: ref-filter.c:202
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "nicht erkanntes %%(contents) Argument: %s"
 
-#: ref-filter.c:214
+#: ref-filter.c:215
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "Positiver Wert erwartet objectname:short=%s"
 
-#: ref-filter.c:218
+#: ref-filter.c:219
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "nicht erkanntes %%(objectname) Argument: %s"
 
-#: ref-filter.c:245
+#: ref-filter.c:246
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "Erwartetes Format: %%(align:<Breite>,<Position>)"
 
-#: ref-filter.c:257
+#: ref-filter.c:258
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "nicht erkannte Position:%s"
 
-#: ref-filter.c:261
+#: ref-filter.c:262
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "nicht erkannte Breite:%s"
 
-#: ref-filter.c:267
+#: ref-filter.c:268
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "nicht erkanntes %%(align) Argument: %s"
 
-#: ref-filter.c:271
+#: ref-filter.c:272
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "Positive Breitenangabe für %%(align) erwartet"
 
-#: ref-filter.c:286
+#: ref-filter.c:287
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "nicht erkanntes %%(if) Argument: %s"
 
-#: ref-filter.c:371
+#: ref-filter.c:378
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "Fehlerhafter Feldname: %.*s"
 
-#: ref-filter.c:397
+#: ref-filter.c:404
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "Unbekannter Feldname: %.*s"
 
-#: ref-filter.c:501
+#: ref-filter.c:508
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "format: %%(if) Atom ohne ein %%(then) Atom verwendet"
 
-#: ref-filter.c:561
+#: ref-filter.c:568
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "format: %%(then) Atom ohne ein %%(if) Atom verwendet"
 
-#: ref-filter.c:563
+#: ref-filter.c:570
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "format: %%(then) Atom mehr als einmal verwendet"
 
-#: ref-filter.c:565
+#: ref-filter.c:572
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: %%(then) Atom nach %%(else) verwendet"
 
-#: ref-filter.c:591
+#: ref-filter.c:598
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "format: %%(else) Atom ohne ein %%(if) Atom verwendet"
 
-#: ref-filter.c:593
+#: ref-filter.c:600
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "Format: %%(else) Atom ohne ein %%(then) Atom verwendet"
 
-#: ref-filter.c:595
+#: ref-filter.c:602
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "Format: %%(end) Atom mehr als einmal verwendet"
 
-#: ref-filter.c:608
+#: ref-filter.c:615
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "Format: %%(end) Atom ohne zugehöriges Atom verwendet"
 
-#: ref-filter.c:663
+#: ref-filter.c:670
 #, c-format
 msgid "malformed format string %s"
 msgstr "Fehlerhafter Formatierungsstring %s"
 
-#: ref-filter.c:1247
+#: ref-filter.c:1254
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(kein Branch, Rebase von Branch %s im Gange)"
 
-#: ref-filter.c:1250
+#: ref-filter.c:1257
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(kein Branch, binäre Suche begonnen bei %s)"
 
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached at " in wt-status.c
-#: ref-filter.c:1256
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached at " in wt-status.c
+#.
+#: ref-filter.c:1265
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD losgelöst bei %s)"
 
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached from " in wt-status.c
-#: ref-filter.c:1261
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached from " in wt-status.c
+#.
+#: ref-filter.c:1272
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD losgelöst von %s)"
 
-#: ref-filter.c:1265
+#: ref-filter.c:1276
 msgid "(no branch)"
 msgstr "(kein Branch)"
 
-#: ref-filter.c:1420 ref-filter.c:1451
+#: ref-filter.c:1426 ref-filter.c:1457
 #, c-format
 msgid "missing object %s for %s"
 msgstr "Objekt %s fehlt für %s"
 
-#: ref-filter.c:1423 ref-filter.c:1454
+#: ref-filter.c:1429 ref-filter.c:1460
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer bei %s für %s fehlgeschlagen"
 
-#: ref-filter.c:1692
+#: ref-filter.c:1760
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "fehlerhaftes Objekt bei '%s'"
 
-#: ref-filter.c:1759
+#: ref-filter.c:1827
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s"
 
-#: ref-filter.c:1764
+#: ref-filter.c:1832
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "Ignoriere fehlerhafte Referenz %s"
 
-#: ref-filter.c:2028
+#: ref-filter.c:2095
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "Format: %%(end) Atom fehlt"
 
-#: ref-filter.c:2109
+#: ref-filter.c:2176
 #, c-format
 msgid "malformed object name %s"
 msgstr "Missgebildeter Objektname %s"
 
-#: remote.c:754
+#: remote.c:747
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "Kann 'fetch' nicht für sowohl %s als auch %s nach %s ausführen."
 
-#: remote.c:758
+#: remote.c:751
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s folgt üblicherweise %s, nicht %s"
 
-#: remote.c:762
+#: remote.c:755
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s folgt sowohl %s als auch %s"
 
-#: remote.c:770
+#: remote.c:763
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: remote.c:1685 remote.c:1787
+#: remote.c:1680 remote.c:1782
 msgid "HEAD does not point to a branch"
 msgstr "HEAD zeigt auf keinen Branch"
 
-#: remote.c:1694
+#: remote.c:1689
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "Kein solcher Branch: '%s'"
 
-#: remote.c:1697
+#: remote.c:1692
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert."
 
-#: remote.c:1703
+#: remote.c:1698
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "Upstream-Branch '%s' nicht als Remote-Tracking-Branch gespeichert"
 
-#: remote.c:1718
+#: remote.c:1713
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 "Ziel für \"push\" '%s' auf Remote-Repository '%s' hat keinen lokal gefolgten "
 "Branch"
 
-#: remote.c:1730
+#: remote.c:1725
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
 
-#: remote.c:1741
+#: remote.c:1736
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "Push-Refspecs für '%s' beinhalten nicht '%s'"
 
-#: remote.c:1754
+#: remote.c:1749
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "kein Ziel für \"push\" (push.default ist 'nothing')"
 
-#: remote.c:1776
+#: remote.c:1771
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen"
 
-#: remote.c:2081
+#: remote.c:2076
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr ""
 "Ihr Branch basiert auf '%s', aber der Upstream-Branch wurde entfernt.\n"
 
-#: remote.c:2085
+#: remote.c:2080
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n"
 
-#: remote.c:2088
+#: remote.c:2083
 #, c-format
 msgid "Your branch is up-to-date with '%s'.\n"
 msgstr "Ihr Branch ist auf dem selben Stand wie '%s'.\n"
 
-#: remote.c:2092
+#: remote.c:2087
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "Ihr Branch ist %2$d Commit vor '%1$s'.\n"
 msgstr[1] "Ihr Branch ist %2$d Commits vor '%1$s'.\n"
 
-#: remote.c:2098
+#: remote.c:2093
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n"
 
-#: remote.c:2101
+#: remote.c:2096
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -2857,12 +2918,12 @@ msgstr[0] ""
 msgstr[1] ""
 "Ihr Branch ist %2$d Commits hinter '%1$s', und kann vorgespult werden.\n"
 
-#: remote.c:2109
+#: remote.c:2104
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr ""
 "  (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n"
 
-#: remote.c:2112
+#: remote.c:2107
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -2877,54 +2938,49 @@ msgstr[1] ""
 "Ihr Branch und '%s' sind divergiert,\n"
 "und haben jeweils %d und %d unterschiedliche Commits.\n"
 
-#: remote.c:2122
+#: remote.c:2117
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 "  (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch "
 "zusammenzuführen)\n"
 
-#: revision.c:2158
+#: revision.c:2187
 msgid "your current branch appears to be broken"
 msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein."
 
-#: revision.c:2161
+#: revision.c:2190
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "Ihr aktueller Branch '%s' hat noch keine Commits."
 
-#: revision.c:2355
+#: revision.c:2384
 msgid "--first-parent is incompatible with --bisect"
 msgstr "Die Optionen --first-parent und --bisect sind inkompatibel."
 
-#: run-command.c:125
+#: run-command.c:644
 msgid "open /dev/null failed"
 msgstr "Öffnen von /dev/null fehlgeschlagen"
 
-#: run-command.c:127
-#, c-format
-msgid "dup2(%d,%d) failed"
-msgstr "dup2(%d,%d) fehlgeschlagen"
-
-#: send-pack.c:150
+#: send-pack.c:151
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "Konnte Status des Entpackens der Gegenseite nicht parsen: %s"
 
-#: send-pack.c:152
+#: send-pack.c:153
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "Entpacken auf der Gegenseite fehlgeschlagen: %s"
 
-#: send-pack.c:315
+#: send-pack.c:316
 msgid "failed to sign the push certificate"
 msgstr "Fehler beim Signieren des \"push\"-Zertifikates"
 
-#: send-pack.c:428
+#: send-pack.c:429
 msgid "the receiving end does not support --signed push"
 msgstr ""
 "die Gegenseite unterstützt keinen signierten Versand (\"--signed push\")"
 
-#: send-pack.c:430
+#: send-pack.c:431
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -2932,107 +2988,107 @@ msgstr ""
 "kein Versand des \"push\"-Zertifikates, da die Gegenseite keinen signierten\n"
 "Versand (\"--signed push\") unterstützt"
 
-#: send-pack.c:442
+#: send-pack.c:443
 msgid "the receiving end does not support --atomic push"
 msgstr "die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")"
 
-#: send-pack.c:447
+#: send-pack.c:448
 msgid "the receiving end does not support push options"
 msgstr "die Gegenseite unterstützt keine Push-Optionen"
 
-#: sequencer.c:215
+#: sequencer.c:216
 msgid "revert"
 msgstr "Revert"
 
-#: sequencer.c:217
+#: sequencer.c:218
 msgid "cherry-pick"
 msgstr "Cherry-Pick"
 
-#: sequencer.c:219
+#: sequencer.c:220
 msgid "rebase -i"
 msgstr "interaktives Rebase"
 
-#: sequencer.c:221
+#: sequencer.c:222
 #, c-format
 msgid "Unknown action: %d"
 msgstr "Unbekannte Aktion: %d"
 
-#: sequencer.c:278
+#: sequencer.c:279
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
 msgstr ""
-"nach Auflösung der Konflikte, markieren Sie die korrigierten Pfade\n"
+"nach Auflösung der Konflikte markieren Sie die korrigierten Pfade\n"
 "mit 'git add <Pfade>' oder 'git rm <Pfade>'"
 
-#: sequencer.c:281
+#: sequencer.c:282
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
 "and commit the result with 'git commit'"
 msgstr ""
-"nach Auflösung der Konflikte, markieren Sie die korrigierten Pfade\n"
-"mit 'git add <Pfade>' oder 'git rm <Pfade>'und tragen Sie das Ergebnis mit\n"
+"nach Auflösung der Konflikte markieren Sie die korrigierten Pfade\n"
+"mit 'git add <Pfade>' oder 'git rm <Pfade>' und tragen Sie das Ergebnis mit\n"
 "'git commit' ein"
 
-#: sequencer.c:294 sequencer.c:1682
+#: sequencer.c:295 sequencer.c:1685
 #, c-format
 msgid "could not lock '%s'"
 msgstr "Konnte '%s' nicht sperren"
 
-#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701
+#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
 #, c-format
 msgid "could not write to '%s'"
 msgstr "Konnte nicht nach '%s' schreiben."
 
-#: sequencer.c:301
+#: sequencer.c:302
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "Konnte EOL nicht nach '%s' schreiben."
 
-#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689
+#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
 #, c-format
 msgid "failed to finalize '%s'."
 msgstr "Fehler beim Fertigstellen von '%s'."
 
-#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257
-#: builtin/commit.c:749 builtin/merge.c:1018
+#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
+#: builtin/commit.c:750 builtin/merge.c:1017
 #, c-format
 msgid "could not read '%s'"
 msgstr "Konnte '%s' nicht lesen"
 
-#: sequencer.c:355
+#: sequencer.c:356
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "Ihre lokalen Änderungen würden durch den %s überschrieben werden."
 
-#: sequencer.c:359
+#: sequencer.c:360
 msgid "commit your changes or stash them to proceed."
 msgstr ""
 "Committen Sie Ihre Änderungen oder benutzen Sie \"stash\", um fortzufahren."
 
-#: sequencer.c:388
+#: sequencer.c:389
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: Vorspulen"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. * "rebase -i".
+#. "rebase -i".
 #.
-#: sequencer.c:470
+#: sequencer.c:472
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Konnte neue Index-Datei nicht schreiben"
 
-#: sequencer.c:489
+#: sequencer.c:491
 msgid "could not resolve HEAD commit\n"
 msgstr "Konnte HEAD-Commit nicht auflösen\n"
 
-#: sequencer.c:509
+#: sequencer.c:511
 msgid "unable to update cache tree\n"
 msgstr "Konnte Cache-Verzeichnis nicht aktualisieren\n"
 
-#: sequencer.c:592
+#: sequencer.c:595
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -3063,17 +3119,17 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:694
+#: sequencer.c:697
 #, c-format
 msgid "could not parse commit %s\n"
 msgstr "Konnte Commit %s nicht parsen\n"
 
-#: sequencer.c:699
+#: sequencer.c:702
 #, c-format
 msgid "could not parse parent commit %s\n"
 msgstr "Konnte Eltern-Commit %s nicht parsen\n"
 
-#: sequencer.c:821
+#: sequencer.c:824
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
@@ -3084,7 +3140,7 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:827
+#: sequencer.c:830
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
@@ -3095,231 +3151,230 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:833 sequencer.c:858
+#: sequencer.c:836 sequencer.c:861
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Das ist eine Kombination aus %d Commits."
 
-#: sequencer.c:842
+#: sequencer.c:845
 msgid "need a HEAD to fixup"
 msgstr "benötige HEAD für fixup"
 
-#: sequencer.c:844
+#: sequencer.c:847
 msgid "could not read HEAD"
 msgstr "Konnte HEAD nicht lesen"
 
-#: sequencer.c:846
+#: sequencer.c:849
 msgid "could not read HEAD's commit message"
 msgstr "Konnte Commit-Beschreibung von HEAD nicht lesen"
 
-#: sequencer.c:852
+#: sequencer.c:855
 #, c-format
 msgid "cannot write '%s'"
 msgstr "kann '%s' nicht schreiben"
 
-#: sequencer.c:861 git-rebase--interactive.sh:445
+#: sequencer.c:864 git-rebase--interactive.sh:445
 msgid "This is the 1st commit message:"
 msgstr "Das ist die erste Commit-Beschreibung:"
 
-#: sequencer.c:869
+#: sequencer.c:872
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "Konnte Commit-Beschreibung von %s nicht lesen."
 
-#: sequencer.c:876
+#: sequencer.c:879
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Das ist Commit-Beschreibung #%d:"
 
-#: sequencer.c:881
+#: sequencer.c:884
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Die Commit-Beschreibung #%d wird ausgelassen:"
 
-#: sequencer.c:886
+#: sequencer.c:889
 #, c-format
 msgid "unknown command: %d"
 msgstr "Unbekannter Befehl: %d"
 
-#: sequencer.c:952
+#: sequencer.c:955
 msgid "your index file is unmerged."
 msgstr "Ihre Index-Datei ist nicht zusammengeführt."
 
-#: sequencer.c:970
+#: sequencer.c:973
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "Commit %s ist ein Merge, aber die Option -m wurde nicht angegeben."
 
-#: sequencer.c:978
+#: sequencer.c:981
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "Commit %s hat keinen Eltern-Commit %d"
 
-#: sequencer.c:982
+#: sequencer.c:985
 #, c-format
 msgid "mainline was specified but commit %s is not a merge."
 msgstr "Hauptlinie wurde spezifiziert, aber Commit %s ist kein Merge."
 
-#: sequencer.c:988
+#: sequencer.c:991
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "Kann keine Commit-Beschreibung für %s bekommen."
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1009
+#: sequencer.c:1012
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: kann Eltern-Commit %s nicht parsen"
 
-#: sequencer.c:1071 sequencer.c:1827
+#: sequencer.c:1075 sequencer.c:1830
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "Konnte '%s' nicht zu '%s' umbenennen."
 
-#: sequencer.c:1122
+#: sequencer.c:1126
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen"
 
-#: sequencer.c:1123
+#: sequencer.c:1127
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "Konnte %s... (%s) nicht anwenden"
 
-#: sequencer.c:1165
+#: sequencer.c:1169
 msgid "empty commit set passed"
 msgstr "leere Menge von Commits übergeben"
 
-#: sequencer.c:1175
+#: sequencer.c:1179
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: Fehler beim Lesen des Index"
 
-#: sequencer.c:1182
+#: sequencer.c:1186
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: Fehler beim Aktualisieren des Index"
 
-#: sequencer.c:1303
+#: sequencer.c:1306
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "Ungültige Zeile %d: %.*s"
 
-#: sequencer.c:1311
+#: sequencer.c:1314
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "Kann '%s' nicht ohne vorherigen Commit ausführen"
 
-#: sequencer.c:1344
+#: sequencer.c:1347
 #, c-format
 msgid "could not read '%s'."
 msgstr "Konnte '%s' nicht lesen."
 
-#: sequencer.c:1356
+#: sequencer.c:1359
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr ""
 "Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausführen."
 
-#: sequencer.c:1358
+#: sequencer.c:1361
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "Unbenutzbares Instruktionsblatt: '%s'"
 
-#: sequencer.c:1363
+#: sequencer.c:1366
 msgid "no commits parsed."
 msgstr "Keine Commits geparst."
 
-#: sequencer.c:1374
+#: sequencer.c:1377
 msgid "cannot cherry-pick during a revert."
 msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen."
 
-#: sequencer.c:1376
+#: sequencer.c:1379
 msgid "cannot revert during a cherry-pick."
 msgstr "Kann Revert nicht während eines Cherry-Picks ausführen."
 
-#: sequencer.c:1439
+#: sequencer.c:1442
 #, c-format
 msgid "invalid key: %s"
 msgstr "Ungültiger Schlüssel: %s"
 
-#: sequencer.c:1442
+#: sequencer.c:1445
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "Ungültiger Wert für %s: %s"
 
-#: sequencer.c:1499
+#: sequencer.c:1502
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "Fehlerhaftes Optionsblatt: '%s'"
 
-#: sequencer.c:1537
+#: sequencer.c:1540
 msgid "a cherry-pick or revert is already in progress"
 msgstr "\"cherry-pick\" oder \"revert\" ist bereits im Gang"
 
-#: sequencer.c:1538
+#: sequencer.c:1541
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "versuchen Sie \"git cherry-pick (--continue | --quit | --abort)\""
 
-#: sequencer.c:1541
+#: sequencer.c:1544
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "Konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen."
 
-#: sequencer.c:1555
+#: sequencer.c:1558
 msgid "could not lock HEAD"
 msgstr "Konnte HEAD nicht sperren"
 
-#: sequencer.c:1611 sequencer.c:2181
+#: sequencer.c:1614 sequencer.c:2188
 msgid "no cherry-pick or revert in progress"
 msgstr "kein \"cherry-pick\" oder \"revert\" im Gang"
 
-#: sequencer.c:1613
+#: sequencer.c:1616
 msgid "cannot resolve HEAD"
 msgstr "kann HEAD nicht auflösen"
 
-#: sequencer.c:1615 sequencer.c:1649
+#: sequencer.c:1618 sequencer.c:1652
 msgid "cannot abort from a branch yet to be born"
-msgstr "kann nicht abbrechen: bin auf einem Branch, der noch geboren wird"
+msgstr "kann nicht abbrechen: bin auf einem Branch, der noch nicht geboren ist"
 
-#: sequencer.c:1635 builtin/grep.c:910
+#: sequencer.c:1638 builtin/grep.c:929
 #, c-format
 msgid "cannot open '%s'"
 msgstr "kann '%s' nicht öffnen"
 
-#: sequencer.c:1637
+#: sequencer.c:1640
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "Kann '%s' nicht lesen: %s"
 
-#: sequencer.c:1638
+#: sequencer.c:1641
 msgid "unexpected end of file"
 msgstr "Unerwartetes Dateiende"
 
-#: sequencer.c:1644
+#: sequencer.c:1647
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "gespeicherte \"pre-cherry-pick\" HEAD Datei '%s' ist beschädigt"
 
-#: sequencer.c:1655
+#: sequencer.c:1658
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
-msgstr ""
-"Sie scheinen HEAD verschoben zu haben. Keine Zurücksetzung, prüfen Sie HEAD."
+msgstr "Sie scheinen HEAD verändert zu haben. Keine Rückspulung, prüfen Sie HEAD."
 
-#: sequencer.c:1792 sequencer.c:2080
+#: sequencer.c:1795 sequencer.c:2086
 msgid "cannot read HEAD"
 msgstr "Kann HEAD nicht lesen"
 
-#: sequencer.c:1832 builtin/difftool.c:616
+#: sequencer.c:1835 builtin/difftool.c:633
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "Konnte '%s' nicht nach '%s' kopieren."
 
-#: sequencer.c:1848
+#: sequencer.c:1851
 msgid "could not read index"
 msgstr "Konnte den Index nicht lesen."
 
-#: sequencer.c:1853
+#: sequencer.c:1856
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3335,11 +3390,11 @@ msgstr ""
 "\n"
 "ausführen.\n"
 
-#: sequencer.c:1859
+#: sequencer.c:1862
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert.\n"
 
-#: sequencer.c:1865
+#: sequencer.c:1868
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3357,17 +3412,17 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1920 git-rebase.sh:169
+#: sequencer.c:1925
 #, c-format
-msgid "Applied autostash."
-msgstr "Automatischen Stash angewendet."
+msgid "Applied autostash.\n"
+msgstr "Automatischen Stash angewendet.\n"
 
-#: sequencer.c:1932
+#: sequencer.c:1937
 #, c-format
 msgid "cannot store %s"
 msgstr "kann %s nicht speichern"
 
-#: sequencer.c:1934 git-rebase.sh:173
+#: sequencer.c:1940 git-rebase.sh:173
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -3378,59 +3433,59 @@ msgstr ""
 "Ihre Änderungen sind im Stash sicher.\n"
 "Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n"
 
-#: sequencer.c:2016
+#: sequencer.c:2022
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Angehalten bei %s... %.*s\n"
 
-#: sequencer.c:2058
+#: sequencer.c:2064
 #, c-format
 msgid "unknown command %d"
 msgstr "Unbekannter Befehl %d"
 
-#: sequencer.c:2088
+#: sequencer.c:2094
 msgid "could not read orig-head"
 msgstr "Konnte orig-head nicht lesen."
 
-#: sequencer.c:2092
+#: sequencer.c:2099
 msgid "could not read 'onto'"
 msgstr "Konnte 'onto' nicht lesen."
 
-#: sequencer.c:2099
+#: sequencer.c:2106
 #, c-format
 msgid "could not update %s"
 msgstr "Konnte %s nicht aktualisieren."
 
-#: sequencer.c:2106
+#: sequencer.c:2113
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "Konnte HEAD nicht auf %s aktualisieren."
 
-#: sequencer.c:2190
+#: sequencer.c:2197
 msgid "cannot rebase: You have unstaged changes."
 msgstr ""
 "Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit\n"
 "vorgemerkt sind."
 
-#: sequencer.c:2195
+#: sequencer.c:2202
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "Konnte CHERRY_PICK_HEAD nicht löschen."
 
-#: sequencer.c:2204
+#: sequencer.c:2211
 msgid "cannot amend non-existing commit"
 msgstr "Kann nicht existierenden Commit nicht nachbessern."
 
-#: sequencer.c:2206
+#: sequencer.c:2213
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "Ungültige Datei: '%s'"
 
-#: sequencer.c:2208
+#: sequencer.c:2215
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "Ungültige Inhalte: '%s'"
 
-#: sequencer.c:2211
+#: sequencer.c:2218
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3441,25 +3496,25 @@ msgstr ""
 "committen Sie diese zuerst und führen Sie dann 'git rebase --continue'\n"
 "erneut aus."
 
-#: sequencer.c:2221
+#: sequencer.c:2228
 msgid "could not commit staged changes."
 msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
 
-#: sequencer.c:2301
+#: sequencer.c:2308
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden"
 
-#: sequencer.c:2305
+#: sequencer.c:2312
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: ungültiger Commit"
 
-#: sequencer.c:2338
+#: sequencer.c:2345
 msgid "can't revert as initial commit"
 msgstr "Kann nicht als allerersten Commit einen Revert ausführen."
 
-#: setup.c:165
+#: setup.c:171
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -3469,7 +3524,7 @@ msgstr ""
 "Benutzen Sie 'git <Befehl> -- <Pfad>...' zur Angabe von Pfaden, die lokal\n"
 "nicht existieren."
 
-#: setup.c:178
+#: setup.c:184
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -3481,7 +3536,7 @@ msgstr ""
 "Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
 "'git <Befehl> [<Commit>...] -- [<Datei>...]'"
 
-#: setup.c:228
+#: setup.c:252
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -3492,34 +3547,34 @@ msgstr ""
 "Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
 "'git <Befehl> [<Commit>...] -- [<Datei>...]'"
 
-#: setup.c:475
+#: setup.c:504
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden"
 
-#: setup.c:483
+#: setup.c:512
 msgid "unknown repository extensions found:"
 msgstr "Unbekannte Repository-Erweiterungen gefunden:"
 
-#: setup.c:776
+#: setup.c:810
 #, c-format
 msgid "Not a git repository (or any of the parent directories): %s"
 msgstr "Kein Git-Repository (oder irgendein Elternverzeichnis): %s"
 
-#: setup.c:778 builtin/index-pack.c:1646
+#: setup.c:812 builtin/index-pack.c:1652
 msgid "Cannot come back to cwd"
-msgstr "Kann nicht zurück zu Arbeitsverzeichnis wechseln"
+msgstr "Kann nicht zurück zum Arbeitsverzeichnis wechseln"
 
-#: setup.c:1010
+#: setup.c:1050
 msgid "Unable to read current working directory"
 msgstr "Konnte aktuelles Arbeitsverzeichnis nicht lesen."
 
-#: setup.c:1022 setup.c:1028
+#: setup.c:1062 setup.c:1068
 #, c-format
 msgid "Cannot change to '%s'"
 msgstr "Kann nicht nach '%s' wechseln."
 
-#: setup.c:1041
+#: setup.c:1081
 #, c-format
 msgid ""
 "Not a git repository (or any parent up to mount point %s)\n"
@@ -3529,7 +3584,7 @@ msgstr ""
 "%s)\n"
 "Stoppe bei Dateisystemgrenze (GIT_DISCOVERY_ACROSS_FILESYSTEM nicht gesetzt)."
 
-#: setup.c:1106
+#: setup.c:1173
 #, c-format
 msgid ""
 "Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3538,30 +3593,30 @@ msgstr ""
 "Problem mit Wert für Dateimodus (0%.3o) von core.sharedRepository.\n"
 "Der Besitzer der Dateien muss immer Lese- und Schreibrechte haben."
 
-#: sha1_file.c:559
+#: sha1_file.c:560
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "Pfad '%s' existiert nicht"
 
-#: sha1_file.c:585
+#: sha1_file.c:586
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 "Referenziertes Repository '%s' wird noch nicht als verknüpftes\n"
 "Arbeitsverzeichnis unterstützt."
 
-#: sha1_file.c:591
+#: sha1_file.c:592
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "Referenziertes Repository '%s' ist kein lokales Repository."
 
-#: sha1_file.c:597
+#: sha1_file.c:598
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr ""
 "Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)."
 
-#: sha1_file.c:605
+#: sha1_file.c:606
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr ""
@@ -3572,26 +3627,26 @@ msgstr ""
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)"
 
-#: sha1_file.c:2721
+#: sha1_file.c:2729
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "Offset vor Beginn des Pack-Index für %s (beschädigter Index?)"
 
-#: sha1_file.c:2725
+#: sha1_file.c:2733
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr "Offset hinter Ende des Pack-Index für %s (abgeschnittener Index?)"
 
-#: sha1_name.c:409
+#: sha1_name.c:419
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "Kurzer SHA-1 %s ist mehrdeutig."
 
-#: sha1_name.c:420
+#: sha1_name.c:430
 msgid "The candidates are:"
 msgstr "Die Kandidaten sind:"
 
-#: sha1_name.c:580
+#: sha1_name.c:589
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -3616,56 +3671,66 @@ msgstr ""
 "indem Sie \"git config advice.objectNameWarning false\"\n"
 "ausführen."
 
-#: submodule.c:67 submodule.c:101
+#: submodule.c:70 submodule.c:104
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 "Kann nicht zusammengeführte .gitmodules-Datei nicht ändern, lösen\n"
 "Sie zuerst die Konflikte auf"
 
-#: submodule.c:71 submodule.c:105
+#: submodule.c:74 submodule.c:108
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "Konnte keine Sektion in .gitmodules mit Pfad \"%s\" finden"
 
-#: submodule.c:79
+#: submodule.c:82
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren"
 
-#: submodule.c:112
+#: submodule.c:115
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen"
 
-#: submodule.c:123
+#: submodule.c:126
 msgid "staging updated .gitmodules failed"
 msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken"
 
-#: submodule.c:161
+#: submodule.c:165
 msgid "negative values not allowed for submodule.fetchJobs"
 msgstr "Negative Werte für submodule.fetchJobs nicht erlaubt"
 
-#: submodule.c:1194
+#: submodule.c:376
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "In nicht ausgechecktem Submodul '%s'."
+
+#: submodule.c:407
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'"
+
+#: submodule.c:1337
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "'%s' nicht als Git-Repository erkannt"
 
-#: submodule.c:1332
+#: submodule.c:1475
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "Konnte 'git status' in Submodul '%s' nicht starten."
 
-#: submodule.c:1345
+#: submodule.c:1488
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "Konnte 'git status' in Submodul '%s' nicht ausführen."
 
-#: submodule.c:1421
+#: submodule.c:1581
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "Submodul '%s' hat einen geänderten Index."
 
-#: submodule.c:1678
+#: submodule.c:1845
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3673,18 +3738,18 @@ msgstr ""
 "relocate_gitdir für Submodul '%s' mit mehr als einem Arbeitsverzeichnis\n"
 "wird nicht unterstützt"
 
-#: submodule.c:1690 submodule.c:1746
+#: submodule.c:1857 submodule.c:1913
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "konnte Name für Submodul '%s' nicht nachschlagen"
 
-#: submodule.c:1694 builtin/submodule--helper.c:678
+#: submodule.c:1861 builtin/submodule--helper.c:678
 #: builtin/submodule--helper.c:688
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht erstellen."
 
-#: submodule.c:1697
+#: submodule.c:1864
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3695,94 +3760,94 @@ msgstr ""
 "'%s' nach\n"
 "'%s'\n"
 
-#: submodule.c:1781
+#: submodule.c:1948
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'"
 
-#: submodule.c:1825
+#: submodule.c:1992
 msgid "could not start ls-files in .."
 msgstr "Konnte 'ls-files' nicht in .. starten"
 
-#: submodule.c:1845
+#: submodule.c:2012
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr "FEHLER: zurückgegebene Zeichenkette für Pfad entspricht nicht cwd?"
 
-#: submodule.c:1864
+#: submodule.c:2031
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree mit unerwartetem Rückgabewert %d beendet"
 
-#: submodule-config.c:380
+#: submodule-config.c:420
 #, c-format
 msgid "invalid value for %s"
 msgstr "Ungültiger Wert für %s"
 
-#: trailer.c:240
+#: trailer.c:241
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "Ausführen des Anhang-Befehls '%s' fehlgeschlagen"
 
-#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539
-#: trailer.c:543
+#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
+#: trailer.c:544
 #, c-format
 msgid "unknown value '%s' for key '%s'"
 msgstr "unbekannter Wert '%s' für Schlüssel %s"
 
-#: trailer.c:525 trailer.c:530 builtin/remote.c:289
+#: trailer.c:526 trailer.c:531 builtin/remote.c:290
 #, c-format
 msgid "more than one %s"
 msgstr "mehr als ein %s"
 
-#: trailer.c:702
+#: trailer.c:703
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "leerer Anhang-Token in Anhang '%.*s'"
 
-#: trailer.c:722
+#: trailer.c:723
 #, c-format
 msgid "could not read input file '%s'"
 msgstr "Konnte Eingabe-Datei '%s' nicht lesen"
 
-#: trailer.c:725
+#: trailer.c:726
 msgid "could not read from stdin"
 msgstr "konnte nicht von der Standard-Eingabe lesen"
 
-#: trailer.c:949 builtin/am.c:44
+#: trailer.c:950 builtin/am.c:45
 #, c-format
 msgid "could not stat %s"
 msgstr "Konnte '%s' nicht lesen"
 
-#: trailer.c:951
+#: trailer.c:952
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "Datei '%s' ist keine reguläre Datei"
 
-#: trailer.c:953
+#: trailer.c:954
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "Datei %s ist vom Benutzer nicht beschreibbar."
 
-#: trailer.c:965
+#: trailer.c:966
 msgid "could not open temporary file"
 msgstr "konnte temporäre Datei '%s' nicht öffnen"
 
-#: trailer.c:1001
+#: trailer.c:1002
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "konnte temporäre Datei nicht zu %s umbenennen"
 
-#: transport.c:62
+#: transport.c:63
 #, c-format
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "Würde Upstream-Branch von '%s' zu '%s' von '%s' setzen\n"
 
-#: transport.c:151
+#: transport.c:152
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: ungültige --depth Option '%s'"
 
-#: transport.c:889
+#: transport.c:890
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -3791,7 +3856,7 @@ msgstr ""
 "Die folgenden Submodul-Pfade enthalten Änderungen, die in keinem\n"
 "Remote-Repository gefunden wurden:\n"
 
-#: transport.c:893
+#: transport.c:894
 #, c-format
 msgid ""
 "\n"
@@ -3818,11 +3883,11 @@ msgstr ""
 "zum Versenden zu einem Remote-Repository.\n"
 "\n"
 
-#: transport.c:901
+#: transport.c:902
 msgid "Aborting."
 msgstr "Abbruch."
 
-#: transport-helper.c:1080
+#: transport-helper.c:1071
 #, c-format
 msgid "Could not read ref %s"
 msgstr "Konnte Referenz %s nicht lesen."
@@ -3843,7 +3908,7 @@ msgstr "leerer Dateiname in Tree-Eintrag"
 msgid "too-short tree file"
 msgstr "zu kurze Tree-Datei"
 
-#: unpack-trees.c:104
+#: unpack-trees.c:105
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3854,7 +3919,7 @@ msgstr ""
 "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie Branches\n"
 "wechseln."
 
-#: unpack-trees.c:106
+#: unpack-trees.c:107
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3864,7 +3929,7 @@ msgstr ""
 "überschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:109
+#: unpack-trees.c:110
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -3872,9 +3937,9 @@ msgid ""
 msgstr ""
 "Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n"
 "überschrieben werden:\n"
-"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor sie mergen."
+"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie mergen."
 
-#: unpack-trees.c:111
+#: unpack-trees.c:112
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -3884,7 +3949,7 @@ msgstr ""
 "überschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:114
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -3894,7 +3959,7 @@ msgstr ""
 "überschrieben werden:\n"
 "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie %s ausführen."
 
-#: unpack-trees.c:116
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -3903,7 +3968,7 @@ msgstr ""
 "Ihre lokalen Änderungen würden durch %s überschrieben werden.\n"
 "%%s"
 
-#: unpack-trees.c:121
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -3913,7 +3978,7 @@ msgstr ""
 "Dateien in diesen Verzeichnissen verloren gehen:\n"
 "%s"
 
-#: unpack-trees.c:125
+#: unpack-trees.c:126
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -3923,7 +3988,7 @@ msgstr ""
 "den Checkout entfernt werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
 
-#: unpack-trees.c:127
+#: unpack-trees.c:128
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -3934,7 +3999,7 @@ msgstr ""
 "Checkout entfernt werden:\n"
 "%%s"
 
-#: unpack-trees.c:130
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -3944,7 +4009,7 @@ msgstr ""
 "den Merge entfernt werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor sie mergen."
 
-#: unpack-trees.c:132
+#: unpack-trees.c:133
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -3955,7 +4020,7 @@ msgstr ""
 "Merge entfernt werden:\n"
 "%%s"
 
-#: unpack-trees.c:135
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -3965,7 +4030,7 @@ msgstr ""
 "den %s entfernt werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
 
-#: unpack-trees.c:137
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -3975,7 +4040,7 @@ msgstr ""
 "den %s entfernt werden:\n"
 "%%s"
 
-#: unpack-trees.c:142
+#: unpack-trees.c:143
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -3986,7 +4051,7 @@ msgstr ""
 "den Checkout überschrieben werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
 
-#: unpack-trees.c:144
+#: unpack-trees.c:145
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -3998,7 +4063,7 @@ msgstr ""
 "Checkout überschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:147
+#: unpack-trees.c:148
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4008,7 +4073,7 @@ msgstr ""
 "den Merge überschrieben werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor Sie mergen."
 
-#: unpack-trees.c:149
+#: unpack-trees.c:150
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4018,7 +4083,7 @@ msgstr ""
 "den Merge überschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:152
+#: unpack-trees.c:153
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4028,7 +4093,7 @@ msgstr ""
 "den %s überschrieben werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
 
-#: unpack-trees.c:154
+#: unpack-trees.c:155
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4039,12 +4104,12 @@ msgstr ""
 "%s überschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:161
+#: unpack-trees.c:162
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Eintrag '%s' überschneidet sich mit '%s'. Kann nicht verbinden."
 
-#: unpack-trees.c:164
+#: unpack-trees.c:165
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up-to-date:\n"
@@ -4055,7 +4120,7 @@ msgstr ""
 "aktuell:\n"
 "%s"
 
-#: unpack-trees.c:166
+#: unpack-trees.c:167
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -4066,7 +4131,7 @@ msgstr ""
 "über einen partiellen Checkout überschrieben werden:\n"
 "%s"
 
-#: unpack-trees.c:168
+#: unpack-trees.c:169
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -4077,7 +4142,7 @@ msgstr ""
 "über einen partiellen Checkout entfernt werden:\n"
 "%s"
 
-#: unpack-trees.c:170
+#: unpack-trees.c:171
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -4086,19 +4151,19 @@ msgstr ""
 "Kann Submodul nicht aktualisieren:\n"
 "%s"
 
-#: unpack-trees.c:247
+#: unpack-trees.c:248
 #, c-format
 msgid "Aborting\n"
 msgstr "Abbruch\n"
 
-#: unpack-trees.c:272
+#: unpack-trees.c:277
 #, c-format
 msgid "submodule update strategy not supported for submodule '%s'"
 msgstr ""
 "Strategie zur Aktualisierung von Submodulen für Submodul '%s' nicht "
 "unterstützt."
 
-#: unpack-trees.c:340
+#: unpack-trees.c:346
 msgid "Checking out files"
 msgstr "Checke Dateien aus"
 
@@ -4131,201 +4196,207 @@ msgstr "ungültige Portnummer"
 msgid "invalid '..' path segment"
 msgstr "ungültiges '..' Pfadsegment"
 
-#: worktree.c:285
+#: worktree.c:245
 #, c-format
 msgid "failed to read '%s'"
 msgstr "Fehler beim Lesen von '%s'"
 
-#: wrapper.c:222 wrapper.c:392
+#: wrapper.c:223 wrapper.c:393
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "Konnte '%s' nicht zum Lesen und Schreiben öffnen."
 
-#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
+#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "Konnte '%s' nicht zum Schreiben öffnen."
 
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757
-#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015
-#: builtin/pull.c:341
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
+#: builtin/am.c:849 builtin/merge.c:1014
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "Konnte '%s' nicht zum Lesen öffnen."
 
-#: wrapper.c:581 wrapper.c:602
+#: wrapper.c:424 wrapper.c:624
 #, c-format
 msgid "unable to access '%s'"
 msgstr "konnte nicht auf '%s' zugreifen"
 
-#: wrapper.c:610
+#: wrapper.c:632
 msgid "unable to get current working directory"
 msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen."
 
-#: wrapper.c:634
+#: wrapper.c:656
 #, c-format
 msgid "could not write to %s"
 msgstr "Konnte nicht nach '%s' schreiben."
 
-#: wrapper.c:636
+#: wrapper.c:658
 #, c-format
 msgid "could not close %s"
 msgstr "Konnte '%s' nicht schließen."
 
-#: wt-status.c:151
+#: wt-status.c:152
 msgid "Unmerged paths:"
 msgstr "Nicht zusammengeführte Pfade:"
 
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr ""
 "  (benutzen Sie \"git reset %s <Datei>...\" zum Entfernen aus der Staging-"
 "Area)"
 
-#: wt-status.c:180 wt-status.c:207
+#: wt-status.c:181 wt-status.c:208
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr ""
 "  (benutzen Sie \"git rm --cached <Datei>...\" zum Entfernen aus der Staging-"
 "Area)"
 
-#: wt-status.c:184
+#: wt-status.c:185
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr ""
 "  (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
 
-#: wt-status.c:186 wt-status.c:190
+#: wt-status.c:187 wt-status.c:191
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 "  (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung entsprechend zu "
 "markieren)"
 
-#: wt-status.c:188
+#: wt-status.c:189
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr ""
 "  (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
 
-#: wt-status.c:199 wt-status.c:958
+#: wt-status.c:200 wt-status.c:981
 msgid "Changes to be committed:"
 msgstr "zum Commit vorgemerkte Änderungen:"
 
-#: wt-status.c:217 wt-status.c:967
+#: wt-status.c:218 wt-status.c:990
 msgid "Changes not staged for commit:"
 msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:"
 
-#: wt-status.c:221
+#: wt-status.c:222
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
 "  (benutzen Sie \"git add <Datei>...\", um die Änderungen zum Commit "
 "vorzumerken)"
 
-#: wt-status.c:223
+#: wt-status.c:224
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 "  (benutzen Sie \"git add/rm <Datei>...\", um die Änderungen zum Commit "
 "vorzumerken)"
 
-#: wt-status.c:224
+#: wt-status.c:225
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 "  (benutzen Sie \"git checkout -- <Datei>...\", um die Änderungen im "
 "Arbeitsverzeichnis zu verwerfen)"
 
-#: wt-status.c:226
+#: wt-status.c:227
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 "  (committen oder verwerfen Sie den unversionierten oder geänderten Inhalt "
 "in den Submodulen)"
 
-#: wt-status.c:238
+#: wt-status.c:239
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 "  (benutzen Sie \"git %s <Datei>...\", um die Änderungen zum Commit "
 "vorzumerken)"
 
-#: wt-status.c:253
+#: wt-status.c:254
 msgid "both deleted:"
 msgstr "beide gelöscht:"
 
-#: wt-status.c:255
+#: wt-status.c:256
 msgid "added by us:"
 msgstr "von uns hinzugefügt:"
 
-#: wt-status.c:257
+#: wt-status.c:258
 msgid "deleted by them:"
 msgstr "von denen gelöscht:"
 
-#: wt-status.c:259
+#: wt-status.c:260
 msgid "added by them:"
 msgstr "von denen hinzugefügt:"
 
-#: wt-status.c:261
+#: wt-status.c:262
 msgid "deleted by us:"
 msgstr "von uns gelöscht:"
 
-#: wt-status.c:263
+#: wt-status.c:264
 msgid "both added:"
 msgstr "von beiden hinzugefügt:"
 
-#: wt-status.c:265
+#: wt-status.c:266
 msgid "both modified:"
 msgstr "von beiden geändert:"
 
-#: wt-status.c:275
+#: wt-status.c:276
 msgid "new file:"
 msgstr "neue Datei:"
 
-#: wt-status.c:277
+#: wt-status.c:278
 msgid "copied:"
 msgstr "kopiert:"
 
-#: wt-status.c:279
+#: wt-status.c:280
 msgid "deleted:"
 msgstr "gelöscht:"
 
-#: wt-status.c:281
+#: wt-status.c:282
 msgid "modified:"
 msgstr "geändert:"
 
-#: wt-status.c:283
+#: wt-status.c:284
 msgid "renamed:"
 msgstr "umbenannt:"
 
-#: wt-status.c:285
+#: wt-status.c:286
 msgid "typechange:"
 msgstr "Typänderung:"
 
-#: wt-status.c:287
+#: wt-status.c:288
 msgid "unknown:"
 msgstr "unbekannt:"
 
-#: wt-status.c:289
+#: wt-status.c:290
 msgid "unmerged:"
 msgstr "nicht gemerged:"
 
-#: wt-status.c:371
+#: wt-status.c:372
 msgid "new commits, "
 msgstr "neue Commits, "
 
-#: wt-status.c:373
+#: wt-status.c:374
 msgid "modified content, "
 msgstr "geänderter Inhalt, "
 
-#: wt-status.c:375
+#: wt-status.c:376
 msgid "untracked content, "
 msgstr "unversionierter Inhalt, "
 
-#: wt-status.c:831
+#: wt-status.c:821
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "Ihr Stash hat gerade %d Eintrag"
+msgstr[1] "Ihr Stash hat gerade %d Einträge"
+
+#: wt-status.c:853
 msgid "Submodules changed but not updated:"
 msgstr "Submodule geändert, aber nicht aktualisiert:"
 
-#: wt-status.c:833
+#: wt-status.c:855
 msgid "Submodule changes to be committed:"
 msgstr "Änderungen in Submodul zum Committen:"
 
-#: wt-status.c:914
+#: wt-status.c:937
 msgid ""
 "Do not touch the line above.\n"
 "Everything below will be removed."
@@ -4333,114 +4404,114 @@ msgstr ""
 "Ändern Sie nicht die obige Zeile.\n"
 "Alles unterhalb von ihr wird entfernt."
 
-#: wt-status.c:1026
+#: wt-status.c:1049
 msgid "You have unmerged paths."
 msgstr "Sie haben nicht zusammengeführte Pfade."
 
-#: wt-status.c:1029
+#: wt-status.c:1052
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)"
 
-#: wt-status.c:1031
+#: wt-status.c:1054
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (benutzen Sie \"git merge --abort\", um den Merge abzubrechen)"
 
-#: wt-status.c:1036
+#: wt-status.c:1059
 msgid "All conflicts fixed but you are still merging."
 msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge."
 
-#: wt-status.c:1039
+#: wt-status.c:1062
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (benutzen Sie \"git commit\", um den Merge abzuschließen)"
 
-#: wt-status.c:1049
+#: wt-status.c:1072
 msgid "You are in the middle of an am session."
 msgstr "Eine \"am\"-Sitzung ist im Gange."
 
-#: wt-status.c:1052
+#: wt-status.c:1075
 msgid "The current patch is empty."
 msgstr "Der aktuelle Patch ist leer."
 
-#: wt-status.c:1056
+#: wt-status.c:1079
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr ""
 "  (beheben Sie die Konflikte und führen Sie dann \"git am --continue\" aus)"
 
-#: wt-status.c:1058
+#: wt-status.c:1081
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)"
 
-#: wt-status.c:1060
+#: wt-status.c:1083
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr ""
 "  (benutzen Sie \"git am --abort\", um den ursprünglichen Branch "
 "wiederherzustellen)"
 
-#: wt-status.c:1189
+#: wt-status.c:1214
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo fehlt."
 
-#: wt-status.c:1191
+#: wt-status.c:1216
 msgid "No commands done."
 msgstr "Keine Befehle ausgeführt."
 
-#: wt-status.c:1194
+#: wt-status.c:1219
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "Zuletzt ausgeführter Befehl (%d Befehl ausgeführt):"
 msgstr[1] "Zuletzt ausgeführte Befehle (%d Befehle ausgeführt):"
 
-#: wt-status.c:1205
+#: wt-status.c:1230
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (mehr Informationen in Datei %s)"
 
-#: wt-status.c:1210
+#: wt-status.c:1235
 msgid "No commands remaining."
 msgstr "Keine Befehle verbleibend."
 
-#: wt-status.c:1213
+#: wt-status.c:1238
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] "Nächster auszuführender Befehl (%d Befehle verbleibend):"
 msgstr[1] "Nächste auszuführende Befehle (%d Befehle verbleibend):"
 
-#: wt-status.c:1221
+#: wt-status.c:1246
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (benutzen Sie \"git rebase --edit-todo\" zum Ansehen und Bearbeiten)"
 
-#: wt-status.c:1234
+#: wt-status.c:1259
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "Sie sind gerade beim Rebase von Branch '%s' auf '%s'."
 
-#: wt-status.c:1239
+#: wt-status.c:1264
 msgid "You are currently rebasing."
 msgstr "Sie sind gerade beim Rebase."
 
-#: wt-status.c:1253
+#: wt-status.c:1278
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr ""
 "  (beheben Sie die Konflikte und führen Sie dann \"git rebase --continue\" "
 "aus)"
 
-#: wt-status.c:1255
+#: wt-status.c:1280
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)"
 
-#: wt-status.c:1257
+#: wt-status.c:1282
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr ""
 "  (benutzen Sie \"git rebase --abort\", um den ursprünglichen Branch "
 "auszuchecken)"
 
-#: wt-status.c:1263
+#: wt-status.c:1288
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)"
 
-#: wt-status.c:1267
+#: wt-status.c:1292
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -4448,134 +4519,138 @@ msgstr ""
 "Sie teilen gerade einen Commit auf, während ein Rebase von Branch '%s' auf "
 "'%s' im Gange ist."
 
-#: wt-status.c:1272
+#: wt-status.c:1297
 msgid "You are currently splitting a commit during a rebase."
 msgstr "Sie teilen gerade einen Commit während eines Rebase auf."
 
-#: wt-status.c:1275
+#: wt-status.c:1300
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 "  (Sobald Ihr Arbeitsverzeichnis unverändert ist, führen Sie \"git rebase --"
 "continue\" aus)"
 
-#: wt-status.c:1279
+#: wt-status.c:1304
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 "Sie editieren gerade einen Commit während eines Rebase von Branch '%s' auf "
 "'%s'."
 
-#: wt-status.c:1284
+#: wt-status.c:1309
 msgid "You are currently editing a commit during a rebase."
 msgstr "Sie editieren gerade einen Commit während eines Rebase."
 
-#: wt-status.c:1287
+#: wt-status.c:1312
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr ""
 "  (benutzen Sie \"git commit --amend\", um den aktuellen Commit "
 "nachzubessern)"
 
-#: wt-status.c:1289
+#: wt-status.c:1314
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 "  (benutzen Sie \"git rebase --continue\" sobald Ihre Änderungen "
 "abgeschlossen sind)"
 
-#: wt-status.c:1299
+#: wt-status.c:1324
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus."
 
-#: wt-status.c:1304
+#: wt-status.c:1329
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr ""
 "  (beheben Sie die Konflikte und führen Sie dann \"git cherry-pick --continue"
 "\" aus)"
 
-#: wt-status.c:1307
+#: wt-status.c:1332
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)"
 
-#: wt-status.c:1309
+#: wt-status.c:1334
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 "  (benutzen Sie \"git cherry-pick --abort\", um die Cherry-Pick-Operation "
 "abzubrechen)"
 
-#: wt-status.c:1318
+#: wt-status.c:1343
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Sie sind gerade an einem Revert von Commit '%s'."
 
-#: wt-status.c:1323
+#: wt-status.c:1348
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr ""
 "  (beheben Sie die Konflikte und führen Sie dann \"git revert --continue\" "
 "aus)"
 
-#: wt-status.c:1326
+#: wt-status.c:1351
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)"
 
-#: wt-status.c:1328
+#: wt-status.c:1353
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr ""
 "  (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)"
 
-#: wt-status.c:1339
+#: wt-status.c:1364
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Sie sind gerade bei einer binären Suche, gestartet von Branch '%s'."
 
-#: wt-status.c:1343
+#: wt-status.c:1368
 msgid "You are currently bisecting."
 msgstr "Sie sind gerade bei einer binären Suche."
 
-#: wt-status.c:1346
+#: wt-status.c:1371
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr ""
 "  (benutzen Sie \"git bisect reset\", um zum ursprünglichen Branch "
 "zurückzukehren)"
 
-#: wt-status.c:1543
+#: wt-status.c:1568
 msgid "On branch "
 msgstr "Auf Branch "
 
-#: wt-status.c:1549
+#: wt-status.c:1574
 msgid "interactive rebase in progress; onto "
 msgstr "interaktives Rebase im Gange; auf "
 
-#: wt-status.c:1551
+#: wt-status.c:1576
 msgid "rebase in progress; onto "
 msgstr "Rebase im Gange; auf "
 
-#: wt-status.c:1556
+#: wt-status.c:1581
 msgid "HEAD detached at "
 msgstr "HEAD losgelöst bei "
 
-#: wt-status.c:1558
+#: wt-status.c:1583
 msgid "HEAD detached from "
 msgstr "HEAD losgelöst von "
 
-#: wt-status.c:1561
+#: wt-status.c:1586
 msgid "Not currently on any branch."
 msgstr "Im Moment auf keinem Branch."
 
-#: wt-status.c:1579
+#: wt-status.c:1606
 msgid "Initial commit"
 msgstr "Initialer Commit"
 
-#: wt-status.c:1593
+#: wt-status.c:1607
+msgid "No commits yet"
+msgstr "Noch keine Commits"
+
+#: wt-status.c:1621
 msgid "Untracked files"
 msgstr "Unversionierte Dateien"
 
-#: wt-status.c:1595
+#: wt-status.c:1623
 msgid "Ignored files"
 msgstr "Ignorierte Dateien"
 
-#: wt-status.c:1599
+#: wt-status.c:1627
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4586,32 +4661,32 @@ msgstr ""
 "'status -uno' könnte das beschleunigen, aber Sie müssen darauf achten,\n"
 "neue Dateien selbstständig hinzuzufügen (siehe 'git help status')."
 
-#: wt-status.c:1605
+#: wt-status.c:1633
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Unversionierte Dateien nicht aufgelistet%s"
 
-#: wt-status.c:1607
+#: wt-status.c:1635
 msgid " (use -u option to show untracked files)"
 msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)"
 
-#: wt-status.c:1613
+#: wt-status.c:1641
 msgid "No changes"
 msgstr "Keine Änderungen"
 
-#: wt-status.c:1618
+#: wt-status.c:1646
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "keine Änderungen zum Commit vorgemerkt (benutzen Sie \"git add\" und/oder "
 "\"git commit -a\")\n"
 
-#: wt-status.c:1621
+#: wt-status.c:1649
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "keine Änderungen zum Commit vorgemerkt\n"
 
-#: wt-status.c:1624
+#: wt-status.c:1652
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -4620,235 +4695,276 @@ msgstr ""
 "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
 "(benutzen Sie \"git add\" zum Versionieren)\n"
 
-#: wt-status.c:1627
+#: wt-status.c:1655
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
 
-#: wt-status.c:1630
+#: wt-status.c:1658
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "nichts zu committen (Erstellen/Kopieren Sie Dateien und benutzen\n"
 "Sie \"git add\" zum Versionieren)\n"
 
-#: wt-status.c:1633 wt-status.c:1638
+#: wt-status.c:1661 wt-status.c:1666
 #, c-format
 msgid "nothing to commit\n"
 msgstr "nichts zu committen\n"
 
-#: wt-status.c:1636
+#: wt-status.c:1664
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "nichts zu committen (benutzen Sie die Option -u, um unversionierte Dateien "
 "anzuzeigen)\n"
 
-#: wt-status.c:1640
+#: wt-status.c:1668
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n"
 
-#: wt-status.c:1749
-msgid "Initial commit on "
-msgstr "Initialer Commit auf "
+#: wt-status.c:1780
+msgid "No commits yet on "
+msgstr "Noch keine Commits in "
 
-#: wt-status.c:1753
+#: wt-status.c:1784
 msgid "HEAD (no branch)"
 msgstr "HEAD (kein Branch)"
 
-#: wt-status.c:1782 wt-status.c:1790
+#: wt-status.c:1813 wt-status.c:1821
 msgid "behind "
 msgstr "hinterher "
 
-#: wt-status.c:1785 wt-status.c:1788
+#: wt-status.c:1816 wt-status.c:1819
 msgid "ahead "
 msgstr "voraus "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2280
+#: wt-status.c:2311
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr ""
 "%s nicht möglich: Sie haben Änderungen, die nicht zum Commit vorgemerkt sind."
 
-#: wt-status.c:2286
+#: wt-status.c:2317
 msgid "additionally, your index contains uncommitted changes."
 msgstr "Zusätzlich enthält die Staging-Area nicht committete Änderungen."
 
-#: wt-status.c:2288
+#: wt-status.c:2319
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""
 "%s nicht möglich: Die Staging-Area enthält nicht committete Änderungen."
 
-#: compat/precompose_utf8.c:57 builtin/clone.c:432
+#: compat/precompose_utf8.c:58 builtin/clone.c:436
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "Konnte '%s' nicht entfernen."
 
-#: builtin/add.c:22
+#: builtin/add.c:24
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..."
 
-#: builtin/add.c:80
+#: builtin/add.c:82
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "unerwarteter Differenz-Status %c"
 
-#: builtin/add.c:85 builtin/commit.c:291
+#: builtin/add.c:87 builtin/commit.c:292
 msgid "updating files failed"
 msgstr "Aktualisierung der Dateien fehlgeschlagen"
 
-#: builtin/add.c:95
+#: builtin/add.c:97
 #, c-format
 msgid "remove '%s'\n"
 msgstr "lösche '%s'\n"
 
-#: builtin/add.c:149
+#: builtin/add.c:151
 msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 "Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:"
 
-#: builtin/add.c:209 builtin/rev-parse.c:872
+#: builtin/add.c:211 builtin/rev-parse.c:873
 msgid "Could not read the index"
 msgstr "Konnte den Index nicht lesen"
 
-#: builtin/add.c:220
+#: builtin/add.c:222
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "Konnte '%s' nicht zum Schreiben öffnen."
 
-#: builtin/add.c:224
+#: builtin/add.c:226
 msgid "Could not write patch"
 msgstr "Konnte Patch nicht schreiben"
 
-#: builtin/add.c:227
+#: builtin/add.c:229
 msgid "editing patch failed"
 msgstr "Bearbeitung des Patches fehlgeschlagen"
 
-#: builtin/add.c:230
+#: builtin/add.c:232
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht lesen"
 
-#: builtin/add.c:232
+#: builtin/add.c:234
 msgid "Empty patch. Aborted."
 msgstr "Leerer Patch. Abgebrochen."
 
-#: builtin/add.c:237
+#: builtin/add.c:239
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Konnte '%s' nicht anwenden."
 
-#: builtin/add.c:247
+#: builtin/add.c:249
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 "Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien "
 "ignoriert:\n"
 
-#: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123
-#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524
-#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163
+#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
+#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
+#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
 msgstr "Probelauf"
 
-#: builtin/add.c:269
+#: builtin/add.c:272
 msgid "interactive picking"
 msgstr "interaktives Auswählen"
 
-#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286
+#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
 msgid "select hunks interactively"
 msgstr "Blöcke interaktiv auswählen"
 
-#: builtin/add.c:271
+#: builtin/add.c:274
 msgid "edit current diff and apply"
 msgstr "aktuelle Unterschiede editieren und anwenden"
 
-#: builtin/add.c:272
+#: builtin/add.c:275
 msgid "allow adding otherwise ignored files"
 msgstr "das Hinzufügen andernfalls ignorierter Dateien erlauben"
 
-#: builtin/add.c:273
+#: builtin/add.c:276
 msgid "update tracked files"
 msgstr "versionierte Dateien aktualisieren"
 
-#: builtin/add.c:274
+#: builtin/add.c:277
 msgid "record only the fact that the path will be added later"
 msgstr "nur speichern, dass der Pfad später hinzugefügt werden soll"
 
-#: builtin/add.c:275
+#: builtin/add.c:278
 msgid "add changes from all tracked and untracked files"
 msgstr ""
 "Änderungen von allen versionierten und unversionierten Dateien hinzufügen"
 
-#: builtin/add.c:278
+#: builtin/add.c:281
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "gelöschte Pfade im Arbeitsverzeichnis ignorieren (genau wie --no-all)"
 
-#: builtin/add.c:280
+#: builtin/add.c:283
 msgid "don't add, only refresh the index"
 msgstr "nichts hinzufügen, nur den Index aktualisieren"
 
-#: builtin/add.c:281
+#: builtin/add.c:284
 msgid "just skip files which cannot be added because of errors"
 msgstr ""
 "Dateien überspringen, die aufgrund von Fehlern nicht hinzugefügt werden "
 "konnten"
 
-#: builtin/add.c:282
+#: builtin/add.c:285
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "prüfen ob - auch fehlende - Dateien im Probelauf ignoriert werden"
 
-#: builtin/add.c:283 builtin/update-index.c:951
+#: builtin/add.c:286 builtin/update-index.c:952
 msgid "(+/-)x"
 msgstr "(+/-)x"
 
-#: builtin/add.c:283 builtin/update-index.c:952
+#: builtin/add.c:286 builtin/update-index.c:953
 msgid "override the executable bit of the listed files"
 msgstr "das \"ausführbar\"-Bit der aufgelisteten Dateien überschreiben"
 
-#: builtin/add.c:305
+#: builtin/add.c:288
+msgid "warn when adding an embedded repository"
+msgstr "warnen wenn eingebettetes Repository hinzugefügt wird"
+
+#: builtin/add.c:303
+#, c-format
+msgid ""
+"You've added another git repository inside your current repository.\n"
+"Clones of the outer repository will not contain the contents of\n"
+"the embedded repository and will not know how to obtain it.\n"
+"If you meant to add a submodule, use:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"If you added this path by mistake, you can remove it from the\n"
+"index with:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"See \"git help submodule\" for more information."
+msgstr ""
+"Sie haben ein Git-Repository innerhalb ihres aktuellen Repositories hinzugefügt.\n"
+"Klone des äußeren Repositories werden die Inhalte des eingebetteten Repositories\n"
+"weder enthalten, noch wissen, wie diese zu beschaffen sind.\n"
+"Wenn Sie ein Submodul hinzufügen wollten, benutzen Sie:\n"
+"\n"
+"\tgit submodule add <URL> %s\n"
+"\n"
+"Wenn Sie diesen Pfad aus Versehen hinzugefügt haben, können Sie diesen mit\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"vom Index entfernen.\n"
+"\n"
+"Siehe \"git help submodule\" für weitere Informationen."
+
+#: builtin/add.c:331
+#, c-format
+msgid "adding embedded git repository: %s"
+msgstr "Füge eingebettetes Repository hinzu: %s"
+
+#: builtin/add.c:349
 #, c-format
 msgid "Use -f if you really want to add them.\n"
 msgstr "Verwenden Sie -f wenn Sie diese wirklich hinzufügen möchten.\n"
 
-#: builtin/add.c:312
+#: builtin/add.c:357
 msgid "adding files failed"
 msgstr "Hinzufügen von Dateien fehlgeschlagen"
 
-#: builtin/add.c:348
+#: builtin/add.c:394
 msgid "-A and -u are mutually incompatible"
 msgstr "Die Optionen -A und -u sind zueinander inkompatibel."
 
-#: builtin/add.c:355
+#: builtin/add.c:401
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr ""
 "Die Option --ignore-missing kann nur zusammen mit --dry-run verwendet werden."
 
-#: builtin/add.c:359
+#: builtin/add.c:405
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "--chmod Parameter '%s' muss entweder -x oder +x sein"
 
-#: builtin/add.c:374
+#: builtin/add.c:420
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Nichts spezifiziert, nichts hinzugefügt.\n"
 
-#: builtin/add.c:375
+#: builtin/add.c:421
 #, c-format
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Meinten Sie vielleicht 'git add .'?\n"
 
-#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298
-#: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350
-#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271
+#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
+#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
+#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
 #: builtin/submodule--helper.c:244
 msgid "index file corrupt"
 msgstr "Index-Datei beschädigt"
 
-#: builtin/am.c:412
+#: builtin/am.c:413
 msgid "could not parse author script"
 msgstr "konnte Autor-Skript nicht parsen"
 
@@ -4896,7 +5012,7 @@ msgstr "Ungültiger Offset in der Zeitzone"
 msgid "Patch format detection failed."
 msgstr "Patch-Formaterkennung fehlgeschlagen."
 
-#: builtin/am.c:991 builtin/clone.c:397
+#: builtin/am.c:991 builtin/clone.c:401
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
@@ -4905,57 +5021,57 @@ msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
 msgid "Failed to split patches."
 msgstr "Fehler beim Aufteilen der Patches."
 
-#: builtin/am.c:1127 builtin/commit.c:376
+#: builtin/am.c:1120 builtin/commit.c:377
 msgid "unable to write index file"
 msgstr "Konnte Index-Datei nicht schreiben."
 
-#: builtin/am.c:1178
+#: builtin/am.c:1171
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr ""
 "Wenn Sie das Problem aufgelöst haben, führen Sie \"%s --continue\" aus."
 
-#: builtin/am.c:1179
+#: builtin/am.c:1172
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr ""
 "Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen \"%s --skip"
 "\" aus."
 
-#: builtin/am.c:1180
+#: builtin/am.c:1173
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 "Um den ursprünglichen Branch wiederherzustellen und die Anwendung der "
 "Patches abzubrechen, führen Sie \"%s --abort\" aus."
 
-#: builtin/am.c:1315
-msgid "Patch is empty. Was it split wrong?"
-msgstr "Patch ist leer. War dessen Aufteilung falsch?"
+#: builtin/am.c:1304
+msgid "Patch is empty."
+msgstr "Patch ist leer."
 
-#: builtin/am.c:1386 builtin/log.c:1557
+#: builtin/am.c:1370
 #, c-format
-msgid "invalid ident line: %s"
-msgstr "Ungültige Identifikationszeile: %s"
+msgid "invalid ident line: %.*s"
+msgstr "Ungültige Identifikationszeile: %.*s"
 
-#: builtin/am.c:1413
+#: builtin/am.c:1392
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "Konnte Commit '%s' nicht parsen."
 
-#: builtin/am.c:1606
+#: builtin/am.c:1586
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "Dem Repository fehlen notwendige Blobs um auf einen 3-Wege-Merge "
 "zurückzufallen."
 
-#: builtin/am.c:1608
+#: builtin/am.c:1588
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 "Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis "
 "nachzustellen ..."
 
-#: builtin/am.c:1627
+#: builtin/am.c:1607
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -4963,39 +5079,39 @@ msgstr ""
 "Haben Sie den Patch per Hand editiert?\n"
 "Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden."
 
-#: builtin/am.c:1633
+#: builtin/am.c:1613
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..."
 
-#: builtin/am.c:1658
+#: builtin/am.c:1638
 msgid "Failed to merge in the changes."
 msgstr "Merge der Änderungen fehlgeschlagen."
 
-#: builtin/am.c:1682 builtin/merge.c:631
+#: builtin/am.c:1662 builtin/merge.c:632
 msgid "git write-tree failed to write a tree"
 msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl"
 
-#: builtin/am.c:1689
+#: builtin/am.c:1669
 msgid "applying to an empty history"
 msgstr "auf leere Historie anwenden"
 
-#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802
-#: builtin/merge.c:827
+#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
+#: builtin/merge.c:828
 msgid "failed to write commit object"
 msgstr "Fehler beim Schreiben des Commit-Objektes."
 
-#: builtin/am.c:1735 builtin/am.c:1739
+#: builtin/am.c:1715 builtin/am.c:1719
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "Kann nicht fortsetzen: %s existiert nicht"
 
-#: builtin/am.c:1755
+#: builtin/am.c:1735
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 "Kann nicht interaktiv sein, ohne dass die Standard-Eingabe mit einem "
 "Terminal verbunden ist."
 
-#: builtin/am.c:1760
+#: builtin/am.c:1740
 msgid "Commit Body is:"
 msgstr "Commit-Beschreibung ist:"
 
@@ -5003,35 +5119,35 @@ msgstr "Commit-Beschreibung ist:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1770
+#: builtin/am.c:1750
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "Anwenden? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 
-#: builtin/am.c:1820
+#: builtin/am.c:1800
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)"
 
-#: builtin/am.c:1860 builtin/am.c:1932
+#: builtin/am.c:1840 builtin/am.c:1912
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Wende an: %.*s"
 
-#: builtin/am.c:1876
+#: builtin/am.c:1856
 msgid "No changes -- Patch already applied."
 msgstr "Keine Änderungen -- Patches bereits angewendet."
 
-#: builtin/am.c:1884
+#: builtin/am.c:1864
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s"
 
-#: builtin/am.c:1890
+#: builtin/am.c:1870
 #, c-format
 msgid "The copy of the patch that failed is found in: %s"
 msgstr "Die Kopie des fehlgeschlagenen Patches befindet sich in: %s"
 
-#: builtin/am.c:1935
+#: builtin/am.c:1915
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -5042,25 +5158,30 @@ msgstr ""
 "diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n"
 "auslassen."
 
-#: builtin/am.c:1942
+#: builtin/am.c:1922
 msgid ""
 "You still have unmerged paths in your index.\n"
-"Did you forget to use 'git add'?"
+"You should 'git add' each file with resolved conflicts to mark them as "
+"such.\n"
+"You might run `git rm` on a file to accept \"deleted by them\" for it."
 msgstr ""
-"Sie haben immer noch nicht zusammengeführte Pfade im Index.\n"
-"Haben Sie vergessen 'git add' zu benutzen?"
+"Sie haben noch immer nicht zusammengeführte Pfade in Ihrem Index.\n"
+"Sie sollten 'git add' für jede Datei mit aufgelösten Konflikten ausführen,\n"
+"um diese als solche zu markieren.\n"
+"Sie können 'git rm' auf Dateien ausführen, um \"von denen gelöscht\" für\n"
+"diese zu akzeptieren."
 
-#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308
-#: builtin/reset.c:316
+#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
+#: builtin/reset.c:331
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Konnte Objekt '%s' nicht parsen."
 
-#: builtin/am.c:2102
+#: builtin/am.c:2083
 msgid "failed to clean index"
 msgstr "Fehler beim Bereinigen des Index"
 
-#: builtin/am.c:2136
+#: builtin/am.c:2117
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -5068,134 +5189,135 @@ msgstr ""
 "Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n"
 "Keine Zurücksetzung zu ORIG_HEAD."
 
-#: builtin/am.c:2199
+#: builtin/am.c:2180
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Ungültiger Wert für --patch-format: %s"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2213
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<Optionen>] [(<mbox> | <E-Mail-Verzeichnis>)...]"
 
-#: builtin/am.c:2233
+#: builtin/am.c:2214
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<Optionen>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2220
 msgid "run interactively"
 msgstr "interaktiv ausführen"
 
-#: builtin/am.c:2241
+#: builtin/am.c:2222
 msgid "historical option -- no-op"
 msgstr "historische Option -- kein Effekt"
 
-#: builtin/am.c:2243
+#: builtin/am.c:2224
 msgid "allow fall back on 3way merging if needed"
 msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge"
 
-#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57
-#: builtin/repack.c:178
+#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/repack.c:180
 msgid "be quiet"
 msgstr "weniger Ausgaben"
 
-#: builtin/am.c:2246
+#: builtin/am.c:2227
 msgid "add a Signed-off-by line to the commit message"
 msgstr "der Commit-Beschreibung eine Signed-off-by Zeile hinzufügen"
 
-#: builtin/am.c:2249
+#: builtin/am.c:2230
 msgid "recode into utf8 (default)"
 msgstr "nach UTF-8 umkodieren (Standard)"
 
-#: builtin/am.c:2251
+#: builtin/am.c:2232
 msgid "pass -k flag to git-mailinfo"
 msgstr "-k an git-mailinfo übergeben"
 
-#: builtin/am.c:2253
+#: builtin/am.c:2234
 msgid "pass -b flag to git-mailinfo"
 msgstr "-b an git-mailinfo übergeben"
 
-#: builtin/am.c:2255
+#: builtin/am.c:2236
 msgid "pass -m flag to git-mailinfo"
 msgstr "-m an git-mailinfo übergeben"
 
-#: builtin/am.c:2257
+#: builtin/am.c:2238
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "--keep-cr an git-mailsplit für mbox-Format übergeben"
 
-#: builtin/am.c:2260
+#: builtin/am.c:2241
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr "kein --keep-cr an git-mailsplit übergeben, unabhängig von am.keepcr"
 
-#: builtin/am.c:2263
+#: builtin/am.c:2244
 msgid "strip everything before a scissors line"
 msgstr "alles vor einer Scheren-Zeile entfernen"
 
-#: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274
-#: builtin/am.c:2277 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286
-#: builtin/am.c:2292
+#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2273
 msgid "pass it through git-apply"
 msgstr "an git-apply übergeben"
 
-#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
-#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135
-#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191
-#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398
-#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
+#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
+#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193
+#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169
+#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134
+#: parse-options.h:245
 msgid "n"
 msgstr "Anzahl"
 
-#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37
-#: builtin/replace.c:443 builtin/tag.c:433 builtin/verify-tag.c:38
+#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
+#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
 msgid "format"
 msgstr "Format"
 
-#: builtin/am.c:2289
+#: builtin/am.c:2270
 msgid "format the patch(es) are in"
 msgstr "Patch-Format"
 
-#: builtin/am.c:2295
+#: builtin/am.c:2276
 msgid "override error message when patch failure occurs"
 msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben"
 
-#: builtin/am.c:2297
+#: builtin/am.c:2278
 msgid "continue applying patches after resolving a conflict"
 msgstr "Anwendung der Patches nach Auflösung eines Konfliktes fortsetzen"
 
-#: builtin/am.c:2300
+#: builtin/am.c:2281
 msgid "synonyms for --continue"
 msgstr "Synonyme für --continue"
 
-#: builtin/am.c:2303
+#: builtin/am.c:2284
 msgid "skip the current patch"
 msgstr "den aktuellen Patch auslassen"
 
-#: builtin/am.c:2306
+#: builtin/am.c:2287
 msgid "restore the original branch and abort the patching operation."
 msgstr ""
 "ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen"
 
-#: builtin/am.c:2310
+#: builtin/am.c:2291
 msgid "lie about committer date"
 msgstr "Autor-Datum als Commit-Datum verwenden"
 
-#: builtin/am.c:2312
+#: builtin/am.c:2293
 msgid "use current timestamp for author date"
 msgstr "aktuellen Zeitstempel als Autor-Datum verwenden"
 
-#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232
-#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
+#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
+#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
 msgid "key-id"
 msgstr "GPG-Schlüsselkennung"
 
-#: builtin/am.c:2315
+#: builtin/am.c:2296
 msgid "GPG-sign commits"
 msgstr "Commits mit GPG signieren"
 
-#: builtin/am.c:2318
+#: builtin/am.c:2299
 msgid "(internal use for git-rebase)"
 msgstr "(intern für git-rebase verwendet)"
 
-#: builtin/am.c:2333
+#: builtin/am.c:2317
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -5203,16 +5325,16 @@ msgstr ""
 "Die -b/--binary Option hat seit Langem keinen Effekt und wird\n"
 "entfernt. Bitte verwenden Sie diese nicht mehr."
 
-#: builtin/am.c:2340
+#: builtin/am.c:2324
 msgid "failed to read the index"
 msgstr "Fehler beim Lesen des Index"
 
-#: builtin/am.c:2355
+#: builtin/am.c:2339
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "Vorheriges Rebase-Verzeichnis %s existiert noch, aber mbox gegeben."
 
-#: builtin/am.c:2379
+#: builtin/am.c:2363
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -5221,7 +5343,7 @@ msgstr ""
 "Stray %s Verzeichnis gefunden.\n"
 "Benutzen Sie \"git am --abort\", um es zu entfernen."
 
-#: builtin/am.c:2385
+#: builtin/am.c:2369
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt."
 
@@ -5271,204 +5393,173 @@ msgstr "'git bisect next' ausführen"
 msgid "update BISECT_HEAD instead of checking out the current commit"
 msgstr "BISECT_HEAD aktualisieren, anstatt den aktuellen Commit auszuchecken"
 
-#: builtin/blame.c:33
+#: builtin/blame.c:27
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<Optionen>] [<rev-opts>] [<Commit>] [--] <Datei>"
 
-#: builtin/blame.c:38
+#: builtin/blame.c:32
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)"
 
-#: builtin/blame.c:1777
-msgid "Blaming lines"
-msgstr "Verarbeite Zeilen"
-
-#: builtin/blame.c:2573
+#: builtin/blame.c:668
 msgid "Show blame entries as we find them, incrementally"
 msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie generieren"
 
-#: builtin/blame.c:2574
+#: builtin/blame.c:669
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr "leere SHA-1 für Grenz-Commits anzeigen (Standard: aus)"
 
-#: builtin/blame.c:2575
+#: builtin/blame.c:670
 msgid "Do not treat root commits as boundaries (Default: off)"
-msgstr "Ursprungs-Commit nicht als Grenzen behandeln (Standard: aus)"
+msgstr "Ursprungs-Commits nicht als Grenzen behandeln (Standard: aus)"
 
-#: builtin/blame.c:2576
+#: builtin/blame.c:671
 msgid "Show work cost statistics"
 msgstr "Statistiken zum Arbeitsaufwand anzeigen"
 
-#: builtin/blame.c:2577
+#: builtin/blame.c:672
 msgid "Force progress reporting"
 msgstr "Fortschrittsanzeige erzwingen"
 
-#: builtin/blame.c:2578
+#: builtin/blame.c:673
 msgid "Show output score for blame entries"
 msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen"
 
-#: builtin/blame.c:2579
+#: builtin/blame.c:674
 msgid "Show original filename (Default: auto)"
 msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)"
 
-#: builtin/blame.c:2580
+#: builtin/blame.c:675
 msgid "Show original linenumber (Default: off)"
 msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)"
 
-#: builtin/blame.c:2581
+#: builtin/blame.c:676
 msgid "Show in a format designed for machine consumption"
 msgstr "Anzeige in einem Format für maschinelle Auswertung"
 
-#: builtin/blame.c:2582
+#: builtin/blame.c:677
 msgid "Show porcelain format with per-line commit information"
 msgstr ""
 "Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile"
 
-#: builtin/blame.c:2583
+#: builtin/blame.c:678
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr ""
 "Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)"
 
-#: builtin/blame.c:2584
+#: builtin/blame.c:679
 msgid "Show raw timestamp (Default: off)"
 msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)"
 
-#: builtin/blame.c:2585
+#: builtin/blame.c:680
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)"
 
-#: builtin/blame.c:2586
+#: builtin/blame.c:681
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "Den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)"
 
-#: builtin/blame.c:2587
+#: builtin/blame.c:682
 msgid "Show author email instead of name (Default: off)"
 msgstr ""
 "Anstatt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)"
 
-#: builtin/blame.c:2588
+#: builtin/blame.c:683
 msgid "Ignore whitespace differences"
 msgstr "Unterschiede im Whitespace ignorieren"
 
-#: builtin/blame.c:2595
+#: builtin/blame.c:690
 msgid "Use an experimental heuristic to improve diffs"
 msgstr ""
 "eine experimentelle Heuristik zur Verbesserung der Darstellung\n"
 "von Unterschieden verwenden"
 
-#: builtin/blame.c:2597
+#: builtin/blame.c:692
 msgid "Spend extra cycles to find better match"
 msgstr "Länger arbeiten, um bessere Übereinstimmungen zu finden"
 
-#: builtin/blame.c:2598
+#: builtin/blame.c:693
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen"
 
-#: builtin/blame.c:2599
+#: builtin/blame.c:694
 msgid "Use <file>'s contents as the final image"
 msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen"
 
-#: builtin/blame.c:2600 builtin/blame.c:2601
+#: builtin/blame.c:695 builtin/blame.c:696
 msgid "score"
 msgstr "Bewertung"
 
-#: builtin/blame.c:2600
+#: builtin/blame.c:695
 msgid "Find line copies within and across files"
 msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden"
 
-#: builtin/blame.c:2601
+#: builtin/blame.c:696
 msgid "Find line movements within and across files"
 msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden"
 
-#: builtin/blame.c:2602
+#: builtin/blame.c:697
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:2602
+#: builtin/blame.c:697
 msgid "Process only line range n,m, counting from 1"
 msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 1"
 
-#: builtin/blame.c:2649
+#: builtin/blame.c:744
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "--progress kann nicht mit --incremental oder Formaten für Fremdprogramme\n"
 "verwendet werden"
 
-#. TRANSLATORS: This string is used to tell us the maximum
-#. display width for a relative timestamp in "git blame"
-#. output.  For C locale, "4 years, 11 months ago", which
-#. takes 22 places, is the longest among various forms of
-#. relative timestamps, but your language may need more or
-#. fewer display columns.
-#: builtin/blame.c:2697
+#. TRANSLATORS: This string is used to tell us the
+#. maximum display width for a relative timestamp in
+#. "git blame" output.  For C locale, "4 years, 11
+#. months ago", which takes 22 places, is the longest
+#. among various forms of relative timestamps, but
+#. your language may need more or fewer display
+#. columns.
+#.
+#: builtin/blame.c:795
 msgid "4 years, 11 months ago"
-msgstr "vor 4 Jahren, und 11 Monaten"
-
-#: builtin/blame.c:2777
-msgid "--contents and --reverse do not blend well."
-msgstr "--contents und --reverse funktionieren gemeinsam nicht."
-
-#: builtin/blame.c:2797
-msgid "cannot use --contents with final commit object name"
-msgstr ""
-"kann --contents nicht mit endgültigem Namen des Commit-Objektes benutzen"
-
-#: builtin/blame.c:2802
-msgid "--reverse and --first-parent together require specified latest commit"
-msgstr ""
-"--reverse und --first-parent zusammen erfordern die Angabe eines "
-"endgültigen\n"
-"Commits"
-
-#: builtin/blame.c:2829
-msgid ""
-"--reverse --first-parent together require range along first-parent chain"
-msgstr ""
-"--reverse und --first-parent zusammen erfordern einen Bereich entlang der\n"
-"\"first-parent\"-Kette"
-
-#: builtin/blame.c:2840
-#, c-format
-msgid "no such path %s in %s"
-msgstr "Pfad %s nicht in %s"
-
-#: builtin/blame.c:2851
-#, c-format
-msgid "cannot read blob %s for path %s"
-msgstr "kann Blob %s für Pfad '%s' nicht lesen"
+msgstr "vor 4 Jahren und 11 Monaten"
 
-#: builtin/blame.c:2870
+#: builtin/blame.c:882
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "Datei %s hat nur %lu Zeile"
 msgstr[1] "Datei %s hat nur %lu Zeilen"
 
-#: builtin/branch.c:26
+#: builtin/blame.c:928
+msgid "Blaming lines"
+msgstr "Verarbeite Zeilen"
+
+#: builtin/branch.c:27
 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
 msgstr "git branch [<Optionen>] [-r | -a] [--merged | --no-merged]"
 
-#: builtin/branch.c:27
+#: builtin/branch.c:28
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
 msgstr "git branch [<Optionen>] [-l] [-f] <Branchname> [<Startpunkt>]"
 
-#: builtin/branch.c:28
+#: builtin/branch.c:29
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<Optionen>] [-r] (-d | -D) <Branchname>..."
 
-#: builtin/branch.c:29
+#: builtin/branch.c:30
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<Optionen>] (-m | -M) [<alter-Branch>] <neuer-Branch>"
 
-#: builtin/branch.c:30
+#: builtin/branch.c:31
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<Optionen>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:31
+#: builtin/branch.c:32
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<Optionen>] [-r | -a] [--format]"
 
-#: builtin/branch.c:144
+#: builtin/branch.c:145
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -5477,7 +5568,7 @@ msgstr ""
 "entferne Branch '%s', der zusammengeführt wurde mit\n"
 "         '%s', aber noch nicht mit HEAD zusammengeführt wurde."
 
-#: builtin/branch.c:148
+#: builtin/branch.c:149
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -5486,12 +5577,12 @@ msgstr ""
 "entferne Branch '%s' nicht, der noch nicht zusammengeführt wurde mit\n"
 "         '%s', obwohl er mit HEAD zusammengeführt wurde."
 
-#: builtin/branch.c:162
+#: builtin/branch.c:163
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Konnte Commit-Objekt für '%s' nicht nachschlagen."
 
-#: builtin/branch.c:166
+#: builtin/branch.c:167
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -5501,94 +5592,94 @@ msgstr ""
 "Wenn Sie sicher sind diesen Branch zu entfernen, führen Sie 'git branch -D "
 "%s' aus."
 
-#: builtin/branch.c:179
+#: builtin/branch.c:180
 msgid "Update of config-file failed"
 msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen."
 
-#: builtin/branch.c:210
+#: builtin/branch.c:211
 msgid "cannot use -a with -d"
 msgstr "kann -a nicht mit -d benutzen"
 
-#: builtin/branch.c:216
+#: builtin/branch.c:217
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Konnte Commit-Objekt für HEAD nicht nachschlagen."
 
-#: builtin/branch.c:230
+#: builtin/branch.c:231
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "Kann Branch '%s' nicht entfernen, ausgecheckt in '%s'."
 
-#: builtin/branch.c:245
+#: builtin/branch.c:246
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "Remote-Tracking-Branch '%s' nicht gefunden"
 
-#: builtin/branch.c:246
+#: builtin/branch.c:247
 #, c-format
 msgid "branch '%s' not found."
 msgstr "Branch '%s' nicht gefunden."
 
-#: builtin/branch.c:261
+#: builtin/branch.c:262
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr "Fehler beim Entfernen des Remote-Tracking-Branches '%s'"
 
-#: builtin/branch.c:262
+#: builtin/branch.c:263
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "Fehler beim Entfernen des Branches '%s'"
 
-#: builtin/branch.c:269
+#: builtin/branch.c:270
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Remote-Tracking-Branch %s entfernt (war %s).\n"
 
-#: builtin/branch.c:270
+#: builtin/branch.c:271
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Branch %s entfernt (war %s).\n"
 
-#: builtin/branch.c:441
+#: builtin/branch.c:445
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Branch %s wird auf %s umgesetzt"
 
-#: builtin/branch.c:445
+#: builtin/branch.c:449
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Binäre Suche von Branch %s zu %s im Gange"
 
-#: builtin/branch.c:460
+#: builtin/branch.c:464
 msgid "cannot rename the current branch while not on any."
 msgstr ""
 "Kann aktuellen Branch nicht umbenennen, solange Sie sich auf keinem befinden."
 
-#: builtin/branch.c:470
+#: builtin/branch.c:474
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Ungültiger Branchname: '%s'"
 
-#: builtin/branch.c:487
+#: builtin/branch.c:491
 msgid "Branch rename failed"
 msgstr "Umbenennung des Branches fehlgeschlagen"
 
-#: builtin/branch.c:490
+#: builtin/branch.c:494
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "falsch benannten Branch '%s' umbenannt"
 
-#: builtin/branch.c:493
+#: builtin/branch.c:497
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "Branch umbenannt zu %s, aber HEAD ist nicht aktualisiert!"
 
-#: builtin/branch.c:502
+#: builtin/branch.c:506
 msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 "Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist "
 "fehlgeschlagen."
 
-#: builtin/branch.c:518
+#: builtin/branch.c:522
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -5599,177 +5690,177 @@ msgstr ""
 "  %s\n"
 "Zeilen, die mit '%c' beginnen, werden entfernt.\n"
 
-#: builtin/branch.c:551
+#: builtin/branch.c:555
 msgid "Generic options"
 msgstr "Allgemeine Optionen"
 
-#: builtin/branch.c:553
+#: builtin/branch.c:557
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch"
 
-#: builtin/branch.c:554
+#: builtin/branch.c:558
 msgid "suppress informational messages"
 msgstr "Informationsmeldungen unterdrücken"
 
-#: builtin/branch.c:555
+#: builtin/branch.c:559
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "den Übernahmemodus einstellen (siehe git-pull(1))"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:561
 msgid "change upstream info"
 msgstr "Informationen zum Upstream-Branch ändern"
 
-#: builtin/branch.c:559
+#: builtin/branch.c:563
 msgid "upstream"
 msgstr "Upstream"
 
-#: builtin/branch.c:559
+#: builtin/branch.c:563
 msgid "change the upstream info"
 msgstr "Informationen zum Upstream-Branch ändern"
 
-#: builtin/branch.c:560
+#: builtin/branch.c:564
 msgid "Unset the upstream info"
 msgstr "Informationen zum Upstream-Branch entfernen"
 
-#: builtin/branch.c:561
+#: builtin/branch.c:565
 msgid "use colored output"
 msgstr "farbige Ausgaben verwenden"
 
-#: builtin/branch.c:562
+#: builtin/branch.c:566
 msgid "act on remote-tracking branches"
 msgstr "auf Remote-Tracking-Branches wirken"
 
-#: builtin/branch.c:564 builtin/branch.c:566
+#: builtin/branch.c:568 builtin/branch.c:570
 msgid "print only branches that contain the commit"
 msgstr "nur Branches ausgeben, die diesen Commit enthalten"
 
-#: builtin/branch.c:565 builtin/branch.c:567
+#: builtin/branch.c:569 builtin/branch.c:571
 msgid "print only branches that don't contain the commit"
 msgstr "nur Branches ausgeben, die diesen Commit nicht enthalten"
 
-#: builtin/branch.c:570
+#: builtin/branch.c:574
 msgid "Specific git-branch actions:"
 msgstr "spezifische Aktionen für \"git-branch\":"
 
-#: builtin/branch.c:571
+#: builtin/branch.c:575
 msgid "list both remote-tracking and local branches"
 msgstr "Remote-Tracking und lokale Branches auflisten"
 
-#: builtin/branch.c:573
+#: builtin/branch.c:577
 msgid "delete fully merged branch"
 msgstr "vollständig zusammengeführten Branch entfernen"
 
-#: builtin/branch.c:574
+#: builtin/branch.c:578
 msgid "delete branch (even if not merged)"
 msgstr "Branch löschen (auch wenn nicht zusammengeführt)"
 
-#: builtin/branch.c:575
+#: builtin/branch.c:579
 msgid "move/rename a branch and its reflog"
 msgstr "einen Branch und dessen Reflog verschieben/umbenennen"
 
-#: builtin/branch.c:576
+#: builtin/branch.c:580
 msgid "move/rename a branch, even if target exists"
 msgstr ""
 "einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert"
 
-#: builtin/branch.c:577
+#: builtin/branch.c:581
 msgid "list branch names"
 msgstr "Branchnamen auflisten"
 
-#: builtin/branch.c:578
+#: builtin/branch.c:582
 msgid "create the branch's reflog"
 msgstr "das Reflog des Branches erzeugen"
 
-#: builtin/branch.c:580
+#: builtin/branch.c:584
 msgid "edit the description for the branch"
 msgstr "die Beschreibung für den Branch bearbeiten"
 
-#: builtin/branch.c:581
+#: builtin/branch.c:585
 msgid "force creation, move/rename, deletion"
 msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen"
 
-#: builtin/branch.c:582
+#: builtin/branch.c:586
 msgid "print only branches that are merged"
 msgstr "nur zusammengeführte Branches ausgeben"
 
-#: builtin/branch.c:583
+#: builtin/branch.c:587
 msgid "print only branches that are not merged"
 msgstr "nur nicht zusammengeführte Branches ausgeben"
 
-#: builtin/branch.c:584
+#: builtin/branch.c:588
 msgid "list branches in columns"
 msgstr "Branches in Spalten auflisten"
 
-#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426
+#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
 msgid "key"
 msgstr "Schüssel"
 
-#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
 msgid "field name to sort on"
 msgstr "sortiere nach diesem Feld"
 
-#: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404
-#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
-#: builtin/tag.c:429
+#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
+#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
+#: builtin/tag.c:430
 msgid "object"
 msgstr "Objekt"
 
-#: builtin/branch.c:589
+#: builtin/branch.c:593
 msgid "print only branches of the object"
 msgstr "nur Branches von diesem Objekt ausgeben"
 
-#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434
+#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
 msgid "sorting and filtering are case insensitive"
 msgstr "Sortierung und Filterung sind unabhängig von Groß- und Kleinschreibung"
 
-#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433
-#: builtin/verify-tag.c:38
+#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr "für die Ausgabe zu verwendendes Format"
 
-#: builtin/branch.c:611
+#: builtin/branch.c:615
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Konnte HEAD nicht als gültige Referenz auflösen."
 
-#: builtin/branch.c:615 builtin/clone.c:724
+#: builtin/branch.c:619 builtin/clone.c:728
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:642
 msgid "--column and --verbose are incompatible"
 msgstr "Die Optionen --column und --verbose sind inkompatibel."
 
-#: builtin/branch.c:649 builtin/branch.c:701
+#: builtin/branch.c:653 builtin/branch.c:705
 msgid "branch name required"
 msgstr "Branchname erforderlich"
 
-#: builtin/branch.c:677
+#: builtin/branch.c:681
 msgid "Cannot give description to detached HEAD"
 msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden"
 
-#: builtin/branch.c:682
+#: builtin/branch.c:686
 msgid "cannot edit description of more than one branch"
 msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden"
 
-#: builtin/branch.c:689
+#: builtin/branch.c:693
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Noch kein Commit in Branch '%s'."
 
-#: builtin/branch.c:692
+#: builtin/branch.c:696
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Branch '%s' nicht vorhanden."
 
-#: builtin/branch.c:707
+#: builtin/branch.c:711
 msgid "too many branches for a rename operation"
 msgstr "zu viele Branches für eine Umbenennen-Operation angegeben"
 
-#: builtin/branch.c:712
+#: builtin/branch.c:716
 msgid "too many branches to set new upstream"
 msgstr "zu viele Branches angegeben, um Upstream-Branch zu setzen"
 
-#: builtin/branch.c:716
+#: builtin/branch.c:720
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -5777,43 +5868,43 @@ msgstr ""
 "Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n"
 "keinen Branch zeigt."
 
-#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762
+#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
 #, c-format
 msgid "no such branch '%s'"
 msgstr "Kein solcher Branch '%s'"
 
-#: builtin/branch.c:723
+#: builtin/branch.c:727
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "Branch '%s' existiert nicht"
 
-#: builtin/branch.c:735
+#: builtin/branch.c:739
 msgid "too many branches to unset upstream"
 msgstr ""
 "zu viele Branches angegeben, um Konfiguration zu Upstream-Branch zu entfernen"
 
-#: builtin/branch.c:739
+#: builtin/branch.c:743
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 "Konnte Konfiguration zu Upstream-Branch von HEAD nicht entfernen, da dieser\n"
 "auf keinen Branch zeigt."
 
-#: builtin/branch.c:745
+#: builtin/branch.c:749
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
 
-#: builtin/branch.c:759
+#: builtin/branch.c:763
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr "'HEAD' darf nicht manuell erstellt werden"
 
-#: builtin/branch.c:765
+#: builtin/branch.c:769
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr ""
 "Die Optionen -a und -r bei 'git branch' können nicht gemeimsam mit einem "
 "Branchnamen verwendet werden."
 
-#: builtin/branch.c:768
+#: builtin/branch.c:772
 #, c-format
 msgid ""
 "The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -5822,7 +5913,7 @@ msgstr ""
 "Die --set-upstream Option ist veraltet und wird entfernt. Benutzen Sie --"
 "track oder --set-upstream-to\n"
 
-#: builtin/branch.c:785
+#: builtin/branch.c:789
 #, c-format
 msgid ""
 "\n"
@@ -5846,7 +5937,7 @@ msgstr "Um ein Paket zu erstellen wird ein Repository benötigt."
 msgid "Need a repository to unbundle."
 msgstr "Zum Entpacken wird ein Repository benötigt."
 
-#: builtin/cat-file.c:513
+#: builtin/cat-file.c:519
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -5854,7 +5945,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <Art> | --textconv | --filters) [--path=<Pfad>] <Objekt>"
 
-#: builtin/cat-file.c:514
+#: builtin/cat-file.c:520
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -5862,311 +5953,311 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:551
+#: builtin/cat-file.c:557
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<Art> kann sein: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:552
+#: builtin/cat-file.c:558
 msgid "show object type"
 msgstr "Objektart anzeigen"
 
-#: builtin/cat-file.c:553
+#: builtin/cat-file.c:559
 msgid "show object size"
 msgstr "Objektgröße anzeigen"
 
-#: builtin/cat-file.c:555
+#: builtin/cat-file.c:561
 msgid "exit with zero when there's no error"
 msgstr "mit Rückgabewert 0 beenden, wenn kein Fehler aufgetreten ist"
 
-#: builtin/cat-file.c:556
+#: builtin/cat-file.c:562
 msgid "pretty-print object's content"
 msgstr "ansprechende Anzeige des Objektinhaltes"
 
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:564
 msgid "for blob objects, run textconv on object's content"
 msgstr "eine Textkonvertierung auf den Inhalt von Blob-Objekten ausführen"
 
-#: builtin/cat-file.c:560
+#: builtin/cat-file.c:566
 msgid "for blob objects, run filters on object's content"
 msgstr "für Blob-Objekte, Filter auf Objekt-Inhalte ausführen"
 
-#: builtin/cat-file.c:561 git-submodule.sh:943
+#: builtin/cat-file.c:567 git-submodule.sh:944
 msgid "blob"
 msgstr "Blob"
 
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:568
 msgid "use a specific path for --textconv/--filters"
 msgstr "einen bestimmten Pfad für --textconv/--filters verwenden"
 
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:570
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "-s und -t mit beschädigten Objekten erlauben"
 
-#: builtin/cat-file.c:565
+#: builtin/cat-file.c:571
 msgid "buffer --batch output"
 msgstr "Ausgabe von --batch puffern"
 
-#: builtin/cat-file.c:567
+#: builtin/cat-file.c:573
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 "Anzeige von Informationen und Inhalt von Objekten, gelesen von der Standard-"
 "Eingabe"
 
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:576
 msgid "show info about objects fed from the standard input"
 msgstr ""
 "Anzeige von Informationen über Objekte, gelesen von der Standard-Eingabe"
 
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:579
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "symbolischen Verknüpfungen innerhalb des Repositories folgen (verwendet mit "
 "--batch oder --batch-check)"
 
-#: builtin/cat-file.c:575
+#: builtin/cat-file.c:581
 msgid "show all objects with --batch or --batch-check"
 msgstr "alle Objekte mit --batch oder --batch-check anzeigen"
 
-#: builtin/check-attr.c:11
+#: builtin/check-attr.c:12
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
 msgstr "git check-attr [-a | --all | <Attribut>...] [--] <Pfadname>..."
 
-#: builtin/check-attr.c:12
+#: builtin/check-attr.c:13
 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 msgstr "git check-attr --stdin [-z] [-a | --all | <Attribut>...]"
 
-#: builtin/check-attr.c:19
+#: builtin/check-attr.c:20
 msgid "report all attributes set on file"
 msgstr "alle Attribute einer Datei ausgeben"
 
-#: builtin/check-attr.c:20
+#: builtin/check-attr.c:21
 msgid "use .gitattributes only from the index"
 msgstr "nur .gitattributes vom Index verwenden"
 
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
 msgid "read file names from stdin"
 msgstr "Dateinamen von der Standard-Eingabe lesen"
 
-#: builtin/check-attr.c:23 builtin/check-ignore.c:24
+#: builtin/check-attr.c:24 builtin/check-ignore.c:26
 msgid "terminate input and output records by a NUL character"
 msgstr "Einträge von Ein- und Ausgabe mit NUL-Zeichen abschließen"
 
-#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356
+#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
 msgid "suppress progress reporting"
 msgstr "Fortschrittsanzeige unterdrücken"
 
-#: builtin/check-ignore.c:26
+#: builtin/check-ignore.c:28
 msgid "show non-matching input paths"
 msgstr "Eingabe-Pfade ohne Übereinstimmungen anzeigen"
 
-#: builtin/check-ignore.c:28
+#: builtin/check-ignore.c:30
 msgid "ignore index when checking"
 msgstr "Index bei der Prüfung ignorieren"
 
-#: builtin/check-ignore.c:154
+#: builtin/check-ignore.c:158
 msgid "cannot specify pathnames with --stdin"
 msgstr "Angabe von Pfadnamen kann nicht gemeinsam mit --stdin verwendet werden"
 
-#: builtin/check-ignore.c:157
+#: builtin/check-ignore.c:161
 msgid "-z only makes sense with --stdin"
 msgstr "Die Option -z kann nur mit --stdin verwendet werden."
 
-#: builtin/check-ignore.c:159
+#: builtin/check-ignore.c:163
 msgid "no path specified"
 msgstr "kein Pfad angegeben"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:167
 msgid "--quiet is only valid with a single pathname"
 msgstr "Die Option --quiet ist nur mit einem einzelnen Pfadnamen gültig."
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:169
 msgid "cannot have both --quiet and --verbose"
 msgstr ""
 "Die Optionen --quiet und --verbose können nicht gemeinsam verwendet werden."
 
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c:172
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching ist nur mit --verbose zulässig"
 
-#: builtin/check-mailmap.c:8
+#: builtin/check-mailmap.c:9
 msgid "git check-mailmap [<options>] <contact>..."
 msgstr "git check-mailmap [<Optionen>] <Kontakt>..."
 
-#: builtin/check-mailmap.c:13
+#: builtin/check-mailmap.c:14
 msgid "also read contacts from stdin"
 msgstr "ebenfalls Kontakte von der Standard-Eingabe lesen"
 
-#: builtin/check-mailmap.c:24
+#: builtin/check-mailmap.c:25
 #, c-format
 msgid "unable to parse contact: %s"
 msgstr "Konnte Kontakt '%s' nicht parsen."
 
-#: builtin/check-mailmap.c:47
+#: builtin/check-mailmap.c:48
 msgid "no contacts specified"
 msgstr "keine Kontakte angegeben"
 
-#: builtin/checkout-index.c:127
+#: builtin/checkout-index.c:128
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<Optionen>] [--] [<Datei>...]"
 
-#: builtin/checkout-index.c:144
+#: builtin/checkout-index.c:145
 msgid "stage should be between 1 and 3 or all"
 msgstr "--stage sollte zwischen 1 und 3 oder 'all' sein"
 
-#: builtin/checkout-index.c:160
+#: builtin/checkout-index.c:161
 msgid "check out all files in the index"
 msgstr "alle Dateien im Index auschecken"
 
-#: builtin/checkout-index.c:161
+#: builtin/checkout-index.c:162
 msgid "force overwrite of existing files"
 msgstr "das Überschreiben bereits existierender Dateien erzwingen"
 
-#: builtin/checkout-index.c:163
+#: builtin/checkout-index.c:164
 msgid "no warning for existing files and files not in index"
 msgstr ""
 "keine Warnung für existierende Dateien, und Dateien, die sich nicht im Index "
 "befinden"
 
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:166
 msgid "don't checkout new files"
 msgstr "keine neuen Dateien auschecken"
 
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:168
 msgid "update stat information in the index file"
 msgstr "Dateiinformationen in der Index-Datei aktualisieren"
 
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:172
 msgid "read list of paths from the standard input"
 msgstr "eine Liste von Pfaden von der Standard-Eingabe lesen"
 
-#: builtin/checkout-index.c:173
+#: builtin/checkout-index.c:174
 msgid "write the content to temporary files"
 msgstr "den Inhalt in temporäre Dateien schreiben"
 
-#: builtin/checkout-index.c:174 builtin/column.c:30
+#: builtin/checkout-index.c:175 builtin/column.c:31
 #: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
 #: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:477
+#: builtin/worktree.c:478
 msgid "string"
 msgstr "Zeichenkette"
 
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:176
 msgid "when creating files, prepend <string>"
 msgstr ""
 "wenn Dateien erzeugt werden, stelle <Zeichenkette> dem Dateinamen voran"
 
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:178
 msgid "copy out the files from named stage"
 msgstr "Dateien von dem benannten Stand kopieren"
 
-#: builtin/checkout.c:27
+#: builtin/checkout.c:26
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<Optionen>] <Branch>"
 
-#: builtin/checkout.c:28
+#: builtin/checkout.c:27
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<Optionen>] [<Branch>] -- <Datei>..."
 
-#: builtin/checkout.c:153 builtin/checkout.c:186
+#: builtin/checkout.c:135 builtin/checkout.c:168
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "Pfad '%s' hat nicht unsere Version."
 
-#: builtin/checkout.c:155 builtin/checkout.c:188
+#: builtin/checkout.c:137 builtin/checkout.c:170
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "Pfad '%s' hat nicht deren Version."
 
-#: builtin/checkout.c:171
+#: builtin/checkout.c:153
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "Pfad '%s' hat nicht alle notwendigen Versionen."
 
-#: builtin/checkout.c:215
+#: builtin/checkout.c:197
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "Pfad '%s' hat nicht die notwendigen Versionen."
 
-#: builtin/checkout.c:232
+#: builtin/checkout.c:214
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "Pfad '%s': kann nicht zusammenführen"
 
-#: builtin/checkout.c:249
+#: builtin/checkout.c:231
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufügen."
 
-#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275
-#: builtin/checkout.c:278
+#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
+#: builtin/checkout.c:262
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' kann nicht mit der Aktualisierung von Pfaden verwendet werden"
 
-#: builtin/checkout.c:281 builtin/checkout.c:284
+#: builtin/checkout.c:265 builtin/checkout.c:268
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' kann nicht mit '%s' verwendet werden"
 
-#: builtin/checkout.c:287
+#: builtin/checkout.c:271
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln"
 
-#: builtin/checkout.c:358 builtin/checkout.c:365
+#: builtin/checkout.c:342 builtin/checkout.c:349
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "Pfad '%s' ist nicht zusammengeführt."
 
-#: builtin/checkout.c:513
+#: builtin/checkout.c:497
 msgid "you need to resolve your current index first"
 msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen."
 
-#: builtin/checkout.c:644
+#: builtin/checkout.c:628
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Kann \"reflog\" für '%s' nicht durchführen: %s\n"
 
-#: builtin/checkout.c:685
+#: builtin/checkout.c:669
 msgid "HEAD is now at"
 msgstr "HEAD ist jetzt bei"
 
-#: builtin/checkout.c:689 builtin/clone.c:678
+#: builtin/checkout.c:673 builtin/clone.c:682
 msgid "unable to update HEAD"
 msgstr "Konnte HEAD nicht aktualisieren."
 
-#: builtin/checkout.c:693
+#: builtin/checkout.c:677
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Setze Branch '%s' neu\n"
 
-#: builtin/checkout.c:696
+#: builtin/checkout.c:680
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Bereits auf '%s'\n"
 
-#: builtin/checkout.c:700
+#: builtin/checkout.c:684
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Zu umgesetztem Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:702 builtin/checkout.c:1090
+#: builtin/checkout.c:686 builtin/checkout.c:1075
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Zu neuem Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:704
+#: builtin/checkout.c:688
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Zu Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:755
+#: builtin/checkout.c:739
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... und %d weitere.\n"
 
-#: builtin/checkout.c:761
+#: builtin/checkout.c:745
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -6189,7 +6280,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:780
+#: builtin/checkout.c:764
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6205,178 +6296,173 @@ msgid_plural ""
 "\n"
 msgstr[0] ""
 "Wenn Sie diese durch einen neuen Branch behalten möchten, dann könnte jetzt\n"
-"ein guter Zeitpunkt sein dies zu tun mit:\n"
+"ein guter Zeitpunkt sein, dies zu tun mit:\n"
 "\n"
 " git branch <neuer-Branchname> %s\n"
 "\n"
 msgstr[1] ""
 "Wenn Sie diese durch einen neuen Branch behalten möchten, dann könnte jetzt\n"
-"ein guter Zeitpunkt sein dies zu tun mit:\n"
+"ein guter Zeitpunkt sein, dies zu tun mit:\n"
 "\n"
 " git branch <neuer-Branchname> %s\n"
 "\n"
 
-#: builtin/checkout.c:816
+#: builtin/checkout.c:800
 msgid "internal error in revision walk"
 msgstr "interner Fehler im Revisionsgang"
 
-#: builtin/checkout.c:820
+#: builtin/checkout.c:804
 msgid "Previous HEAD position was"
 msgstr "Vorherige Position von HEAD war"
 
-#: builtin/checkout.c:847 builtin/checkout.c:1085
+#: builtin/checkout.c:832 builtin/checkout.c:1070
 msgid "You are on a branch yet to be born"
-msgstr "Sie sind auf einem Branch, der noch geboren wird"
+msgstr "Sie sind auf einem Branch, der noch nicht geboren ist"
 
-#: builtin/checkout.c:991
+#: builtin/checkout.c:976
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "nur eine Referenz erwartet, %d gegeben."
 
-#: builtin/checkout.c:1031 builtin/worktree.c:214
+#: builtin/checkout.c:1016 builtin/worktree.c:215
 #, c-format
 msgid "invalid reference: %s"
 msgstr "Ungültige Referenz: %s"
 
-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1045
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "Referenz ist kein \"Tree\"-Objekt: %s"
 
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1084
 msgid "paths cannot be used with switching branches"
 msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden"
 
-#: builtin/checkout.c:1102 builtin/checkout.c:1106
+#: builtin/checkout.c:1087 builtin/checkout.c:1091
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden"
 
-#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118
-#: builtin/checkout.c:1121
+#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
+#: builtin/checkout.c:1106
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' kann nicht mit '%s' verwendet werden"
 
-#: builtin/checkout.c:1126
+#: builtin/checkout.c:1111
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln"
 
-#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:329
-#: builtin/worktree.c:331
+#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
+#: builtin/worktree.c:330
 msgid "branch"
 msgstr "Branch"
 
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1145
 msgid "create and checkout a new branch"
 msgstr "einen neuen Branch erzeugen und auschecken"
 
-#: builtin/checkout.c:1162
+#: builtin/checkout.c:1147
 msgid "create/reset and checkout a branch"
 msgstr "einen Branch erstellen/umsetzen und auschecken"
 
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1148
 msgid "create reflog for new branch"
 msgstr "das Reflog für den neuen Branch erzeugen"
 
-#: builtin/checkout.c:1164 builtin/worktree.c:333
+#: builtin/checkout.c:1149 builtin/worktree.c:332
 msgid "detach HEAD at named commit"
 msgstr "HEAD bei benanntem Commit loslösen"
 
-#: builtin/checkout.c:1165
+#: builtin/checkout.c:1150
 msgid "set upstream info for new branch"
 msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen"
 
-#: builtin/checkout.c:1167
+#: builtin/checkout.c:1152
 msgid "new-branch"
 msgstr "neuer Branch"
 
-#: builtin/checkout.c:1167
+#: builtin/checkout.c:1152
 msgid "new unparented branch"
 msgstr "neuer Branch ohne Eltern-Commit"
 
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1153
 msgid "checkout our version for unmerged files"
 msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken"
 
-#: builtin/checkout.c:1170
+#: builtin/checkout.c:1155
 msgid "checkout their version for unmerged files"
 msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken"
 
-#: builtin/checkout.c:1172
+#: builtin/checkout.c:1157
 msgid "force checkout (throw away local modifications)"
 msgstr "Auschecken erzwingen (verwirft lokale Änderungen)"
 
-#: builtin/checkout.c:1173
+#: builtin/checkout.c:1158
 msgid "perform a 3-way merge with the new branch"
 msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen"
 
-#: builtin/checkout.c:1174 builtin/merge.c:234
+#: builtin/checkout.c:1159 builtin/merge.c:235
 msgid "update ignored files (default)"
 msgstr "ignorierte Dateien aktualisieren (Standard)"
 
-#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251
+#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
 msgid "style"
 msgstr "Stil"
 
-#: builtin/checkout.c:1176
+#: builtin/checkout.c:1161
 msgid "conflict style (merge or diff3)"
 msgstr "Konfliktstil (merge oder diff3)"
 
-#: builtin/checkout.c:1179
+#: builtin/checkout.c:1164
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken"
 
-#: builtin/checkout.c:1181
+#: builtin/checkout.c:1166
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "second guess 'git checkout <no-such-branch>'"
 
-#: builtin/checkout.c:1183
+#: builtin/checkout.c:1168
 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 "Prüfung, ob die Referenz bereits in einem anderen Arbeitsverzeichnis "
 "ausgecheckt wurde, deaktivieren"
 
-#: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119
-#: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539
-#: builtin/send-pack.c:172
+#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
+#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: builtin/send-pack.c:173
 msgid "force progress reporting"
 msgstr "Fortschrittsanzeige erzwingen"
 
-#: builtin/checkout.c:1224
+#: builtin/checkout.c:1203
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus."
 
-#: builtin/checkout.c:1241
+#: builtin/checkout.c:1220
 msgid "--track needs a branch name"
 msgstr "Bei der Option --track muss ein Branchname angegeben werden."
 
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1225
 msgid "Missing branch name; try -b"
 msgstr "Vermisse Branchnamen; versuchen Sie -b"
 
-#: builtin/checkout.c:1282
+#: builtin/checkout.c:1261
 msgid "invalid path specification"
 msgstr "ungültige Pfadspezifikation"
 
-#: builtin/checkout.c:1289
+#: builtin/checkout.c:1268
 #, c-format
-msgid ""
-"Cannot update paths and switch to branch '%s' at the same time.\n"
-"Did you intend to checkout '%s' which can not be resolved as commit?"
-msgstr ""
-"Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln.\n"
-"Haben Sie beabsichtigt '%s' auszuchecken, welcher nicht als Commit aufgelöst "
-"werden kann?"
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgstr "'%s' ist kein Commit und es kann kein Branch '%s' aus diesem erstellt werden."
 
-#: builtin/checkout.c:1294
+#: builtin/checkout.c:1272
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach nimmt kein Pfad-Argument '%s'"
 
-#: builtin/checkout.c:1298
+#: builtin/checkout.c:1276
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -6384,38 +6470,38 @@ msgstr ""
 "git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n"
 "Sie aus dem Index auschecken."
 
-#: builtin/clean.c:25
+#: builtin/clean.c:26
 msgid ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
 msgstr ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <Muster>] [-x | -X] [--] <Pfade>..."
 
-#: builtin/clean.c:29
+#: builtin/clean.c:30
 #, c-format
 msgid "Removing %s\n"
 msgstr "Lösche %s\n"
 
-#: builtin/clean.c:30
+#: builtin/clean.c:31
 #, c-format
 msgid "Would remove %s\n"
 msgstr "Würde %s löschen\n"
 
-#: builtin/clean.c:31
+#: builtin/clean.c:32
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "Überspringe Repository %s\n"
 
-#: builtin/clean.c:32
+#: builtin/clean.c:33
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "Würde Repository %s überspringen\n"
 
-#: builtin/clean.c:33
+#: builtin/clean.c:34
 #, c-format
 msgid "failed to remove %s"
 msgstr "Fehler beim Löschen von %s"
 
-#: builtin/clean.c:297 git-add--interactive.perl:614
+#: builtin/clean.c:298 git-add--interactive.perl:572
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6428,7 +6514,7 @@ msgstr ""
 "foo        - Element anhand eines eindeutigen Präfix auswählen\n"
 "           - (leer) nichts auswählen\n"
 
-#: builtin/clean.c:301 git-add--interactive.perl:623
+#: builtin/clean.c:302 git-add--interactive.perl:581
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6449,38 +6535,38 @@ msgstr ""
 "*          - alle Elemente auswählen\n"
 "           - (leer) Auswahl beenden\n"
 
-#: builtin/clean.c:517 git-add--interactive.perl:589
-#: git-add--interactive.perl:594
+#: builtin/clean.c:518 git-add--interactive.perl:547
+#: git-add--interactive.perl:552
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Wie bitte (%s)?\n"
 
-#: builtin/clean.c:659
+#: builtin/clean.c:660
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Ignorier-Muster eingeben>> "
 
-#: builtin/clean.c:696
+#: builtin/clean.c:697
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "WARNUNG: Kann keine Einträge finden die Muster entsprechen: %s"
 
-#: builtin/clean.c:717
+#: builtin/clean.c:718
 msgid "Select items to delete"
 msgstr "Wählen Sie Einträge zum Löschen"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:758
+#: builtin/clean.c:759
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "'%s' löschen [y/N]? "
 
-#: builtin/clean.c:783 git-add--interactive.perl:1660
+#: builtin/clean.c:784 git-add--interactive.perl:1616
 #, c-format
 msgid "Bye.\n"
 msgstr "Tschüss.\n"
 
-#: builtin/clean.c:791
+#: builtin/clean.c:792
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -6498,15 +6584,15 @@ msgstr ""
 "help                - diese Meldung anzeigen\n"
 "?                   - Hilfe zur Auswahl mittels Eingabe anzeigen"
 
-#: builtin/clean.c:818 git-add--interactive.perl:1736
+#: builtin/clean.c:819 git-add--interactive.perl:1692
 msgid "*** Commands ***"
 msgstr "*** Befehle ***"
 
-#: builtin/clean.c:819 git-add--interactive.perl:1733
+#: builtin/clean.c:820 git-add--interactive.perl:1689
 msgid "What now"
 msgstr "Was nun"
 
-#: builtin/clean.c:827
+#: builtin/clean.c:828
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Würde das folgende Element entfernen:"
@@ -6516,45 +6602,45 @@ msgstr[1] "Würde die folgenden Elemente entfernen:"
 msgid "No more files to clean, exiting."
 msgstr "Keine Dateien mehr zum Löschen, beende."
 
-#: builtin/clean.c:875
+#: builtin/clean.c:906
 msgid "do not print names of files removed"
 msgstr "keine Namen von gelöschten Dateien ausgeben"
 
-#: builtin/clean.c:877
+#: builtin/clean.c:908
 msgid "force"
 msgstr "Aktion erzwingen"
 
-#: builtin/clean.c:878
+#: builtin/clean.c:909
 msgid "interactive cleaning"
 msgstr "interaktives Clean"
 
-#: builtin/clean.c:880
+#: builtin/clean.c:911
 msgid "remove whole directories"
 msgstr "ganze Verzeichnisse löschen"
 
-#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451
-#: builtin/grep.c:1063 builtin/ls-files.c:546 builtin/name-rev.c:348
-#: builtin/name-rev.c:350 builtin/show-ref.c:176
+#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
+#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
+#: builtin/name-rev.c:399 builtin/show-ref.c:176
 msgid "pattern"
 msgstr "Muster"
 
-#: builtin/clean.c:882
+#: builtin/clean.c:913
 msgid "add <pattern> to ignore rules"
 msgstr "<Muster> zu den Regeln für ignorierte Pfade hinzufügen"
 
-#: builtin/clean.c:883
+#: builtin/clean.c:914
 msgid "remove ignored files, too"
 msgstr "auch ignorierte Dateien löschen"
 
-#: builtin/clean.c:885
+#: builtin/clean.c:916
 msgid "remove only ignored files"
 msgstr "nur ignorierte Dateien löschen"
 
-#: builtin/clean.c:903
+#: builtin/clean.c:934
 msgid "-x and -X cannot be used together"
 msgstr "Die Optionen -x und -X können nicht gemeinsam verwendet werden."
 
-#: builtin/clean.c:907
+#: builtin/clean.c:938
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -6562,7 +6648,7 @@ msgstr ""
 "clean.requireForce auf \"true\" gesetzt und weder -i, -n noch -f gegeben; "
 "\"clean\" verweigert"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:941
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -6570,144 +6656,148 @@ msgstr ""
 "clean.requireForce standardmäßig auf \"true\" gesetzt und weder -i, -n noch -"
 "f gegeben; \"clean\" verweigert"
 
-#: builtin/clone.c:37
+#: builtin/clone.c:38
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]"
 
-#: builtin/clone.c:80
+#: builtin/clone.c:82
 msgid "don't create a checkout"
 msgstr "kein Auschecken"
 
-#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478
+#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
 msgid "create a bare repository"
 msgstr "ein Bare-Repository erstellen"
 
-#: builtin/clone.c:85
+#: builtin/clone.c:87
 msgid "create a mirror repository (implies bare)"
 msgstr "ein Spiegelarchiv erstellen (impliziert --bare)"
 
-#: builtin/clone.c:87
+#: builtin/clone.c:89
 msgid "to clone from a local repository"
 msgstr "von einem lokalen Repository klonen"
 
-#: builtin/clone.c:89
+#: builtin/clone.c:91
 msgid "don't use local hardlinks, always copy"
 msgstr "lokal keine harten Verweise verwenden, immer Kopien"
 
-#: builtin/clone.c:91
+#: builtin/clone.c:93
 msgid "setup as shared repository"
 msgstr "als verteiltes Repository einrichten"
 
-#: builtin/clone.c:93 builtin/clone.c:97
+#: builtin/clone.c:95 builtin/clone.c:99
 msgid "pathspec"
 msgstr "Pfadspezifikation"
 
-#: builtin/clone.c:93 builtin/clone.c:97
+#: builtin/clone.c:95 builtin/clone.c:99
 msgid "initialize submodules in the clone"
 msgstr "Submodule im Klon initialisieren"
 
-#: builtin/clone.c:100
+#: builtin/clone.c:102
 msgid "number of submodules cloned in parallel"
 msgstr "Anzahl der parallel zu klonenden Submodule"
 
-#: builtin/clone.c:101 builtin/init-db.c:475
+#: builtin/clone.c:103 builtin/init-db.c:476
 msgid "template-directory"
 msgstr "Vorlagenverzeichnis"
 
-#: builtin/clone.c:102 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:477
 msgid "directory from which templates will be used"
 msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden"
 
-#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642
+#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
 #: builtin/submodule--helper.c:983
 msgid "reference repository"
 msgstr "Repository referenzieren"
 
-#: builtin/clone.c:108
+#: builtin/clone.c:110
 msgid "use --reference only while cloning"
 msgstr "--reference nur während des Klonens benutzen"
 
-#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43
+#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
 msgid "name"
 msgstr "Name"
 
-#: builtin/clone.c:110
+#: builtin/clone.c:112
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "<Name> statt 'origin' für Upstream-Repository verwenden"
 
-#: builtin/clone.c:112
+#: builtin/clone.c:114
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories"
 
-#: builtin/clone.c:114
+#: builtin/clone.c:116
 msgid "path to git-upload-pack on the remote"
 msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite"
 
-#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006
-#: builtin/pull.c:202
+#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
+#: builtin/pull.c:205
 msgid "depth"
 msgstr "Tiefe"
 
-#: builtin/clone.c:116
+#: builtin/clone.c:118
 msgid "create a shallow clone of that depth"
 msgstr ""
 "einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen"
 
-#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918
+#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
 #: parse-options.h:142
 msgid "time"
 msgstr "Zeit"
 
-#: builtin/clone.c:118
+#: builtin/clone.c:120
 msgid "create a shallow clone since a specific time"
 msgstr ""
 "einen Klon mit unvollständiger Historie (shallow) seit einer bestimmten "
 "Zeit\n"
 "erstellen"
 
-#: builtin/clone.c:119 builtin/fetch.c:124
+#: builtin/clone.c:121 builtin/fetch.c:119
 msgid "revision"
 msgstr "Commit"
 
-#: builtin/clone.c:120 builtin/fetch.c:125
+#: builtin/clone.c:122 builtin/fetch.c:120
 msgid "deepen history of shallow clone, excluding rev"
 msgstr ""
 "die Historie eines Klons mit unvollständiger Historie (shallow) mittels\n"
 "Ausschluss eines Commits vertiefen"
 
-#: builtin/clone.c:122
+#: builtin/clone.c:124
 msgid "clone only one branch, HEAD or --branch"
 msgstr "nur einen Branch klonen, HEAD oder --branch"
 
-#: builtin/clone.c:124
+#: builtin/clone.c:126
+msgid "don't clone any tags, and make later fetches not to follow them"
+msgstr "keine Tags klonen, und auch bei späteren Abrufen nicht beachten"
+
+#: builtin/clone.c:128
 msgid "any cloned submodules will be shallow"
 msgstr "jedes geklonte Submodul mit unvollständiger Historie (shallow)"
 
-#: builtin/clone.c:125 builtin/init-db.c:484
+#: builtin/clone.c:129 builtin/init-db.c:485
 msgid "gitdir"
 msgstr ".git-Verzeichnis"
 
-#: builtin/clone.c:126 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:486
 msgid "separate git dir from working tree"
 msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:131
 msgid "key=value"
 msgstr "Schlüssel=Wert"
 
-#: builtin/clone.c:128
+#: builtin/clone.c:132
 msgid "set config inside the new repository"
 msgstr "Konfiguration innerhalb des neuen Repositories setzen"
 
-#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550
+#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
 msgid "use IPv4 addresses only"
 msgstr "nur IPv4-Adressen benutzen"
 
-#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552
+#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
 msgid "use IPv6 addresses only"
 msgstr "nur IPv6-Adressen benutzen"
 
-#: builtin/clone.c:268
+#: builtin/clone.c:272
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -6715,42 +6805,42 @@ msgstr ""
 "Konnte keinen Verzeichnisnamen erraten.\n"
 "Bitte geben Sie ein Verzeichnis auf der Befehlszeile an."
 
-#: builtin/clone.c:321
+#: builtin/clone.c:325
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: Konnte Alternative für '%s' nicht hinzufügen: %s\n"
 
-#: builtin/clone.c:393
+#: builtin/clone.c:397
 #, c-format
 msgid "failed to open '%s'"
 msgstr "Fehler beim Öffnen von '%s'"
 
-#: builtin/clone.c:401
+#: builtin/clone.c:405
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existiert und ist kein Verzeichnis"
 
-#: builtin/clone.c:415
+#: builtin/clone.c:419
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "Konnte %s nicht lesen\n"
 
-#: builtin/clone.c:437
+#: builtin/clone.c:441
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "Konnte Verweis '%s' nicht erstellen"
 
-#: builtin/clone.c:441
+#: builtin/clone.c:445
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "Konnte Datei nicht nach '%s' kopieren"
 
-#: builtin/clone.c:466
+#: builtin/clone.c:470
 #, c-format
 msgid "done.\n"
 msgstr "Fertig.\n"
 
-#: builtin/clone.c:478
+#: builtin/clone.c:482
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -6760,101 +6850,101 @@ msgstr ""
 "Sie können mit 'git status' prüfen, was ausgecheckt worden ist\n"
 "und das Auschecken mit 'git checkout -f HEAD' erneut versuchen.\n"
 
-#: builtin/clone.c:555
+#: builtin/clone.c:559
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Konnte zu klonenden Remote-Branch %s nicht finden."
 
-#: builtin/clone.c:650
+#: builtin/clone.c:654
 msgid "remote did not send all necessary objects"
 msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet."
 
-#: builtin/clone.c:666
+#: builtin/clone.c:670
 #, c-format
 msgid "unable to update %s"
 msgstr "kann %s nicht aktualisieren"
 
-#: builtin/clone.c:715
+#: builtin/clone.c:719
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "Externer HEAD bezieht sich auf eine nicht existierende Referenz und kann "
 "nicht ausgecheckt werden.\n"
 
-#: builtin/clone.c:746
+#: builtin/clone.c:750
 msgid "unable to checkout working tree"
 msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden"
 
-#: builtin/clone.c:786
+#: builtin/clone.c:792
 msgid "unable to write parameters to config file"
 msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben"
 
-#: builtin/clone.c:849
+#: builtin/clone.c:855
 msgid "cannot repack to clean up"
 msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen"
 
-#: builtin/clone.c:851
+#: builtin/clone.c:857
 msgid "cannot unlink temporary alternates file"
 msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen"
 
-#: builtin/clone.c:884 builtin/receive-pack.c:1900
+#: builtin/clone.c:890 builtin/receive-pack.c:1945
 msgid "Too many arguments."
 msgstr "Zu viele Argumente."
 
-#: builtin/clone.c:888
+#: builtin/clone.c:894
 msgid "You must specify a repository to clone."
 msgstr "Sie müssen ein Repository zum Klonen angeben."
 
-#: builtin/clone.c:901
+#: builtin/clone.c:907
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "Die Optionen --bare und --origin %s sind inkompatibel."
 
-#: builtin/clone.c:904
+#: builtin/clone.c:910
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel."
 
-#: builtin/clone.c:917
+#: builtin/clone.c:923
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "Repository '%s' existiert nicht."
 
-#: builtin/clone.c:923 builtin/fetch.c:1337
+#: builtin/clone.c:929 builtin/fetch.c:1337
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "Tiefe %s ist keine positive Zahl"
 
-#: builtin/clone.c:933
+#: builtin/clone.c:939
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "Zielpfad '%s' existiert bereits und ist kein leeres Verzeichnis."
 
-#: builtin/clone.c:943
+#: builtin/clone.c:949
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "Arbeitsverzeichnis '%s' existiert bereits."
 
-#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
-#: builtin/worktree.c:221 builtin/worktree.c:251
+#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
+#: builtin/worktree.c:222 builtin/worktree.c:252
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
 
-#: builtin/clone.c:961
+#: builtin/clone.c:967
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen"
 
-#: builtin/clone.c:973
+#: builtin/clone.c:979
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Klone in Bare-Repository '%s' ...\n"
 
-#: builtin/clone.c:975
+#: builtin/clone.c:981
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Klone nach '%s' ...\n"
 
-#: builtin/clone.c:999
+#: builtin/clone.c:1005
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -6862,89 +6952,89 @@ msgstr ""
 "'clone --recursive' ist nicht kompatibel mit --reference und --reference-if-"
 "able"
 
-#: builtin/clone.c:1055
+#: builtin/clone.c:1067
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 "Die Option --depth wird in lokalen Klonen ignoriert; benutzen Sie "
 "stattdessen file://"
 
-#: builtin/clone.c:1057
+#: builtin/clone.c:1069
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-since wird in lokalen Klonen ignoriert; benutzen Sie stattdessen "
 "file://"
 
-#: builtin/clone.c:1059
+#: builtin/clone.c:1071
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-exclude wird in lokalen Klonen ignoriert; benutzen Sie stattdessen "
 "file://"
 
-#: builtin/clone.c:1062
+#: builtin/clone.c:1074
 msgid "source repository is shallow, ignoring --local"
 msgstr ""
-"Quelle ist ein Repository mit unvollständiger Historie (shallow),ignoriere --"
-"local"
+"Quelle ist ein Repository mit unvollständiger Historie (shallow),\n"
+"ignoriere --local"
 
-#: builtin/clone.c:1067
+#: builtin/clone.c:1079
 msgid "--local is ignored"
 msgstr "--local wird ignoriert"
 
-#: builtin/clone.c:1071
+#: builtin/clone.c:1083
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr "Weiß nicht wie %s zu klonen ist."
 
-#: builtin/clone.c:1126 builtin/clone.c:1134
+#: builtin/clone.c:1138 builtin/clone.c:1146
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden"
 
-#: builtin/clone.c:1137
+#: builtin/clone.c:1149
 msgid "You appear to have cloned an empty repository."
 msgstr "Sie scheinen ein leeres Repository geklont zu haben."
 
-#: builtin/column.c:9
+#: builtin/column.c:10
 msgid "git column [<options>]"
 msgstr "git column [<Optionen>]"
 
-#: builtin/column.c:26
+#: builtin/column.c:27
 msgid "lookup config vars"
 msgstr "Konfigurationsvariablen nachschlagen"
 
-#: builtin/column.c:27 builtin/column.c:28
+#: builtin/column.c:28 builtin/column.c:29
 msgid "layout to use"
 msgstr "zu verwendende Anordnung"
 
-#: builtin/column.c:29
+#: builtin/column.c:30
 msgid "Maximum width"
 msgstr "maximale Breite"
 
-#: builtin/column.c:30
+#: builtin/column.c:31
 msgid "Padding space on left border"
 msgstr "Abstand zum linken Rand"
 
-#: builtin/column.c:31
+#: builtin/column.c:32
 msgid "Padding space on right border"
 msgstr "Abstand zur rechten Rand"
 
-#: builtin/column.c:32
+#: builtin/column.c:33
 msgid "Padding space between columns"
 msgstr "Abstand zwischen Spalten"
 
-#: builtin/column.c:51
+#: builtin/column.c:52
 msgid "--command must be the first argument"
 msgstr "Die Option --command muss an erster Stelle stehen."
 
-#: builtin/commit.c:38
+#: builtin/commit.c:39
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<Optionen>] [--] <Pfadspezifikation>..."
 
-#: builtin/commit.c:43
+#: builtin/commit.c:44
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<Optionen>] [--] <Pfadspezifikation>..."
 
-#: builtin/commit.c:48
+#: builtin/commit.c:49
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -6972,7 +7062,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: builtin/commit.c:61
+#: builtin/commit.c:62
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -6998,7 +7088,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: builtin/commit.c:73
+#: builtin/commit.c:74
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -7008,7 +7098,7 @@ msgstr ""
 "machen. Sie können Ihren Befehl mit --allow-empty wiederholen, oder diesen\n"
 "Commit mit \"git reset HEAD^\" vollständig entfernen.\n"
 
-#: builtin/commit.c:78
+#: builtin/commit.c:79
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -7023,11 +7113,11 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:85
+#: builtin/commit.c:86
 msgid "Otherwise, please use 'git reset'\n"
 msgstr "Andernfalls benutzen Sie bitte 'git reset'\n"
 
-#: builtin/commit.c:88
+#: builtin/commit.c:89
 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"
@@ -7043,62 +7133,62 @@ msgstr ""
 "Benutzen Sie anschließend \"git cherry-pick --continue\", um die\n"
 "Cherry-Pick-Operation mit den verbleibenden Commits fortzusetzen.\n"
 
-#: builtin/commit.c:318
+#: builtin/commit.c:319
 msgid "failed to unpack HEAD tree object"
 msgstr "Fehler beim Entpacken des \"Tree\"-Objektes von HEAD."
 
-#: builtin/commit.c:359
+#: builtin/commit.c:360
 msgid "unable to create temporary index"
 msgstr "Konnte temporären Index nicht erstellen."
 
-#: builtin/commit.c:365
+#: builtin/commit.c:366
 msgid "interactive add failed"
 msgstr "interaktives Hinzufügen fehlgeschlagen"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:379
 msgid "unable to update temporary index"
 msgstr "Konnte temporären Index nicht aktualisieren."
 
-#: builtin/commit.c:380
+#: builtin/commit.c:381
 msgid "Failed to update main cache tree"
 msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren"
 
-#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
+#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
 msgid "unable to write new_index file"
 msgstr "Konnte new_index Datei nicht schreiben"
 
-#: builtin/commit.c:458
+#: builtin/commit.c:459
 msgid "cannot do a partial commit during a merge."
 msgstr "Kann keinen Teil-Commit durchführen, während ein Merge im Gange ist."
 
-#: builtin/commit.c:460
+#: builtin/commit.c:461
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr ""
 "Kann keinen Teil-Commit durchführen, während \"cherry-pick\" im Gange ist."
 
-#: builtin/commit.c:469
+#: builtin/commit.c:470
 msgid "cannot read the index"
 msgstr "Kann Index nicht lesen"
 
-#: builtin/commit.c:488
+#: builtin/commit.c:489
 msgid "unable to write temporary index file"
 msgstr "Konnte temporäre Index-Datei nicht schreiben."
 
-#: builtin/commit.c:582
+#: builtin/commit.c:583
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "Commit '%s' fehlt Autor-Kopfbereich"
 
-#: builtin/commit.c:584
+#: builtin/commit.c:585
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "Commit '%s' hat fehlerhafte Autor-Zeile"
 
-#: builtin/commit.c:603
+#: builtin/commit.c:604
 msgid "malformed --author parameter"
 msgstr "Fehlerhafter --author Parameter"
 
-#: builtin/commit.c:655
+#: builtin/commit.c:656
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -7106,38 +7196,38 @@ msgstr ""
 "Konnte kein Kommentar-Zeichen auswählen, das nicht in\n"
 "der aktuellen Commit-Beschreibung verwendet wird."
 
-#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
+#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "Konnte Commit %s nicht nachschlagen"
 
-#: builtin/commit.c:704 builtin/shortlog.c:294
+#: builtin/commit.c:705 builtin/shortlog.c:295
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(lese Log-Nachricht von Standard-Eingabe)\n"
 
-#: builtin/commit.c:706
+#: builtin/commit.c:707
 msgid "could not read log from standard input"
 msgstr "Konnte Log nicht von Standard-Eingabe lesen."
 
-#: builtin/commit.c:710
+#: builtin/commit.c:711
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "Konnte Log-Datei '%s' nicht lesen"
 
-#: builtin/commit.c:737 builtin/commit.c:745
+#: builtin/commit.c:738 builtin/commit.c:746
 msgid "could not read SQUASH_MSG"
 msgstr "Konnte SQUASH_MSG nicht lesen"
 
-#: builtin/commit.c:742
+#: builtin/commit.c:743
 msgid "could not read MERGE_MSG"
 msgstr "Konnte MERGE_MSG nicht lesen"
 
-#: builtin/commit.c:796
+#: builtin/commit.c:797
 msgid "could not write commit template"
 msgstr "Konnte Commit-Vorlage nicht schreiben"
 
-#: builtin/commit.c:814
+#: builtin/commit.c:815
 #, c-format
 msgid ""
 "\n"
@@ -7152,7 +7242,7 @@ msgstr ""
 "\t%s\n"
 "und versuchen Sie es erneut.\n"
 
-#: builtin/commit.c:819
+#: builtin/commit.c:820
 #, c-format
 msgid ""
 "\n"
@@ -7167,7 +7257,7 @@ msgstr ""
 "\t%s\n"
 "und versuchen Sie es erneut.\n"
 
-#: builtin/commit.c:832
+#: builtin/commit.c:833
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7177,7 +7267,7 @@ msgstr ""
 "die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n"
 "bricht den Commit ab.\n"
 
-#: builtin/commit.c:839
+#: builtin/commit.c:840
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7190,157 +7280,157 @@ msgstr ""
 "entfernen.\n"
 "Eine leere Beschreibung bricht den Commit ab.\n"
 
-#: builtin/commit.c:859
+#: builtin/commit.c:857
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:           %.*s <%.*s>"
 
-#: builtin/commit.c:867
+#: builtin/commit.c:865
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sDatum:            %s"
 
-#: builtin/commit.c:874
+#: builtin/commit.c:872
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sCommit-Ersteller: %.*s <%.*s>"
 
-#: builtin/commit.c:892
+#: builtin/commit.c:889
 msgid "Cannot read index"
 msgstr "Kann Index nicht lesen"
 
-#: builtin/commit.c:954
+#: builtin/commit.c:951
 msgid "Error building trees"
 msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte"
 
-#: builtin/commit.c:968 builtin/tag.c:273
+#: builtin/commit.c:965 builtin/tag.c:274
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr ""
 "Bitte liefern Sie eine Beschreibung entweder mit der Option -m oder -F.\n"
 
-#: builtin/commit.c:1071
+#: builtin/commit.c:1068
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s' ist nicht im Format 'Name <E-Mail>' und stimmt mit keinem "
 "vorhandenen Autor überein"
 
-#: builtin/commit.c:1086 builtin/commit.c:1325
+#: builtin/commit.c:1083 builtin/commit.c:1328
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Ungültiger Modus '%s' für unversionierte Dateien"
 
-#: builtin/commit.c:1124
+#: builtin/commit.c:1121
 msgid "--long and -z are incompatible"
 msgstr "Die Optionen --long und -z sind inkompatibel."
 
-#: builtin/commit.c:1154
+#: builtin/commit.c:1151
 msgid "Using both --reset-author and --author does not make sense"
 msgstr ""
 "Die Optionen --reset-author und --author können nicht gemeinsam verwendet "
 "werden."
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1160
 msgid "You have nothing to amend."
 msgstr "Sie haben nichts für \"--amend\"."
 
-#: builtin/commit.c:1166
+#: builtin/commit.c:1163
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Ein Merge ist im Gange -- kann \"--amend\" nicht ausführen."
 
-#: builtin/commit.c:1168
+#: builtin/commit.c:1165
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "\"cherry-pick\" ist im Gange -- kann \"--amend\" nicht ausführen."
 
-#: builtin/commit.c:1171
+#: builtin/commit.c:1168
 msgid "Options --squash and --fixup cannot be used together"
 msgstr ""
 "Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden."
 
-#: builtin/commit.c:1181
+#: builtin/commit.c:1178
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Es kann nur eine Option von -c/-C/-F/--fixup verwendet werden."
 
-#: builtin/commit.c:1183
+#: builtin/commit.c:1180
 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
 msgstr "Die Option -m kann nicht mit -c/-C/-F/--fixup kombiniert werden."
 
-#: builtin/commit.c:1191
+#: builtin/commit.c:1188
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
 "Die Option --reset--author kann nur mit -C, -c oder --amend verwendet werden."
 
-#: builtin/commit.c:1208
+#: builtin/commit.c:1205
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Es kann nur eine Option von --include/--only/--all/--interactive/--patch "
 "verwendet werden."
 
-#: builtin/commit.c:1210
+#: builtin/commit.c:1207
 msgid "No paths with --include/--only does not make sense."
 msgstr ""
 "Die Optionen --include und --only können nur mit der Angabe von Pfaden "
 "verwendet werden."
 
-#: builtin/commit.c:1212
-msgid "Explicit paths specified without -i or -o; assuming --only paths..."
-msgstr "Explizite Pfade ohne -i oder -o angegeben; nehme --only an"
-
-#: builtin/commit.c:1224 builtin/tag.c:551
+#: builtin/commit.c:1219 builtin/tag.c:552
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Ungültiger \"cleanup\" Modus %s"
 
-#: builtin/commit.c:1229
+#: builtin/commit.c:1224
 msgid "Paths with -a does not make sense."
 msgstr "Die Option -a kann nicht mit der Angabe von Pfaden verwendet werden."
 
-#: builtin/commit.c:1339 builtin/commit.c:1612
+#: builtin/commit.c:1342 builtin/commit.c:1617
 msgid "show status concisely"
 msgstr "Status im Kurzformat anzeigen"
 
-#: builtin/commit.c:1341 builtin/commit.c:1614
+#: builtin/commit.c:1344 builtin/commit.c:1619
 msgid "show branch information"
 msgstr "Branchinformationen anzeigen"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1346
+msgid "show stash information"
+msgstr "Stashinformationen anzeigen"
+
+#: builtin/commit.c:1348
 msgid "version"
 msgstr "Version"
 
-#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
-#: builtin/worktree.c:448
+#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
+#: builtin/worktree.c:449
 msgid "machine-readable output"
 msgstr "maschinenlesbare Ausgabe"
 
-#: builtin/commit.c:1346 builtin/commit.c:1618
+#: builtin/commit.c:1351 builtin/commit.c:1623
 msgid "show status in long format (default)"
 msgstr "Status im Langformat anzeigen (Standard)"
 
-#: builtin/commit.c:1349 builtin/commit.c:1621
+#: builtin/commit.c:1354 builtin/commit.c:1626
 msgid "terminate entries with NUL"
 msgstr "Einträge mit NUL-Zeichen abschließen"
 
-#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:411
+#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
+#: builtin/fast-export.c:986 builtin/tag.c:412
 msgid "mode"
 msgstr "Modus"
 
-#: builtin/commit.c:1352 builtin/commit.c:1624
+#: builtin/commit.c:1357 builtin/commit.c:1629
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "unversionierte Dateien anzeigen, optionale Modi: all, normal, no. (Standard: "
 "all)"
 
-#: builtin/commit.c:1355
+#: builtin/commit.c:1360
 msgid "show ignored files"
 msgstr "ignorierte Dateien anzeigen"
 
-#: builtin/commit.c:1356 parse-options.h:155
+#: builtin/commit.c:1361 parse-options.h:155
 msgid "when"
 msgstr "wann"
 
-#: builtin/commit.c:1357
+#: builtin/commit.c:1362
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -7348,203 +7438,203 @@ msgstr ""
 "Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. "
 "(Standard: all)"
 
-#: builtin/commit.c:1359
+#: builtin/commit.c:1364
 msgid "list untracked files in columns"
 msgstr "unversionierte Dateien in Spalten auflisten"
 
-#: builtin/commit.c:1435
+#: builtin/commit.c:1440
 msgid "couldn't look up newly created commit"
 msgstr "Konnte neu erstellten Commit nicht nachschlagen."
 
-#: builtin/commit.c:1437
+#: builtin/commit.c:1442
 msgid "could not parse newly created commit"
 msgstr "Konnte neulich erstellten Commit nicht analysieren."
 
-#: builtin/commit.c:1482
+#: builtin/commit.c:1487
 msgid "detached HEAD"
 msgstr "losgelöster HEAD"
 
-#: builtin/commit.c:1485
+#: builtin/commit.c:1490
 msgid " (root-commit)"
 msgstr " (Basis-Commit)"
 
-#: builtin/commit.c:1582
+#: builtin/commit.c:1587
 msgid "suppress summary after successful commit"
 msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken"
 
-#: builtin/commit.c:1583
+#: builtin/commit.c:1588
 msgid "show diff in commit message template"
 msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen"
 
-#: builtin/commit.c:1585
+#: builtin/commit.c:1590
 msgid "Commit message options"
 msgstr "Optionen für Commit-Beschreibung"
 
-#: builtin/commit.c:1586 builtin/tag.c:409
+#: builtin/commit.c:1591 builtin/tag.c:410
 msgid "read message from file"
 msgstr "Beschreibung von Datei lesen"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1592
 msgid "author"
 msgstr "Autor"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1592
 msgid "override author for commit"
 msgstr "Autor eines Commits überschreiben"
 
-#: builtin/commit.c:1588 builtin/gc.c:357
+#: builtin/commit.c:1593 builtin/gc.c:358
 msgid "date"
 msgstr "Datum"
 
-#: builtin/commit.c:1588
+#: builtin/commit.c:1593
 msgid "override date for commit"
 msgstr "Datum eines Commits überschreiben"
 
-#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/tag.c:407
+#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
+#: builtin/notes.c:564 builtin/tag.c:408
 msgid "message"
 msgstr "Beschreibung"
 
-#: builtin/commit.c:1589
+#: builtin/commit.c:1594
 msgid "commit message"
 msgstr "Commit-Beschreibung"
 
-#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592
-#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
+#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
 msgid "commit"
 msgstr "Commit"
 
-#: builtin/commit.c:1590
+#: builtin/commit.c:1595
 msgid "reuse and edit message from specified commit"
 msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren"
 
-#: builtin/commit.c:1591
+#: builtin/commit.c:1596
 msgid "reuse message from specified commit"
 msgstr "Beschreibung des angegebenen Commits wiederverwenden"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1597
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "eine automatisch zusammengesetzte Beschreibung zum Nachbessern des "
 "angegebenen Commits verwenden"
 
-#: builtin/commit.c:1593
+#: builtin/commit.c:1598
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "eine automatisch zusammengesetzte Beschreibung beim \"squash\" des "
 "angegebenen Commits verwenden"
 
-#: builtin/commit.c:1594
+#: builtin/commit.c:1599
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "Sie als Autor des Commits setzen (verwendet mit -C/-c/--amend)"
 
-#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104
+#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr "'Signed-off-by:'-Zeile hinzufügen"
 
-#: builtin/commit.c:1596
+#: builtin/commit.c:1601
 msgid "use specified template file"
 msgstr "angegebene Vorlagendatei verwenden"
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1602
 msgid "force edit of commit"
 msgstr "Bearbeitung des Commits erzwingen"
 
-#: builtin/commit.c:1598
+#: builtin/commit.c:1603
 msgid "default"
 msgstr "Standard"
 
-#: builtin/commit.c:1598 builtin/tag.c:412
+#: builtin/commit.c:1603 builtin/tag.c:413
 msgid "how to strip spaces and #comments from message"
 msgstr ""
 "wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen"
 
-#: builtin/commit.c:1599
+#: builtin/commit.c:1604
 msgid "include status in commit message template"
 msgstr "Status in die Commit-Beschreibungsvorlage einfügen"
 
-#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166
-#: builtin/revert.c:112
+#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr "Commit mit GPG signieren"
 
-#: builtin/commit.c:1604
+#: builtin/commit.c:1609
 msgid "Commit contents options"
 msgstr "Optionen für Commit-Inhalt"
 
-#: builtin/commit.c:1605
+#: builtin/commit.c:1610
 msgid "commit all changed files"
 msgstr "alle geänderten Dateien committen"
 
-#: builtin/commit.c:1606
+#: builtin/commit.c:1611
 msgid "add specified files to index for commit"
 msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken"
 
-#: builtin/commit.c:1607
+#: builtin/commit.c:1612
 msgid "interactively add files"
 msgstr "interaktives Hinzufügen von Dateien"
 
-#: builtin/commit.c:1608
+#: builtin/commit.c:1613
 msgid "interactively add changes"
 msgstr "interaktives Hinzufügen von Änderungen"
 
-#: builtin/commit.c:1609
+#: builtin/commit.c:1614
 msgid "commit only specified files"
 msgstr "nur die angegebenen Dateien committen"
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1615
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "Hooks pre-commit und commit-msg umgehen"
 
-#: builtin/commit.c:1611
+#: builtin/commit.c:1616
 msgid "show what would be committed"
 msgstr "anzeigen, was committet werden würde"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c:1627
 msgid "amend previous commit"
 msgstr "vorherigen Commit ändern"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1628
 msgid "bypass post-rewrite hook"
 msgstr "\"post-rewrite hook\" umgehen"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1633
 msgid "ok to record an empty change"
 msgstr "Aufzeichnung einer leeren Änderung erlauben"
 
-#: builtin/commit.c:1630
+#: builtin/commit.c:1635
 msgid "ok to record a change with an empty message"
 msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben"
 
-#: builtin/commit.c:1659
+#: builtin/commit.c:1665
 msgid "could not parse HEAD commit"
 msgstr "Konnte Commit von HEAD nicht analysieren."
 
-#: builtin/commit.c:1707
+#: builtin/commit.c:1710
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Beschädigte MERGE_HEAD-Datei (%s)"
 
-#: builtin/commit.c:1714
+#: builtin/commit.c:1717
 msgid "could not read MERGE_MODE"
 msgstr "Konnte MERGE_MODE nicht lesen"
 
-#: builtin/commit.c:1733
+#: builtin/commit.c:1736
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "Konnte Commit-Beschreibung nicht lesen: %s"
 
-#: builtin/commit.c:1744
+#: builtin/commit.c:1747
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Commit abgebrochen; Sie haben die Beschreibung nicht editiert.\n"
 
-#: builtin/commit.c:1749
+#: builtin/commit.c:1752
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n"
 
-#: builtin/commit.c:1797
+#: builtin/commit.c:1800
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -7555,145 +7645,145 @@ msgstr ""
 "voll und Ihr Kontingent nicht aufgebraucht ist und führen Sie\n"
 "anschließend \"git reset HEAD\" zu Wiederherstellung aus."
 
-#: builtin/config.c:9
+#: builtin/config.c:10
 msgid "git config [<options>]"
 msgstr "git config [<Optionen>]"
 
-#: builtin/config.c:56
+#: builtin/config.c:57
 msgid "Config file location"
 msgstr "Ort der Konfigurationsdatei"
 
-#: builtin/config.c:57
+#: builtin/config.c:58
 msgid "use global config file"
 msgstr "globale Konfigurationsdatei verwenden"
 
-#: builtin/config.c:58
+#: builtin/config.c:59
 msgid "use system config file"
 msgstr "systemweite Konfigurationsdatei verwenden"
 
-#: builtin/config.c:59
+#: builtin/config.c:60
 msgid "use repository config file"
 msgstr "Konfigurationsdatei des Repositories verwenden"
 
-#: builtin/config.c:60
+#: builtin/config.c:61
 msgid "use given config file"
 msgstr "die angegebene Konfigurationsdatei verwenden"
 
-#: builtin/config.c:61
+#: builtin/config.c:62
 msgid "blob-id"
 msgstr "Blob-Id"
 
-#: builtin/config.c:61
+#: builtin/config.c:62
 msgid "read config from given blob object"
 msgstr "Konfiguration von angegebenem Blob-Objekt lesen"
 
-#: builtin/config.c:62
+#: builtin/config.c:63
 msgid "Action"
 msgstr "Aktion"
 
-#: builtin/config.c:63
+#: builtin/config.c:64
 msgid "get value: name [value-regex]"
 msgstr "Wert zurückgeben: Name [Wert-regex]"
 
-#: builtin/config.c:64
+#: builtin/config.c:65
 msgid "get all values: key [value-regex]"
 msgstr "alle Werte zurückgeben: Schlüssel [Wert-regex]"
 
-#: builtin/config.c:65
+#: builtin/config.c:66
 msgid "get values for regexp: name-regex [value-regex]"
 msgstr "Werte für den regulären Ausdruck zurückgeben: Name-regex [Wert-regex]"
 
-#: builtin/config.c:66
+#: builtin/config.c:67
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "Wert spezifisch für eine URL zurückgeben: section[.var] URL"
 
-#: builtin/config.c:67
+#: builtin/config.c:68
 msgid "replace all matching variables: name value [value_regex]"
 msgstr "alle passenden Variablen ersetzen: Name Wert [Wert-regex] "
 
-#: builtin/config.c:68
+#: builtin/config.c:69
 msgid "add a new variable: name value"
 msgstr "neue Variable hinzufügen: Name Wert"
 
-#: builtin/config.c:69
+#: builtin/config.c:70
 msgid "remove a variable: name [value-regex]"
 msgstr "eine Variable entfernen: Name [Wert-regex]"
 
-#: builtin/config.c:70
+#: builtin/config.c:71
 msgid "remove all matches: name [value-regex]"
 msgstr "alle Übereinstimmungen entfernen: Name [Wert-regex]"
 
-#: builtin/config.c:71
+#: builtin/config.c:72
 msgid "rename section: old-name new-name"
 msgstr "eine Sektion umbenennen: alter-Name neuer-Name"
 
-#: builtin/config.c:72
+#: builtin/config.c:73
 msgid "remove a section: name"
 msgstr "eine Sektion entfernen: Name"
 
-#: builtin/config.c:73
+#: builtin/config.c:74
 msgid "list all"
 msgstr "alles auflisten"
 
-#: builtin/config.c:74
+#: builtin/config.c:75
 msgid "open an editor"
 msgstr "einen Editor öffnen"
 
-#: builtin/config.c:75
+#: builtin/config.c:76
 msgid "find the color configured: slot [default]"
 msgstr "die konfigurierte Farbe finden: Slot [Standard]"
 
-#: builtin/config.c:76
+#: builtin/config.c:77
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "die Farbeinstellung finden: Slot [Standard-Ausgabe-ist-Terminal]"
 
-#: builtin/config.c:77
+#: builtin/config.c:78
 msgid "Type"
 msgstr "Typ"
 
-#: builtin/config.c:78
+#: builtin/config.c:79
 msgid "value is \"true\" or \"false\""
 msgstr "Wert ist \"true\" oder \"false\""
 
-#: builtin/config.c:79
+#: builtin/config.c:80
 msgid "value is decimal number"
 msgstr "Wert ist eine Dezimalzahl"
 
-#: builtin/config.c:80
+#: builtin/config.c:81
 msgid "value is --bool or --int"
 msgstr "Wert ist --bool oder --int"
 
-#: builtin/config.c:81
+#: builtin/config.c:82
 msgid "value is a path (file or directory name)"
 msgstr "Wert ist ein Pfad (Datei oder Verzeichnisname)"
 
-#: builtin/config.c:82
+#: builtin/config.c:83
 msgid "Other"
 msgstr "Sonstiges"
 
-#: builtin/config.c:83
+#: builtin/config.c:84
 msgid "terminate values with NUL byte"
 msgstr "schließt Werte mit NUL-Byte ab"
 
-#: builtin/config.c:84
+#: builtin/config.c:85
 msgid "show variable names only"
 msgstr "nur Variablennamen anzeigen"
 
-#: builtin/config.c:85
+#: builtin/config.c:86
 msgid "respect include directives on lookup"
 msgstr "beachtet \"include\"-Direktiven beim Nachschlagen"
 
-#: builtin/config.c:86
+#: builtin/config.c:87
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 "Ursprung der Konfiguration anzeigen (Datei, Standard-Eingabe, Blob, "
 "Befehlszeile)"
 
-#: builtin/config.c:328
+#: builtin/config.c:327
 msgid "unable to parse default color value"
 msgstr "konnte Standard-Farbwert nicht parsen"
 
-#: builtin/config.c:472
+#: builtin/config.c:471
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -7702,18 +7792,22 @@ msgid ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 msgstr ""
-"# Das ist Git's benutzerspezifische Konfiguraionsdatei.\n"
+"# Das ist Git's benutzerspezifische Konfigurationsdatei.\n"
 "[user]\n"
 "# Bitte passen Sie die folgenden Zeilen an und kommentieren Sie diese aus:\n"
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:615
+#: builtin/config.c:499
+msgid "--local can only be used inside a git repository"
+msgstr "--local kann nur innerhalb eines Git-Repositories verwendet werden."
+
+#: builtin/config.c:621
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen."
 
-#: builtin/config.c:627
+#: builtin/config.c:633
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -7723,75 +7817,75 @@ msgstr ""
 "       Benutzen Sie einen regulären Ausdruck, --add oder --replace, um %s\n"
 "       zu ändern."
 
-#: builtin/count-objects.c:86
+#: builtin/count-objects.c:87
 msgid "git count-objects [-v] [-H | --human-readable]"
 msgstr "git count-objects [-v] [-H | --human-readable]"
 
-#: builtin/count-objects.c:96
+#: builtin/count-objects.c:97
 msgid "print sizes in human readable format"
 msgstr "gibt Größenangaben in menschenlesbaren Format aus"
 
-#: builtin/describe.c:18
+#: builtin/describe.c:19
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<Optionen>] [<Commit-Angabe>...]"
 
-#: builtin/describe.c:19
+#: builtin/describe.c:20
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<Optionen>] --dirty"
 
-#: builtin/describe.c:53
+#: builtin/describe.c:54
 msgid "head"
 msgstr "Branch"
 
-#: builtin/describe.c:53
+#: builtin/describe.c:54
 msgid "lightweight"
 msgstr "nicht-annotiert"
 
-#: builtin/describe.c:53
+#: builtin/describe.c:54
 msgid "annotated"
 msgstr "annotiert"
 
-#: builtin/describe.c:250
+#: builtin/describe.c:253
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "annotiertes Tag %s ist nicht verfügbar"
 
-#: builtin/describe.c:254
+#: builtin/describe.c:257
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "annotiertes Tag %s hat keinen eingebetteten Namen"
 
-#: builtin/describe.c:256
+#: builtin/describe.c:259
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "Tag '%s' ist eigentlich '%s' hier"
 
-#: builtin/describe.c:283 builtin/log.c:487
+#: builtin/describe.c:286 builtin/log.c:489
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "%s ist kein gültiger Objekt-Name"
 
-#: builtin/describe.c:286
+#: builtin/describe.c:289
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s ist kein gültiges '%s' Objekt"
 
-#: builtin/describe.c:303
+#: builtin/describe.c:306
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "kein Tag entspricht exakt '%s'"
 
-#: builtin/describe.c:305
+#: builtin/describe.c:308
 #, c-format
 msgid "searching to describe %s\n"
 msgstr "suche zur Beschreibung von %s\n"
 
-#: builtin/describe.c:352
+#: builtin/describe.c:355
 #, c-format
 msgid "finished search at %s\n"
 msgstr "beendete Suche bei %s\n"
 
-#: builtin/describe.c:379
+#: builtin/describe.c:382
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -7800,7 +7894,7 @@ msgstr ""
 "Keine annotierten Tags können '%s' beschreiben.\n"
 "Jedoch gab es nicht-annotierte Tags: versuchen Sie --tags."
 
-#: builtin/describe.c:383
+#: builtin/describe.c:386
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -7809,12 +7903,12 @@ msgstr ""
 "Keine Tags können '%s' beschreiben.\n"
 "Versuchen Sie --always oder erstellen Sie einige Tags."
 
-#: builtin/describe.c:413
+#: builtin/describe.c:416
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu Commits durchlaufen\n"
 
-#: builtin/describe.c:416
+#: builtin/describe.c:419
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -7823,79 +7917,79 @@ msgstr ""
 "mehr als %i Tags gefunden; führe die ersten %i auf\n"
 "Suche bei %s aufgegeben\n"
 
-#: builtin/describe.c:438
+#: builtin/describe.c:441
 msgid "find the tag that comes after the commit"
 msgstr "das Tag finden, das nach dem Commit kommt"
 
-#: builtin/describe.c:439
+#: builtin/describe.c:442
 msgid "debug search strategy on stderr"
 msgstr "die Suchstrategie in der Standard-Fehlerausgabe protokollieren"
 
-#: builtin/describe.c:440
+#: builtin/describe.c:443
 msgid "use any ref"
 msgstr "alle Referenzen verwenden"
 
-#: builtin/describe.c:441
+#: builtin/describe.c:444
 msgid "use any tag, even unannotated"
 msgstr "jedes Tag verwenden, auch nicht-annotierte"
 
-#: builtin/describe.c:442
+#: builtin/describe.c:445
 msgid "always use long format"
 msgstr "immer langes Format verwenden"
 
-#: builtin/describe.c:443
+#: builtin/describe.c:446
 msgid "only follow first parent"
 msgstr "nur erstem Elternteil folgen"
 
-#: builtin/describe.c:446
+#: builtin/describe.c:449
 msgid "only output exact matches"
 msgstr "nur exakte Übereinstimmungen ausgeben"
 
-#: builtin/describe.c:448
+#: builtin/describe.c:451
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "die jüngsten <n> Tags betrachten (Standard: 10)"
 
-#: builtin/describe.c:450
+#: builtin/describe.c:453
 msgid "only consider tags matching <pattern>"
 msgstr "nur Tags, die <Muster> entsprechen, betrachten"
 
-#: builtin/describe.c:452
+#: builtin/describe.c:455
 msgid "do not consider tags matching <pattern>"
 msgstr "keine Tags betrachten, die <Muster> entsprechen"
 
-#: builtin/describe.c:454 builtin/name-rev.c:357
+#: builtin/describe.c:457 builtin/name-rev.c:406
 msgid "show abbreviated commit object as fallback"
 msgstr "gekürztes Commit-Objekt anzeigen, wenn sonst nichts zutrifft"
 
-#: builtin/describe.c:455 builtin/describe.c:458
+#: builtin/describe.c:458 builtin/describe.c:461
 msgid "mark"
 msgstr "Kennzeichen"
 
-#: builtin/describe.c:456
+#: builtin/describe.c:459
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr ""
 "<Kennzeichen> bei geändertem Arbeitsverzeichnis anhängen (Standard: \"-dirty"
 "\")"
 
-#: builtin/describe.c:459
+#: builtin/describe.c:462
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 "<Kennzeichen> bei defektem Arbeitsverzeichnis anhängen (Standard: \"-broken"
 "\")"
 
-#: builtin/describe.c:477
+#: builtin/describe.c:480
 msgid "--long is incompatible with --abbrev=0"
 msgstr "Die Optionen --long und --abbrev=0 sind inkompatibel."
 
-#: builtin/describe.c:506
+#: builtin/describe.c:509
 msgid "No names found, cannot describe anything."
 msgstr "Keine Namen gefunden, kann nichts beschreiben."
 
-#: builtin/describe.c:549
+#: builtin/describe.c:552
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "Die Option --dirty kann nicht mit Commits verwendet werden."
 
-#: builtin/describe.c:551
+#: builtin/describe.c:554
 msgid "--broken is incompatible with commit-ishes"
 msgstr "Die Option --broken kann nicht mit Commits verwendet werden."
 
@@ -7904,55 +7998,55 @@ msgstr "Die Option --broken kann nicht mit Commits verwendet werden."
 msgid "'%s': not a regular file or symlink"
 msgstr "'%s': keine reguläre Datei oder symbolische Verknüpfung"
 
-#: builtin/diff.c:234
+#: builtin/diff.c:235
 #, c-format
 msgid "invalid option: %s"
 msgstr "Ungültige Option: %s"
 
-#: builtin/diff.c:358
+#: builtin/diff.c:359
 msgid "Not a git repository"
 msgstr "Kein Git-Repository"
 
-#: builtin/diff.c:401
+#: builtin/diff.c:402
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "Objekt '%s' ist ungültig."
 
-#: builtin/diff.c:410
+#: builtin/diff.c:411
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "Mehr als zwei Blobs angegeben: '%s'"
 
-#: builtin/diff.c:417
+#: builtin/diff.c:416
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "unbehandeltes Objekt '%s' angegeben"
 
-#: builtin/difftool.c:28
+#: builtin/difftool.c:29
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<Optionen>] [<Commit> [<Commit>]] [--] [<Pfad>...]"
 
-#: builtin/difftool.c:241
+#: builtin/difftool.c:249
 #, c-format
 msgid "failed: %d"
 msgstr "fehlgeschlagen: %d"
 
-#: builtin/difftool.c:283
+#: builtin/difftool.c:291
 #, c-format
 msgid "could not read symlink %s"
 msgstr "konnte symbolische Verknüpfung %s nicht lesen"
 
-#: builtin/difftool.c:285
+#: builtin/difftool.c:293
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "Konnte Datei von symbolischer Verknüpfung '%s' nicht lesen."
 
-#: builtin/difftool.c:293
+#: builtin/difftool.c:301
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "Konnte Objekt '%s' für symbolische Verknüpfung '%s' nicht lesen."
 
-#: builtin/difftool.c:395
+#: builtin/difftool.c:403
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
@@ -7960,54 +8054,54 @@ msgstr ""
 "Kombinierte Diff-Formate('-c' und '--cc') werden im Verzeichnis-\n"
 "Diff-Modus('-d' und '--dir-diff') nicht unterstützt."
 
-#: builtin/difftool.c:609
+#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "beide Dateien geändert: '%s' und '%s'."
 
-#: builtin/difftool.c:611
+#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "Datei im Arbeitsverzeichnis belassen."
 
-#: builtin/difftool.c:622
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "Es existieren temporäre Dateien in '%s'."
 
-#: builtin/difftool.c:623
+#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "Sie könnten diese aufräumen oder wiederherstellen."
 
-#: builtin/difftool.c:669
+#: builtin/difftool.c:689
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "`diff.guitool` anstatt `diff.tool` benutzen"
 
-#: builtin/difftool.c:671
+#: builtin/difftool.c:691
 msgid "perform a full-directory diff"
 msgstr "Diff über ganzes Verzeichnis ausführen"
 
-#: builtin/difftool.c:673
+#: builtin/difftool.c:693
 msgid "do not prompt before launching a diff tool"
 msgstr "keine Eingabeaufforderung vor Ausführung eines Diff-Tools"
 
-#: builtin/difftool.c:679
+#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "symbolische Verknüpfungen im dir-diff Modus verwenden"
 
-#: builtin/difftool.c:680
+#: builtin/difftool.c:700
 msgid "<tool>"
 msgstr "<Tool>"
 
-#: builtin/difftool.c:681
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "das angegebene Diff-Tool benutzen"
 
-#: builtin/difftool.c:683
+#: builtin/difftool.c:703
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
 "eine Liste mit Diff-Tools darstellen, die mit `--tool` benutzt werden können"
 
-#: builtin/difftool.c:686
+#: builtin/difftool.c:706
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
@@ -8016,245 +8110,249 @@ msgstr ""
 "Rückkehrwert\n"
 "verschieden 0 ausgeführt wurde"
 
-#: builtin/difftool.c:688
+#: builtin/difftool.c:708
 msgid "<command>"
 msgstr "<Programm>"
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr "eigenen Befehl zur Anzeige von Unterschieden angeben"
 
-#: builtin/difftool.c:713
+#: builtin/difftool.c:733
 msgid "no <tool> given for --tool=<tool>"
 msgstr "kein <Tool> für --tool=<Tool> angegeben"
 
-#: builtin/difftool.c:720
+#: builtin/difftool.c:740
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "kein <Programm> für --extcmd=<Programm> angegeben"
 
-#: builtin/fast-export.c:25
+#: builtin/fast-export.c:26
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 
-#: builtin/fast-export.c:980
+#: builtin/fast-export.c:982
 msgid "show progress after <n> objects"
 msgstr "Fortschritt nach <n> Objekten anzeigen"
 
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:984
 msgid "select handling of signed tags"
 msgstr "Behandlung von signierten Tags wählen"
 
-#: builtin/fast-export.c:985
+#: builtin/fast-export.c:987
 msgid "select handling of tags that tag filtered objects"
 msgstr "Behandlung von Tags wählen, die gefilterte Objekte markieren"
 
-#: builtin/fast-export.c:988
+#: builtin/fast-export.c:990
 msgid "Dump marks to this file"
 msgstr "Kennzeichen in diese Datei schreiben"
 
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:992
 msgid "Import marks from this file"
 msgstr "Kennzeichen von dieser Datei importieren"
 
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:994
 msgid "Fake a tagger when tags lack one"
 msgstr "künstlich einen Tag-Ersteller erzeugen, wenn das Tag keinen hat"
 
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:996
 msgid "Output full tree for each commit"
 msgstr "für jeden Commit das gesamte Verzeichnis ausgeben"
 
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:998
 msgid "Use the done feature to terminate the stream"
 msgstr "die \"done\"-Funktion benutzen, um den Datenstrom abzuschließen"
 
-#: builtin/fast-export.c:997
+#: builtin/fast-export.c:999
 msgid "Skip output of blob data"
 msgstr "Ausgabe von Blob-Daten überspringen"
 
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1000
 msgid "refspec"
 msgstr "Refspec"
 
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1001
 msgid "Apply refspec to exported refs"
 msgstr "Refspec auf exportierte Referenzen anwenden"
 
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1002
 msgid "anonymize output"
 msgstr "Ausgabe anonymisieren"
 
-#: builtin/fetch.c:21
+#: builtin/fetch.c:22
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<Optionen>] [<Repository> [<Refspec>...]]"
 
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<Optionen>] <Gruppe>"
 
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]"
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<Optionen>]"
 
-#: builtin/fetch.c:95 builtin/pull.c:175
+#: builtin/fetch.c:90 builtin/pull.c:182
 msgid "fetch from all remotes"
 msgstr "fordert von allen Remote-Repositories an"
 
-#: builtin/fetch.c:97 builtin/pull.c:178
+#: builtin/fetch.c:92 builtin/pull.c:185
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "an .git/FETCH_HEAD anhängen, anstatt zu überschreiben"
 
-#: builtin/fetch.c:99 builtin/pull.c:181
+#: builtin/fetch.c:94 builtin/pull.c:188
 msgid "path to upload pack on remote end"
 msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite"
 
-#: builtin/fetch.c:100 builtin/pull.c:183
+#: builtin/fetch.c:95 builtin/pull.c:190
 msgid "force overwrite of local branch"
 msgstr "das Überschreiben von lokalen Branches erzwingen"
 
-#: builtin/fetch.c:102
+#: builtin/fetch.c:97
 msgid "fetch from multiple remotes"
 msgstr "von mehreren Remote-Repositories anfordern"
 
-#: builtin/fetch.c:104 builtin/pull.c:185
+#: builtin/fetch.c:99 builtin/pull.c:192
 msgid "fetch all tags and associated objects"
 msgstr "alle Tags und verbundene Objekte anfordern"
 
-#: builtin/fetch.c:106
+#: builtin/fetch.c:101
 msgid "do not fetch all tags (--no-tags)"
 msgstr "nicht alle Tags anfordern (--no-tags)"
 
-#: builtin/fetch.c:108
+#: builtin/fetch.c:103
 msgid "number of submodules fetched in parallel"
 msgstr "Anzahl der parallel anzufordernden Submodule"
 
-#: builtin/fetch.c:110 builtin/pull.c:188
+#: builtin/fetch.c:105 builtin/pull.c:195
 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 "Remote-Tracking-Branches entfernen, die sich nicht mehr im Remote-Repository "
 "befinden"
 
-#: builtin/fetch.c:111 builtin/pull.c:191
+#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
 msgid "on-demand"
 msgstr "bei-Bedarf"
 
-#: builtin/fetch.c:112 builtin/pull.c:192
+#: builtin/fetch.c:107
 msgid "control recursive fetching of submodules"
 msgstr "rekursive Anforderungen von Submodulen kontrollieren"
 
-#: builtin/fetch.c:116 builtin/pull.c:200
+#: builtin/fetch.c:111 builtin/pull.c:203
 msgid "keep downloaded pack"
 msgstr "heruntergeladenes Paket behalten"
 
-#: builtin/fetch.c:118
+#: builtin/fetch.c:113
 msgid "allow updating of HEAD ref"
 msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben"
 
-#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
+#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
 msgid "deepen history of shallow clone"
 msgstr ""
 "die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen"
 
-#: builtin/fetch.c:123
+#: builtin/fetch.c:118
 msgid "deepen history of shallow repository based on time"
 msgstr ""
 "die Historie eines Klons mit unvollständiger Historie (shallow) auf "
 "Zeitbasis\n"
 "vertiefen"
 
-#: builtin/fetch.c:129 builtin/pull.c:206
+#: builtin/fetch.c:124 builtin/pull.c:209
 msgid "convert to a complete repository"
 msgstr "zu einem vollständigen Repository konvertieren"
 
-#: builtin/fetch.c:131 builtin/log.c:1440
+#: builtin/fetch.c:126 builtin/log.c:1450
 msgid "dir"
 msgstr "Verzeichnis"
 
-#: builtin/fetch.c:132
+#: builtin/fetch.c:127
 msgid "prepend this to submodule path output"
 msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen"
 
-#: builtin/fetch.c:135
-msgid "default mode for recursion"
-msgstr "Standard-Modus für Rekursion"
+#: builtin/fetch.c:130
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr ""
+"Standard für die rekursive Anforderung von Submodulen (geringere Priorität\n"
+"als Konfigurationsdateien)"
 
-#: builtin/fetch.c:137 builtin/pull.c:209
+#: builtin/fetch.c:134 builtin/pull.c:212
 msgid "accept refs that update .git/shallow"
 msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren"
 
-#: builtin/fetch.c:138 builtin/pull.c:211
+#: builtin/fetch.c:135 builtin/pull.c:214
 msgid "refmap"
 msgstr "Refmap"
 
-#: builtin/fetch.c:139 builtin/pull.c:212
+#: builtin/fetch.c:136 builtin/pull.c:215
 msgid "specify fetch refmap"
 msgstr "Refmap für 'fetch' angeben"
 
-#: builtin/fetch.c:395
+#: builtin/fetch.c:394
 msgid "Couldn't find remote ref HEAD"
 msgstr "Konnte Remote-Referenz von HEAD nicht finden."
 
-#: builtin/fetch.c:513
+#: builtin/fetch.c:512
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "Konfiguration fetch.output enthält ungültigen Wert %s"
 
-#: builtin/fetch.c:606
+#: builtin/fetch.c:605
 #, c-format
 msgid "object %s not found"
 msgstr "Objekt %s nicht gefunden"
 
-#: builtin/fetch.c:610
+#: builtin/fetch.c:609
 msgid "[up to date]"
 msgstr "[aktuell]"
 
-#: builtin/fetch.c:623 builtin/fetch.c:703
+#: builtin/fetch.c:622 builtin/fetch.c:702
 msgid "[rejected]"
 msgstr "[zurückgewiesen]"
 
-#: builtin/fetch.c:624
+#: builtin/fetch.c:623
 msgid "can't fetch in current branch"
 msgstr "kann \"fetch\" im aktuellen Branch nicht ausführen"
 
-#: builtin/fetch.c:633
+#: builtin/fetch.c:632
 msgid "[tag update]"
 msgstr "[Tag Aktualisierung]"
 
-#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683
-#: builtin/fetch.c:698
+#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
+#: builtin/fetch.c:697
 msgid "unable to update local ref"
 msgstr "kann lokale Referenz nicht aktualisieren"
 
-#: builtin/fetch.c:653
+#: builtin/fetch.c:652
 msgid "[new tag]"
 msgstr "[neues Tag]"
 
-#: builtin/fetch.c:656
+#: builtin/fetch.c:655
 msgid "[new branch]"
 msgstr "[neuer Branch]"
 
-#: builtin/fetch.c:659
+#: builtin/fetch.c:658
 msgid "[new ref]"
 msgstr "[neue Referenz]"
 
-#: builtin/fetch.c:698
+#: builtin/fetch.c:697
 msgid "forced update"
 msgstr "Aktualisierung erzwungen"
 
-#: builtin/fetch.c:703
+#: builtin/fetch.c:702
 msgid "non-fast-forward"
 msgstr "kein Vorspulen"
 
-#: builtin/fetch.c:748
+#: builtin/fetch.c:747
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n"
 
-#: builtin/fetch.c:768
+#: builtin/fetch.c:767
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr ""
@@ -8289,7 +8387,7 @@ msgstr "   (%s wurde unreferenziert)"
 msgid "[deleted]"
 msgstr "[gelöscht]"
 
-#: builtin/fetch.c:955 builtin/remote.c:1022
+#: builtin/fetch.c:955 builtin/remote.c:1023
 msgid "(none)"
 msgstr "(nichts)"
 
@@ -8297,7 +8395,7 @@ msgstr "(nichts)"
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr ""
-"Der \"fetch\" in den aktuellen Branch %s von einem nicht-Bare-Repository "
+"Der \"fetch\" in den aktuellen Branch %s von einem Nicht-Bare-Repository "
 "wurde verweigert."
 
 #: builtin/fetch.c:997
@@ -8320,7 +8418,7 @@ msgstr "Weiß nicht wie von %s angefordert wird."
 msgid "Fetching %s\n"
 msgstr "Fordere an von %s\n"
 
-#: builtin/fetch.c:1238 builtin/remote.c:96
+#: builtin/fetch.c:1238 builtin/remote.c:97
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Konnte nicht von %s anfordern"
@@ -8357,105 +8455,105 @@ msgstr ""
 "Die Option --unshallow kann nicht in einem Repository mit unvollständiger "
 "Historie verwendet werden."
 
-#: builtin/fetch.c:1352
+#: builtin/fetch.c:1349
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all akzeptiert kein Repository als Argument"
 
-#: builtin/fetch.c:1354
+#: builtin/fetch.c:1351
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all kann nicht mit Refspecs verwendet werden."
 
-#: builtin/fetch.c:1365
+#: builtin/fetch.c:1362
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s"
 
-#: builtin/fetch.c:1373
+#: builtin/fetch.c:1370
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 "Das Abholen einer Gruppe von Remote-Repositories kann nicht mit der Angabe\n"
 "von Refspecs verwendet werden."
 
-#: builtin/fmt-merge-msg.c:14
+#: builtin/fmt-merge-msg.c:15
 msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr ""
 "git fmt-merge-msg [-m <Beschreibung>] [--log[=<n>] | --no-log] [--file "
 "<Datei>]"
 
-#: builtin/fmt-merge-msg.c:663
+#: builtin/fmt-merge-msg.c:664
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "Historie mit höchstens <n> Einträgen von \"shortlog\" hinzufügen"
 
-#: builtin/fmt-merge-msg.c:666
+#: builtin/fmt-merge-msg.c:667
 msgid "alias for --log (deprecated)"
 msgstr "Alias für --log (veraltet)"
 
-#: builtin/fmt-merge-msg.c:669
+#: builtin/fmt-merge-msg.c:670
 msgid "text"
 msgstr "Text"
 
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:671
 msgid "use <text> as start of message"
 msgstr "<Text> als Beschreibungsanfang verwenden"
 
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
 msgid "file to read from"
 msgstr "Datei zum Einlesen"
 
-#: builtin/for-each-ref.c:9
+#: builtin/for-each-ref.c:10
 msgid "git for-each-ref [<options>] [<pattern>]"
 msgstr "git for-each-ref [<Optionen>] [<Muster>]"
 
-#: builtin/for-each-ref.c:10
+#: builtin/for-each-ref.c:11
 msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <Objekt>]"
 
-#: builtin/for-each-ref.c:11
+#: builtin/for-each-ref.c:12
 msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
 msgstr "git for-each-ref [(--merged | --no-merged) [<Commit>]]"
 
-#: builtin/for-each-ref.c:12
+#: builtin/for-each-ref.c:13
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr "git for-each-ref [--contains [<Objekt>]] [--no-contains [<Commit>]]"
 
-#: builtin/for-each-ref.c:27
+#: builtin/for-each-ref.c:28
 msgid "quote placeholders suitably for shells"
 msgstr "Platzhalter als Shell-String formatieren"
 
-#: builtin/for-each-ref.c:29
+#: builtin/for-each-ref.c:30
 msgid "quote placeholders suitably for perl"
 msgstr "Platzhalter als Perl-String formatieren"
 
-#: builtin/for-each-ref.c:31
+#: builtin/for-each-ref.c:32
 msgid "quote placeholders suitably for python"
 msgstr "Platzhalter als Python-String formatieren"
 
-#: builtin/for-each-ref.c:33
+#: builtin/for-each-ref.c:34
 msgid "quote placeholders suitably for Tcl"
 msgstr "Platzhalter als Tcl-String formatieren"
 
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
 msgid "show only <n> matched refs"
 msgstr "nur <n> passende Referenzen anzeigen"
 
-#: builtin/for-each-ref.c:41
+#: builtin/for-each-ref.c:42
 msgid "print only refs which points at the given object"
 msgstr "nur auf dieses Objekt zeigende Referenzen ausgeben"
 
-#: builtin/for-each-ref.c:43
+#: builtin/for-each-ref.c:44
 msgid "print only refs that are merged"
 msgstr "nur zusammengeführte Referenzen ausgeben"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 msgid "print only refs that are not merged"
 msgstr "nur nicht zusammengeführte Referenzen ausgeben"
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
 msgid "print only refs which contain the commit"
 msgstr "nur Referenzen ausgeben, die diesen Commit enthalten"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
 msgid "print only refs which don't contain the commit"
 msgstr "nur Referenzen ausgeben, die diesen Commit nicht enthalten"
 
@@ -8519,21 +8617,21 @@ msgstr "ausführliche Namen für erreichbare Objekte anzeigen"
 msgid "Checking objects"
 msgstr "Prüfe Objekte"
 
-#: builtin/gc.c:25
+#: builtin/gc.c:26
 msgid "git gc [<options>]"
 msgstr "git gc [<Optionen>]"
 
-#: builtin/gc.c:78
+#: builtin/gc.c:79
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "Konnte '%s' nicht lesen: %s"
 
-#: builtin/gc.c:310
+#: builtin/gc.c:311
 #, c-format
 msgid "Can't stat %s"
 msgstr "Kann '%s' nicht lesen."
 
-#: builtin/gc.c:319
+#: builtin/gc.c:320
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -8549,49 +8647,49 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:358
+#: builtin/gc.c:359
 msgid "prune unreferenced objects"
 msgstr "unreferenzierte Objekte entfernen"
 
-#: builtin/gc.c:360
+#: builtin/gc.c:361
 msgid "be more thorough (increased runtime)"
 msgstr "mehr Gründlichkeit (erhöht Laufzeit)"
 
-#: builtin/gc.c:361
+#: builtin/gc.c:362
 msgid "enable auto-gc mode"
 msgstr "\"auto-gc\" Modus aktivieren"
 
-#: builtin/gc.c:362
+#: builtin/gc.c:363
 msgid "force running gc even if there may be another gc running"
 msgstr ""
 "Ausführung von \"git gc\" erzwingen, selbst wenn ein anderes\n"
 "\"git gc\" bereits ausgeführt wird"
 
-#: builtin/gc.c:379
+#: builtin/gc.c:380
 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr "Fehler beim Parsen des Wertes '%s' von gc.logexpiry"
 
-#: builtin/gc.c:407
+#: builtin/gc.c:408
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "Die Datenbank des Repositories wird für eine optimale Performance im\n"
 "Hintergrund komprimiert.\n"
 
-#: builtin/gc.c:409
+#: builtin/gc.c:410
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr ""
 "Die Datenbank des Projektarchivs wird für eine optimale Performance "
 "komprimiert.\n"
 
-#: builtin/gc.c:410
+#: builtin/gc.c:411
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Siehe \"git help gc\" für manuelles Aufräumen.\n"
 
-#: builtin/gc.c:431
+#: builtin/gc.c:436
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8599,275 +8697,288 @@ msgstr ""
 "\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgeführt\n"
 "(benutzen Sie --force falls nicht)"
 
-#: builtin/gc.c:475
+#: builtin/gc.c:480
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Es gibt zu viele unerreichbare lose Objekte; führen Sie 'git prune' aus, um "
 "diese zu löschen."
 
-#: builtin/grep.c:25
+#: builtin/grep.c:27
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<Optionen>] [-e] <Muster> [<Commit>...] [[--] <Pfad>...]"
 
-#: builtin/grep.c:232
+#: builtin/grep.c:235
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: Fehler beim Erzeugen eines Thread: %s"
 
-#: builtin/grep.c:290
+#: builtin/grep.c:293
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "ungültige Anzahl von Threads (%d) für %s angegeben"
 
-#: builtin/grep.c:769 builtin/grep.c:810
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#, c-format
+msgid "no threads support, ignoring %s"
+msgstr "keine Unterstützung von Threads, '%s' wird ignoriert"
+
+#: builtin/grep.c:788 builtin/grep.c:829
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen"
 
-#: builtin/grep.c:829
+#: builtin/grep.c:848
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "kann \"grep\" nicht mit Objekten des Typs %s durchführen"
 
-#: builtin/grep.c:893
+#: builtin/grep.c:912
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "Schalter '%c' erwartet einen numerischen Wert"
 
-#: builtin/grep.c:980
+#: builtin/grep.c:999
 msgid "search in index instead of in the work tree"
 msgstr "im Index anstatt im Arbeitsverzeichnis suchen"
 
-#: builtin/grep.c:982
+#: builtin/grep.c:1001
 msgid "find in contents not managed by git"
 msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden"
 
-#: builtin/grep.c:984
+#: builtin/grep.c:1003
 msgid "search in both tracked and untracked files"
 msgstr "in versionierten und unversionierten Dateien suchen"
 
-#: builtin/grep.c:986
+#: builtin/grep.c:1005
 msgid "ignore files specified via '.gitignore'"
 msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren"
 
-#: builtin/grep.c:988
+#: builtin/grep.c:1007
 msgid "recursively search in each submodule"
 msgstr "rekursive Suche in jedem Submodul"
 
-#: builtin/grep.c:990
+#: builtin/grep.c:1009
 msgid "basename"
 msgstr "Basisname"
 
-#: builtin/grep.c:991
+#: builtin/grep.c:1010
 msgid "prepend parent project's basename to output"
 msgstr "Basisname des Elternprojektes an Ausgaben voranstellen"
 
-#: builtin/grep.c:994
+#: builtin/grep.c:1013
 msgid "show non-matching lines"
 msgstr "Zeilen ohne Übereinstimmungen anzeigen"
 
-#: builtin/grep.c:996
+#: builtin/grep.c:1015
 msgid "case insensitive matching"
 msgstr "Übereinstimmungen unabhängig von Groß- und Kleinschreibung finden"
 
-#: builtin/grep.c:998
+#: builtin/grep.c:1017
 msgid "match patterns only at word boundaries"
 msgstr "nur ganze Wörter suchen"
 
-#: builtin/grep.c:1000
+#: builtin/grep.c:1019
 msgid "process binary files as text"
 msgstr "binäre Dateien als Text verarbeiten"
 
-#: builtin/grep.c:1002
+#: builtin/grep.c:1021
 msgid "don't match patterns in binary files"
 msgstr "keine Muster in Binärdateien finden"
 
-#: builtin/grep.c:1005
+#: builtin/grep.c:1024
 msgid "process binary files with textconv filters"
 msgstr "binäre Dateien mit \"textconv\"-Filtern verarbeiten"
 
-#: builtin/grep.c:1007
+#: builtin/grep.c:1026
 msgid "descend at most <depth> levels"
 msgstr "höchstens <Tiefe> Ebenen durchlaufen"
 
-#: builtin/grep.c:1011
+#: builtin/grep.c:1030
 msgid "use extended POSIX regular expressions"
 msgstr "erweiterte reguläre Ausdrücke aus POSIX verwenden"
 
-#: builtin/grep.c:1014
+#: builtin/grep.c:1033
 msgid "use basic POSIX regular expressions (default)"
 msgstr "grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard)"
 
-#: builtin/grep.c:1017
+#: builtin/grep.c:1036
 msgid "interpret patterns as fixed strings"
 msgstr "Muster als feste Zeichenketten interpretieren"
 
-#: builtin/grep.c:1020
+#: builtin/grep.c:1039
 msgid "use Perl-compatible regular expressions"
 msgstr "Perl-kompatible reguläre Ausdrücke verwenden"
 
-#: builtin/grep.c:1023
+#: builtin/grep.c:1042
 msgid "show line numbers"
 msgstr "Zeilennummern anzeigen"
 
-#: builtin/grep.c:1024
+#: builtin/grep.c:1043
 msgid "don't show filenames"
 msgstr "keine Dateinamen anzeigen"
 
-#: builtin/grep.c:1025
+#: builtin/grep.c:1044
 msgid "show filenames"
 msgstr "Dateinamen anzeigen"
 
-#: builtin/grep.c:1027
+#: builtin/grep.c:1046
 msgid "show filenames relative to top directory"
 msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen"
 
-#: builtin/grep.c:1029
+#: builtin/grep.c:1048
 msgid "show only filenames instead of matching lines"
 msgstr "nur Dateinamen anzeigen anstatt übereinstimmende Zeilen"
 
-#: builtin/grep.c:1031
+#: builtin/grep.c:1050
 msgid "synonym for --files-with-matches"
 msgstr "Synonym für --files-with-matches"
 
-#: builtin/grep.c:1034
+#: builtin/grep.c:1053
 msgid "show only the names of files without match"
 msgstr "nur die Dateinamen ohne Übereinstimmungen anzeigen"
 
-#: builtin/grep.c:1036
+#: builtin/grep.c:1055
 msgid "print NUL after filenames"
 msgstr "NUL-Zeichen nach Dateinamen ausgeben"
 
-#: builtin/grep.c:1038
+#: builtin/grep.c:1057
 msgid "show the number of matches instead of matching lines"
 msgstr "anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen"
 
-#: builtin/grep.c:1039
+#: builtin/grep.c:1058
 msgid "highlight matches"
 msgstr "Übereinstimmungen hervorheben"
 
-#: builtin/grep.c:1041
+#: builtin/grep.c:1060
 msgid "print empty line between matches from different files"
 msgstr ""
 "eine Leerzeile zwischen Übereinstimmungen in verschiedenen Dateien ausgeben"
 
-#: builtin/grep.c:1043
+#: builtin/grep.c:1062
 msgid "show filename only once above matches from same file"
 msgstr ""
 "den Dateinamen nur einmal oberhalb der Übereinstimmungen aus dieser Datei "
 "anzeigen"
 
-#: builtin/grep.c:1046
+#: builtin/grep.c:1065
 msgid "show <n> context lines before and after matches"
 msgstr "<n> Zeilen vor und nach den Übereinstimmungen anzeigen"
 
-#: builtin/grep.c:1049
+#: builtin/grep.c:1068
 msgid "show <n> context lines before matches"
 msgstr "<n> Zeilen vor den Übereinstimmungen anzeigen"
 
-#: builtin/grep.c:1051
+#: builtin/grep.c:1070
 msgid "show <n> context lines after matches"
 msgstr "<n> Zeilen nach den Übereinstimmungen anzeigen"
 
-#: builtin/grep.c:1053
+#: builtin/grep.c:1072
 msgid "use <n> worker threads"
 msgstr "<n> Threads benutzen"
 
-#: builtin/grep.c:1054
+#: builtin/grep.c:1073
 msgid "shortcut for -C NUM"
 msgstr "Kurzform für -C NUM"
 
-#: builtin/grep.c:1057
+#: builtin/grep.c:1076
 msgid "show a line with the function name before matches"
 msgstr "eine Zeile mit dem Funktionsnamen vor Übereinstimmungen anzeigen"
 
-#: builtin/grep.c:1059
+#: builtin/grep.c:1078
 msgid "show the surrounding function"
 msgstr "die umgebende Funktion anzeigen"
 
-#: builtin/grep.c:1062
+#: builtin/grep.c:1081
 msgid "read patterns from file"
 msgstr "Muster von einer Datei lesen"
 
-#: builtin/grep.c:1064
+#: builtin/grep.c:1083
 msgid "match <pattern>"
 msgstr "<Muster> finden"
 
-#: builtin/grep.c:1066
+#: builtin/grep.c:1085
 msgid "combine patterns specified with -e"
 msgstr "Muster kombinieren, die mit -e angegeben wurden"
 
-#: builtin/grep.c:1078
+#: builtin/grep.c:1097
 msgid "indicate hit with exit status without output"
 msgstr "Übereinstimmungen nur durch Beendigungsstatus anzeigen"
 
-#: builtin/grep.c:1080
+#: builtin/grep.c:1099
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "nur Übereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen"
 
-#: builtin/grep.c:1082
+#: builtin/grep.c:1101
 msgid "show parse tree for grep expression"
 msgstr "geparstes Verzeichnis für \"grep\"-Ausdruck anzeigen"
 
-#: builtin/grep.c:1086
+#: builtin/grep.c:1105
 msgid "pager"
 msgstr "Anzeigeprogramm"
 
-#: builtin/grep.c:1086
+#: builtin/grep.c:1105
 msgid "show matching files in the pager"
 msgstr "Dateien mit Übereinstimmungen im Anzeigeprogramm anzeigen"
 
-#: builtin/grep.c:1089
+#: builtin/grep.c:1108
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)"
 
-#: builtin/grep.c:1153
+#: builtin/grep.c:1172
 msgid "no pattern given."
 msgstr "keine Muster angegeben"
 
-#: builtin/grep.c:1189
+#: builtin/grep.c:1204
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index oder --untracked können nicht mit Commits verwendet werden"
 
-#: builtin/grep.c:1195
+#: builtin/grep.c:1211
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "Konnte Commit nicht auflösen: %s"
 
-#: builtin/grep.c:1228 builtin/index-pack.c:1485
+#: builtin/grep.c:1245 builtin/index-pack.c:1490
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "ungültige Anzahl von Threads angegeben (%d)"
 
-#: builtin/grep.c:1251
+#: builtin/grep.c:1250
+msgid "no threads support, ignoring --threads"
+msgstr "keine Unterstützung von Threads, --threads wird ignoriert"
+
+#: builtin/grep.c:1281
 msgid "--open-files-in-pager only works on the worktree"
 msgstr ""
 "Die Option --open-files-in-pager kann nur innerhalb des "
 "Arbeitsverzeichnisses verwendet werden."
 
-#: builtin/grep.c:1274
+#: builtin/grep.c:1304
 msgid "option not supported with --recurse-submodules."
 msgstr "Option wird mit --recurse-submodules nicht unterstützt."
 
-#: builtin/grep.c:1280
+#: builtin/grep.c:1310
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr ""
 "Die Optionen --cached und --untracked können nicht mit --no-index verwendet "
 "werden."
 
-#: builtin/grep.c:1286
+#: builtin/grep.c:1316
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr ""
 "Die Option --[no-]exclude-standard kann nicht mit versionierten Inhalten "
 "verwendet werden."
 
-#: builtin/grep.c:1294
+#: builtin/grep.c:1324
 msgid "both --cached and trees are given."
 msgstr "Die Option --cached kann nicht mit \"Tree\"-Objekten verwendet werden."
 
-#: builtin/hash-object.c:81
+#: builtin/hash-object.c:82
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -8875,93 +8986,93 @@ msgstr ""
 "git hash-object [-t <Art>] [-w] [--path=<Datei> | --no-filters] [--stdin] "
 "[--] <Datei>..."
 
-#: builtin/hash-object.c:82
+#: builtin/hash-object.c:83
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
 msgid "type"
 msgstr "Art"
 
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
 msgid "object type"
 msgstr "Art des Objektes"
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "write the object into the object database"
 msgstr "das Objekt in die Objektdatenbank schreiben"
 
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98
 msgid "read the object from stdin"
 msgstr "das Objekt von der Standard-Eingabe lesen"
 
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:100
 msgid "store file as is without filters"
 msgstr "Datei wie sie ist speichern, ohne Filter"
 
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr ""
 "Hash über zufällige Daten, zur Erzeugung von beschädigten Objekten zur\n"
 "Fehlersuche in Git, erzeugen"
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:102
 msgid "process file as it were from this path"
 msgstr "Datei verarbeiten, als ob sie von diesem Pfad wäre"
 
-#: builtin/help.c:42
+#: builtin/help.c:43
 msgid "print all available commands"
 msgstr "alle vorhandenen Befehle anzeigen"
 
-#: builtin/help.c:43
+#: builtin/help.c:44
 msgid "exclude guides"
 msgstr "Anleitungen ausschließen"
 
-#: builtin/help.c:44
+#: builtin/help.c:45
 msgid "print list of useful guides"
 msgstr "Liste von allgemein verwendeten Anleitungen anzeigen"
 
-#: builtin/help.c:45
+#: builtin/help.c:46
 msgid "show man page"
 msgstr "Handbuch anzeigen"
 
-#: builtin/help.c:46
+#: builtin/help.c:47
 msgid "show manual in web browser"
 msgstr "Handbuch in einem Webbrowser anzeigen"
 
-#: builtin/help.c:48
+#: builtin/help.c:49
 msgid "show info page"
 msgstr "Info-Seite anzeigen"
 
-#: builtin/help.c:54
+#: builtin/help.c:55
 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
 msgstr "git help [--all] [--guides] [--man | --web | --info] [<Befehl>]"
 
-#: builtin/help.c:66
+#: builtin/help.c:67
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "nicht erkanntes Hilfeformat: %s"
 
-#: builtin/help.c:93
+#: builtin/help.c:94
 msgid "Failed to start emacsclient."
 msgstr "Konnte emacsclient nicht starten."
 
-#: builtin/help.c:106
+#: builtin/help.c:107
 msgid "Failed to parse emacsclient version."
 msgstr "Konnte Version des emacsclient nicht parsen."
 
-#: builtin/help.c:114
+#: builtin/help.c:115
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "Version des emacsclient '%d' ist zu alt (< 22)."
 
-#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
+#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "Fehler beim Ausführen von '%s'"
 
-#: builtin/help.c:207
+#: builtin/help.c:208
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -8970,7 +9081,7 @@ msgstr ""
 "'%s': Pfad für nicht unterstützten Handbuchbetrachter.\n"
 "Sie könnten stattdessen 'man.<Werkzeug>.cmd' benutzen."
 
-#: builtin/help.c:219
+#: builtin/help.c:220
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -8979,132 +9090,132 @@ msgstr ""
 "'%s': Programm für unterstützten Handbuchbetrachter.\n"
 "Sie könnten stattdessen 'man.<Werkzeug>.path' benutzen."
 
-#: builtin/help.c:336
+#: builtin/help.c:337
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s': unbekannter Handbuch-Betrachter."
 
-#: builtin/help.c:353
+#: builtin/help.c:354
 msgid "no man viewer handled the request"
 msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen"
 
-#: builtin/help.c:361
+#: builtin/help.c:362
 msgid "no info viewer handled the request"
 msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen"
 
-#: builtin/help.c:403
+#: builtin/help.c:404
 msgid "Defining attributes per path"
 msgstr "Definition von Attributen pro Pfad"
 
-#: builtin/help.c:404
+#: builtin/help.c:405
 msgid "Everyday Git With 20 Commands Or So"
 msgstr "Tägliche Benutzung von Git mit ungefähr 20 Befehlen"
 
-#: builtin/help.c:405
+#: builtin/help.c:406
 msgid "A Git glossary"
 msgstr "Ein Git-Glossar"
 
-#: builtin/help.c:406
+#: builtin/help.c:407
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Spezifikation von bewusst ignorierten, unversionierten Dateien"
 
-#: builtin/help.c:407
+#: builtin/help.c:408
 msgid "Defining submodule properties"
 msgstr "Definition von Submodul-Eigenschaften"
 
-#: builtin/help.c:408
+#: builtin/help.c:409
 msgid "Specifying revisions and ranges for Git"
 msgstr "Spezifikation von Commits und Bereichen für Git"
 
-#: builtin/help.c:409
+#: builtin/help.c:410
 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
 msgstr "Eine einführende Anleitung zu Git (für Version 1.5.1 oder neuer)"
 
-#: builtin/help.c:410
+#: builtin/help.c:411
 msgid "An overview of recommended workflows with Git"
 msgstr "Eine Übersicht über empfohlene Arbeitsabläufe mit Git"
 
-#: builtin/help.c:422
+#: builtin/help.c:423
 msgid "The common Git guides are:\n"
 msgstr "Die allgemein verwendeten Git-Anleitungen sind:\n"
 
-#: builtin/help.c:440
+#: builtin/help.c:441
 #, c-format
 msgid "`git %s' is aliased to `%s'"
 msgstr "für `git %s' wurde der Alias `%s' angelegt"
 
-#: builtin/help.c:462 builtin/help.c:479
+#: builtin/help.c:463 builtin/help.c:480
 #, c-format
 msgid "usage: %s%s"
 msgstr "Verwendung: %s%s"
 
-#: builtin/index-pack.c:154
+#: builtin/index-pack.c:155
 #, c-format
 msgid "unable to open %s"
 msgstr "kann %s nicht öffnen"
 
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "Objekt-Typen passen bei %s nicht zusammen"
 
-#: builtin/index-pack.c:224
+#: builtin/index-pack.c:225
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "konnte erwartetes Objekt %s nicht empfangen"
 
-#: builtin/index-pack.c:227
+#: builtin/index-pack.c:228
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "Objekt %s: erwarteter Typ %s, %s gefunden"
 
-#: builtin/index-pack.c:269
+#: builtin/index-pack.c:270
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "kann %d Byte nicht lesen"
 msgstr[1] "kann %d Bytes nicht lesen"
 
-#: builtin/index-pack.c:279
+#: builtin/index-pack.c:280
 msgid "early EOF"
 msgstr "zu frühes Dateiende"
 
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
 msgid "read error on input"
 msgstr "Fehler beim Lesen der Eingabe"
 
-#: builtin/index-pack.c:292
+#: builtin/index-pack.c:293
 msgid "used more bytes than were available"
 msgstr "verwendete mehr Bytes als verfügbar waren"
 
-#: builtin/index-pack.c:299
+#: builtin/index-pack.c:300
 msgid "pack too large for current definition of off_t"
 msgstr "Paket ist zu groß für die aktuelle Definition von off_t"
 
-#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
+#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
 msgid "pack exceeds maximum allowed size"
 msgstr "Paket überschreitet die maximal erlaubte Größe"
 
-#: builtin/index-pack.c:317
+#: builtin/index-pack.c:318
 #, c-format
 msgid "unable to create '%s'"
 msgstr "konnte '%s' nicht erstellen"
 
-#: builtin/index-pack.c:323
+#: builtin/index-pack.c:324
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "Kann Paketdatei '%s' nicht öffnen"
 
-#: builtin/index-pack.c:337
+#: builtin/index-pack.c:338
 msgid "pack signature mismatch"
 msgstr "Paketsignatur stimmt nicht überein"
 
-#: builtin/index-pack.c:339
+#: builtin/index-pack.c:340
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "Paketversion %<PRIu32> nicht unterstützt"
 
-#: builtin/index-pack.c:357
+#: builtin/index-pack.c:358
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "Paket hat ein ungültiges Objekt bei Versatz %<PRIuMAX>: %s"
@@ -9143,14 +9254,14 @@ msgstr[1] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Bytes"
 msgid "serious inflate inconsistency"
 msgstr "ernsthafte Inkonsistenz nach Dekomprimierung"
 
-#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
 #: builtin/index-pack.c:816 builtin/index-pack.c:825
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !"
 
-#: builtin/index-pack.c:752 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:257
+#: builtin/index-pack.c:751 builtin/pack-objects.c:167
+#: builtin/pack-objects.c:261
 #, c-format
 msgid "unable to read %s"
 msgstr "kann %s nicht lesen"
@@ -9170,250 +9281,245 @@ msgstr "Kann existierendes Objekt %s nicht lesen."
 msgid "invalid blob object %s"
 msgstr "ungültiges Blob-Objekt %s"
 
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:851
 #, c-format
 msgid "invalid %s"
 msgstr "Ungültiger Objekt-Typ %s"
 
-#: builtin/index-pack.c:853
+#: builtin/index-pack.c:854
 msgid "Error in object"
 msgstr "Fehler in Objekt"
 
-#: builtin/index-pack.c:855
+#: builtin/index-pack.c:856
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Nicht alle Kind-Objekte von %s sind erreichbar"
 
-#: builtin/index-pack.c:927 builtin/index-pack.c:958
+#: builtin/index-pack.c:928 builtin/index-pack.c:959
 msgid "failed to apply delta"
 msgstr "Konnte Dateiunterschied nicht anwenden"
 
-#: builtin/index-pack.c:1128
+#: builtin/index-pack.c:1130
 msgid "Receiving objects"
 msgstr "Empfange Objekte"
 
-#: builtin/index-pack.c:1128
+#: builtin/index-pack.c:1130
 msgid "Indexing objects"
 msgstr "Indiziere Objekte"
 
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1164
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "Paket ist beschädigt (SHA1 unterschiedlich)"
 
-#: builtin/index-pack.c:1165
+#: builtin/index-pack.c:1169
 msgid "cannot fstat packfile"
 msgstr "kann Paketdatei nicht lesen"
 
-#: builtin/index-pack.c:1168
+#: builtin/index-pack.c:1172
 msgid "pack has junk at the end"
 msgstr "Paketende enthält nicht verwendbaren Inhalt"
 
-#: builtin/index-pack.c:1179
+#: builtin/index-pack.c:1184
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "Fehler beim Ausführen von \"parse_pack_objects()\""
 
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1207
 msgid "Resolving deltas"
 msgstr "Löse Unterschiede auf"
 
-#: builtin/index-pack.c:1213
+#: builtin/index-pack.c:1218
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "kann Thread nicht erzeugen: %s"
 
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1260
 msgid "confusion beyond insanity"
 msgstr "Fehler beim Auflösen der Unterschiede"
 
-#: builtin/index-pack.c:1261
+#: builtin/index-pack.c:1266
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "abgeschlossen mit %d lokalem Objekt"
 msgstr[1] "abgeschlossen mit %d lokalen Objekten"
 
-#: builtin/index-pack.c:1273
+#: builtin/index-pack.c:1278
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Unerwartete Prüfsumme für %s (Festplattenfehler?)"
 
-#: builtin/index-pack.c:1277
+#: builtin/index-pack.c:1282
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "Paket hat %d unaufgelöste Unterschied"
 msgstr[1] "Paket hat %d unaufgelöste Unterschiede"
 
-#: builtin/index-pack.c:1301
+#: builtin/index-pack.c:1306
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren"
 
-#: builtin/index-pack.c:1377
+#: builtin/index-pack.c:1382
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "lokales Objekt %s ist beschädigt"
 
-#: builtin/index-pack.c:1403
+#: builtin/index-pack.c:1408
 msgid "error while closing pack file"
 msgstr "Fehler beim Schließen der Paketdatei"
 
-#: builtin/index-pack.c:1415
+#: builtin/index-pack.c:1420
 #, c-format
 msgid "cannot write keep file '%s'"
 msgstr "Kann Paketbeschreibungsdatei '%s' nicht schreiben"
 
-#: builtin/index-pack.c:1423
+#: builtin/index-pack.c:1428
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr "Kann eben erstellte Paketbeschreibungsdatei '%s' nicht schließen"
 
-#: builtin/index-pack.c:1433
+#: builtin/index-pack.c:1438
 msgid "cannot store pack file"
 msgstr "Kann Paketdatei nicht speichern"
 
-#: builtin/index-pack.c:1441
+#: builtin/index-pack.c:1446
 msgid "cannot store index file"
 msgstr "Kann Indexdatei nicht speichern"
 
-#: builtin/index-pack.c:1479
+#: builtin/index-pack.c:1484
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig"
 
-#: builtin/index-pack.c:1489 builtin/index-pack.c:1686
-#, c-format
-msgid "no threads support, ignoring %s"
-msgstr "keine Unterstützung von Threads, '%s' wird ignoriert"
-
-#: builtin/index-pack.c:1547
+#: builtin/index-pack.c:1552
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Kann existierende Paketdatei '%s' nicht öffnen"
 
-#: builtin/index-pack.c:1549
+#: builtin/index-pack.c:1554
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Kann existierende Indexdatei für Paket '%s' nicht öffnen"
 
-#: builtin/index-pack.c:1596
+#: builtin/index-pack.c:1602
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "kein Unterschied: %d Objekt"
 msgstr[1] "kein Unterschied: %d Objekte"
 
-#: builtin/index-pack.c:1603
+#: builtin/index-pack.c:1609
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "Länge der Objekt-Liste = %d: %lu Objekt"
 msgstr[1] "Länge der Objekt-Liste = %d: %lu Objekte"
 
-#: builtin/index-pack.c:1616
+#: builtin/index-pack.c:1622
 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'"
 
-#: builtin/index-pack.c:1698 builtin/index-pack.c:1701
-#: builtin/index-pack.c:1717 builtin/index-pack.c:1721
+#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
+#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
 #, c-format
 msgid "bad %s"
 msgstr "%s ist ungültig"
 
-#: builtin/index-pack.c:1737
+#: builtin/index-pack.c:1743
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden."
 
-#: builtin/index-pack.c:1739
+#: builtin/index-pack.c:1745
 msgid "--stdin requires a git repository"
 msgstr "--stdin erfordert ein Git-Repository"
 
-#: builtin/index-pack.c:1747
+#: builtin/index-pack.c:1753
 msgid "--verify with no packfile name given"
 msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben."
 
-#: builtin/init-db.c:54
+#: builtin/init-db.c:55
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "Kann '%s' nicht lesen"
 
-#: builtin/init-db.c:60
+#: builtin/init-db.c:61
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "kann Vorlage '%s' nicht lesen"
 
-#: builtin/init-db.c:65
+#: builtin/init-db.c:66
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "kann Verzeichnis '%s' nicht öffnen"
 
-#: builtin/init-db.c:76
+#: builtin/init-db.c:77
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "kann Verweis '%s' nicht lesen"
 
-#: builtin/init-db.c:78
+#: builtin/init-db.c:79
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "kann symbolische Verknüpfung '%s' auf '%s' nicht erstellen"
 
-#: builtin/init-db.c:84
+#: builtin/init-db.c:85
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "kann '%s' nicht nach '%s' kopieren"
 
-#: builtin/init-db.c:88
+#: builtin/init-db.c:89
 #, c-format
 msgid "ignoring template %s"
 msgstr "ignoriere Vorlage %s"
 
-#: builtin/init-db.c:119
+#: builtin/init-db.c:120
 #, c-format
 msgid "templates not found %s"
 msgstr "keine Vorlagen in '%s' gefunden"
 
-#: builtin/init-db.c:134
+#: builtin/init-db.c:135
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "kopiere keine Vorlagen von '%s': %s"
 
-#: builtin/init-db.c:327
+#: builtin/init-db.c:328
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "kann nicht mit Dateityp %d umgehen"
 
-#: builtin/init-db.c:330
+#: builtin/init-db.c:331
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "Konnte %s nicht nach %s verschieben"
 
-#: builtin/init-db.c:347 builtin/init-db.c:350
+#: builtin/init-db.c:348 builtin/init-db.c:351
 #, c-format
 msgid "%s already exists"
 msgstr "%s existiert bereits"
 
-#: builtin/init-db.c:403
+#: builtin/init-db.c:404
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "Bestehendes verteiltes Git-Repository in %s%s neuinitialisiert\n"
 
-#: builtin/init-db.c:404
+#: builtin/init-db.c:405
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "Bestehendes Git-Repository in %s%s neuinitialisiert\n"
 
-#: builtin/init-db.c:408
+#: builtin/init-db.c:409
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "Leeres verteiltes Git-Repository in %s%s initialisiert\n"
 
-#: builtin/init-db.c:409
+#: builtin/init-db.c:410
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "Leeres Git-Repository in %s%s initialisiert\n"
 
-#: builtin/init-db.c:457
+#: builtin/init-db.c:458
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -9421,25 +9527,25 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<Vorlagenverzeichnis>] [--"
 "shared[=<Berechtigungen>]] [<Verzeichnis>]"
 
-#: builtin/init-db.c:480
+#: builtin/init-db.c:481
 msgid "permissions"
 msgstr "Berechtigungen"
 
-#: builtin/init-db.c:481
+#: builtin/init-db.c:482
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "angeben, dass das Git-Repository mit mehreren Benutzern geteilt wird"
 
-#: builtin/init-db.c:515 builtin/init-db.c:520
+#: builtin/init-db.c:516 builtin/init-db.c:521
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "kann Verzeichnis %s nicht erstellen"
 
-#: builtin/init-db.c:524
+#: builtin/init-db.c:525
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "kann nicht in Verzeichnis %s wechseln"
 
-#: builtin/init-db.c:545
+#: builtin/init-db.c:546
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -9448,7 +9554,7 @@ msgstr ""
 "%s (oder --work-tree=<Verzeichnis>) nicht erlaubt ohne Spezifizierung von %s "
 "(oder --git-dir=<Verzeichnis>)"
 
-#: builtin/init-db.c:573
+#: builtin/init-db.c:574
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Kann nicht auf Arbeitsverzeichnis '%s' zugreifen."
@@ -9481,112 +9587,112 @@ msgstr "Anhang/Anhänge hinzufügen"
 msgid "no input file given for in-place editing"
 msgstr "keine Datei zur direkten Bearbeitung angegeben"
 
-#: builtin/log.c:44
+#: builtin/log.c:45
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]"
 
-#: builtin/log.c:45
+#: builtin/log.c:46
 msgid "git show [<options>] <object>..."
 msgstr "git show [<Optionen>] <Objekt>..."
 
-#: builtin/log.c:89
+#: builtin/log.c:90
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "Ungültige Option für --decorate: %s"
 
-#: builtin/log.c:144
+#: builtin/log.c:147
 msgid "suppress diff output"
 msgstr "Ausgabe der Unterschiede unterdrücken"
 
-#: builtin/log.c:145
+#: builtin/log.c:148
 msgid "show source"
 msgstr "Quelle anzeigen"
 
-#: builtin/log.c:146
+#: builtin/log.c:149
 msgid "Use mail map file"
 msgstr "\"mailmap\"-Datei verwenden"
 
-#: builtin/log.c:147
+#: builtin/log.c:150
 msgid "decorate options"
 msgstr "decorate-Optionen"
 
-#: builtin/log.c:150
+#: builtin/log.c:153
 msgid "Process line range n,m in file, counting from 1"
 msgstr "Verarbeitet nur Zeilen im Bereich n,m in der Datei, gezählt von 1"
 
-#: builtin/log.c:246
+#: builtin/log.c:249
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "letzte Ausgabe: %d %s\n"
 
-#: builtin/log.c:493
+#: builtin/log.c:497
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: ungültige Datei"
 
-#: builtin/log.c:507 builtin/log.c:601
+#: builtin/log.c:512 builtin/log.c:606
 #, c-format
 msgid "Could not read object %s"
 msgstr "Kann Objekt %s nicht lesen."
 
-#: builtin/log.c:625
+#: builtin/log.c:630
 #, c-format
 msgid "Unknown type: %d"
 msgstr "Unbekannter Typ: %d"
 
-#: builtin/log.c:746
+#: builtin/log.c:751
 msgid "format.headers without value"
 msgstr "format.headers ohne Wert"
 
-#: builtin/log.c:846
+#: builtin/log.c:852
 msgid "name of output directory is too long"
 msgstr "Name des Ausgabeverzeichnisses ist zu lang."
 
-#: builtin/log.c:861
+#: builtin/log.c:868
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "Kann Patch-Datei %s nicht öffnen"
 
-#: builtin/log.c:875
+#: builtin/log.c:885
 msgid "Need exactly one range."
 msgstr "Brauche genau einen Commit-Bereich."
 
-#: builtin/log.c:885
+#: builtin/log.c:895
 msgid "Not a range."
 msgstr "Kein Commit-Bereich."
 
-#: builtin/log.c:991
+#: builtin/log.c:1001
 msgid "Cover letter needs email format"
 msgstr "Anschreiben benötigt E-Mail-Format"
 
-#: builtin/log.c:1071
+#: builtin/log.c:1081
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "ungültiges in-reply-to: %s"
 
-#: builtin/log.c:1098
+#: builtin/log.c:1108
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]"
 
-#: builtin/log.c:1148
+#: builtin/log.c:1158
 msgid "Two output directories?"
 msgstr "Zwei Ausgabeverzeichnisse?"
 
-#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912
+#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
 #, c-format
 msgid "Unknown commit %s"
 msgstr "Unbekannter Commit %s"
 
-#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532
+#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
 
-#: builtin/log.c:1270
+#: builtin/log.c:1280
 msgid "Could not find exact merge base."
 msgstr "Konnte keine exakte Merge-Basis finden."
 
-#: builtin/log.c:1274
+#: builtin/log.c:1284
 msgid ""
 "Failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
@@ -9597,216 +9703,221 @@ msgstr ""
 "'git branch --set-upstream-to', um einem Remote-Branch zu folgen.\n"
 "Oder geben Sie den Basis-Commit mit '--base=<Basis-Commit-Id>' manuell an."
 
-#: builtin/log.c:1294
+#: builtin/log.c:1304
 msgid "Failed to find exact merge base"
 msgstr "Fehler beim Finden einer exakten Merge-Basis."
 
-#: builtin/log.c:1305
+#: builtin/log.c:1315
 msgid "base commit should be the ancestor of revision list"
 msgstr "Basis-Commit sollte der Vorgänger der Revisionsliste sein."
 
-#: builtin/log.c:1309
+#: builtin/log.c:1319
 msgid "base commit shouldn't be in revision list"
 msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein."
 
-#: builtin/log.c:1358
+#: builtin/log.c:1368
 msgid "cannot get patch id"
 msgstr "kann Patch-Id nicht lesen"
 
-#: builtin/log.c:1415
+#: builtin/log.c:1425
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden"
 
-#: builtin/log.c:1418
+#: builtin/log.c:1428
 msgid "use [PATCH] even with multiple patches"
 msgstr "[PATCH] auch mit mehreren Patches verwenden"
 
-#: builtin/log.c:1422
+#: builtin/log.c:1432
 msgid "print patches to standard out"
 msgstr "Ausgabe der Patches in Standard-Ausgabe"
 
-#: builtin/log.c:1424
+#: builtin/log.c:1434
 msgid "generate a cover letter"
 msgstr "ein Deckblatt erzeugen"
 
-#: builtin/log.c:1426
+#: builtin/log.c:1436
 msgid "use simple number sequence for output file names"
 msgstr "einfache Nummernfolge für die Namen der Ausgabedateien verwenden"
 
-#: builtin/log.c:1427
+#: builtin/log.c:1437
 msgid "sfx"
 msgstr "Dateiendung"
 
-#: builtin/log.c:1428
+#: builtin/log.c:1438
 msgid "use <sfx> instead of '.patch'"
 msgstr "<Dateiendung> anstatt '.patch' verwenden"
 
-#: builtin/log.c:1430
+#: builtin/log.c:1440
 msgid "start numbering patches at <n> instead of 1"
 msgstr "die Nummerierung der Patches bei <n> anstatt bei 1 beginnen"
 
-#: builtin/log.c:1432
+#: builtin/log.c:1442
 msgid "mark the series as Nth re-roll"
 msgstr "die Serie als n-te Fassung kennzeichnen"
 
-#: builtin/log.c:1434
+#: builtin/log.c:1444
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "[RFC PATCH] anstatt [PATCH] verwenden"
 
-#: builtin/log.c:1437
+#: builtin/log.c:1447
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "[<Präfix>] anstatt [PATCH] verwenden"
 
-#: builtin/log.c:1440
+#: builtin/log.c:1450
 msgid "store resulting files in <dir>"
 msgstr "erzeugte Dateien in <Verzeichnis> speichern"
 
-#: builtin/log.c:1443
+#: builtin/log.c:1453
 msgid "don't strip/add [PATCH]"
 msgstr "[PATCH] nicht entfernen/hinzufügen"
 
-#: builtin/log.c:1446
+#: builtin/log.c:1456
 msgid "don't output binary diffs"
 msgstr "keine binären Unterschiede ausgeben"
 
-#: builtin/log.c:1448
+#: builtin/log.c:1458
 msgid "output all-zero hash in From header"
 msgstr "Hash mit Nullen in \"From\"-Header ausgeben"
 
-#: builtin/log.c:1450
+#: builtin/log.c:1460
 msgid "don't include a patch matching a commit upstream"
 msgstr ""
 "keine Patches einschließen, die einem Commit im Upstream-Branch entsprechen"
 
-#: builtin/log.c:1452
+#: builtin/log.c:1462
 msgid "show patch format instead of default (patch + stat)"
 msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)"
 
-#: builtin/log.c:1454
+#: builtin/log.c:1464
 msgid "Messaging"
 msgstr "E-Mail-Einstellungen"
 
-#: builtin/log.c:1455
+#: builtin/log.c:1465
 msgid "header"
 msgstr "Header"
 
-#: builtin/log.c:1456
+#: builtin/log.c:1466
 msgid "add email header"
 msgstr "E-Mail-Header hinzufügen"
 
-#: builtin/log.c:1457 builtin/log.c:1459
+#: builtin/log.c:1467 builtin/log.c:1469
 msgid "email"
 msgstr "E-Mail"
 
-#: builtin/log.c:1457
+#: builtin/log.c:1467
 msgid "add To: header"
 msgstr "\"To:\"-Header hinzufügen"
 
-#: builtin/log.c:1459
+#: builtin/log.c:1469
 msgid "add Cc: header"
 msgstr "\"Cc:\"-Header hinzufügen"
 
-#: builtin/log.c:1461
+#: builtin/log.c:1471
 msgid "ident"
 msgstr "Ident"
 
-#: builtin/log.c:1462
+#: builtin/log.c:1472
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "\"From\"-Adresse auf <Ident> setzen (oder Ident des Commit-Erstellers, wenn "
 "fehlend)"
 
-#: builtin/log.c:1464
+#: builtin/log.c:1474
 msgid "message-id"
 msgstr "message-id"
 
-#: builtin/log.c:1465
+#: builtin/log.c:1475
 msgid "make first mail a reply to <message-id>"
 msgstr "aus erster E-Mail eine Antwort zu <message-id> machen"
 
-#: builtin/log.c:1466 builtin/log.c:1469
+#: builtin/log.c:1476 builtin/log.c:1479
 msgid "boundary"
 msgstr "Grenze"
 
-#: builtin/log.c:1467
+#: builtin/log.c:1477
 msgid "attach the patch"
 msgstr "den Patch anhängen"
 
-#: builtin/log.c:1470
+#: builtin/log.c:1480
 msgid "inline the patch"
 msgstr "den Patch direkt in die Nachricht einfügen"
 
-#: builtin/log.c:1474
+#: builtin/log.c:1484
 msgid "enable message threading, styles: shallow, deep"
 msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep"
 
-#: builtin/log.c:1476
+#: builtin/log.c:1486
 msgid "signature"
 msgstr "Signatur"
 
-#: builtin/log.c:1477
+#: builtin/log.c:1487
 msgid "add a signature"
 msgstr "eine Signatur hinzufügen"
 
-#: builtin/log.c:1478
+#: builtin/log.c:1488
 msgid "base-commit"
 msgstr "Basis-Commit"
 
-#: builtin/log.c:1479
+#: builtin/log.c:1489
 msgid "add prerequisite tree info to the patch series"
 msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufügen"
 
-#: builtin/log.c:1481
+#: builtin/log.c:1491
 msgid "add a signature from a file"
 msgstr "eine Signatur aus einer Datei hinzufügen"
 
-#: builtin/log.c:1482
+#: builtin/log.c:1492
 msgid "don't print the patch filenames"
 msgstr "keine Dateinamen der Patches anzeigen"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1567
+#, c-format
+msgid "invalid ident line: %s"
+msgstr "Ungültige Identifikationszeile: %s"
+
+#: builtin/log.c:1582
 msgid "-n and -k are mutually exclusive."
 msgstr "Die Optionen -n und -k schließen sich gegenseitig aus."
 
-#: builtin/log.c:1574
+#: builtin/log.c:1584
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr "--subject-prefix/--rfc und -k schließen sich gegenseitig aus."
 
-#: builtin/log.c:1582
+#: builtin/log.c:1592
 msgid "--name-only does not make sense"
 msgstr "Die Option --name-only kann nicht verwendet werden."
 
-#: builtin/log.c:1584
+#: builtin/log.c:1594
 msgid "--name-status does not make sense"
 msgstr "Die Option --name-status kann nicht verwendet werden."
 
-#: builtin/log.c:1586
+#: builtin/log.c:1596
 msgid "--check does not make sense"
 msgstr "Die Option --check kann nicht verwendet werden."
 
-#: builtin/log.c:1616
+#: builtin/log.c:1626
 msgid "standard output, or directory, which one?"
 msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?"
 
-#: builtin/log.c:1618
+#: builtin/log.c:1628
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht erstellen."
 
-#: builtin/log.c:1712
+#: builtin/log.c:1722
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "Konnte Signatur-Datei '%s' nicht lesen"
 
-#: builtin/log.c:1784
+#: builtin/log.c:1794
 msgid "Failed to create output files"
 msgstr "Fehler beim Erstellen der Ausgabedateien."
 
-#: builtin/log.c:1833
+#: builtin/log.c:1843
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]"
 
-#: builtin/log.c:1887
+#: builtin/log.c:1897
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -9965,221 +10076,226 @@ msgstr ""
 
 #: builtin/ls-remote.c:66
 msgid "show underlying ref in addition to the object pointed by it"
-msgstr "zusätzlich die auf durch dieses Objekt verwiesene Referenzen anzeigen"
+msgstr "zusätzlich zum Objekt die darauf verweisenden Referenzen anzeigen"
 
-#: builtin/ls-tree.c:28
+#: builtin/ls-tree.c:29
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
 msgstr "git ls-tree [<Optionen>] <Commit-Referenz> [<Pfad>...]"
 
-#: builtin/ls-tree.c:126
+#: builtin/ls-tree.c:127
 msgid "only show trees"
 msgstr "nur Verzeichnisse anzeigen"
 
-#: builtin/ls-tree.c:128
+#: builtin/ls-tree.c:129
 msgid "recurse into subtrees"
 msgstr "Rekursion in Unterverzeichnissen durchführen"
 
-#: builtin/ls-tree.c:130
+#: builtin/ls-tree.c:131
 msgid "show trees when recursing"
 msgstr "Verzeichnisse bei Rekursion anzeigen"
 
-#: builtin/ls-tree.c:133
+#: builtin/ls-tree.c:134
 msgid "terminate entries with NUL byte"
 msgstr "Einträge mit NUL-Byte abschließen"
 
-#: builtin/ls-tree.c:134
+#: builtin/ls-tree.c:135
 msgid "include object size"
 msgstr "Objektgröße einschließen"
 
-#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
+#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
 msgid "list only filenames"
 msgstr "nur Dateinamen auflisten"
 
-#: builtin/ls-tree.c:141
+#: builtin/ls-tree.c:142
 msgid "use full path names"
 msgstr "vollständige Pfadnamen verwenden"
 
-#: builtin/ls-tree.c:143
+#: builtin/ls-tree.c:144
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr ""
 "das gesamte Verzeichnis auflisten; nicht nur das aktuelle Verzeichnis "
 "(impliziert --full-name)"
 
-#: builtin/merge.c:46
+#: builtin/mailsplit.c:241
+#, c-format
+msgid "empty mbox: '%s'"
+msgstr "Leere mbox: '%s'"
+
+#: builtin/merge.c:47
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<Optionen>] [<Commit>...]"
 
-#: builtin/merge.c:47
+#: builtin/merge.c:48
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:48
+#: builtin/merge.c:49
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:103
+#: builtin/merge.c:104
 msgid "switch `m' requires a value"
 msgstr "Schalter 'm' erfordert einen Wert."
 
-#: builtin/merge.c:140
+#: builtin/merge.c:141
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Konnte Merge-Strategie '%s' nicht finden.\n"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:142
 #, c-format
 msgid "Available strategies are:"
 msgstr "Verfügbare Strategien sind:"
 
-#: builtin/merge.c:146
+#: builtin/merge.c:147
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Verfügbare benutzerdefinierte Strategien sind:"
 
-#: builtin/merge.c:196 builtin/pull.c:127
+#: builtin/merge.c:197 builtin/pull.c:134
 msgid "do not show a diffstat at the end of the merge"
 msgstr "keine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
 
-#: builtin/merge.c:199 builtin/pull.c:130
+#: builtin/merge.c:200 builtin/pull.c:137
 msgid "show a diffstat at the end of the merge"
 msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
 
-#: builtin/merge.c:200 builtin/pull.c:133
+#: builtin/merge.c:201 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(Synonym für --stat)"
 
-#: builtin/merge.c:202 builtin/pull.c:136
+#: builtin/merge.c:203 builtin/pull.c:143
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "(höchstens <n>) Einträge von \"shortlog\" zur Beschreibung des Merge-Commits "
 "hinzufügen"
 
-#: builtin/merge.c:205 builtin/pull.c:139
+#: builtin/merge.c:206 builtin/pull.c:146
 msgid "create a single commit instead of doing a merge"
 msgstr "einen einzelnen Commit anstatt eines Merges erzeugen"
 
-#: builtin/merge.c:207 builtin/pull.c:142
+#: builtin/merge.c:208 builtin/pull.c:149
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)"
 
-#: builtin/merge.c:209 builtin/pull.c:145
+#: builtin/merge.c:210 builtin/pull.c:152
 msgid "edit message before committing"
 msgstr "Bearbeitung der Beschreibung vor dem Commit"
 
-#: builtin/merge.c:210
+#: builtin/merge.c:211
 msgid "allow fast-forward (default)"
 msgstr "Vorspulen erlauben (Standard)"
 
-#: builtin/merge.c:212 builtin/pull.c:151
+#: builtin/merge.c:213 builtin/pull.c:158
 msgid "abort if fast-forward is not possible"
 msgstr "abbrechen, wenn kein Vorspulen möglich ist"
 
-#: builtin/merge.c:216 builtin/pull.c:154
+#: builtin/merge.c:217 builtin/pull.c:161
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "den genannten Commit auf eine gültige GPG-Signatur überprüfen"
 
-#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158
-#: builtin/revert.c:108
+#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/revert.c:109
 msgid "strategy"
 msgstr "Strategie"
 
-#: builtin/merge.c:218 builtin/pull.c:159
+#: builtin/merge.c:219 builtin/pull.c:166
 msgid "merge strategy to use"
 msgstr "zu verwendende Merge-Strategie"
 
-#: builtin/merge.c:219 builtin/pull.c:162
+#: builtin/merge.c:220 builtin/pull.c:169
 msgid "option=value"
 msgstr "Option=Wert"
 
-#: builtin/merge.c:220 builtin/pull.c:163
+#: builtin/merge.c:221 builtin/pull.c:170
 msgid "option for selected merge strategy"
 msgstr "Option für ausgewählte Merge-Strategie"
 
-#: builtin/merge.c:222
+#: builtin/merge.c:223
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr ""
 "Commit-Beschreibung zusammenführen (für einen Merge, der kein Vorspulen war)"
 
-#: builtin/merge.c:226
+#: builtin/merge.c:227
 msgid "abort the current in-progress merge"
 msgstr "den sich im Gange befindlichen Merge abbrechen"
 
-#: builtin/merge.c:228
+#: builtin/merge.c:229
 msgid "continue the current in-progress merge"
 msgstr "den sich im Gange befindlichen Merge fortsetzen"
 
-#: builtin/merge.c:230 builtin/pull.c:170
+#: builtin/merge.c:231 builtin/pull.c:177
 msgid "allow merging unrelated histories"
 msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien"
 
-#: builtin/merge.c:258
+#: builtin/merge.c:259
 msgid "could not run stash."
 msgstr "Konnte \"stash\" nicht ausführen."
 
-#: builtin/merge.c:263
+#: builtin/merge.c:264
 msgid "stash failed"
 msgstr "\"stash\" fehlgeschlagen"
 
-#: builtin/merge.c:268
+#: builtin/merge.c:269
 #, c-format
 msgid "not a valid object: %s"
 msgstr "kein gültiges Objekt: %s"
 
-#: builtin/merge.c:287 builtin/merge.c:304
+#: builtin/merge.c:288 builtin/merge.c:305
 msgid "read-tree failed"
 msgstr "read-tree fehlgeschlagen"
 
-#: builtin/merge.c:334
+#: builtin/merge.c:335
 msgid " (nothing to squash)"
 msgstr " (nichts zu quetschen)"
 
-#: builtin/merge.c:345
+#: builtin/merge.c:346
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n"
 
-#: builtin/merge.c:395
+#: builtin/merge.c:396
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n"
 
-#: builtin/merge.c:446
+#: builtin/merge.c:447
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' zeigt auf keinen Commit"
 
-#: builtin/merge.c:536
+#: builtin/merge.c:537
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Ungültiger branch.%s.mergeoptions String: %s"
 
-#: builtin/merge.c:656
+#: builtin/merge.c:657
 msgid "Not handling anything other than two heads merge."
 msgstr "Es wird nur der Merge von zwei Branches behandelt."
 
-#: builtin/merge.c:670
+#: builtin/merge.c:671
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Unbekannte Option für merge-recursive: -X%s"
 
-#: builtin/merge.c:685
+#: builtin/merge.c:686
 #, c-format
 msgid "unable to write %s"
 msgstr "konnte %s nicht schreiben"
 
-#: builtin/merge.c:737
+#: builtin/merge.c:738
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "konnte nicht von '%s' lesen"
 
-#: builtin/merge.c:746
+#: builtin/merge.c:747
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 "Merge wurde nicht committet; benutzen Sie 'git commit', um den Merge "
 "abzuschließen.\n"
 
-#: builtin/merge.c:752
+#: builtin/merge.c:753
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -10195,76 +10311,71 @@ msgstr ""
 "Zeilen beginnend mit '%c' werden ignoriert, und eine leere Beschreibung\n"
 "bricht den Commit ab.\n"
 
-#: builtin/merge.c:776
+#: builtin/merge.c:777
 msgid "Empty commit message."
 msgstr "Leere Commit-Beschreibung"
 
-#: builtin/merge.c:796
+#: builtin/merge.c:797
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Wunderbar.\n"
 
-#: builtin/merge.c:851
+#: builtin/merge.c:850
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "Automatischer Merge fehlgeschlagen; beheben Sie die Konflikte und committen "
 "Sie dann das Ergebnis.\n"
 
-#: builtin/merge.c:890
+#: builtin/merge.c:889
 msgid "No current branch."
 msgstr "Sie befinden sich auf keinem Branch."
 
-#: builtin/merge.c:892
+#: builtin/merge.c:891
 msgid "No remote for the current branch."
 msgstr "Kein Remote-Repository für den aktuellen Branch."
 
-#: builtin/merge.c:894
+#: builtin/merge.c:893
 msgid "No default upstream defined for the current branch."
 msgstr ""
 "Es ist kein Standard-Upstream-Branch für den aktuellen Branch definiert."
 
-#: builtin/merge.c:899
+#: builtin/merge.c:898
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Kein Remote-Tracking-Branch für %s von %s"
 
-#: builtin/merge.c:946
+#: builtin/merge.c:945
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'"
 
-#: builtin/merge.c:1020
-#, c-format
-msgid "could not close '%s'"
-msgstr "Konnte '%s' nicht schließen"
-
-#: builtin/merge.c:1047
+#: builtin/merge.c:1046
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "nichts was wir in %s zusammenführen können: %s"
 
-#: builtin/merge.c:1081
+#: builtin/merge.c:1080
 msgid "not something we can merge"
 msgstr "nichts was wir zusammenführen können"
 
-#: builtin/merge.c:1146
+#: builtin/merge.c:1145
 msgid "--abort expects no arguments"
 msgstr "--abort akzeptiert keine Argumente"
 
-#: builtin/merge.c:1150
+#: builtin/merge.c:1149
 msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr "Es gibt keinen Merge zum Abbrechen (MERGE_HEAD fehlt)"
+msgstr "Es gibt keinen Merge abzubrechen (MERGE_HEAD fehlt)"
 
-#: builtin/merge.c:1162
+#: builtin/merge.c:1161
 msgid "--continue expects no arguments"
 msgstr "--continue erwartet keine Argumente"
 
-#: builtin/merge.c:1166
+#: builtin/merge.c:1165
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Es ist keine Merge im Gange (MERGE_HEAD fehlt)."
 
-#: builtin/merge.c:1182
+#: builtin/merge.c:1181
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10272,7 +10383,7 @@ msgstr ""
 "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n"
 "Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen."
 
-#: builtin/merge.c:1189
+#: builtin/merge.c:1188
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10280,163 +10391,163 @@ msgstr ""
 "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n"
 "Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen."
 
-#: builtin/merge.c:1192
+#: builtin/merge.c:1191
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr ""
 "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert)."
 
-#: builtin/merge.c:1201
+#: builtin/merge.c:1200
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Sie können --squash nicht mit --no-ff kombinieren."
 
-#: builtin/merge.c:1209
+#: builtin/merge.c:1208
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt."
 
-#: builtin/merge.c:1226
+#: builtin/merge.c:1225
 msgid "Squash commit into empty head not supported yet"
 msgstr ""
 "Bin auf einem Commit, der noch geboren wird; kann \"squash\" nicht ausführen."
 
-#: builtin/merge.c:1228
+#: builtin/merge.c:1227
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
 "Nicht vorzuspulender Commit kann nicht in einem leeren Branch verwendet "
 "werden."
 
-#: builtin/merge.c:1233
+#: builtin/merge.c:1232
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - nichts was wir zusammenführen können"
 
-#: builtin/merge.c:1235
+#: builtin/merge.c:1234
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Kann nur exakt einen Commit in einem leeren Branch zusammenführen."
 
-#: builtin/merge.c:1269
+#: builtin/merge.c:1268
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 "Commit %s hat eine nicht vertrauenswürdige GPG-Signatur, angeblich von %s."
 
-#: builtin/merge.c:1272
+#: builtin/merge.c:1271
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "Commit %s hat eine ungültige GPG-Signatur, angeblich von %s."
 
-#: builtin/merge.c:1275
+#: builtin/merge.c:1274
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Commit %s hat keine GPG-Signatur."
 
-#: builtin/merge.c:1278
+#: builtin/merge.c:1277
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "Commit %s hat eine gültige GPG-Signatur von %s\n"
 
-#: builtin/merge.c:1340
+#: builtin/merge.c:1339
 msgid "refusing to merge unrelated histories"
 msgstr "Verweigere den Merge von nicht zusammenhängenden Historien."
 
-#: builtin/merge.c:1349
+#: builtin/merge.c:1348
 msgid "Already up-to-date."
 msgstr "Bereits aktuell."
 
-#: builtin/merge.c:1359
+#: builtin/merge.c:1358
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Aktualisiere %s..%s\n"
 
-#: builtin/merge.c:1400
+#: builtin/merge.c:1399
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n"
 
-#: builtin/merge.c:1407
+#: builtin/merge.c:1406
 #, c-format
 msgid "Nope.\n"
 msgstr "Nein.\n"
 
-#: builtin/merge.c:1432
+#: builtin/merge.c:1431
 msgid "Already up-to-date. Yeeah!"
 msgstr "Bereits aktuell."
 
-#: builtin/merge.c:1438
+#: builtin/merge.c:1437
 msgid "Not possible to fast-forward, aborting."
 msgstr "Vorspulen nicht möglich, breche ab."
 
-#: builtin/merge.c:1461 builtin/merge.c:1540
+#: builtin/merge.c:1460 builtin/merge.c:1539
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n"
 
-#: builtin/merge.c:1465
+#: builtin/merge.c:1464
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Probiere Merge-Strategie %s ...\n"
 
-#: builtin/merge.c:1531
+#: builtin/merge.c:1530
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Keine Merge-Strategie behandelt diesen Merge.\n"
 
-#: builtin/merge.c:1533
+#: builtin/merge.c:1532
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Merge mit Strategie %s fehlgeschlagen.\n"
 
-#: builtin/merge.c:1542
+#: builtin/merge.c:1541
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "Benutzen Sie \"%s\", um die Auflösung per Hand vorzubereiten.\n"
 
-#: builtin/merge.c:1554
+#: builtin/merge.c:1553
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
 "Automatischer Merge abgeschlossen; halte, wie gewünscht, vor dem Commit an\n"
 
-#: builtin/merge-base.c:29
+#: builtin/merge-base.c:30
 msgid "git merge-base [-a | --all] <commit> <commit>..."
 msgstr "git merge-base [-a | --all] <Commit> <Commit>..."
 
-#: builtin/merge-base.c:30
+#: builtin/merge-base.c:31
 msgid "git merge-base [-a | --all] --octopus <commit>..."
 msgstr "git merge-base [-a | --all] --octopus <Commit>..."
 
-#: builtin/merge-base.c:31
+#: builtin/merge-base.c:32
 msgid "git merge-base --independent <commit>..."
 msgstr "git merge-base --independent <Commit>..."
 
-#: builtin/merge-base.c:32
+#: builtin/merge-base.c:33
 msgid "git merge-base --is-ancestor <commit> <commit>"
 msgstr "git merge-base --is-ancestor <Commit> <Commit>"
 
-#: builtin/merge-base.c:33
+#: builtin/merge-base.c:34
 msgid "git merge-base --fork-point <ref> [<commit>]"
 msgstr "git merge-base --fork-point <Referenz> [<Commit>]"
 
-#: builtin/merge-base.c:217
+#: builtin/merge-base.c:218
 msgid "output all common ancestors"
 msgstr "Ausgabe aller gemeinsamen Vorgänger-Commits"
 
-#: builtin/merge-base.c:219
+#: builtin/merge-base.c:220
 msgid "find ancestors for a single n-way merge"
 msgstr "Vorgänger-Commits für einen einzelnen n-Wege-Merge finden"
 
-#: builtin/merge-base.c:221
+#: builtin/merge-base.c:222
 msgid "list revs not reachable from others"
 msgstr "Commits auflisten, die nicht durch Andere erreichbar sind"
 
-#: builtin/merge-base.c:223
+#: builtin/merge-base.c:224
 msgid "is the first one ancestor of the other?"
-msgstr "ist der Erste ein Vorgänger-Commit von dem Anderen?"
+msgstr "ist der Erste ein Vorgänger-Commit des Anderen?"
 
-#: builtin/merge-base.c:225
+#: builtin/merge-base.c:226
 msgid "find where <commit> forked from reflog of <ref>"
 msgstr "<Commit> finden, von wo Reflog von <Referenz> abgespalten wurde"
 
-#: builtin/merge-file.c:8
+#: builtin/merge-file.c:9
 msgid ""
 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
 "<orig-file> <file2>"
@@ -10444,35 +10555,35 @@ msgstr ""
 "git merge-file [<Optionen>] [-L <Name1> [-L <orig> [-L <Name2>]]] <Datei1> "
 "<orig-Datei> <Datei2>"
 
-#: builtin/merge-file.c:32
+#: builtin/merge-file.c:33
 msgid "send results to standard output"
 msgstr "Ergebnisse zur Standard-Ausgabe senden"
 
-#: builtin/merge-file.c:33
+#: builtin/merge-file.c:34
 msgid "use a diff3 based merge"
 msgstr "einen diff3 basierten Merge verwenden"
 
-#: builtin/merge-file.c:34
+#: builtin/merge-file.c:35
 msgid "for conflicts, use our version"
 msgstr "bei Konflikten unsere Variante verwenden"
 
-#: builtin/merge-file.c:36
+#: builtin/merge-file.c:37
 msgid "for conflicts, use their version"
 msgstr "bei Konflikten ihre Variante verwenden"
 
-#: builtin/merge-file.c:38
+#: builtin/merge-file.c:39
 msgid "for conflicts, use a union version"
 msgstr "bei Konflikten eine gemeinsame Variante verwenden"
 
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:42
 msgid "for conflicts, use this marker size"
 msgstr "bei Konflikten diese Kennzeichnungslänge verwenden"
 
-#: builtin/merge-file.c:42
+#: builtin/merge-file.c:43
 msgid "do not warn about conflicts"
 msgstr "keine Warnung bei Konflikten"
 
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:45
 msgid "set labels for file1/orig-file/file2"
 msgstr "Beschriftung für Datei1/orig-Datei/Datei2 setzen"
 
@@ -10511,162 +10622,162 @@ msgstr "Führe %s mit %s zusammen\n"
 msgid "git mktree [-z] [--missing] [--batch]"
 msgstr "git mktree [-z] [--missing] [--batch]"
 
-#: builtin/mktree.c:152
+#: builtin/mktree.c:153
 msgid "input is NUL terminated"
 msgstr "Eingabe ist durch NUL-Zeichen abgeschlossen"
 
-#: builtin/mktree.c:153 builtin/write-tree.c:24
+#: builtin/mktree.c:154 builtin/write-tree.c:25
 msgid "allow missing objects"
 msgstr "fehlende Objekte erlauben"
 
-#: builtin/mktree.c:154
+#: builtin/mktree.c:155
 msgid "allow creation of more than one tree"
 msgstr "die Erstellung von mehr als einem \"Tree\"-Objekt erlauben"
 
-#: builtin/mv.c:16
+#: builtin/mv.c:17
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<Optionen>] <Quelle>... <Ziel>"
 
-#: builtin/mv.c:82
+#: builtin/mv.c:83
 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr "Verzeichnis %s ist zum Commit vorgemerkt und kein Submodul?"
 
-#: builtin/mv.c:84 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:290
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder "
 "benutzen\n"
 "Sie \"stash\", um fortzufahren."
 
-#: builtin/mv.c:102
+#: builtin/mv.c:103
 #, c-format
 msgid "%.*s is in index"
 msgstr "%.*s ist zum Commit vorgemerkt"
 
-#: builtin/mv.c:124
+#: builtin/mv.c:125
 msgid "force move/rename even if target exists"
 msgstr "Verschieben/Umbenennen erzwingen, auch wenn das Ziel existiert"
 
-#: builtin/mv.c:125
+#: builtin/mv.c:126
 msgid "skip move/rename errors"
 msgstr "Fehler beim Verschieben oder Umbenennen überspringen"
 
-#: builtin/mv.c:167
+#: builtin/mv.c:168
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "Ziel '%s' ist kein Verzeichnis"
 
-#: builtin/mv.c:178
+#: builtin/mv.c:179
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Prüfe Umbenennung von '%s' nach '%s'\n"
 
-#: builtin/mv.c:182
+#: builtin/mv.c:183
 msgid "bad source"
 msgstr "ungültige Quelle"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:186
 msgid "can not move directory into itself"
 msgstr "kann Verzeichnis nicht in sich selbst verschieben"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:189
 msgid "cannot move directory over file"
 msgstr "kann Verzeichnis nicht über Datei verschieben"
 
-#: builtin/mv.c:197
+#: builtin/mv.c:198
 msgid "source directory is empty"
 msgstr "Quellverzeichnis ist leer"
 
-#: builtin/mv.c:222
+#: builtin/mv.c:223
 msgid "not under version control"
 msgstr "nicht unter Versionskontrolle"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:226
 msgid "destination exists"
 msgstr "Ziel existiert bereits"
 
-#: builtin/mv.c:233
+#: builtin/mv.c:234
 #, c-format
 msgid "overwriting '%s'"
 msgstr "überschreibe '%s'"
 
-#: builtin/mv.c:236
+#: builtin/mv.c:237
 msgid "Cannot overwrite"
 msgstr "Kann nicht überschreiben"
 
-#: builtin/mv.c:239
+#: builtin/mv.c:240
 msgid "multiple sources for the same target"
 msgstr "mehrere Quellen für das selbe Ziel"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:242
 msgid "destination directory does not exist"
 msgstr "Zielverzeichnis existiert nicht"
 
-#: builtin/mv.c:248
+#: builtin/mv.c:249
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, Quelle=%s, Ziel=%s"
 
-#: builtin/mv.c:269
+#: builtin/mv.c:270
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Benenne %s nach %s um\n"
 
-#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384
+#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "Umbenennung von '%s' fehlgeschlagen"
 
-#: builtin/name-rev.c:289
+#: builtin/name-rev.c:338
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<Optionen>] <Commit>..."
 
-#: builtin/name-rev.c:290
+#: builtin/name-rev.c:339
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<Optionen>] --all"
 
-#: builtin/name-rev.c:291
+#: builtin/name-rev.c:340
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<Optionen>] --stdin"
 
-#: builtin/name-rev.c:346
+#: builtin/name-rev.c:395
 msgid "print only names (no SHA-1)"
 msgstr "nur Namen anzeigen (keine SHA-1)"
 
-#: builtin/name-rev.c:347
+#: builtin/name-rev.c:396
 msgid "only use tags to name the commits"
 msgstr "nur Tags verwenden, um die Commits zu benennen"
 
-#: builtin/name-rev.c:349
+#: builtin/name-rev.c:398
 msgid "only use refs matching <pattern>"
 msgstr "nur Referenzen verwenden die <Muster> entsprechen"
 
-#: builtin/name-rev.c:351
+#: builtin/name-rev.c:400
 msgid "ignore refs matching <pattern>"
 msgstr "ignoriere Referenzen die <Muster> entsprechen"
 
-#: builtin/name-rev.c:353
+#: builtin/name-rev.c:402
 msgid "list all commits reachable from all refs"
 msgstr "alle Commits auflisten, die von allen Referenzen erreichbar sind"
 
-#: builtin/name-rev.c:354
+#: builtin/name-rev.c:403
 msgid "read from stdin"
 msgstr "von der Standard-Eingabe lesen"
 
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:404
 msgid "allow to print `undefined` names (default)"
 msgstr "Ausgabe von `undefinierten` Namen erlauben (Standard)"
 
-#: builtin/name-rev.c:361
+#: builtin/name-rev.c:410
 msgid "dereference tags in the input (internal use)"
 msgstr "Tags in der Eingabe dereferenzieren (interne Verwendung)"
 
-#: builtin/notes.c:25
+#: builtin/notes.c:26
 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
 msgstr "git notes [--ref <Notiz-Referenz>] [list [<Objekt>]]"
 
-#: builtin/notes.c:26
+#: builtin/notes.c:27
 msgid ""
 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
 "| (-c | -C) <object>] [<object>]"
@@ -10674,12 +10785,12 @@ msgstr ""
 "git notes [--ref <Notiz-Referenz>] add [-f] [--allow-empty] [-m "
 "<Beschreibung> | -F <Datei> | (-c | -C) <Objekt>] [<Objekt>]"
 
-#: builtin/notes.c:27
+#: builtin/notes.c:28
 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
 msgstr ""
 "git notes [--ref <Notiz-Referenz>] copy [-f] <von-Objekt> <nach-Objekt>"
 
-#: builtin/notes.c:28
+#: builtin/notes.c:29
 msgid ""
 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
 "(-c | -C) <object>] [<object>]"
@@ -10687,207 +10798,208 @@ msgstr ""
 "git notes [--ref <Notiz-Referenz>] append [--allow-empty] [-m <Beschreibung> "
 "| -F <Datei> | (-c | -C) <Objekt>] [<Objekt>]"
 
-#: builtin/notes.c:29
+#: builtin/notes.c:30
 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
 msgstr "git notes [--ref <Notiz-Referenz>] edit [--allow-empty] [<Objekt>]"
 
-#: builtin/notes.c:30
+#: builtin/notes.c:31
 msgid "git notes [--ref <notes-ref>] show [<object>]"
 msgstr "git notes [--ref <Notiz-Referenz>] show [<Objekt>]"
 
-#: builtin/notes.c:31
+#: builtin/notes.c:32
 msgid ""
 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
 msgstr ""
 "git notes [--ref <Notiz-Referenz>] merge [-v | -q] [-s <Strategie>] <Notiz-"
 "Referenz>"
 
-#: builtin/notes.c:32
+#: builtin/notes.c:33
 msgid "git notes merge --commit [-v | -q]"
 msgstr "git notes merge --commit [-v | -q]"
 
-#: builtin/notes.c:33
+#: builtin/notes.c:34
 msgid "git notes merge --abort [-v | -q]"
 msgstr "git notes merge --abort [-v | -q]"
 
-#: builtin/notes.c:34
+#: builtin/notes.c:35
 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
 msgstr "git notes [--ref <Notiz-Referenz>] remove [<Objekt>...]"
 
-#: builtin/notes.c:35
+#: builtin/notes.c:36
 msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
 msgstr "git notes [--ref <Notiz-Referenz>] prune [-n | -v]"
 
-#: builtin/notes.c:36
+#: builtin/notes.c:37
 msgid "git notes [--ref <notes-ref>] get-ref"
 msgstr "git notes [--ref <Notiz-Referenz>] get-ref"
 
-#: builtin/notes.c:41
+#: builtin/notes.c:42
 msgid "git notes [list [<object>]]"
 msgstr "git notes [list [<Objekt>]]"
 
-#: builtin/notes.c:46
+#: builtin/notes.c:47
 msgid "git notes add [<options>] [<object>]"
 msgstr "git notes add [<Optionen>] [<Objekt>]"
 
-#: builtin/notes.c:51
+#: builtin/notes.c:52
 msgid "git notes copy [<options>] <from-object> <to-object>"
 msgstr "git notes copy [<Optionen>] <von-Objekt> <nach-Objekt>"
 
-#: builtin/notes.c:52
+#: builtin/notes.c:53
 msgid "git notes copy --stdin [<from-object> <to-object>]..."
 msgstr "git notes copy --stdin [<von-Objekt> <nach-Objekt>]..."
 
-#: builtin/notes.c:57
+#: builtin/notes.c:58
 msgid "git notes append [<options>] [<object>]"
 msgstr "git notes append [<Optionen>] [<Objekt>]"
 
-#: builtin/notes.c:62
+#: builtin/notes.c:63
 msgid "git notes edit [<object>]"
 msgstr "git notes edit [<Objekt>]"
 
-#: builtin/notes.c:67
+#: builtin/notes.c:68
 msgid "git notes show [<object>]"
 msgstr "git notes show [<Objekt>]"
 
-#: builtin/notes.c:72
+#: builtin/notes.c:73
 msgid "git notes merge [<options>] <notes-ref>"
 msgstr "git notes merge [<Optionen>] <Notiz-Referenz>"
 
-#: builtin/notes.c:73
+#: builtin/notes.c:74
 msgid "git notes merge --commit [<options>]"
 msgstr "git notes merge --commit [<Optionen>]"
 
-#: builtin/notes.c:74
+#: builtin/notes.c:75
 msgid "git notes merge --abort [<options>]"
 msgstr "git notes merge --abort [<Optionen>]"
 
-#: builtin/notes.c:79
+#: builtin/notes.c:80
 msgid "git notes remove [<object>]"
 msgstr "git notes remove [<Objekt>]"
 
-#: builtin/notes.c:84
+#: builtin/notes.c:85
 msgid "git notes prune [<options>]"
 msgstr "git notes prune [<Optionen>]"
 
-#: builtin/notes.c:89
+#: builtin/notes.c:90
 msgid "git notes get-ref"
 msgstr "git notes get-ref"
 
-#: builtin/notes.c:94
+#: builtin/notes.c:95
 msgid "Write/edit the notes for the following object:"
 msgstr "Schreiben/Bearbeiten der Notizen für das folgende Objekt:"
 
-#: builtin/notes.c:147
+#: builtin/notes.c:148
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "konnte 'show' für Objekt '%s' nicht starten"
 
-#: builtin/notes.c:151
+#: builtin/notes.c:152
 msgid "could not read 'show' output"
 msgstr "Konnte Ausgabe von 'show' nicht lesen."
 
-#: builtin/notes.c:159
+#: builtin/notes.c:160
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "konnte 'show' für Objekt '%s' nicht abschließen"
 
-#: builtin/notes.c:194
+#: builtin/notes.c:195
 msgid "please supply the note contents using either -m or -F option"
 msgstr ""
 "Bitte liefern Sie die Notiz-Inhalte unter Verwendung der Option -m oder -F."
 
-#: builtin/notes.c:203
+#: builtin/notes.c:204
 msgid "unable to write note object"
 msgstr "Konnte Notiz-Objekt nicht schreiben"
 
-#: builtin/notes.c:205
+#: builtin/notes.c:206
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr "Die Notiz-Inhalte wurden in %s belassen."
 
-#: builtin/notes.c:233 builtin/tag.c:516
+#: builtin/notes.c:234 builtin/tag.c:517
 #, c-format
 msgid "cannot read '%s'"
 msgstr "kann '%s' nicht lesen"
 
-#: builtin/notes.c:235 builtin/tag.c:519
+#: builtin/notes.c:236 builtin/tag.c:520
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "konnte '%s' nicht öffnen oder lesen"
 
-#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
-#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
-#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658
+#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
+#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
+#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
 
-#: builtin/notes.c:257
+#: builtin/notes.c:258
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "Fehler beim Lesen des Objektes '%s'."
 
-#: builtin/notes.c:261
+#: builtin/notes.c:262
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr "Kann Notiz-Daten nicht von Nicht-Blob Objekt '%s' lesen."
 
-#: builtin/notes.c:301
+#: builtin/notes.c:302
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "Fehlerhafte Eingabezeile: '%s'."
 
-#: builtin/notes.c:316
+#: builtin/notes.c:317
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'"
 
-#. TRANSLATORS: the first %s will be replaced by a
-#. git notes command: 'add', 'merge', 'remove', etc.
-#: builtin/notes.c:345
+#. TRANSLATORS: the first %s will be replaced by a git
+#. notes command: 'add', 'merge', 'remove', etc.
+#.
+#: builtin/notes.c:348
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr ""
 "Ausführung von %s auf Notizen in %s (außerhalb von refs/notes/) "
 "zurückgewiesen"
 
-#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
-#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651
-#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969
+#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
+#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
+#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
 msgid "too many parameters"
 msgstr "zu viele Parameter"
 
-#: builtin/notes.c:378 builtin/notes.c:664
+#: builtin/notes.c:381 builtin/notes.c:667
 #, c-format
 msgid "no note found for object %s."
 msgstr "Keine Notiz für Objekt %s gefunden."
 
-#: builtin/notes.c:399 builtin/notes.c:562
+#: builtin/notes.c:402 builtin/notes.c:565
 msgid "note contents as a string"
 msgstr "Notizinhalte als Zeichenkette"
 
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:405 builtin/notes.c:568
 msgid "note contents in a file"
 msgstr "Notizinhalte in einer Datei"
 
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:408 builtin/notes.c:571
 msgid "reuse and edit specified note object"
 msgstr "Wiederverwendung und Bearbeitung des angegebenen Notiz-Objektes"
 
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:411 builtin/notes.c:574
 msgid "reuse specified note object"
 msgstr "Wiederverwendung des angegebenen Notiz-Objektes"
 
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:414 builtin/notes.c:577
 msgid "allow storing empty note"
 msgstr "Speichern leerer Notiz erlauben"
 
-#: builtin/notes.c:412 builtin/notes.c:483
+#: builtin/notes.c:415 builtin/notes.c:486
 msgid "replace existing notes"
 msgstr "existierende Notizen ersetzen"
 
-#: builtin/notes.c:437
+#: builtin/notes.c:440
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -10896,31 +11008,31 @@ msgstr ""
 "Konnte Notizen nicht hinzufügen. Existierende Notizen für Objekt %s "
 "gefunden. Verwenden Sie '-f', um die existierenden Notizen zu überschreiben."
 
-#: builtin/notes.c:452 builtin/notes.c:531
+#: builtin/notes.c:455 builtin/notes.c:534
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Überschreibe existierende Notizen für Objekt %s\n"
 
-#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888
+#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Entferne Notiz für Objekt %s\n"
 
-#: builtin/notes.c:484
+#: builtin/notes.c:487
 msgid "read objects from stdin"
 msgstr "Objekte von der Standard-Eingabe lesen"
 
-#: builtin/notes.c:486
+#: builtin/notes.c:489
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr ""
 "Konfiguration für <Befehl> zum Umschreiben von Commits laden (impliziert --"
 "stdin)"
 
-#: builtin/notes.c:504
+#: builtin/notes.c:507
 msgid "too few parameters"
 msgstr "zu wenig Parameter"
 
-#: builtin/notes.c:525
+#: builtin/notes.c:528
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -10929,12 +11041,12 @@ msgstr ""
 "Kann Notizen nicht kopieren. Existierende Notizen für Objekt %s gefunden. "
 "Verwenden Sie '-f', um die existierenden Notizen zu überschreiben."
 
-#: builtin/notes.c:537
+#: builtin/notes.c:540
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "Keine Notizen für Quell-Objekt %s. Kopie nicht möglich."
 
-#: builtin/notes.c:589
+#: builtin/notes.c:592
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -10943,52 +11055,52 @@ msgstr ""
 "Die Optionen -m/-F/-c/-C sind für den Unterbefehl 'edit' veraltet.\n"
 "Bitte benutzen Sie stattdessen 'git notes add -f -m/-F/-c/-C'.\n"
 
-#: builtin/notes.c:684
+#: builtin/notes.c:687
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:686
+#: builtin/notes.c:689
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_REF"
 
-#: builtin/notes.c:688
+#: builtin/notes.c:691
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "Fehler beim Löschen des Arbeitsverzeichnisses von 'git notes merge'."
 
-#: builtin/notes.c:708
+#: builtin/notes.c:711
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "Fehler beim Lesen der Referenz NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:710
+#: builtin/notes.c:713
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht finden."
 
-#: builtin/notes.c:712
+#: builtin/notes.c:715
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht parsen."
 
-#: builtin/notes.c:725
+#: builtin/notes.c:728
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "Fehler beim Auflösen von NOTES_MERGE_REF"
 
-#: builtin/notes.c:728
+#: builtin/notes.c:731
 msgid "failed to finalize notes merge"
 msgstr "Fehler beim Abschließen der Zusammenführung der Notizen."
 
-#: builtin/notes.c:754
+#: builtin/notes.c:757
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "unbekannte Merge-Strategie '%s' für Notizen"
 
-#: builtin/notes.c:770
+#: builtin/notes.c:773
 msgid "General options"
 msgstr "Allgemeine Optionen"
 
-#: builtin/notes.c:772
+#: builtin/notes.c:775
 msgid "Merge options"
 msgstr "Merge-Optionen"
 
-#: builtin/notes.c:774
+#: builtin/notes.c:777
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -10996,49 +11108,49 @@ msgstr ""
 "löst Konflikte bei Notizen mit der angegebenen Strategie auf (manual/ours/"
 "theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:776
+#: builtin/notes.c:779
 msgid "Committing unmerged notes"
 msgstr "nicht zusammengeführte Notizen eintragen"
 
-#: builtin/notes.c:778
+#: builtin/notes.c:781
 msgid "finalize notes merge by committing unmerged notes"
 msgstr ""
 "Merge von Notizen abschließen, in dem nicht zusammengeführte Notizen "
 "committet werden"
 
-#: builtin/notes.c:780
+#: builtin/notes.c:783
 msgid "Aborting notes merge resolution"
 msgstr "Konfliktauflösung beim Merge von Notizen abbrechen"
 
-#: builtin/notes.c:782
+#: builtin/notes.c:785
 msgid "abort notes merge"
 msgstr "Merge von Notizen abbrechen"
 
-#: builtin/notes.c:793
+#: builtin/notes.c:796
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "Kann --commit, --abort oder -s/--strategy nicht kombinieren."
 
-#: builtin/notes.c:798
+#: builtin/notes.c:801
 msgid "must specify a notes ref to merge"
 msgstr "Sie müssen eine Notiz-Referenz zum Mergen angeben."
 
-#: builtin/notes.c:822
+#: builtin/notes.c:825
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "Unbekannter Wert für -s/--strategy: %s"
 
-#: builtin/notes.c:859
+#: builtin/notes.c:862
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "Ein Merge von Notizen nach %s ist bereits im Gange bei %s"
 
-#: builtin/notes.c:862
+#: builtin/notes.c:865
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr ""
 "Fehler beim Speichern der Verknüpfung zur aktuellen Notes-Referenz (%s)"
 
-#: builtin/notes.c:864
+#: builtin/notes.c:867
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -11050,236 +11162,235 @@ msgstr ""
 "commit',\n"
 "oder brechen Sie den Merge mit 'git notes merge --abort' ab.\n"
 
-#: builtin/notes.c:886
+#: builtin/notes.c:889
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "Objekt %s hat keine Notiz\n"
 
-#: builtin/notes.c:898
+#: builtin/notes.c:901
 msgid "attempt to remove non-existent note is not an error"
 msgstr "der Versuch, eine nicht existierende Notiz zu löschen, ist kein Fehler"
 
-#: builtin/notes.c:901
+#: builtin/notes.c:904
 msgid "read object names from the standard input"
 msgstr "Objektnamen von der Standard-Eingabe lesen"
 
-#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
 msgid "do not remove, show only"
 msgstr "nicht löschen, nur anzeigen"
 
-#: builtin/notes.c:940
+#: builtin/notes.c:943
 msgid "report pruned notes"
 msgstr "gelöschte Notizen melden"
 
-#: builtin/notes.c:982
+#: builtin/notes.c:985
 msgid "notes-ref"
 msgstr "Notiz-Referenz"
 
-#: builtin/notes.c:983
+#: builtin/notes.c:986
 msgid "use notes from <notes-ref>"
 msgstr "Notizen von <Notiz-Referenz> verwenden"
 
-#: builtin/notes.c:1018
+#: builtin/notes.c:1021
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "Unbekannter Unterbefehl: %s"
 
-#: builtin/pack-objects.c:29
+#: builtin/pack-objects.c:30
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [<Optionen>...] [< <Referenzliste> | < "
 "<Objektliste>]"
 
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:31
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [<Optionen>...] <Basis-Name> [< <Referenzliste> | < "
 "<Objektliste>]"
 
-#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
+#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
 #, c-format
 msgid "deflate error (%d)"
 msgstr "Fehler beim Komprimieren (%d)"
 
-#: builtin/pack-objects.c:770
+#: builtin/pack-objects.c:776
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "Deaktiviere Schreiben der Bitmap, Pakete wurden durch pack.packSizeLimit\n"
 "aufgetrennt."
 
-#: builtin/pack-objects.c:783
+#: builtin/pack-objects.c:789
 msgid "Writing objects"
 msgstr "Schreibe Objekte"
 
-#: builtin/pack-objects.c:1063
+#: builtin/pack-objects.c:1069
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 "Deaktiviere Schreiben der Bitmap, da einige Objekte nicht in eine Pack-"
 "Datei\n"
 "geschrieben wurden."
 
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2434
 msgid "Compressing objects"
 msgstr "Komprimiere Objekte"
 
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2843
 #, c-format
 msgid "unsupported index version %s"
 msgstr "Nicht unterstützte Index-Version %s"
 
-#: builtin/pack-objects.c:2833
+#: builtin/pack-objects.c:2847
 #, c-format
 msgid "bad index version '%s'"
 msgstr "Ungültige Index-Version '%s'"
 
-#: builtin/pack-objects.c:2863
+#: builtin/pack-objects.c:2877
 msgid "do not show progress meter"
 msgstr "keine Fortschrittsanzeige anzeigen"
 
-#: builtin/pack-objects.c:2865
+#: builtin/pack-objects.c:2879
 msgid "show progress meter"
 msgstr "Fortschrittsanzeige anzeigen"
 
-#: builtin/pack-objects.c:2867
+#: builtin/pack-objects.c:2881
 msgid "show progress meter during object writing phase"
-msgstr ""
-"Forschrittsanzeige während der Phase des Schreibens der Objekte anzeigen"
+msgstr "Forschrittsanzeige während des Schreibens von Objekten anzeigen"
 
-#: builtin/pack-objects.c:2870
+#: builtin/pack-objects.c:2884
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird"
 
-#: builtin/pack-objects.c:2871
+#: builtin/pack-objects.c:2885
 msgid "version[,offset]"
 msgstr "version[,offset]"
 
-#: builtin/pack-objects.c:2872
+#: builtin/pack-objects.c:2886
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "die Index-Datei des Paketes in der angegebenen Indexformat-Version schreiben"
 
-#: builtin/pack-objects.c:2875
+#: builtin/pack-objects.c:2889
 msgid "maximum size of each output pack file"
 msgstr "maximale Größe für jede ausgegebene Paketdatei"
 
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2891
 msgid "ignore borrowed objects from alternate object store"
 msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren"
 
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2893
 msgid "ignore packed objects"
 msgstr "gepackte Objekte ignorieren"
 
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2895
 msgid "limit pack window by objects"
 msgstr "Paketfenster durch Objekte begrenzen"
 
-#: builtin/pack-objects.c:2883
+#: builtin/pack-objects.c:2897
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen"
 
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2899
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 "maximale Länge der erlaubten Differenzverkettung im resultierenden Paket"
 
-#: builtin/pack-objects.c:2887
+#: builtin/pack-objects.c:2901
 msgid "reuse existing deltas"
 msgstr "existierende Unterschiede wiederverwenden"
 
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2903
 msgid "reuse existing objects"
 msgstr "existierende Objekte wiederverwenden"
 
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2905
 msgid "use OFS_DELTA objects"
 msgstr "OFS_DELTA Objekte verwenden"
 
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2907
 msgid "use threads when searching for best delta matches"
 msgstr ""
 "Threads bei der Suche nach den besten Übereinstimmungen bei Unterschieden "
 "verwenden"
 
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2909
 msgid "do not create an empty pack output"
 msgstr "keine leeren Pakete erzeugen"
 
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2911
 msgid "read revision arguments from standard input"
 msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen"
 
-#: builtin/pack-objects.c:2899
+#: builtin/pack-objects.c:2913
 msgid "limit the objects to those that are not yet packed"
 msgstr "die Objekte zu solchen, die noch nicht gepackt wurden, begrenzen"
 
-#: builtin/pack-objects.c:2902
+#: builtin/pack-objects.c:2916
 msgid "include objects reachable from any reference"
 msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind"
 
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2919
 msgid "include objects referred by reflog entries"
 msgstr ""
 "Objekte einschließen, die von Einträgen des Reflogs referenziert werden"
 
-#: builtin/pack-objects.c:2908
+#: builtin/pack-objects.c:2922
 msgid "include objects referred to by the index"
 msgstr "Objekte einschließen, die vom Index referenziert werden"
 
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2925
 msgid "output pack to stdout"
 msgstr "Paket in die Standard-Ausgabe schreiben"
 
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2927
 msgid "include tag objects that refer to objects to be packed"
 msgstr "Tag-Objekte einschließen, die auf gepackte Objekte referenzieren"
 
-#: builtin/pack-objects.c:2915
+#: builtin/pack-objects.c:2929
 msgid "keep unreachable objects"
 msgstr "nicht erreichbare Objekte behalten"
 
-#: builtin/pack-objects.c:2917
+#: builtin/pack-objects.c:2931
 msgid "pack loose unreachable objects"
 msgstr "nicht erreichbare lose Objekte packen"
 
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2933
 msgid "unpack unreachable objects newer than <time>"
 msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind"
 
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:2936
 msgid "create thin packs"
 msgstr "dünnere Pakete erzeugen"
 
-#: builtin/pack-objects.c:2924
+#: builtin/pack-objects.c:2938
 msgid "create packs suitable for shallow fetches"
 msgstr ""
 "Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen"
 
-#: builtin/pack-objects.c:2926
+#: builtin/pack-objects.c:2940
 msgid "ignore packs that have companion .keep file"
 msgstr "Pakete ignorieren, die .keep Dateien haben"
 
-#: builtin/pack-objects.c:2928
+#: builtin/pack-objects.c:2942
 msgid "pack compression level"
 msgstr "Komprimierungsgrad für Paketierung"
 
-#: builtin/pack-objects.c:2930
+#: builtin/pack-objects.c:2944
 msgid "do not hide commits by grafts"
 msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen"
 
-#: builtin/pack-objects.c:2932
+#: builtin/pack-objects.c:2946
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "Bitmap-Index (falls verfügbar) zur Optimierung der Objektzählung benutzen"
 
-#: builtin/pack-objects.c:2934
+#: builtin/pack-objects.c:2948
 msgid "write a bitmap index together with the pack index"
 msgstr "Bitmap-Index zusammen mit Pack-Index schreiben"
 
-#: builtin/pack-objects.c:3061
+#: builtin/pack-objects.c:3075
 msgid "Counting objects"
 msgstr "Zähle Objekte"
 
@@ -11319,45 +11430,49 @@ msgstr "Objekte älter als <Zeit> verfallen lassen"
 msgid "cannot prune in a precious-objects repo"
 msgstr "kann \"prune\" in precious-objects Repository nicht ausführen"
 
-#: builtin/pull.c:51 builtin/pull.c:53
+#: builtin/pull.c:54 builtin/pull.c:56
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "Ungültiger Wert für %s: %s"
 
-#: builtin/pull.c:73
+#: builtin/pull.c:76
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<Optionen>] [<Repository> [<Refspec>...]]"
 
-#: builtin/pull.c:121
+#: builtin/pull.c:124
+msgid "control for recursive fetching of submodules"
+msgstr "rekursive Anforderungen von Submodulen kontrollieren"
+
+#: builtin/pull.c:128
 msgid "Options related to merging"
 msgstr "Optionen bezogen auf Merge"
 
-#: builtin/pull.c:124
+#: builtin/pull.c:131
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "Integration von Änderungen durch Rebase statt Merge"
 
-#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120
+#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
 msgid "allow fast-forward"
 msgstr "Vorspulen erlauben"
 
-#: builtin/pull.c:157
+#: builtin/pull.c:164
 msgid "automatically stash/stash pop before and after rebase"
 msgstr "automatischer Stash/Stash-Pop vor und nach eines Rebase"
 
-#: builtin/pull.c:173
+#: builtin/pull.c:180
 msgid "Options related to fetching"
 msgstr "Optionen bezogen auf Fetch"
 
-#: builtin/pull.c:195
+#: builtin/pull.c:198
 msgid "number of submodules pulled in parallel"
 msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule"
 
-#: builtin/pull.c:284
+#: builtin/pull.c:287
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Ungültiger Wert für pull.ff: %s"
 
-#: builtin/pull.c:397
+#: builtin/pull.c:399
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -11365,14 +11480,14 @@ msgstr ""
 "Es gibt keinen Kandidaten für Rebase innerhalb der Referenzen, die eben "
 "angefordert wurden."
 
-#: builtin/pull.c:399
+#: builtin/pull.c:401
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "Es gibt keine Kandidaten für Merge innerhalb der Referenzen, die eben "
 "angefordert wurden."
 
-#: builtin/pull.c:400
+#: builtin/pull.c:402
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -11380,7 +11495,7 @@ msgstr ""
 "Im Allgemeinen bedeutet das, dass Sie einen Refspec mit Wildcards angegeben\n"
 "haben, der auf der Gegenseite mit keinen Referenzen übereinstimmt."
 
-#: builtin/pull.c:403
+#: builtin/pull.c:405
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -11392,39 +11507,39 @@ msgstr ""
 "Repository für den aktuellen Branch ist, müssen Sie einen Branch auf\n"
 "der Befehlszeile angeben."
 
-#: builtin/pull.c:408 git-parse-remote.sh:73
+#: builtin/pull.c:410 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Im Moment auf keinem Branch."
 
-#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
+#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr ""
 "Bitte geben Sie den Branch an, gegen welchen Sie \"rebase\" ausführen "
 "möchten."
 
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
+#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "Bitte geben Sie den Branch an, welchen Sie zusammenführen möchten."
 
-#: builtin/pull.c:413 builtin/pull.c:428
+#: builtin/pull.c:415 builtin/pull.c:430
 msgid "See git-pull(1) for details."
 msgstr "Siehe git-pull(1) für weitere Details."
 
-#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
+#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
 #: git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<Remote-Repository>"
 
-#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456
+#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<Branch>"
 
-#: builtin/pull.c:423 git-parse-remote.sh:75
+#: builtin/pull.c:425 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "Es gibt keine Tracking-Informationen für den aktuellen Branch."
 
-#: builtin/pull.c:432 git-parse-remote.sh:95
+#: builtin/pull.c:434 git-parse-remote.sh:95
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
@@ -11432,7 +11547,7 @@ msgstr ""
 "Sie\n"
 "dies tun mit:"
 
-#: builtin/pull.c:437
+#: builtin/pull.c:439
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -11442,29 +11557,29 @@ msgstr ""
 "des Remote-Repositories durchzuführen, aber diese Referenz\n"
 "wurde nicht angefordert."
 
-#: builtin/pull.c:754
+#: builtin/pull.c:792
 msgid "ignoring --verify-signatures for rebase"
 msgstr "Ignoriere --verify-signatures für Rebase"
 
-#: builtin/pull.c:801
+#: builtin/pull.c:840
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "--[no-]autostash ist nur mit --rebase zulässig."
 
-#: builtin/pull.c:809
+#: builtin/pull.c:848
 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 "Aktualisiere einen ungeborenen Branch mit Änderungen, die zum Commit "
 "vorgemerkt sind."
 
-#: builtin/pull.c:812
+#: builtin/pull.c:851
 msgid "pull with rebase"
 msgstr "Pull mit Rebase"
 
-#: builtin/pull.c:813
+#: builtin/pull.c:852
 msgid "please commit or stash them."
 msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
 
-#: builtin/pull.c:838
+#: builtin/pull.c:877
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -11474,7 +11589,7 @@ msgstr ""
 "\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n"
 "Spule Ihr Arbeitsverzeichnis von Commit %s vor."
 
-#: builtin/pull.c:843
+#: builtin/pull.c:882
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -11491,27 +11606,31 @@ msgstr ""
 "$ git reset --hard\n"
 "zur Wiederherstellung aus."
 
-#: builtin/pull.c:858
+#: builtin/pull.c:897
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenführen."
 
-#: builtin/pull.c:862
+#: builtin/pull.c:901
 msgid "Cannot rebase onto multiple branches."
 msgstr "Kann Rebase nicht auf mehrere Branches ausführen."
 
-#: builtin/push.c:16
+#: builtin/pull.c:908
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr "Kann Rebase nicht mit lokal aufgezeichneten Änderungen in Submodulen ausführen."
+
+#: builtin/push.c:17
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [<Optionen>] [<Repository> [<Refspec>...]]"
 
-#: builtin/push.c:89
+#: builtin/push.c:90
 msgid "tag shorthand without <tag>"
 msgstr "Kurzschrift für Tag ohne <Tag>"
 
-#: builtin/push.c:99
+#: builtin/push.c:100
 msgid "--delete only accepts plain target ref names"
 msgstr "Die Option --delete akzeptiert nur reine Referenznamen als Ziel."
 
-#: builtin/push.c:143
+#: builtin/push.c:144
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
@@ -11520,7 +11639,7 @@ msgstr ""
 "Um eine Variante permanent zu verwenden, siehe push.default in 'git help "
 "config'."
 
-#: builtin/push.c:146
+#: builtin/push.c:147
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -11546,7 +11665,7 @@ msgstr ""
 "    git push %s %s\n"
 "%s"
 
-#: builtin/push.c:161
+#: builtin/push.c:162
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -11561,7 +11680,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<Name-des-Remote-Branches>\n"
 
-#: builtin/push.c:175
+#: builtin/push.c:176
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -11575,13 +11694,13 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:183
+#: builtin/push.c:184
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr ""
 "Der aktuelle Branch %s hat mehrere Upstream-Branches, \"push\" verweigert."
 
-#: builtin/push.c:186
+#: builtin/push.c:187
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -11592,14 +11711,14 @@ msgstr ""
 "Branches '%s' ist, ohne anzugeben, was versendet werden soll, um welchen\n"
 "Remote-Branch zu aktualisieren."
 
-#: builtin/push.c:245
+#: builtin/push.c:246
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 "Sie haben keine Refspec für \"push\" angegeben, und push.default ist "
 "\"nothing\"."
 
-#: builtin/push.c:252
+#: builtin/push.c:253
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -11613,7 +11732,7 @@ msgstr ""
 "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
 "für weitere Details."
 
-#: builtin/push.c:258
+#: builtin/push.c:259
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -11627,7 +11746,7 @@ msgstr ""
 "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
 "für weitere Details."
 
-#: builtin/push.c:264
+#: builtin/push.c:265
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -11646,13 +11765,13 @@ msgstr ""
 "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
 "für weitere Details."
 
-#: builtin/push.c:271
+#: builtin/push.c:272
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 "Aktualisierungen wurden zurückgewiesen, weil das Tag bereits\n"
 "im Remote-Repository existiert."
 
-#: builtin/push.c:274
+#: builtin/push.c:275
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -11662,22 +11781,22 @@ msgstr ""
 "das kein Commit ist, oder es auf ein solches Objekt zeigen lassen, ohne\n"
 "die Option '--force' zu verwenden.\n"
 
-#: builtin/push.c:334
+#: builtin/push.c:335
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Versende nach %s\n"
 
-#: builtin/push.c:338
+#: builtin/push.c:339
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "Fehler beim Versenden einiger Referenzen nach '%s'"
 
-#: builtin/push.c:369
+#: builtin/push.c:370
 #, c-format
 msgid "bad repository '%s'"
 msgstr "ungültiges Repository '%s'"
 
-#: builtin/push.c:370
+#: builtin/push.c:371
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -11699,112 +11818,112 @@ msgstr ""
 "\n"
 "    git push <Name>\n"
 
-#: builtin/push.c:388
+#: builtin/push.c:389
 msgid "--all and --tags are incompatible"
 msgstr "Die Optionen --all und --tags sind inkompatibel."
 
-#: builtin/push.c:389
+#: builtin/push.c:390
 msgid "--all can't be combined with refspecs"
 msgstr "Die Option --all kann nicht mit Refspecs kombiniert werden."
 
-#: builtin/push.c:394
+#: builtin/push.c:395
 msgid "--mirror and --tags are incompatible"
 msgstr "Die Optionen --mirror und --tags sind inkompatibel."
 
-#: builtin/push.c:395
+#: builtin/push.c:396
 msgid "--mirror can't be combined with refspecs"
 msgstr "Die Option --mirror kann nicht mit Refspecs kombiniert werden."
 
-#: builtin/push.c:400
+#: builtin/push.c:401
 msgid "--all and --mirror are incompatible"
 msgstr "Die Optionen --all und --mirror sind inkompatibel."
 
-#: builtin/push.c:518
+#: builtin/push.c:523
 msgid "repository"
 msgstr "Repository"
 
-#: builtin/push.c:519 builtin/send-pack.c:162
+#: builtin/push.c:524 builtin/send-pack.c:163
 msgid "push all refs"
 msgstr "alle Referenzen versenden"
 
-#: builtin/push.c:520 builtin/send-pack.c:164
+#: builtin/push.c:525 builtin/send-pack.c:165
 msgid "mirror all refs"
 msgstr "alle Referenzen spiegeln"
 
-#: builtin/push.c:522
+#: builtin/push.c:527
 msgid "delete refs"
 msgstr "Referenzen löschen"
 
-#: builtin/push.c:523
+#: builtin/push.c:528
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "Tags versenden (kann nicht mit --all oder --mirror verwendet werden)"
 
-#: builtin/push.c:526 builtin/send-pack.c:165
+#: builtin/push.c:531 builtin/send-pack.c:166
 msgid "force updates"
 msgstr "Aktualisierung erzwingen"
 
-#: builtin/push.c:528 builtin/send-pack.c:179
+#: builtin/push.c:533 builtin/send-pack.c:180
 msgid "refname>:<expect"
 msgstr "Referenzname>:<Erwartungswert"
 
-#: builtin/push.c:529 builtin/send-pack.c:180
+#: builtin/push.c:534 builtin/send-pack.c:181
 msgid "require old value of ref to be at this value"
 msgstr "Referenz muss sich auf dem angegebenen Wert befinden"
 
-#: builtin/push.c:532
+#: builtin/push.c:537
 msgid "control recursive pushing of submodules"
 msgstr "rekursiven \"push\" von Submodulen steuern"
 
-#: builtin/push.c:534 builtin/send-pack.c:173
+#: builtin/push.c:539 builtin/send-pack.c:174
 msgid "use thin pack"
 msgstr "kleinere Pakete verwenden"
 
-#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159
-#: builtin/send-pack.c:160
+#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
+#: builtin/send-pack.c:161
 msgid "receive pack program"
 msgstr "'receive pack' Programm"
 
-#: builtin/push.c:537
+#: builtin/push.c:542
 msgid "set upstream for git pull/status"
 msgstr "Upstream für \"git pull/status\" setzen"
 
-#: builtin/push.c:540
+#: builtin/push.c:545
 msgid "prune locally removed refs"
 msgstr "lokal gelöschte Referenzen entfernen"
 
-#: builtin/push.c:542
+#: builtin/push.c:547
 msgid "bypass pre-push hook"
 msgstr "\"pre-push hook\" umgehen"
 
-#: builtin/push.c:543
+#: builtin/push.c:548
 msgid "push missing but relevant tags"
 msgstr "fehlende, aber relevante Tags versenden"
 
-#: builtin/push.c:546 builtin/send-pack.c:167
+#: builtin/push.c:551 builtin/send-pack.c:168
 msgid "GPG sign the push"
 msgstr "signiert \"push\" mit GPG"
 
-#: builtin/push.c:548 builtin/send-pack.c:174
+#: builtin/push.c:553 builtin/send-pack.c:175
 msgid "request atomic transaction on remote side"
 msgstr "Referenzen atomar versenden"
 
-#: builtin/push.c:549 builtin/send-pack.c:170
+#: builtin/push.c:554 builtin/send-pack.c:171
 msgid "server-specific"
 msgstr "serverspezifisch"
 
-#: builtin/push.c:549 builtin/send-pack.c:171
+#: builtin/push.c:554 builtin/send-pack.c:172
 msgid "option to transmit"
 msgstr "Option übertragen"
 
-#: builtin/push.c:563
+#: builtin/push.c:568
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "Die Option --delete ist inkompatibel mit --all, --mirror und --tags."
 
-#: builtin/push.c:565
+#: builtin/push.c:570
 msgid "--delete doesn't make sense without any refs"
 msgstr "Die Option --delete kann nur mit Referenzen verwendet werden."
 
-#: builtin/push.c:584
+#: builtin/push.c:589
 msgid "push options must not have new line characters"
 msgstr "Push-Optionen dürfen keine Zeilenvorschubzeichen haben"
 
@@ -11819,87 +11938,87 @@ msgstr ""
 "index-output=<Datei>] (--empty | <Commit-Referenz1> [<Commit-Referenz2> "
 "[<Commit-Referenz3>]])"
 
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:121
 msgid "write resulting index to <file>"
 msgstr "resultierenden Index nach <Datei> schreiben"
 
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:124
 msgid "only empty the index"
 msgstr "nur den Index leeren"
 
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:126
 msgid "Merging"
 msgstr "Merge"
 
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:128
 msgid "perform a merge in addition to a read"
 msgstr "einen Merge, zusätzlich zum Lesen, ausführen"
 
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:130
 msgid "3-way merge if no file level merging required"
 msgstr "3-Wege-Merge, wenn kein Merge auf Dateiebene erforderlich ist"
 
-#: builtin/read-tree.c:141
+#: builtin/read-tree.c:132
 msgid "3-way merge in presence of adds and removes"
 msgstr "3-Wege-Merge bei Vorhandensein von hinzugefügten/entfernten Zeilen"
 
-#: builtin/read-tree.c:143
+#: builtin/read-tree.c:134
 msgid "same as -m, but discard unmerged entries"
 msgstr "genau wie -m, aber nicht zusammengeführte Einträge verwerfen"
 
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:135
 msgid "<subdirectory>/"
 msgstr "<Unterverzeichnis>/"
 
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:136
 msgid "read the tree into the index under <subdirectory>/"
 msgstr "das Verzeichnis in den Index unter <Unterverzeichnis>/ lesen"
 
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:139
 msgid "update working tree with merge result"
 msgstr "Arbeitsverzeichnis mit dem Ergebnis des Merges aktualisieren"
 
-#: builtin/read-tree.c:150
+#: builtin/read-tree.c:141
 msgid "gitignore"
 msgstr "gitignore"
 
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:142
 msgid "allow explicitly ignored files to be overwritten"
 msgstr "explizit ignorierte Dateien zu überschreiben erlauben"
 
-#: builtin/read-tree.c:154
+#: builtin/read-tree.c:145
 msgid "don't check the working tree after merging"
 msgstr "das Arbeitsverzeichnis nach dem Merge nicht prüfen"
 
-#: builtin/read-tree.c:155
+#: builtin/read-tree.c:146
 msgid "don't update the index or the work tree"
 msgstr "weder den Index, noch das Arbeitsverzeichnis aktualisieren"
 
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:148
 msgid "skip applying sparse checkout filter"
 msgstr "Anwendung des Filters für partielles Auschecken überspringen"
 
-#: builtin/read-tree.c:159
+#: builtin/read-tree.c:150
 msgid "debug unpack-trees"
 msgstr "unpack-trees protokollieren"
 
-#: builtin/rebase--helper.c:7
+#: builtin/rebase--helper.c:8
 msgid "git rebase--helper [<options>]"
 msgstr "git rebase--helper [<Optionen>]"
 
-#: builtin/rebase--helper.c:19
+#: builtin/rebase--helper.c:20
 msgid "continue rebase"
 msgstr "Rebase fortsetzen"
 
-#: builtin/rebase--helper.c:21
+#: builtin/rebase--helper.c:22
 msgid "abort rebase"
 msgstr "Rebase abbrechen"
 
-#: builtin/receive-pack.c:27
+#: builtin/receive-pack.c:28
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <Git-Verzeichnis>"
 
-#: builtin/receive-pack.c:795
+#: builtin/receive-pack.c:838
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -11916,7 +12035,7 @@ msgid ""
 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
 msgstr ""
 "Standardmäßig wird die Aktualisierung des aktuellen Branches in einem\n"
-"nicht-Bare-Repository zurückgewiesen, da dies den Index und das Arbeits-\n"
+"Nicht-Bare-Repository zurückgewiesen, da dies den Index und das Arbeits-\n"
 "verzeichnis inkonsistent zu dem machen würde, was Sie gepushed haben, und\n"
 "'git reset --hard' erforderlich wäre, damit das Arbeitsverzeichnis HEAD\n"
 "entspricht.\n"
@@ -11931,7 +12050,7 @@ msgstr ""
 "setzen Sie die Konfigurationsvariable 'receive.denyCurrentBranch' auf\n"
 "'refuse'."
 
-#: builtin/receive-pack.c:815
+#: builtin/receive-pack.c:858
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -11952,29 +12071,29 @@ msgstr ""
 "\n"
 "Um diese Meldung zu unterdrücken, setzen Sie die Variable auf 'refuse'."
 
-#: builtin/receive-pack.c:1888
+#: builtin/receive-pack.c:1933
 msgid "quiet"
 msgstr "weniger Ausgaben"
 
-#: builtin/receive-pack.c:1902
+#: builtin/receive-pack.c:1947
 msgid "You must specify a directory."
 msgstr "Sie müssen ein Repository angeben."
 
-#: builtin/reflog.c:423
+#: builtin/reflog.c:424
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "'%s' ist kein gültiger Zeitstempel für '%s'"
 
-#: builtin/reflog.c:540 builtin/reflog.c:545
+#: builtin/reflog.c:541 builtin/reflog.c:546
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' ist kein gültiger Zeitstempel"
 
-#: builtin/remote.c:12
+#: builtin/remote.c:13
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
-#: builtin/remote.c:13
+#: builtin/remote.c:14
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -11982,82 +12101,82 @@ msgstr ""
 "git remote add [-t <Branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <Name> <URL>"
 
-#: builtin/remote.c:14 builtin/remote.c:34
+#: builtin/remote.c:15 builtin/remote.c:35
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename <alt> <neu>"
 
-#: builtin/remote.c:15 builtin/remote.c:39
+#: builtin/remote.c:16 builtin/remote.c:40
 msgid "git remote remove <name>"
 msgstr "git remote remove <Name>"
 
-#: builtin/remote.c:16 builtin/remote.c:44
+#: builtin/remote.c:17 builtin/remote.c:45
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <Name> (-a | --auto | -d | --delete | <Branch>)"
 
-#: builtin/remote.c:17
+#: builtin/remote.c:18
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <Name>"
 
-#: builtin/remote.c:18
+#: builtin/remote.c:19
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <Name>"
 
-#: builtin/remote.c:19
+#: builtin/remote.c:20
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<Gruppe> | <Remote>)...]"
 
-#: builtin/remote.c:20
+#: builtin/remote.c:21
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <Name> <Branch>..."
 
-#: builtin/remote.c:21 builtin/remote.c:70
+#: builtin/remote.c:22 builtin/remote.c:71
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <Name>"
 
-#: builtin/remote.c:22 builtin/remote.c:75
+#: builtin/remote.c:23 builtin/remote.c:76
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <Name> <neueURL> [<alteURL>]"
 
-#: builtin/remote.c:23 builtin/remote.c:76
+#: builtin/remote.c:24 builtin/remote.c:77
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <Name> <neueURL>"
 
-#: builtin/remote.c:24 builtin/remote.c:77
+#: builtin/remote.c:25 builtin/remote.c:78
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <Name> <URL>"
 
-#: builtin/remote.c:29
+#: builtin/remote.c:30
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<Optionen>] <Name> <URL>"
 
-#: builtin/remote.c:49
+#: builtin/remote.c:50
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <Name> <Branch>..."
 
-#: builtin/remote.c:50
+#: builtin/remote.c:51
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <Name> <Branch>..."
 
-#: builtin/remote.c:55
+#: builtin/remote.c:56
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<Optionen>] <Name>"
 
-#: builtin/remote.c:60
+#: builtin/remote.c:61
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<Optionen>] <Name>"
 
-#: builtin/remote.c:65
+#: builtin/remote.c:66
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<Optionen>] [<Gruppe> | <externesRepository>]..."
 
-#: builtin/remote.c:94
+#: builtin/remote.c:95
 #, c-format
 msgid "Updating %s"
 msgstr "Aktualisiere %s"
 
-#: builtin/remote.c:126
+#: builtin/remote.c:127
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -12065,92 +12184,92 @@ msgstr ""
 "--mirror ist gefährlich und veraltet; bitte\n"
 "\t benutzen Sie stattdessen --mirror=fetch oder --mirror=push"
 
-#: builtin/remote.c:143
+#: builtin/remote.c:144
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "unbekanntes Argument für Option --mirror: %s"
 
-#: builtin/remote.c:159
+#: builtin/remote.c:160
 msgid "fetch the remote branches"
 msgstr "die Remote-Branches anfordern"
 
-#: builtin/remote.c:161
+#: builtin/remote.c:162
 msgid "import all tags and associated objects when fetching"
 msgstr "alle Tags und verbundene Objekte beim Anfordern importieren"
 
-#: builtin/remote.c:164
+#: builtin/remote.c:165
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "oder fordere gar keine Zweige an (--no-tags)"
 
-#: builtin/remote.c:166
+#: builtin/remote.c:167
 msgid "branch(es) to track"
 msgstr "Branch(es) zur Übernahme"
 
-#: builtin/remote.c:167
+#: builtin/remote.c:168
 msgid "master branch"
 msgstr "Hauptbranch"
 
-#: builtin/remote.c:168
+#: builtin/remote.c:169
 msgid "push|fetch"
 msgstr "push|fetch"
 
-#: builtin/remote.c:169
+#: builtin/remote.c:170
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr ""
 "Aufsetzen des Remote-Repositories als Spiegel-Repository für \"push\" und "
 "\"fetch\""
 
-#: builtin/remote.c:181
+#: builtin/remote.c:182
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr ""
 "Die Option --mirror kann nicht mit der Angabe eines Hauptbranches verwendet "
 "werden."
 
-#: builtin/remote.c:183
+#: builtin/remote.c:184
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr ""
 "Die Angabe von zu folgenden Branches kann nur mit dem Anfordern von "
 "Spiegelarchiven verwendet werden."
 
-#: builtin/remote.c:190 builtin/remote.c:629
+#: builtin/remote.c:191 builtin/remote.c:630
 #, c-format
 msgid "remote %s already exists."
 msgstr "externes Repository %s existiert bereits"
 
-#: builtin/remote.c:194 builtin/remote.c:633
+#: builtin/remote.c:195 builtin/remote.c:634
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' ist kein gültiger Name für ein Remote-Repository"
 
-#: builtin/remote.c:234
+#: builtin/remote.c:235
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "Konnte symbolische Referenz für Hauptbranch von '%s' nicht einrichten"
 
-#: builtin/remote.c:336
+#: builtin/remote.c:337
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "Konnte Fetch-Map für Refspec %s nicht bekommen"
 
-#: builtin/remote.c:437 builtin/remote.c:445
+#: builtin/remote.c:438 builtin/remote.c:446
 msgid "(matching)"
 msgstr "(übereinstimmend)"
 
-#: builtin/remote.c:449
+#: builtin/remote.c:450
 msgid "(delete)"
 msgstr "(lösche)"
 
-#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856
+#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
 #, c-format
 msgid "No such remote: %s"
 msgstr "Kein solches Remote-Repository: %s"
 
-#: builtin/remote.c:639
+#: builtin/remote.c:640
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Konnte Sektion '%s' in Konfiguration nicht nach '%s' umbenennen"
 
-#: builtin/remote.c:659
+#: builtin/remote.c:660
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -12161,17 +12280,17 @@ msgstr ""
 "\t%s\n"
 "\tBitte aktualisieren Sie, falls notwendig, die Konfiguration manuell."
 
-#: builtin/remote.c:695
+#: builtin/remote.c:696
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "Konnte '%s' nicht löschen"
 
-#: builtin/remote.c:729
+#: builtin/remote.c:730
 #, c-format
 msgid "creating '%s' failed"
 msgstr "Konnte '%s' nicht erstellen"
 
-#: builtin/remote.c:794
+#: builtin/remote.c:795
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -12187,137 +12306,139 @@ msgstr[1] ""
 "entfernt;\n"
 "um diese zu entfernen, benutzen Sie:"
 
-#: builtin/remote.c:808
+#: builtin/remote.c:809
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Konnte Sektion '%s' nicht aus Konfiguration entfernen"
 
-#: builtin/remote.c:909
+#: builtin/remote.c:910
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " neu (wird bei nächstem \"fetch\" in remotes/%s gespeichert)"
 
-#: builtin/remote.c:912
+#: builtin/remote.c:913
 msgid " tracked"
 msgstr " gefolgt"
 
-#: builtin/remote.c:914
+#: builtin/remote.c:915
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " veraltet (benutzen Sie 'git remote prune' zum Löschen)"
 
-#: builtin/remote.c:916
+#: builtin/remote.c:917
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:957
+#: builtin/remote.c:958
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "ungültiges branch.%s.merge; kann Rebase nicht auf > 1 Branch ausführen"
 
-#: builtin/remote.c:965
+#: builtin/remote.c:966
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "interaktiver Rebase auf Remote-Branch %s"
 
-#: builtin/remote.c:966
+#: builtin/remote.c:967
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "Rebase auf Remote-Branch %s"
 
-#: builtin/remote.c:969
+#: builtin/remote.c:970
 #, c-format
 msgid " merges with remote %s"
 msgstr " führt mit Remote-Branch %s zusammen"
 
-#: builtin/remote.c:972
+#: builtin/remote.c:973
 #, c-format
 msgid "merges with remote %s"
 msgstr "führt mit Remote-Branch %s zusammen"
 
-#: builtin/remote.c:975
+#: builtin/remote.c:976
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    und mit Remote-Branch %s\n"
 
-#: builtin/remote.c:1018
+#: builtin/remote.c:1019
 msgid "create"
 msgstr "erstellt"
 
-#: builtin/remote.c:1021
+#: builtin/remote.c:1022
 msgid "delete"
 msgstr "gelöscht"
 
-#: builtin/remote.c:1025
+#: builtin/remote.c:1026
 msgid "up to date"
 msgstr "aktuell"
 
-#: builtin/remote.c:1028
+#: builtin/remote.c:1029
 msgid "fast-forwardable"
 msgstr "vorspulbar"
 
-#: builtin/remote.c:1031
+#: builtin/remote.c:1032
 msgid "local out of date"
 msgstr "lokal nicht aktuell"
 
-#: builtin/remote.c:1038
+#: builtin/remote.c:1039
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s erzwingt Versandt nach %-*s (%s)"
 
-#: builtin/remote.c:1041
+#: builtin/remote.c:1042
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s versendet nach %-*s (%s)"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1046
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s erzwingt Versand nach %s"
 
-#: builtin/remote.c:1048
+#: builtin/remote.c:1049
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s versendet nach %s"
 
-#: builtin/remote.c:1116
+#: builtin/remote.c:1117
 msgid "do not query remotes"
 msgstr "keine Abfrage von Remote-Repositories"
 
-#: builtin/remote.c:1143
+#: builtin/remote.c:1144
 #, c-format
 msgid "* remote %s"
 msgstr "* Remote-Repository %s"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL zum Abholen: %s"
 
-#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297
+#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
 msgid "(no URL)"
 msgstr "(keine URL)"
 
-#. TRANSLATORS: the colon ':' should align with
-#. the one in "  Fetch URL: %s" translation
-#: builtin/remote.c:1156 builtin/remote.c:1158
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#: builtin/remote.c:1160 builtin/remote.c:1162
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL zum Versenden: %s"
 
-#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164
+#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Hauptbranch: %s"
 
-#: builtin/remote.c:1160
+#: builtin/remote.c:1164
 msgid "(not queried)"
 msgstr "(nicht abgefragt)"
 
-#: builtin/remote.c:1162
+#: builtin/remote.c:1166
 msgid "(unknown)"
 msgstr "(unbekannt)"
 
-#: builtin/remote.c:1166
+#: builtin/remote.c:1170
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -12325,172 +12446,172 @@ msgstr ""
 "  Hauptbranch (externer HEAD ist mehrdeutig, könnte einer der folgenden "
 "sein):\n"
 
-#: builtin/remote.c:1178
+#: builtin/remote.c:1182
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Remote-Branch:%s"
 msgstr[1] "  Remote-Branches:%s"
 
-#: builtin/remote.c:1181 builtin/remote.c:1207
+#: builtin/remote.c:1185 builtin/remote.c:1211
 msgid " (status not queried)"
 msgstr " (Zustand nicht abgefragt)"
 
-#: builtin/remote.c:1190
+#: builtin/remote.c:1194
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Lokaler Branch konfiguriert für 'git pull':"
 msgstr[1] "  Lokale Branches konfiguriert für 'git pull':"
 
-#: builtin/remote.c:1198
+#: builtin/remote.c:1202
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Lokale Referenzen werden von 'git push' gespiegelt"
 
-#: builtin/remote.c:1204
+#: builtin/remote.c:1208
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Lokale Referenz konfiguriert für 'git push'%s:"
 msgstr[1] "  Lokale Referenzen konfiguriert für 'git push'%s:"
 
-#: builtin/remote.c:1225
+#: builtin/remote.c:1229
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Remote-Repository"
 
-#: builtin/remote.c:1227
+#: builtin/remote.c:1231
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "entfernt refs/remotes/<Name>/HEAD"
 
-#: builtin/remote.c:1242
+#: builtin/remote.c:1246
 msgid "Cannot determine remote HEAD"
 msgstr "Kann HEAD des Remote-Repositories nicht bestimmen"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1248
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 "Mehrere Hauptbranches im Remote-Repository. Bitte wählen Sie explizit einen "
 "aus mit:"
 
-#: builtin/remote.c:1254
+#: builtin/remote.c:1258
 #, c-format
 msgid "Could not delete %s"
 msgstr "Konnte %s nicht entfernen"
 
-#: builtin/remote.c:1262
+#: builtin/remote.c:1266
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "keine gültige Referenz: %s"
 
-#: builtin/remote.c:1264
+#: builtin/remote.c:1268
 #, c-format
 msgid "Could not setup %s"
 msgstr "Konnte %s nicht einrichten"
 
-#: builtin/remote.c:1282
+#: builtin/remote.c:1286
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s wird unreferenziert!"
 
-#: builtin/remote.c:1283
+#: builtin/remote.c:1287
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s wurde unreferenziert!"
 
-#: builtin/remote.c:1293
+#: builtin/remote.c:1297
 #, c-format
 msgid "Pruning %s"
 msgstr "entferne veraltete Branches von %s"
 
-#: builtin/remote.c:1294
+#: builtin/remote.c:1298
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1314
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [würde veralteten Branch entfernen] %s"
 
-#: builtin/remote.c:1313
+#: builtin/remote.c:1317
 #, c-format
 msgid " * [pruned] %s"
 msgstr "* [veralteten Branch entfernt] %s"
 
-#: builtin/remote.c:1358
+#: builtin/remote.c:1362
 msgid "prune remotes after fetching"
 msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\""
 
-#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Kein solches Remote-Repository '%s'"
 
-#: builtin/remote.c:1437
+#: builtin/remote.c:1441
 msgid "add branch"
 msgstr "Branch hinzufügen"
 
-#: builtin/remote.c:1444
+#: builtin/remote.c:1448
 msgid "no remote specified"
 msgstr "kein Remote-Repository angegeben"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1465
 msgid "query push URLs rather than fetch URLs"
 msgstr "nur URLs für Push ausgeben"
 
-#: builtin/remote.c:1463
+#: builtin/remote.c:1467
 msgid "return all URLs"
 msgstr "alle URLs ausgeben"
 
-#: builtin/remote.c:1491
+#: builtin/remote.c:1495
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "Keine URLs für Remote-Repository '%s' konfiguriert."
 
-#: builtin/remote.c:1517
+#: builtin/remote.c:1521
 msgid "manipulate push URLs"
 msgstr "URLs für \"push\" manipulieren"
 
-#: builtin/remote.c:1519
+#: builtin/remote.c:1523
 msgid "add URL"
 msgstr "URL hinzufügen"
 
-#: builtin/remote.c:1521
+#: builtin/remote.c:1525
 msgid "delete URLs"
 msgstr "URLs löschen"
 
-#: builtin/remote.c:1528
+#: builtin/remote.c:1532
 msgid "--add --delete doesn't make sense"
 msgstr ""
 "Die Optionen --add und --delete können nicht gemeinsam verwendet werden."
 
-#: builtin/remote.c:1569
+#: builtin/remote.c:1573
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "ungültiges altes URL Format: %s"
 
-#: builtin/remote.c:1577
+#: builtin/remote.c:1581
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Keine solche URL gefunden: %s"
 
-#: builtin/remote.c:1579
+#: builtin/remote.c:1583
 msgid "Will not delete all non-push URLs"
 msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind"
 
-#: builtin/remote.c:1593
+#: builtin/remote.c:1597
 msgid "be verbose; must be placed before a subcommand"
 msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden"
 
-#: builtin/remote.c:1624
+#: builtin/remote.c:1628
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Unbekannter Unterbefehl: %s"
 
-#: builtin/repack.c:17
+#: builtin/repack.c:18
 msgid "git repack [<options>]"
 msgstr "git repack [<Optionen>]"
 
-#: builtin/repack.c:22
+#: builtin/repack.c:23
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -12499,126 +12620,130 @@ msgstr ""
 "--no-write-bitmap-index oder deaktivieren Sie die pack.writebitmaps\n"
 "Konfiguration."
 
-#: builtin/repack.c:166
+#: builtin/repack.c:168
 msgid "pack everything in a single pack"
 msgstr "alles in eine einzige Pack-Datei packen"
 
-#: builtin/repack.c:168
+#: builtin/repack.c:170
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "genau wie -a, unerreichbare Objekte werden aber nicht gelöscht"
 
-#: builtin/repack.c:171
+#: builtin/repack.c:173
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "redundante Pakete entfernen und \"git-prune-packed\" ausführen"
 
-#: builtin/repack.c:173
+#: builtin/repack.c:175
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "--no-reuse-delta an git-pack-objects übergeben"
 
-#: builtin/repack.c:175
+#: builtin/repack.c:177
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "--no-reuse-object an git-pack-objects übergeben"
 
-#: builtin/repack.c:177
+#: builtin/repack.c:179
 msgid "do not run git-update-server-info"
 msgstr "git-update-server-info nicht ausführen"
 
-#: builtin/repack.c:180
+#: builtin/repack.c:182
 msgid "pass --local to git-pack-objects"
 msgstr "--local an git-pack-objects übergeben"
 
-#: builtin/repack.c:182
+#: builtin/repack.c:184
 msgid "write bitmap index"
 msgstr "Bitmap-Index schreiben"
 
-#: builtin/repack.c:183
+#: builtin/repack.c:185
 msgid "approxidate"
 msgstr "Datumsangabe"
 
-#: builtin/repack.c:184
+#: builtin/repack.c:186
 msgid "with -A, do not loosen objects older than this"
 msgstr "mit -A, keine Objekte älter als dieses Datum löschen"
 
-#: builtin/repack.c:186
+#: builtin/repack.c:188
 msgid "with -a, repack unreachable objects"
 msgstr "mit -a, nicht erreichbare Objekte neu packen"
 
-#: builtin/repack.c:188
+#: builtin/repack.c:190
 msgid "size of the window used for delta compression"
 msgstr "Größe des Fensters für die Delta-Kompression"
 
-#: builtin/repack.c:189 builtin/repack.c:193
+#: builtin/repack.c:191 builtin/repack.c:197
 msgid "bytes"
 msgstr "Bytes"
 
-#: builtin/repack.c:190
+#: builtin/repack.c:192
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 "gleiches wie oben, aber die Speichergröße anstatt der\n"
 "Anzahl der Einträge limitieren"
 
-#: builtin/repack.c:192
+#: builtin/repack.c:194
 msgid "limits the maximum delta depth"
 msgstr "die maximale Delta-Tiefe limitieren"
 
-#: builtin/repack.c:194
+#: builtin/repack.c:196
+msgid "limits the maximum number of threads"
+msgstr "maximale Anzahl von Threads limitieren"
+
+#: builtin/repack.c:198
 msgid "maximum size of each packfile"
 msgstr "maximale Größe für jede Paketdatei"
 
-#: builtin/repack.c:196
+#: builtin/repack.c:200
 msgid "repack objects in packs marked with .keep"
 msgstr ""
 "Objekte umpacken, die sich in mit .keep markierten Pack-Dateien befinden"
 
-#: builtin/repack.c:206
+#: builtin/repack.c:210
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "kann Pack-Dateien in precious-objects Repository nicht löschen"
 
-#: builtin/repack.c:210
+#: builtin/repack.c:214
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable und -A sind inkompatibel"
 
-#: builtin/repack.c:400 builtin/worktree.c:115
+#: builtin/repack.c:406 builtin/worktree.c:116
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "Fehler beim Löschen von '%s'"
 
-#: builtin/replace.c:19
+#: builtin/replace.c:20
 msgid "git replace [-f] <object> <replacement>"
 msgstr "git replace [-f] <Objekt> <Ersetzung>"
 
-#: builtin/replace.c:20
+#: builtin/replace.c:21
 msgid "git replace [-f] --edit <object>"
 msgstr "git replace [-f] --edit <Objekt>"
 
-#: builtin/replace.c:21
+#: builtin/replace.c:22
 msgid "git replace [-f] --graft <commit> [<parent>...]"
 msgstr "git replace [-f] --graft <Commit> [<Eltern-Commit>...]"
 
-#: builtin/replace.c:22
+#: builtin/replace.c:23
 msgid "git replace -d <object>..."
 msgstr "git replace -d <Objekt>..."
 
-#: builtin/replace.c:23
+#: builtin/replace.c:24
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr "git replace [--format=<Format>] [-l [<Muster>]]"
 
-#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396
+#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
 #, c-format
 msgid "Not a valid object name: '%s'"
 msgstr "Ungültiger Objekt-Name: '%s'"
 
-#: builtin/replace.c:360
+#: builtin/replace.c:361
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "ungültiger Merge-Tag in Commit '%s'"
 
-#: builtin/replace.c:362
+#: builtin/replace.c:363
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "fehlerhafter Merge-Tag in Commit '%s'"
 
-#: builtin/replace.c:373
+#: builtin/replace.c:374
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -12627,206 +12752,206 @@ msgstr ""
 "Der ursprüngliche Commit '%s' enthält Merge-Tag '%s', der verworfen\n"
 "wird; benutzen Sie --edit anstatt --graft"
 
-#: builtin/replace.c:406
+#: builtin/replace.c:407
 #, c-format
 msgid "the original commit '%s' has a gpg signature."
 msgstr "Der ursprüngliche Commit '%s' hat eine GPG-Signatur."
 
-#: builtin/replace.c:407
+#: builtin/replace.c:408
 msgid "the signature will be removed in the replacement commit!"
 msgstr "Die Signatur wird in dem Ersetzungs-Commit entfernt!"
 
-#: builtin/replace.c:413
+#: builtin/replace.c:414
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "Konnte Ersetzungs-Commit für '%s' nicht schreiben"
 
-#: builtin/replace.c:437
+#: builtin/replace.c:438
 msgid "list replace refs"
 msgstr "ersetzende Referenzen auflisten"
 
-#: builtin/replace.c:438
+#: builtin/replace.c:439
 msgid "delete replace refs"
 msgstr "ersetzende Referenzen löschen"
 
-#: builtin/replace.c:439
+#: builtin/replace.c:440
 msgid "edit existing object"
 msgstr "existierendes Objekt bearbeiten"
 
-#: builtin/replace.c:440
+#: builtin/replace.c:441
 msgid "change a commit's parents"
 msgstr "Eltern-Commits eines Commits ändern"
 
-#: builtin/replace.c:441
+#: builtin/replace.c:442
 msgid "replace the ref if it exists"
 msgstr "die Referenz ersetzen, wenn sie existiert"
 
-#: builtin/replace.c:442
+#: builtin/replace.c:443
 msgid "do not pretty-print contents for --edit"
 msgstr "keine ansprechende Anzeige des Objektinhaltes für --edit"
 
-#: builtin/replace.c:443
+#: builtin/replace.c:444
 msgid "use this format"
 msgstr "das angegebene Format benutzen"
 
-#: builtin/rerere.c:12
+#: builtin/rerere.c:13
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr "git rerere [clean | forget <Pfad>... | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:58
+#: builtin/rerere.c:59
 msgid "register clean resolutions in index"
 msgstr "saubere Auflösungen im Index registrieren"
 
-#: builtin/reset.c:26
+#: builtin/reset.c:29
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<Commit>]"
 
-#: builtin/reset.c:27
+#: builtin/reset.c:30
 msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
 msgstr "git reset [-q] [<Commit-Referenz>] [--] <Pfade>..."
 
-#: builtin/reset.c:28
+#: builtin/reset.c:31
 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
 msgstr "git reset --patch [<Commit-Referenz>] [--] [<Pfade>...]"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:37
 msgid "mixed"
 msgstr "mixed"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:37
 msgid "soft"
 msgstr "soft"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:37
 msgid "hard"
 msgstr "hard"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:37
 msgid "merge"
 msgstr "zusammenführen"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:37
 msgid "keep"
 msgstr "keep"
 
-#: builtin/reset.c:74
+#: builtin/reset.c:77
 msgid "You do not have a valid HEAD."
 msgstr "Sie haben keinen gültigen HEAD."
 
-#: builtin/reset.c:76
+#: builtin/reset.c:79
 msgid "Failed to find tree of HEAD."
 msgstr "Fehler beim Finden des \"Tree\"-Objektes von HEAD."
 
-#: builtin/reset.c:82
+#: builtin/reset.c:85
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s."
 
-#: builtin/reset.c:100
+#: builtin/reset.c:103
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD ist jetzt bei %s"
 
-#: builtin/reset.c:183
+#: builtin/reset.c:186
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "Kann keinen '%s'-Reset durchführen, während ein Merge im Gange ist."
 
-#: builtin/reset.c:276
+#: builtin/reset.c:286
 msgid "be quiet, only report errors"
 msgstr "weniger Ausgaben, meldet nur Fehler"
 
-#: builtin/reset.c:278
+#: builtin/reset.c:288
 msgid "reset HEAD and index"
 msgstr "HEAD und Index umsetzen"
 
-#: builtin/reset.c:279
+#: builtin/reset.c:289
 msgid "reset only HEAD"
 msgstr "nur HEAD umsetzen"
 
-#: builtin/reset.c:281 builtin/reset.c:283
+#: builtin/reset.c:291 builtin/reset.c:293
 msgid "reset HEAD, index and working tree"
 msgstr "HEAD, Index und Arbeitsverzeichnis umsetzen"
 
-#: builtin/reset.c:285
+#: builtin/reset.c:295
 msgid "reset HEAD but keep local changes"
 msgstr "HEAD umsetzen, aber lokale Änderungen behalten"
 
-#: builtin/reset.c:288
+#: builtin/reset.c:301
 msgid "record only the fact that removed paths will be added later"
 msgstr "nur speichern, dass gelöschte Pfade später hinzugefügt werden sollen"
 
-#: builtin/reset.c:305
+#: builtin/reset.c:320
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Konnte '%s' nicht als gültigen Commit auflösen."
 
-#: builtin/reset.c:313
+#: builtin/reset.c:328
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "Konnte '%s' nicht als gültiges \"Tree\"-Objekt auflösen."
 
-#: builtin/reset.c:322
+#: builtin/reset.c:337
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch ist inkompatibel mit --{hard,mixed,soft}"
 
-#: builtin/reset.c:331
+#: builtin/reset.c:346
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "--mixed mit Pfaden ist veraltet; benutzen Sie stattdessen 'git reset -- "
 "<Pfade>'."
 
-#: builtin/reset.c:333
+#: builtin/reset.c:348
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Ein '%s'-Reset mit Pfaden ist nicht möglich."
 
-#: builtin/reset.c:343
+#: builtin/reset.c:358
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "'%s'-Reset ist in einem Bare-Repository nicht erlaubt"
 
-#: builtin/reset.c:347
+#: builtin/reset.c:362
 msgid "-N can only be used with --mixed"
 msgstr "-N kann nur mit -mixed benutzt werden"
 
-#: builtin/reset.c:364
+#: builtin/reset.c:379
 msgid "Unstaged changes after reset:"
 msgstr "Nicht zum Commit vorgemerkte Änderungen nach Zurücksetzung:"
 
-#: builtin/reset.c:370
+#: builtin/reset.c:385
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Konnte Index-Datei nicht zu Commit '%s' setzen."
 
-#: builtin/reset.c:374
+#: builtin/reset.c:389
 msgid "Could not write new index file."
 msgstr "Konnte neue Index-Datei nicht schreiben."
 
-#: builtin/rev-list.c:354
+#: builtin/rev-list.c:358
 msgid "rev-list does not support display of notes"
 msgstr "rev-list unterstützt keine Anzeige von Notizen"
 
-#: builtin/rev-parse.c:393
+#: builtin/rev-parse.c:394
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<Optionen>] -- [<Argumente>...]"
 
-#: builtin/rev-parse.c:398
+#: builtin/rev-parse.c:399
 msgid "keep the `--` passed as an arg"
 msgstr "`--` als Argument lassen"
 
-#: builtin/rev-parse.c:400
+#: builtin/rev-parse.c:401
 msgid "stop parsing after the first non-option argument"
 msgstr "das Parsen nach dem ersten Argument, was keine Option ist, stoppen"
 
-#: builtin/rev-parse.c:403
+#: builtin/rev-parse.c:404
 msgid "output in stuck long form"
 msgstr ""
 "Ausgabe in Langform mit Argumenten an den Optionen (getrennt durch '=')"
 
-#: builtin/rev-parse.c:534
+#: builtin/rev-parse.c:535
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12841,96 +12966,96 @@ msgstr ""
 "Führen Sie \"git rev-parse --parseopt -h\" für weitere Informationen bei "
 "erster Verwendung aus."
 
-#: builtin/revert.c:22
+#: builtin/revert.c:23
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<Optionen>] <Commit-Angabe>..."
 
-#: builtin/revert.c:23
+#: builtin/revert.c:24
 msgid "git revert <subcommand>"
 msgstr "git revert <Unterbefehl>"
 
-#: builtin/revert.c:28
+#: builtin/revert.c:29
 msgid "git cherry-pick [<options>] <commit-ish>..."
 msgstr "git cherry-pick [<Optionen>] <Commit-Angabe>..."
 
-#: builtin/revert.c:29
+#: builtin/revert.c:30
 msgid "git cherry-pick <subcommand>"
 msgstr "git cherry-pick <Unterbefehl>"
 
-#: builtin/revert.c:89
+#: builtin/revert.c:90
 #, c-format
 msgid "%s: %s cannot be used with %s"
 msgstr "%s: %s kann nicht mit %s verwendet werden"
 
-#: builtin/revert.c:98
+#: builtin/revert.c:99
 msgid "end revert or cherry-pick sequence"
 msgstr "\"revert\" oder \"cherry-pick\" Ablauf beenden"
 
-#: builtin/revert.c:99
+#: builtin/revert.c:100
 msgid "resume revert or cherry-pick sequence"
 msgstr "\"revert\" oder \"cherry-pick\" Ablauf fortsetzen"
 
-#: builtin/revert.c:100
+#: builtin/revert.c:101
 msgid "cancel revert or cherry-pick sequence"
 msgstr "\"revert\" oder \"cherry-pick\" Ablauf abbrechen"
 
-#: builtin/revert.c:101
+#: builtin/revert.c:102
 msgid "don't automatically commit"
 msgstr "nicht automatisch committen"
 
-#: builtin/revert.c:102
+#: builtin/revert.c:103
 msgid "edit the commit message"
 msgstr "Commit-Beschreibung bearbeiten"
 
-#: builtin/revert.c:105
+#: builtin/revert.c:106
 msgid "parent-number"
 msgstr "Nummer des Elternteils"
 
-#: builtin/revert.c:106
+#: builtin/revert.c:107
 msgid "select mainline parent"
 msgstr "Elternteil der Hauptlinie auswählen"
 
-#: builtin/revert.c:108
+#: builtin/revert.c:109
 msgid "merge strategy"
 msgstr "Merge-Strategie"
 
-#: builtin/revert.c:109
+#: builtin/revert.c:110
 msgid "option"
 msgstr "Option"
 
-#: builtin/revert.c:110
+#: builtin/revert.c:111
 msgid "option for merge strategy"
 msgstr "Option für Merge-Strategie"
 
-#: builtin/revert.c:119
+#: builtin/revert.c:120
 msgid "append commit name"
 msgstr "Commit-Namen anhängen"
 
-#: builtin/revert.c:121
+#: builtin/revert.c:122
 msgid "preserve initially empty commits"
 msgstr "ursprüngliche, leere Commits erhalten"
 
-#: builtin/revert.c:122
+#: builtin/revert.c:123
 msgid "allow commits with empty messages"
 msgstr "Commits mit leerer Beschreibung erlauben"
 
-#: builtin/revert.c:123
+#: builtin/revert.c:124
 msgid "keep redundant, empty commits"
 msgstr "redundante, leere Commits behalten"
 
-#: builtin/revert.c:211
+#: builtin/revert.c:212
 msgid "revert failed"
 msgstr "\"revert\" fehlgeschlagen"
 
-#: builtin/revert.c:224
+#: builtin/revert.c:225
 msgid "cherry-pick failed"
 msgstr "\"cherry-pick\" fehlgeschlagen"
 
-#: builtin/rm.c:17
+#: builtin/rm.c:18
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<Optionen>] [--] <Datei>..."
 
-#: builtin/rm.c:205
+#: builtin/rm.c:206
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -12945,7 +13070,7 @@ msgstr[1] ""
 "unterschiedlich\n"
 "zu der Datei und HEAD:"
 
-#: builtin/rm.c:210
+#: builtin/rm.c:211
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -12953,44 +13078,44 @@ msgstr ""
 "\n"
 "(benutzen Sie -f, um die Löschung zu erzwingen)"
 
-#: builtin/rm.c:214
+#: builtin/rm.c:215
 msgid "the following file has changes staged in the index:"
 msgid_plural "the following files have changes staged in the index:"
 msgstr[0] "die folgende Datei hat zum Commit vorgemerkte Änderungen:"
 msgstr[1] "die folgenden Dateien haben zum Commit vorgemerkte Änderungen:"
 
-#: builtin/rm.c:218 builtin/rm.c:227
+#: builtin/rm.c:219 builtin/rm.c:228
 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
 msgstr ""
 "\n"
-"(benutzen Sie --cached, um die Datei zu behalten, oder -f, um die Entfernung "
+"(benutzen Sie --cached, um die Datei zu behalten, oder -f, um das Entfernen "
 "zu erzwingen)"
 
-#: builtin/rm.c:224
+#: builtin/rm.c:225
 msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] "die folgende Datei hat lokale Änderungen:"
 msgstr[1] "die folgenden Dateien haben lokale Änderungen:"
 
-#: builtin/rm.c:242
+#: builtin/rm.c:243
 msgid "do not list removed files"
 msgstr "keine gelöschten Dateien auflisten"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:244
 msgid "only remove from the index"
 msgstr "nur aus dem Index entfernen"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "override the up-to-date check"
 msgstr "die \"up-to-date\" Prüfung überschreiben"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "allow recursive removal"
-msgstr "rekursive Entfernung erlauben"
+msgstr "rekursives Entfernen erlauben"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "exit with a zero status even if nothing matched"
 msgstr "mit Rückgabewert 0 beenden, wenn keine Übereinstimmung gefunden wurde"
 
@@ -13009,7 +13134,7 @@ msgstr "git rm: konnte %s nicht löschen"
 msgid "could not remove '%s'"
 msgstr "Konnte '%s' nicht löschen"
 
-#: builtin/send-pack.c:18
+#: builtin/send-pack.c:19
 msgid ""
 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
 "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
@@ -13022,51 +13147,51 @@ msgstr ""
 "  --all und die explizite Angabe einer <Referenz> schließen sich gegenseitig "
 "aus."
 
-#: builtin/send-pack.c:161
+#: builtin/send-pack.c:162
 msgid "remote name"
 msgstr "Name des Remote-Repositories"
 
-#: builtin/send-pack.c:175
+#: builtin/send-pack.c:176
 msgid "use stateless RPC protocol"
 msgstr "zustandsloses RPC-Protokoll verwenden"
 
-#: builtin/send-pack.c:176
+#: builtin/send-pack.c:177
 msgid "read refs from stdin"
 msgstr "Referenzen von der Standard-Eingabe lesen"
 
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:178
 msgid "print status from remote helper"
 msgstr "Status des Remote-Helpers ausgeben"
 
-#: builtin/shortlog.c:13
+#: builtin/shortlog.c:14
 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
 msgstr "git shortlog [<Optionen>] [<Commitbereich>] [[--] [<Pfad>...]]"
 
-#: builtin/shortlog.c:248
+#: builtin/shortlog.c:249
 msgid "Group by committer rather than author"
 msgstr "über Commit-Ersteller anstatt Autor gruppieren"
 
-#: builtin/shortlog.c:250
+#: builtin/shortlog.c:251
 msgid "sort output according to the number of commits per author"
 msgstr "die Ausgabe entsprechend der Anzahl von Commits pro Autor sortieren"
 
-#: builtin/shortlog.c:252
+#: builtin/shortlog.c:253
 msgid "Suppress commit descriptions, only provides commit count"
 msgstr "Commit-Beschreibungen unterdrücken, nur Anzahl der Commits liefern"
 
-#: builtin/shortlog.c:254
+#: builtin/shortlog.c:255
 msgid "Show the email address of each author"
 msgstr "die E-Mail-Adresse von jedem Autor anzeigen"
 
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:256
 msgid "w[,i1[,i2]]"
 msgstr "w[,i1[,i2]]"
 
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:257
 msgid "Linewrap output"
 msgstr "Ausgabe mit Zeilenumbrüchen"
 
-#: builtin/show-branch.c:10
+#: builtin/show-branch.c:12
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -13078,127 +13203,127 @@ msgstr ""
 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
 "\t\t[--no-name | --sha1-name] [--topics] [(<Commit> | <glob>)...]"
 
-#: builtin/show-branch.c:14
+#: builtin/show-branch.c:16
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
 msgstr "git show-branch (-g | --reflog)[=<n>[,<Basis>]] [--list] [<Referenz>]"
 
-#: builtin/show-branch.c:374
+#: builtin/show-branch.c:376
 #, c-format
 msgid "ignoring %s; cannot handle more than %d ref"
 msgid_plural "ignoring %s; cannot handle more than %d refs"
 msgstr[0] "ignoriere %s; kann nicht mehr als %d Referenz behandeln"
 msgstr[1] "ignoriere %s; kann nicht mehr als %d Referenzen behandeln"
 
-#: builtin/show-branch.c:536
+#: builtin/show-branch.c:530
 #, c-format
 msgid "no matching refs with %s"
 msgstr "keine übereinstimmenden Referenzen mit %s"
 
-#: builtin/show-branch.c:632
+#: builtin/show-branch.c:626
 msgid "show remote-tracking and local branches"
 msgstr "Remote-Tracking und lokale Branches anzeigen"
 
-#: builtin/show-branch.c:634
+#: builtin/show-branch.c:628
 msgid "show remote-tracking branches"
 msgstr "Remote-Tracking-Branches anzeigen"
 
-#: builtin/show-branch.c:636
+#: builtin/show-branch.c:630
 msgid "color '*!+-' corresponding to the branch"
 msgstr "'*!+-' entsprechend des Branches einfärben"
 
-#: builtin/show-branch.c:638
+#: builtin/show-branch.c:632
 msgid "show <n> more commits after the common ancestor"
 msgstr "<n> weitere Commits nach dem gemeinsamen Vorgänger-Commit anzeigen"
 
-#: builtin/show-branch.c:640
+#: builtin/show-branch.c:634
 msgid "synonym to more=-1"
 msgstr "Synonym für more=-1"
 
-#: builtin/show-branch.c:641
+#: builtin/show-branch.c:635
 msgid "suppress naming strings"
 msgstr "Namen unterdrücken"
 
-#: builtin/show-branch.c:643
+#: builtin/show-branch.c:637
 msgid "include the current branch"
 msgstr "den aktuellen Branch einbeziehen"
 
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:639
 msgid "name commits with their object names"
 msgstr "Commits nach ihren Objektnamen benennen"
 
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:641
 msgid "show possible merge bases"
 msgstr "mögliche Merge-Basen anzeigen"
 
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:643
 msgid "show refs unreachable from any other ref"
 msgstr ""
 "Referenzen, die unerreichbar von allen anderen Referenzen sind, anzeigen"
 
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:645
 msgid "show commits in topological order"
 msgstr "Commits in topologischer Ordnung anzeigen"
 
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:648
 msgid "show only commits not on the first branch"
 msgstr "nur Commits anzeigen, die sich nicht im ersten Branch befinden"
 
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:650
 msgid "show merges reachable from only one tip"
 msgstr "Merges anzeigen, die nur von einem Branch aus erreichbar sind"
 
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:652
 msgid "topologically sort, maintaining date order where possible"
 msgstr "topologische Sortierung, Beibehaltung Datumsordnung wo möglich"
 
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:655
 msgid "<n>[,<base>]"
 msgstr "<n>[,<Basis>]"
 
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:656
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "die <n> jüngsten Einträge im Reflog, beginnend an der Basis, anzeigen"
 
-#: builtin/show-branch.c:696
+#: builtin/show-branch.c:690
 msgid ""
 "--reflog is incompatible with --all, --remotes, --independent or --merge-base"
 msgstr ""
 "--reflog ist inkompatibel mit --all, --remotes, --independent oder --merge-"
 "base"
 
-#: builtin/show-branch.c:720
+#: builtin/show-branch.c:714
 msgid "no branches given, and HEAD is not valid"
 msgstr "keine Branches angegeben, und HEAD ist ungültig"
 
-#: builtin/show-branch.c:723
+#: builtin/show-branch.c:717
 msgid "--reflog option needs one branch name"
 msgstr "Die Option --reflog benötigt einen Branchnamen."
 
-#: builtin/show-branch.c:726
+#: builtin/show-branch.c:720
 #, c-format
 msgid "only %d entry can be shown at one time."
 msgid_plural "only %d entries can be shown at one time."
 msgstr[0] "nur %d Eintrag kann zur selben Zeit angezeigt werden"
 msgstr[1] "nur %d Einträge können zur selben Zeit angezeigt werden"
 
-#: builtin/show-branch.c:730
+#: builtin/show-branch.c:724
 #, c-format
 msgid "no such ref %s"
 msgstr "Referenz nicht gefunden: %s"
 
-#: builtin/show-branch.c:814
+#: builtin/show-branch.c:808
 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
 msgstr[0] "Kann nicht mehr als %d Commit behandeln."
 msgstr[1] "Kann nicht mehr als %d Commits behandeln."
 
-#: builtin/show-branch.c:818
+#: builtin/show-branch.c:812
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "'%s' ist keine gültige Referenz."
 
-#: builtin/show-branch.c:821
+#: builtin/show-branch.c:815
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "kann Commit %s (%s) nicht finden"
@@ -13251,35 +13376,35 @@ msgstr ""
 "Referenzen von der Standard-Eingabe anzeigen, die sich nicht im lokalen "
 "Repository befinden"
 
-#: builtin/stripspace.c:17
+#: builtin/stripspace.c:18
 msgid "git stripspace [-s | --strip-comments]"
 msgstr "git stripspace [-s | --strip-comments]"
 
-#: builtin/stripspace.c:18
+#: builtin/stripspace.c:19
 msgid "git stripspace [-c | --comment-lines]"
 msgstr "git stripspace [-c | --comment-lines]"
 
-#: builtin/stripspace.c:35
+#: builtin/stripspace.c:36
 msgid "skip and remove all lines starting with comment character"
 msgstr ""
 "alle Zeilen, die mit dem Kommentarzeichen beginnen, überspringen und "
 "entfernen"
 
-#: builtin/stripspace.c:38
+#: builtin/stripspace.c:39
 msgid "prepend comment character and space to each line"
 msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen"
 
-#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
 #, c-format
 msgid "No such ref: %s"
 msgstr "Referenz nicht gefunden: %s"
 
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Vollständiger Referenzname erwartet, %s erhalten"
 
-#: builtin/submodule--helper.c:71
+#: builtin/submodule--helper.c:72
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "Kann eine Komponente von URL '%s' nicht extrahieren"
@@ -13489,50 +13614,46 @@ msgstr "Rekursion in Submodule durchführen"
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper embed-git-dir [<Pfad>...]"
 
-#: builtin/submodule--helper.c:1226
-msgid "submodule--helper subcommand must be called with a subcommand"
-msgstr "submodule--helper muss mit einem Unterbefehl aufgerufen werden"
-
-#: builtin/submodule--helper.c:1233
+#: builtin/submodule--helper.c:1232
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s unterstützt kein --super-prefix"
 
-#: builtin/submodule--helper.c:1239
+#: builtin/submodule--helper.c:1238
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper"
 
-#: builtin/symbolic-ref.c:7
+#: builtin/symbolic-ref.c:8
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
 msgstr "git symbolic-ref [<Optionen>] <Name> [<Referenz>]"
 
-#: builtin/symbolic-ref.c:8
+#: builtin/symbolic-ref.c:9
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <Name>"
 
-#: builtin/symbolic-ref.c:40
+#: builtin/symbolic-ref.c:41
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr ""
 "Fehlermeldungen für nicht-symbolische (losgelöste) Referenzen unterdrücken"
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:42
 msgid "delete symbolic ref"
 msgstr "symbolische Referenzen löschen"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:43
 msgid "shorten ref output"
 msgstr "verkürzte Ausgabe der Referenzen"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
 msgid "reason"
 msgstr "Grund"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
 msgid "reason of the update"
 msgstr "Grund für die Aktualisierung"
 
-#: builtin/tag.c:23
+#: builtin/tag.c:24
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
 "[<head>]"
@@ -13540,11 +13661,11 @@ msgstr ""
 "git tag [-a | -s | -u <Schlüssel-id>] [-f] [-m <Beschreibung> | -F <Datei>] "
 "<Tagname> [<Commit>]"
 
-#: builtin/tag.c:24
+#: builtin/tag.c:25
 msgid "git tag -d <tagname>..."
 msgstr "git tag -d <Tagname>..."
 
-#: builtin/tag.c:25
+#: builtin/tag.c:26
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
@@ -13554,21 +13675,21 @@ msgstr ""
 "points-at <Objekt>]\n"
 "\t\t[--format=<Muster>] [--[no-]merged [<Commit>]] [<Muster>...]"
 
-#: builtin/tag.c:27
+#: builtin/tag.c:28
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<Format>] <Tagname>..."
 
-#: builtin/tag.c:83
+#: builtin/tag.c:84
 #, c-format
 msgid "tag '%s' not found."
 msgstr "Tag '%s' nicht gefunden."
 
-#: builtin/tag.c:99
+#: builtin/tag.c:100
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Tag '%s' gelöscht (war %s)\n"
 
-#: builtin/tag.c:128
+#: builtin/tag.c:129
 #, c-format
 msgid ""
 "\n"
@@ -13581,7 +13702,7 @@ msgstr ""
 "  %s\n"
 "ein. Zeilen, die mit '%c' beginnen, werden ignoriert.\n"
 
-#: builtin/tag.c:132
+#: builtin/tag.c:133
 #, c-format
 msgid ""
 "\n"
@@ -13596,348 +13717,348 @@ msgstr ""
 "ein. Zeilen, die mit '%c' beginnen, werden behalten; Sie dürfen diese\n"
 "selbst entfernen wenn Sie möchten.\n"
 
-#: builtin/tag.c:210
+#: builtin/tag.c:211
 msgid "unable to sign the tag"
 msgstr "konnte Tag nicht signieren"
 
-#: builtin/tag.c:212
+#: builtin/tag.c:213
 msgid "unable to write tag file"
 msgstr "konnte Tag-Datei nicht schreiben"
 
-#: builtin/tag.c:236
+#: builtin/tag.c:237
 msgid "bad object type."
 msgstr "ungültiger Objekt-Typ"
 
-#: builtin/tag.c:282
+#: builtin/tag.c:283
 msgid "no tag message?"
 msgstr "keine Tag-Beschreibung?"
 
-#: builtin/tag.c:289
+#: builtin/tag.c:290
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Die Tag-Beschreibung wurde gelassen in %s\n"
 
-#: builtin/tag.c:397
+#: builtin/tag.c:398
 msgid "list tag names"
 msgstr "Tagnamen auflisten"
 
-#: builtin/tag.c:399
+#: builtin/tag.c:400
 msgid "print <n> lines of each tag message"
 msgstr "<n> Zeilen jeder Tag-Beschreibung anzeigen"
 
-#: builtin/tag.c:401
+#: builtin/tag.c:402
 msgid "delete tags"
 msgstr "Tags löschen"
 
-#: builtin/tag.c:402
+#: builtin/tag.c:403
 msgid "verify tags"
 msgstr "Tags überprüfen"
 
-#: builtin/tag.c:404
+#: builtin/tag.c:405
 msgid "Tag creation options"
 msgstr "Optionen für Erstellung von Tags"
 
-#: builtin/tag.c:406
+#: builtin/tag.c:407
 msgid "annotated tag, needs a message"
 msgstr "annotiertes Tag, benötigt eine Beschreibung"
 
-#: builtin/tag.c:408
+#: builtin/tag.c:409
 msgid "tag message"
 msgstr "Tag-Beschreibung"
 
-#: builtin/tag.c:410
+#: builtin/tag.c:411
 msgid "annotated and GPG-signed tag"
 msgstr "annotiertes und GPG-signiertes Tag"
 
-#: builtin/tag.c:414
+#: builtin/tag.c:415
 msgid "use another key to sign the tag"
 msgstr "einen anderen Schlüssel verwenden, um das Tag zu signieren"
 
-#: builtin/tag.c:415
+#: builtin/tag.c:416
 msgid "replace the tag if exists"
 msgstr "das Tag ersetzen, wenn es existiert"
 
-#: builtin/tag.c:416 builtin/update-ref.c:368
+#: builtin/tag.c:417 builtin/update-ref.c:369
 msgid "create a reflog"
 msgstr "Reflog erstellen"
 
-#: builtin/tag.c:418
+#: builtin/tag.c:419
 msgid "Tag listing options"
 msgstr "Optionen für Auflistung der Tags"
 
-#: builtin/tag.c:419
+#: builtin/tag.c:420
 msgid "show tag list in columns"
 msgstr "Liste der Tags in Spalten anzeigen"
 
-#: builtin/tag.c:420 builtin/tag.c:422
+#: builtin/tag.c:421 builtin/tag.c:423
 msgid "print only tags that contain the commit"
 msgstr "nur Tags ausgeben, die diesen Commit beinhalten"
 
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:422 builtin/tag.c:424
 msgid "print only tags that don't contain the commit"
 msgstr "nur Tags ausgeben, die diesen Commit nicht enthalten"
 
-#: builtin/tag.c:424
+#: builtin/tag.c:425
 msgid "print only tags that are merged"
 msgstr "nur Tags ausgeben, die gemerged wurden"
 
-#: builtin/tag.c:425
+#: builtin/tag.c:426
 msgid "print only tags that are not merged"
 msgstr "nur Tags ausgeben, die nicht gemerged wurden"
 
-#: builtin/tag.c:430
+#: builtin/tag.c:431
 msgid "print only tags of the object"
 msgstr "nur Tags von dem Objekt ausgeben"
 
-#: builtin/tag.c:469
+#: builtin/tag.c:470
 msgid "--column and -n are incompatible"
 msgstr "--column und -n sind inkompatibel"
 
-#: builtin/tag.c:491
+#: builtin/tag.c:492
 msgid "-n option is only allowed in list mode"
 msgstr "Die Option -n ist nur im Listenmodus erlaubt."
 
-#: builtin/tag.c:493
+#: builtin/tag.c:494
 msgid "--contains option is only allowed in list mode"
 msgstr "Die Option --contains ist nur im Listenmodus erlaubt."
 
-#: builtin/tag.c:495
+#: builtin/tag.c:496
 msgid "--no-contains option is only allowed in list mode"
 msgstr "Die Option --no-contains ist nur im Listenmodus erlaubt."
 
-#: builtin/tag.c:497
+#: builtin/tag.c:498
 msgid "--points-at option is only allowed in list mode"
 msgstr "Die Option --points-at ist nur im Listenmodus erlaubt."
 
-#: builtin/tag.c:499
+#: builtin/tag.c:500
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr "Die Optionen --merged und --no-merged sind nur im Listenmodus erlaubt."
 
-#: builtin/tag.c:510
+#: builtin/tag.c:511
 msgid "only one -F or -m option is allowed."
 msgstr "nur eine -F oder -m Option ist erlaubt."
 
-#: builtin/tag.c:529
+#: builtin/tag.c:530
 msgid "too many params"
 msgstr "zu viele Parameter"
 
-#: builtin/tag.c:535
+#: builtin/tag.c:536
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' ist kein gültiger Tagname."
 
-#: builtin/tag.c:540
+#: builtin/tag.c:541
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "Tag '%s' existiert bereits"
 
-#: builtin/tag.c:570
+#: builtin/tag.c:571
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Tag '%s' aktualisiert (war %s)\n"
 
-#: builtin/unpack-objects.c:493
+#: builtin/unpack-objects.c:494
 msgid "Unpacking objects"
 msgstr "Entpacke Objekte"
 
-#: builtin/update-index.c:79
+#: builtin/update-index.c:80
 #, c-format
 msgid "failed to create directory %s"
 msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
 
-#: builtin/update-index.c:85
+#: builtin/update-index.c:86
 #, c-format
 msgid "failed to stat %s"
 msgstr "Konnte '%s' nicht lesen"
 
-#: builtin/update-index.c:95
+#: builtin/update-index.c:96
 #, c-format
 msgid "failed to create file %s"
 msgstr "Konnte Datei '%s' nicht erstellen"
 
-#: builtin/update-index.c:103
+#: builtin/update-index.c:104
 #, c-format
 msgid "failed to delete file %s"
 msgstr "Konnte Datei '%s' nicht löschen"
 
-#: builtin/update-index.c:110 builtin/update-index.c:216
+#: builtin/update-index.c:111 builtin/update-index.c:217
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "Konnte Verzeichnis '%s' nicht löschen"
 
-#: builtin/update-index.c:135
+#: builtin/update-index.c:136
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Prüfe mtime in '%s' "
 
-#: builtin/update-index.c:149
+#: builtin/update-index.c:150
 msgid "directory stat info does not change after adding a new file"
 msgstr ""
 "Verzeichnisinformationen haben sich nach Hinzufügen einer neuen Datei nicht "
 "geändert"
 
-#: builtin/update-index.c:162
+#: builtin/update-index.c:163
 msgid "directory stat info does not change after adding a new directory"
 msgstr ""
 "Verzeichnisinformationen haben sich nach Hinzufügen eines neuen "
 "Verzeichnisses nicht geändert"
 
-#: builtin/update-index.c:175
+#: builtin/update-index.c:176
 msgid "directory stat info changes after updating a file"
 msgstr ""
 "Verzeichnisinformationen haben sich nach Aktualisierung einer Datei geändert"
 
-#: builtin/update-index.c:186
+#: builtin/update-index.c:187
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 "Verzeichnisinformationen haben sich nach Hinzufügen einer Datei in ein "
 "Unterverzeichnis geändert"
 
-#: builtin/update-index.c:197
+#: builtin/update-index.c:198
 msgid "directory stat info does not change after deleting a file"
 msgstr ""
 "Verzeichnisinformationen haben sich nach dem Löschen einer Datei nicht "
 "geändert"
 
-#: builtin/update-index.c:210
+#: builtin/update-index.c:211
 msgid "directory stat info does not change after deleting a directory"
 msgstr ""
 "Verzeichnisinformationen haben sich nach dem Löschen eines Verzeichnisses "
 "nicht geändert"
 
-#: builtin/update-index.c:217
+#: builtin/update-index.c:218
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:568
+#: builtin/update-index.c:569
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<Optionen>] [--] [<Datei>...]"
 
-#: builtin/update-index.c:923
+#: builtin/update-index.c:924
 msgid "continue refresh even when index needs update"
 msgstr ""
 "Aktualisierung fortsetzen, auch wenn der Index aktualisiert werden muss"
 
-#: builtin/update-index.c:926
+#: builtin/update-index.c:927
 msgid "refresh: ignore submodules"
 msgstr "Aktualisierung: ignoriert Submodule"
 
-#: builtin/update-index.c:929
+#: builtin/update-index.c:930
 msgid "do not ignore new files"
 msgstr "keine neuen Dateien ignorieren"
 
-#: builtin/update-index.c:931
+#: builtin/update-index.c:932
 msgid "let files replace directories and vice-versa"
 msgstr "Dateien Verzeichnisse ersetzen lassen, und umgedreht"
 
-#: builtin/update-index.c:933
+#: builtin/update-index.c:934
 msgid "notice files missing from worktree"
 msgstr "fehlende Dateien im Arbeitsverzeichnis beachten"
 
-#: builtin/update-index.c:935
+#: builtin/update-index.c:936
 msgid "refresh even if index contains unmerged entries"
 msgstr ""
 "aktualisieren, auch wenn der Index nicht zusammengeführte Einträge beinhaltet"
 
-#: builtin/update-index.c:938
+#: builtin/update-index.c:939
 msgid "refresh stat information"
 msgstr "Dateiinformationen aktualisieren"
 
-#: builtin/update-index.c:942
+#: builtin/update-index.c:943
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "wie --refresh, ignoriert aber \"assume-unchanged\" Einstellung"
 
-#: builtin/update-index.c:946
+#: builtin/update-index.c:947
 msgid "<mode>,<object>,<path>"
 msgstr "<Modus>,<Objekt>,<Pfad>"
 
-#: builtin/update-index.c:947
+#: builtin/update-index.c:948
 msgid "add the specified entry to the index"
 msgstr "den angegebenen Eintrag zum Commit vormerken"
 
-#: builtin/update-index.c:956
+#: builtin/update-index.c:957
 msgid "mark files as \"not changing\""
 msgstr "diese Datei immer als unverändert betrachten"
 
-#: builtin/update-index.c:959
+#: builtin/update-index.c:960
 msgid "clear assumed-unchanged bit"
 msgstr "\"assumed-unchanged\"-Bit löschen"
 
-#: builtin/update-index.c:962
+#: builtin/update-index.c:963
 msgid "mark files as \"index-only\""
 msgstr "Dateien als \"index-only\" markieren"
 
-#: builtin/update-index.c:965
+#: builtin/update-index.c:966
 msgid "clear skip-worktree bit"
 msgstr "\"skip-worktree\"-Bit löschen"
 
-#: builtin/update-index.c:968
+#: builtin/update-index.c:969
 msgid "add to index only; do not add content to object database"
 msgstr ""
 "die Änderungen nur zum Commit vormerken; Inhalt wird nicht der Objekt-"
 "Datenbank hinzugefügt"
 
-#: builtin/update-index.c:970
+#: builtin/update-index.c:971
 msgid "remove named paths even if present in worktree"
 msgstr ""
 "benannte Pfade löschen, auch wenn sie sich im Arbeitsverzeichnis befinden"
 
-#: builtin/update-index.c:972
+#: builtin/update-index.c:973
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "mit --stdin: eingegebene Zeilen sind durch NUL-Bytes abgeschlossen"
 
-#: builtin/update-index.c:974
+#: builtin/update-index.c:975
 msgid "read list of paths to be updated from standard input"
 msgstr "Liste der zu aktualisierenden Pfade von der Standard-Eingabe lesen"
 
-#: builtin/update-index.c:978
+#: builtin/update-index.c:979
 msgid "add entries from standard input to the index"
 msgstr "Einträge von der Standard-Eingabe zum Commit vormerken"
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:983
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr ""
 "wiederholtes Einpflegen der Zustände #2 und #3 für die aufgelisteten Pfade"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:987
 msgid "only update entries that differ from HEAD"
 msgstr "nur Einträge aktualisieren, die unterschiedlich zu HEAD sind"
 
-#: builtin/update-index.c:990
+#: builtin/update-index.c:991
 msgid "ignore files missing from worktree"
 msgstr "fehlende Dateien im Arbeitsverzeichnis ignorieren"
 
-#: builtin/update-index.c:993
+#: builtin/update-index.c:994
 msgid "report actions to standard output"
 msgstr "die Aktionen in der Standard-Ausgabe ausgeben"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:996
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(für Fremdprogramme) keine gespeicherten, nicht aufgelöste Konflikte"
 
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1000
 msgid "write index in this format"
 msgstr "Index-Datei in diesem Format schreiben"
 
-#: builtin/update-index.c:1001
+#: builtin/update-index.c:1002
 msgid "enable or disable split index"
 msgstr "Splitting des Index aktivieren oder deaktivieren"
 
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1004
 msgid "enable/disable untracked cache"
 msgstr "Cache für unversionierte Dateien aktivieren oder deaktivieren"
 
-#: builtin/update-index.c:1005
+#: builtin/update-index.c:1006
 msgid "test if the filesystem supports untracked cache"
 msgstr ""
 "prüfen ob das Dateisystem einen Cache für unversionierte Dateien unterstützt"
 
-#: builtin/update-index.c:1007
+#: builtin/update-index.c:1008
 msgid "enable untracked cache without testing the filesystem"
 msgstr ""
 "Cache für unversionierte Dateien ohne Prüfung des Dateisystems aktivieren"
 
-#: builtin/update-index.c:1107
+#: builtin/update-index.c:1108
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -13945,7 +14066,7 @@ msgstr ""
 "core.splitIndex ist auf 'false' gesetzt. Entfernen oder ändern Sie dies,\n"
 "wenn sie wirklich das Splitting des Index aktivieren möchten."
 
-#: builtin/update-index.c:1116
+#: builtin/update-index.c:1117
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -13953,7 +14074,7 @@ msgstr ""
 "core.splitIndex ist auf 'true' gesetzt. Entfernen oder ändern Sie dies,\n"
 "wenn Sie wirklich das Splitting des Index deaktivieren möchten."
 
-#: builtin/update-index.c:1127
+#: builtin/update-index.c:1128
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -13961,11 +14082,11 @@ msgstr ""
 "core.untrackedCache ist auf 'true' gesetzt. Entfernen oder ändern Sie dies,\n"
 "wenn Sie wirklich den Cache für unversionierte Dateien deaktivieren möchten."
 
-#: builtin/update-index.c:1131
+#: builtin/update-index.c:1132
 msgid "Untracked cache disabled"
 msgstr "Cache für unversionierte Dateien deaktiviert"
 
-#: builtin/update-index.c:1139
+#: builtin/update-index.c:1140
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -13974,241 +14095,241 @@ msgstr ""
 "dies,\n"
 "wenn sie wirklich den Cache für unversionierte Dateien aktivieren möchten."
 
-#: builtin/update-index.c:1143
+#: builtin/update-index.c:1144
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Cache für unversionierte Dateien für '%s' aktiviert"
 
-#: builtin/update-ref.c:9
+#: builtin/update-ref.c:10
 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
 msgstr "git update-ref [<Optionen>] -d <Referenzname> [<alter-Wert>]"
 
-#: builtin/update-ref.c:10
+#: builtin/update-ref.c:11
 msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
 msgstr ""
 "git update-ref [<Optionen>]    <Referenzname> <neuer-Wert> [<alter-Wert>]"
 
-#: builtin/update-ref.c:11
+#: builtin/update-ref.c:12
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<Optionen>] --stdin [-z]"
 
-#: builtin/update-ref.c:363
+#: builtin/update-ref.c:364
 msgid "delete the reference"
 msgstr "diese Referenz löschen"
 
-#: builtin/update-ref.c:365
+#: builtin/update-ref.c:366
 msgid "update <refname> not the one it points to"
 msgstr "<Referenzname> aktualisieren, nicht den Verweis"
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:367
 msgid "stdin has NUL-terminated arguments"
 msgstr "Standard-Eingabe hat durch NUL-Zeichen abgeschlossene Argumente"
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:368
 msgid "read updates from stdin"
 msgstr "Aktualisierungen von der Standard-Eingabe lesen"
 
-#: builtin/update-server-info.c:6
+#: builtin/update-server-info.c:7
 msgid "git update-server-info [--force]"
 msgstr "git update-server-info [--force]"
 
-#: builtin/update-server-info.c:14
+#: builtin/update-server-info.c:15
 msgid "update the info files from scratch"
 msgstr "die Informationsdateien von Grund auf aktualisieren"
 
-#: builtin/verify-commit.c:17
+#: builtin/verify-commit.c:18
 msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr "git verify-commit [-v | --verbose] <Commit>..."
 
-#: builtin/verify-commit.c:72
+#: builtin/verify-commit.c:73
 msgid "print commit contents"
 msgstr "Commit-Inhalte ausgeben"
 
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:37
+#: builtin/verify-commit.c:74 builtin/verify-tag.c:38
 msgid "print raw gpg status output"
 msgstr "unbearbeitete Ausgabe des Status von gpg ausgeben"
 
-#: builtin/verify-pack.c:54
+#: builtin/verify-pack.c:55
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <Paket>..."
 
-#: builtin/verify-pack.c:64
+#: builtin/verify-pack.c:65
 msgid "verbose"
 msgstr "erweiterte Ausgaben"
 
-#: builtin/verify-pack.c:66
+#: builtin/verify-pack.c:67
 msgid "show statistics only"
 msgstr "nur Statistiken anzeigen"
 
-#: builtin/verify-tag.c:18
+#: builtin/verify-tag.c:19
 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
 msgstr "git verify-tag [-v | --verbose] [--format=<Format>] <Tag>..."
 
-#: builtin/verify-tag.c:36
+#: builtin/verify-tag.c:37
 msgid "print tag contents"
 msgstr "Tag-Inhalte ausgeben"
 
-#: builtin/worktree.c:15
+#: builtin/worktree.c:16
 msgid "git worktree add [<options>] <path> [<branch>]"
 msgstr "git worktree add [<Optionen>] <Pfad> [<Branch>]"
 
-#: builtin/worktree.c:16
+#: builtin/worktree.c:17
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<Optionen>]"
 
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<Optionen>] <Pfad>"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<Optionen>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <Pfad>"
 
-#: builtin/worktree.c:43
+#: builtin/worktree.c:44
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Lösche worktrees/%s: kein gültiges Verzeichnis"
 
-#: builtin/worktree.c:49
+#: builtin/worktree.c:50
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Lösche worktrees/%s: gitdir-Datei existiert nicht"
 
-#: builtin/worktree.c:54
+#: builtin/worktree.c:55
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "Lösche worktrees/%s: konnte gitdir-Datei (%s) nicht lesen"
 
-#: builtin/worktree.c:65
+#: builtin/worktree.c:66
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Lösche worktrees/%s: ungültige gitdir-Datei"
 
-#: builtin/worktree.c:81
+#: builtin/worktree.c:82
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr "Lösche worktrees/%s: gitdir-Datei verweist auf nicht existierenden Ort"
 
-#: builtin/worktree.c:128
+#: builtin/worktree.c:129
 msgid "report pruned working trees"
 msgstr "entfernte Arbeitsverzeichnisse ausgeben"
 
-#: builtin/worktree.c:130
+#: builtin/worktree.c:131
 msgid "expire working trees older than <time>"
 msgstr "Arbeitsverzeichnisse älter als <Zeit> verfallen lassen"
 
-#: builtin/worktree.c:204
+#: builtin/worktree.c:205
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' existiert bereits"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:236
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht erstellen."
 
-#: builtin/worktree.c:274
+#: builtin/worktree.c:275
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "Bereite %s vor (Identifikation %s)"
 
-#: builtin/worktree.c:328
+#: builtin/worktree.c:327
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 "<Branch> auschecken, auch wenn dieser bereits in einem anderen "
 "Arbeitsverzeichnis ausgecheckt ist"
 
-#: builtin/worktree.c:330
+#: builtin/worktree.c:329
 msgid "create a new branch"
 msgstr "neuen Branch erstellen"
 
-#: builtin/worktree.c:332
+#: builtin/worktree.c:331
 msgid "create or reset a branch"
 msgstr "Branch erstellen oder umsetzen"
 
-#: builtin/worktree.c:334
+#: builtin/worktree.c:333
 msgid "populate the new working tree"
 msgstr "das neue Arbeitsverzeichnis auschecken"
 
-#: builtin/worktree.c:335
+#: builtin/worktree.c:334
 msgid "keep the new working tree locked"
 msgstr "das neue Arbeitsverzeichnis gesperrt lassen"
 
-#: builtin/worktree.c:343
+#: builtin/worktree.c:342
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B und --detach schließen sich gegenseitig aus"
 
-#: builtin/worktree.c:478
+#: builtin/worktree.c:479
 msgid "reason for locking"
 msgstr "Sperrgrund"
 
-#: builtin/worktree.c:490 builtin/worktree.c:523
+#: builtin/worktree.c:491 builtin/worktree.c:524
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' ist kein Arbeitsverzeichnis"
 
-#: builtin/worktree.c:492 builtin/worktree.c:525
+#: builtin/worktree.c:493 builtin/worktree.c:526
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "Das Hauptarbeitsverzeichnis kann nicht gesperrt oder entsperrt werden."
 
-#: builtin/worktree.c:497
+#: builtin/worktree.c:498
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' ist bereits gesperrt, Grund: %s"
 
-#: builtin/worktree.c:499
+#: builtin/worktree.c:500
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' ist bereits gesperrt"
 
-#: builtin/worktree.c:527
+#: builtin/worktree.c:528
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' ist nicht gesperrt"
 
-#: builtin/write-tree.c:13
+#: builtin/write-tree.c:14
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<Präfix>/]"
 
-#: builtin/write-tree.c:26
+#: builtin/write-tree.c:27
 msgid "<prefix>/"
 msgstr "<Präfix>/"
 
-#: builtin/write-tree.c:27
+#: builtin/write-tree.c:28
 msgid "write tree object for a subdirectory <prefix>"
 msgstr "das \"Tree\"-Objekt für ein Unterverzeichnis <Präfix> schreiben"
 
-#: builtin/write-tree.c:30
+#: builtin/write-tree.c:31
 msgid "only useful for debugging"
 msgstr "nur nützlich für Fehlersuche"
 
-#: upload-pack.c:22
+#: upload-pack.c:23
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<Optionen>] <Verzeichnis>"
 
-#: upload-pack.c:1040
+#: upload-pack.c:1041
 msgid "quit after a single request/response exchange"
 msgstr "nach einem einzigen Request/Response-Austausch beenden"
 
-#: upload-pack.c:1042
+#: upload-pack.c:1043
 msgid "exit immediately after initial ref advertisement"
 msgstr "direkt nach der initialen Angabe der Commits beenden"
 
-#: upload-pack.c:1044
+#: upload-pack.c:1045
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr ""
 "kein Versuch in <Verzeichnis>/.git/ wenn <Verzeichnis> kein Git-Verzeichnis "
 "ist"
 
-#: upload-pack.c:1046
+#: upload-pack.c:1047
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "Übertragung nach <n> Sekunden Inaktivität unterbrechen"
 
-#: credential-cache--daemon.c:223
+#: credential-cache--daemon.c:224
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -14224,11 +14345,11 @@ msgstr ""
 "\n"
 "auszuführen."
 
-#: credential-cache--daemon.c:271
+#: credential-cache--daemon.c:272
 msgid "print debugging messages to stderr"
 msgstr "Meldungen zur Fehlersuche in Standard-Fehlerausgabe ausgeben"
 
-#: git.c:14
+#: git.c:15
 msgid ""
 "'git help -a' and 'git help -g' list available subcommands and some\n"
 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
@@ -14239,22 +14360,22 @@ msgstr ""
 "oder 'git help <Konzept>', um mehr über einen spezifischen Befehl oder\n"
 "Konzept zu erfahren."
 
-#: http.c:336
+#: http.c:337
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "negativer Wert für http.postbuffer; benutze Standardwert %d"
 
-#: http.c:357
+#: http.c:358
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "Kontrolle über Delegation wird mit cURL < 7.22.0 nicht unterstützt"
 
-#: http.c:366
+#: http.c:367
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr ""
 "Das Anheften des öffentlichen Schlüssels wird mit cURL < 7.44.0\n"
 "nicht unterstützt."
 
-#: http.c:1766
+#: http.c:1764
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -14265,7 +14386,7 @@ msgstr ""
 "  gefragt nach: %s\n"
 "    umgeleitet: %s"
 
-#: remote-curl.c:323
+#: remote-curl.c:324
 #, c-format
 msgid "redirecting to %s"
 msgstr "Leite nach %s um"
@@ -14673,6 +14794,10 @@ msgstr ""
 msgid "Could not move back to $head_name"
 msgstr "Konnte nicht zu $head_name zurückgehen"
 
+#: git-rebase.sh:169
+msgid "Applied autostash."
+msgstr "Automatischen Stash angewendet."
+
 #: git-rebase.sh:172
 #, sh-format
 msgid "Cannot store $stash_sha1"
@@ -14794,39 +14919,39 @@ msgstr ""
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "$branch_name zu $onto_name vorgespult."
 
-#: git-stash.sh:53
+#: git-stash.sh:54
 msgid "git stash clear with parameters is unimplemented"
 msgstr "git stash clear mit Parametern ist nicht implementiert"
 
-#: git-stash.sh:94
+#: git-stash.sh:95
 msgid "You do not have the initial commit yet"
 msgstr "Sie haben bisher noch keinen initialen Commit"
 
-#: git-stash.sh:109
+#: git-stash.sh:110
 msgid "Cannot save the current index state"
 msgstr "Kann den aktuellen Zustand des Index nicht speichern"
 
-#: git-stash.sh:124
+#: git-stash.sh:125
 msgid "Cannot save the untracked files"
 msgstr "Kann die unversionierten Dateien nicht speichern"
 
-#: git-stash.sh:144 git-stash.sh:157
+#: git-stash.sh:145 git-stash.sh:158
 msgid "Cannot save the current worktree state"
 msgstr "Kann den aktuellen Zustand des Arbeitsverzeichnisses nicht speichern"
 
-#: git-stash.sh:161
+#: git-stash.sh:162
 msgid "No changes selected"
 msgstr "Keine Änderungen ausgewählt"
 
-#: git-stash.sh:164
+#: git-stash.sh:165
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "Kann temporären Index nicht löschen (kann nicht passieren)"
 
-#: git-stash.sh:177
+#: git-stash.sh:178
 msgid "Cannot record working tree state"
 msgstr "Kann Zustand des Arbeitsverzeichnisses nicht aufzeichnen"
 
-#: git-stash.sh:209
+#: git-stash.sh:210
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr "Kann $ref_stash nicht mit $w_commit aktualisieren."
@@ -14841,7 +14966,7 @@ msgstr "Kann $ref_stash nicht mit $w_commit aktualisieren."
 #. $ git stash save --blah-blah 2>&1 | head -n 2
 #. error: unknown option for 'stash save': --blah-blah
 #. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:265
+#: git-stash.sh:266
 #, sh-format
 msgid ""
 "error: unknown option for 'stash save': $option\n"
@@ -14851,108 +14976,108 @@ msgstr ""
 "        Um eine Beschreibung anzugeben, benutzen Sie \"git stash save -- "
 "'$option'\""
 
-#: git-stash.sh:278
+#: git-stash.sh:281
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr ""
 "Kann nicht gleichzeitig --patch und --include-untracked oder --all verwenden"
 
-#: git-stash.sh:286
+#: git-stash.sh:289
 msgid "No local changes to save"
 msgstr "Keine lokalen Änderungen zum Speichern"
 
-#: git-stash.sh:291
+#: git-stash.sh:294
 msgid "Cannot initialize stash"
 msgstr "Kann \"stash\" nicht initialisieren"
 
-#: git-stash.sh:295
+#: git-stash.sh:298
 msgid "Cannot save the current status"
 msgstr "Kann den aktuellen Status nicht speichern"
 
-#: git-stash.sh:296
+#: git-stash.sh:299
 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr "Speicherte Arbeitsverzeichnis und Index-Status $stash_msg"
 
-#: git-stash.sh:323
+#: git-stash.sh:326
 msgid "Cannot remove worktree changes"
 msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen"
 
-#: git-stash.sh:471
+#: git-stash.sh:474
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "unbekannte Option: $opt"
 
-#: git-stash.sh:484
-msgid "No stash found."
-msgstr "Kein Stash-Eintrag gefunden."
+#: git-stash.sh:487
+msgid "No stash entries found."
+msgstr "Keine Stash-Einträge gefunden."
 
-#: git-stash.sh:491
+#: git-stash.sh:494
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "Zu viele Commits angegeben: $REV"
 
-#: git-stash.sh:506
+#: git-stash.sh:509
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference ist keine gültige Referenz"
 
-#: git-stash.sh:534
+#: git-stash.sh:537
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "'$args' ist kein \"stash\"-artiger Commit"
 
-#: git-stash.sh:545
+#: git-stash.sh:548
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "'$args' ist keine \"stash\"-Referenz"
 
-#: git-stash.sh:553
+#: git-stash.sh:556
 msgid "unable to refresh index"
 msgstr "Konnte den Index nicht aktualisieren."
 
-#: git-stash.sh:557
+#: git-stash.sh:560
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "Kann \"stash\" nicht anwenden, solang ein Merge im Gange ist"
 
-#: git-stash.sh:565
+#: git-stash.sh:568
 msgid "Conflicts in index. Try without --index."
 msgstr "Konflikte im Index. Versuchen Sie es ohne --index."
 
-#: git-stash.sh:567
+#: git-stash.sh:570
 msgid "Could not save index tree"
 msgstr "Konnte Index-Verzeichnis nicht speichern"
 
-#: git-stash.sh:576
-msgid "Could not restore untracked files from stash"
-msgstr "Konnte unversionierte Dateien vom Stash nicht wiederherstellen"
+#: git-stash.sh:579
+msgid "Could not restore untracked files from stash entry"
+msgstr "Konnte unversionierte Dateien vom Stash-Eintrag nicht wiederherstellen."
 
-#: git-stash.sh:601
+#: git-stash.sh:604
 msgid "Cannot unstage modified files"
 msgstr "Kann geänderte Dateien nicht aus dem Index entfernen"
 
-#: git-stash.sh:616
+#: git-stash.sh:619
 msgid "Index was not unstashed."
 msgstr "Index wurde nicht aus dem Stash zurückgeladen."
 
-#: git-stash.sh:630
-msgid "The stash is kept in case you need it again."
-msgstr "Der Stash wird behalten, im Falle Sie benötigen diesen nochmal."
+#: git-stash.sh:633
+msgid "The stash entry is kept in case you need it again."
+msgstr "Der Stash-Eintrag wird behalten, im Falle Sie benötigen diesen nochmal."
 
-#: git-stash.sh:639
+#: git-stash.sh:642
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "Gelöscht ${REV} ($s)"
 
-#: git-stash.sh:640
+#: git-stash.sh:643
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: Konnte \"stash\"-Eintrag nicht löschen"
 
-#: git-stash.sh:648
+#: git-stash.sh:651
 msgid "No branch name specified"
 msgstr "Kein Branchname spezifiziert"
 
-#: git-stash.sh:727
+#: git-stash.sh:730
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)"
 
@@ -14977,7 +15102,7 @@ msgstr "'$sm_path' ist bereits zum Commit vorgemerkt"
 msgid "'$sm_path' already exists in the index and is not a submodule"
 msgstr "'$sm_path' ist bereits zum Commit vorgemerkt und ist kein Submodul"
 
-#: git-submodule.sh:218
+#: git-submodule.sh:219
 #, sh-format
 msgid ""
 "The following path is ignored by one of your .gitignore files:\n"
@@ -14988,24 +15113,24 @@ msgstr ""
 "$sm_path\n"
 "Benutzen Sie -f wenn Sie diesen wirklich hinzufügen möchten."
 
-#: git-submodule.sh:236
+#: git-submodule.sh:237
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "Füge existierendes Repository in '$sm_path' dem Index hinzu."
 
-#: git-submodule.sh:238
+#: git-submodule.sh:239
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "'$sm_path' existiert bereits und ist kein gültiges Git-Repository"
 
-#: git-submodule.sh:246
+#: git-submodule.sh:247
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr ""
 "Ein Git-Verzeichnis für '$sm_name' wurde lokal gefunden mit den Remote-"
 "Repositories:"
 
-#: git-submodule.sh:248
+#: git-submodule.sh:249
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -15023,49 +15148,49 @@ msgstr ""
 "nicht das korrekte Repository ist oder Sie unsicher sind, was das bedeutet,\n"
 "wählen Sie einen anderen Namen mit der Option '--name'."
 
-#: git-submodule.sh:254
+#: git-submodule.sh:255
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr "Reaktiviere lokales Git-Verzeichnis für Submodul '$sm_name'."
 
-#: git-submodule.sh:266
+#: git-submodule.sh:267
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "Kann Submodul '$sm_path' nicht auschecken"
 
-#: git-submodule.sh:271
+#: git-submodule.sh:272
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "Hinzufügen von Submodul '$sm_path' fehlgeschlagen"
 
-#: git-submodule.sh:280
+#: git-submodule.sh:281
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration."
 
-#: git-submodule.sh:341
+#: git-submodule.sh:342
 #, sh-format
 msgid "Entering '$displaypath'"
 msgstr "Betrete '$displaypath'"
 
-#: git-submodule.sh:361
+#: git-submodule.sh:362
 #, sh-format
 msgid "Stopping at '$displaypath'; script returned non-zero status."
 msgstr "Stoppe bei '$displaypath'; Skript gab nicht-Null Status zurück."
 
-#: git-submodule.sh:432
+#: git-submodule.sh:433
 #, sh-format
 msgid "pathspec and --all are incompatible"
 msgstr "Pfadspezifikationen und --all sind inkompatibel."
 
-#: git-submodule.sh:437
+#: git-submodule.sh:438
 #, sh-format
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr ""
 "Verwenden Sie '--all', wenn Sie wirklich alle Submodule deinitialisieren\n"
 "möchten."
 
-#: git-submodule.sh:457
+#: git-submodule.sh:458
 #, sh-format
 msgid ""
 "Submodule work tree '$displaypath' contains a .git directory\n"
@@ -15077,7 +15202,7 @@ msgstr ""
 "löschen\n"
 "möchten)"
 
-#: git-submodule.sh:465
+#: git-submodule.sh:466
 #, sh-format
 msgid ""
 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -15086,41 +15211,41 @@ msgstr ""
 "Arbeitsverzeichnis von Submodul in '$displaypath' enthält lokale Änderungen; "
 "verwenden Sie '-f', um diese zu verwerfen"
 
-#: git-submodule.sh:468
+#: git-submodule.sh:469
 #, sh-format
 msgid "Cleared directory '$displaypath'"
 msgstr "Verzeichnis '$displaypath' bereinigt."
 
-#: git-submodule.sh:469
+#: git-submodule.sh:470
 #, sh-format
 msgid "Could not remove submodule work tree '$displaypath'"
 msgstr ""
 "Konnte Arbeitsverzeichnis des Submoduls in '$displaypath' nicht löschen."
 
-#: git-submodule.sh:472
+#: git-submodule.sh:473
 #, sh-format
 msgid "Could not create empty submodule directory '$displaypath'"
 msgstr ""
 "Konnte kein leeres Verzeichnis für Submodul in '$displaypath' erstellen."
 
-#: git-submodule.sh:481
+#: git-submodule.sh:482
 #, sh-format
 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
 msgstr ""
 "Submodul '$name' ($url) für Pfad '$displaypath' wurde aus der Konfiguration "
 "entfernt."
 
-#: git-submodule.sh:637
+#: git-submodule.sh:638
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "Konnte aktuellen Commit in Submodul-Pfad '$displaypath' nicht finden."
 
-#: git-submodule.sh:647
+#: git-submodule.sh:648
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "Konnte \"fetch\" in Submodul-Pfad '$sm_path' nicht ausführen"
 
-#: git-submodule.sh:652
+#: git-submodule.sh:653
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -15129,12 +15254,12 @@ msgstr ""
 "Konnte aktuellen Commit von ${remote_name}/${branch} in Submodul-Pfad\n"
 "'$sm_path' nicht finden."
 
-#: git-submodule.sh:670
+#: git-submodule.sh:671
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen"
 
-#: git-submodule.sh:676
+#: git-submodule.sh:677
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -15143,85 +15268,85 @@ msgstr ""
 "\"fetch\" in Submodul-Pfad '$displaypath' ausgeführt, aber $sha1 nicht\n"
 "enthalten. Direktes Anfordern dieses Commits ist fehlgeschlagen."
 
-#: git-submodule.sh:683
+#: git-submodule.sh:684
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken."
 
-#: git-submodule.sh:684
+#: git-submodule.sh:685
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt"
 
-#: git-submodule.sh:688
+#: git-submodule.sh:689
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "Rebase auf '$sha1' in Submodul-Pfad '$displaypath' nicht möglich"
 
-#: git-submodule.sh:689
+#: git-submodule.sh:690
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'"
 
-#: git-submodule.sh:694
+#: git-submodule.sh:695
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen"
 
-#: git-submodule.sh:695
+#: git-submodule.sh:696
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'"
 
-#: git-submodule.sh:700
+#: git-submodule.sh:701
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 "Ausführung von '$command $sha1' in Submodul-Pfad '$displaypath' "
 "fehlgeschlagen"
 
-#: git-submodule.sh:701
+#: git-submodule.sh:702
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Submodul-Pfad '$displaypath': '$command $sha1'"
 
-#: git-submodule.sh:732
+#: git-submodule.sh:733
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'"
 
-#: git-submodule.sh:840
+#: git-submodule.sh:841
 msgid "The --cached option cannot be used with the --files option"
 msgstr ""
 "Die Optionen --cached und --files können nicht gemeinsam verwendet werden."
 
-#: git-submodule.sh:892
+#: git-submodule.sh:893
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "unerwarteter Modus $mod_dst"
 
-#: git-submodule.sh:912
+#: git-submodule.sh:913
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Warnung: $display_name beinhaltet nicht Commit $sha1_src"
 
-#: git-submodule.sh:915
+#: git-submodule.sh:916
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Warnung: $display_name beinhaltet nicht Commit $sha1_dst"
 
-#: git-submodule.sh:918
+#: git-submodule.sh:919
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
 "  Warnung: $display_name beinhaltet nicht die Commits $sha1_src und $sha1_dst"
 
-#: git-submodule.sh:1064
+#: git-submodule.sh:1065
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr "Fehler bei Rekursion in Submodul-Pfad '$sm_path'"
 
-#: git-submodule.sh:1136
+#: git-submodule.sh:1137
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr "Synchronisiere Submodul-URL für '$displaypath'"
@@ -15726,81 +15851,81 @@ msgid "Unable to determine absolute path of git directory"
 msgstr "Konnte absoluten Pfad des Git-Verzeichnisses nicht bestimmen."
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:238
+#: git-add--interactive.perl:196
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%28s %25s %s"
 
-#: git-add--interactive.perl:239
+#: git-add--interactive.perl:197
 msgid "staged"
 msgstr "zur Staging-Area hinzugefügt"
 
-#: git-add--interactive.perl:239
+#: git-add--interactive.perl:197
 msgid "unstaged"
 msgstr "aus Staging-Area entfernt"
 
-#: git-add--interactive.perl:288 git-add--interactive.perl:313
+#: git-add--interactive.perl:246 git-add--interactive.perl:271
 msgid "binary"
 msgstr "Binär"
 
-#: git-add--interactive.perl:297 git-add--interactive.perl:351
+#: git-add--interactive.perl:255 git-add--interactive.perl:309
 msgid "nothing"
 msgstr "Nichts"
 
-#: git-add--interactive.perl:333 git-add--interactive.perl:348
+#: git-add--interactive.perl:291 git-add--interactive.perl:306
 msgid "unchanged"
 msgstr "unverändert"
 
-#: git-add--interactive.perl:644
+#: git-add--interactive.perl:602
 #, perl-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
 msgstr[0] "%d Pfad hinzugefügt\n"
 msgstr[1] "%d Pfade hinzugefügt\n"
 
-#: git-add--interactive.perl:647
+#: git-add--interactive.perl:605
 #, perl-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
 msgstr[0] "%d Pfad aktualisiert\n"
 msgstr[1] "%d Pfade aktualisiert\n"
 
-#: git-add--interactive.perl:650
+#: git-add--interactive.perl:608
 #, perl-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
 msgstr[0] "%d Pfad wiederhergestellt\n"
 msgstr[1] "%d Pfade wiederhergestellt\n"
 
-#: git-add--interactive.perl:653
+#: git-add--interactive.perl:611
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "%d Pfad angefasst\n"
 msgstr[1] "%d Pfade angefasst\n"
 
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:620
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: git-add--interactive.perl:674
+#: git-add--interactive.perl:632
 msgid "Revert"
 msgstr "Revert"
 
-#: git-add--interactive.perl:697
+#: git-add--interactive.perl:655
 #, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr "Hinweis: %s ist nun unversioniert.\n"
 
-#: git-add--interactive.perl:708
+#: git-add--interactive.perl:666
 msgid "Add untracked"
 msgstr "unversionierte Dateien hinzufügen"
 
-#: git-add--interactive.perl:714
+#: git-add--interactive.perl:672
 msgid "No untracked files.\n"
 msgstr "Keine unversionierten Dateien.\n"
 
-#: git-add--interactive.perl:1030
+#: git-add--interactive.perl:985
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -15809,7 +15934,7 @@ msgstr ""
 "Block\n"
 "direkt als zum Hinzufügen zur Staging-Area markiert."
 
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:988
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -15818,7 +15943,7 @@ msgstr ""
 "Block\n"
 "direkt als zum Hinzufügen zum Stash markiert."
 
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:991
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -15827,7 +15952,7 @@ msgstr ""
 "Block\n"
 "direkt als zum Entfernen aus der Staging-Area markiert."
 
-#: git-add--interactive.perl:1039 git-add--interactive.perl:1048
+#: git-add--interactive.perl:994 git-add--interactive.perl:1003
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -15836,7 +15961,7 @@ msgstr ""
 "Block\n"
 "direkt als zum Anwenden markiert."
 
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1045
+#: git-add--interactive.perl:997 git-add--interactive.perl:1000
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -15845,19 +15970,19 @@ msgstr ""
 "Block\n"
 "direkt als zum Verwerfen markiert."
 
-#: git-add--interactive.perl:1058
+#: git-add--interactive.perl:1013
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr ""
 "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Schreiben: %s"
 
-#: git-add--interactive.perl:1059
+#: git-add--interactive.perl:1014
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr ""
 "Manueller Editiermodus für Patch-Blöcke -- siehe nach unten für eine\n"
 "Kurzanleitung.\n"
 
-#: git-add--interactive.perl:1065
+#: git-add--interactive.perl:1020
 #, perl-format
 msgid ""
 "---\n"
@@ -15871,7 +15996,7 @@ msgstr ""
 "Zeilen, die mit %s beginnen, werden entfernt.\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1073
+#: git-add--interactive.perl:1028
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
@@ -15882,7 +16007,7 @@ msgstr ""
 "werden,\n"
 "wird die Bearbeitung abgebrochen und der Patch-Block bleibt unverändert.\n"
 
-#: git-add--interactive.perl:1087
+#: git-add--interactive.perl:1042
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Lesen: %s"
@@ -15893,14 +16018,14 @@ msgstr "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Lesen: %s"
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: git-add--interactive.perl:1178
+#: git-add--interactive.perl:1134
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
 "Ihr bearbeiteter Patch-Block kann nicht angewendet werden.\n"
 "Erneut bearbeiten? (\"n\" verwirft Bearbeitung!) [y/n]?"
 
-#: git-add--interactive.perl:1187
+#: git-add--interactive.perl:1143
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -15916,7 +16041,7 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum Commit "
 "vormerken"
 
-#: git-add--interactive.perl:1193
+#: git-add--interactive.perl:1149
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -15930,7 +16055,7 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blöcke dieser Datei stashen\n"
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht stashen"
 
-#: git-add--interactive.perl:1199
+#: git-add--interactive.perl:1155
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -15944,7 +16069,7 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blöcke dieser Datei unstashen\n"
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht unstashen"
 
-#: git-add--interactive.perl:1205
+#: git-add--interactive.perl:1161
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -15961,7 +16086,7 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den Index "
 "anwenden"
 
-#: git-add--interactive.perl:1211
+#: git-add--interactive.perl:1167
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -15978,7 +16103,7 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im "
 "Arbeitsverzeichnis verwerfen"
 
-#: git-add--interactive.perl:1217
+#: git-add--interactive.perl:1173
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -15993,7 +16118,7 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blöcke in der Datei verwerfen\n"
 "d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht verwerfen"
 
-#: git-add--interactive.perl:1223
+#: git-add--interactive.perl:1179
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -16007,7 +16132,7 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n"
 "d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht anwenden"
 
-#: git-add--interactive.perl:1232
+#: git-add--interactive.perl:1188
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -16031,203 +16156,203 @@ msgstr ""
 "e - aktuellen Patch-Block manuell editieren\n"
 "? - Hilfe anzeigen\n"
 
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1219
 msgid "The selected hunks do not apply to the index!\n"
 msgstr ""
 "Die ausgewählten Patch-Blöcke können nicht auf den Index angewendet werden!\n"
 
-#: git-add--interactive.perl:1264
+#: git-add--interactive.perl:1220
 msgid "Apply them to the worktree anyway? "
 msgstr "Trotzdem auf Arbeitsverzeichnis anwenden? "
 
-#: git-add--interactive.perl:1267
+#: git-add--interactive.perl:1223
 msgid "Nothing was applied.\n"
 msgstr "Nichts angewendet.\n"
 
-#: git-add--interactive.perl:1278
+#: git-add--interactive.perl:1234
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "ignoriere nicht zusammengeführte Datei: %s\n"
 
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1243
 msgid "Only binary files changed.\n"
 msgstr "Nur Binärdateien geändert.\n"
 
-#: git-add--interactive.perl:1289
+#: git-add--interactive.perl:1245
 msgid "No changes.\n"
 msgstr "Keine Änderungen.\n"
 
-#: git-add--interactive.perl:1297
+#: git-add--interactive.perl:1253
 msgid "Patch update"
 msgstr "Patch Aktualisierung"
 
-#: git-add--interactive.perl:1349
+#: git-add--interactive.perl:1305
 #, perl-format
 msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
 msgstr "Modusänderung der Staging-Area hinzufügen [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1350
+#: git-add--interactive.perl:1306
 #, perl-format
 msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
 msgstr "Löschung der Staging-Area hinzufügen [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1351
+#: git-add--interactive.perl:1307
 #, perl-format
 msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
 msgstr "Diesen Patch-Block der Staging-Area hinzufügen [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1354
+#: git-add--interactive.perl:1310
 #, perl-format
 msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
 msgstr "Modusänderung stashen [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1311
 #, perl-format
 msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
 msgstr "Löschung stashen [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1356
+#: git-add--interactive.perl:1312
 #, perl-format
 msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
 msgstr "Diesen Patch-Block stashen [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1359
+#: git-add--interactive.perl:1315
 #, perl-format
 msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
 msgstr "Modusänderung aus der Staging-Area entfernen [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1316
 #, perl-format
 msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
 msgstr "Löschung aus der Staging-Area entfernen [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1361
+#: git-add--interactive.perl:1317
 #, perl-format
 msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
 msgstr "Diesen Patch-Block aus der Staging-Area entfernen [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1364
+#: git-add--interactive.perl:1320
 #, perl-format
 msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
 msgstr "Modusänderung auf Index anwenden [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1365
+#: git-add--interactive.perl:1321
 #, perl-format
 msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
 msgstr "Löschung auf Index anwenden [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1366
+#: git-add--interactive.perl:1322
 #, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
 msgstr "Diesen Patch-Block auf Index anwenden [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1369
+#: git-add--interactive.perl:1325
 #, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
 msgstr "Modusänderung im Arbeitsverzeichnis verwerfen [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1370
+#: git-add--interactive.perl:1326
 #, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
 msgstr "Löschung im Arbeitsverzeichnis verwerfen [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1371
+#: git-add--interactive.perl:1327
 #, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
 msgstr "diesen Patch-Block im Arbeitsverzeichnis verwerfen [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1374
+#: git-add--interactive.perl:1330
 #, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr ""
 "Modusänderung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1375
+#: git-add--interactive.perl:1331
 #, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr ""
 "Löschung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1376
+#: git-add--interactive.perl:1332
 #, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr ""
 "Diesen Patch-Block vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d,/"
 "%s,?]? "
 
-#: git-add--interactive.perl:1379
+#: git-add--interactive.perl:1335
 #, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr ""
 "Modusänderung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1380
+#: git-add--interactive.perl:1336
 #, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr "Löschung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1381
+#: git-add--interactive.perl:1337
 #, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr ""
 "Diesen Patch-Block auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d,/"
 "%s,?]? "
 
-#: git-add--interactive.perl:1484
+#: git-add--interactive.perl:1440
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "zu welchem Patch-Block springen (<Enter> für mehr Informationen)? "
 
-#: git-add--interactive.perl:1486
+#: git-add--interactive.perl:1442
 msgid "go to which hunk? "
 msgstr "zu welchem Patch-Block springen? "
 
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1451
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Ungültige Nummer: '%s'\n"
 
-#: git-add--interactive.perl:1500
+#: git-add--interactive.perl:1456
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Entschuldigung, nur %d Patch-Block verfügbar.\n"
 msgstr[1] "Entschuldigung, nur %d Patch-Blöcke verfügbar.\n"
 
-#: git-add--interactive.perl:1526
+#: git-add--interactive.perl:1482
 msgid "search for regex? "
 msgstr "Suche nach regulärem Ausdruck? "
 
-#: git-add--interactive.perl:1539
+#: git-add--interactive.perl:1495
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Fehlerhafter regulärer Ausdruck für Suche %s: %s\n"
 
-#: git-add--interactive.perl:1549
+#: git-add--interactive.perl:1505
 msgid "No hunk matches the given pattern\n"
 msgstr "Kein Patch-Block entspricht dem angegebenen Pattern\n"
 
-#: git-add--interactive.perl:1561 git-add--interactive.perl:1583
+#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
 msgid "No previous hunk\n"
 msgstr "Kein vorheriger Patch-Block\n"
 
-#: git-add--interactive.perl:1570 git-add--interactive.perl:1589
+#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
 msgid "No next hunk\n"
 msgstr "Kein folgender Patch-Block\n"
 
-#: git-add--interactive.perl:1597
+#: git-add--interactive.perl:1553
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "In %d Patch-Block aufgeteilt.\n"
 msgstr[1] "In %d Patch-Blöcke aufgeteilt.\n"
 
-#: git-add--interactive.perl:1649
+#: git-add--interactive.perl:1605
 msgid "Review diff"
 msgstr "Diff überprüfen"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1668
+#: git-add--interactive.perl:1624
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -16246,88 +16371,88 @@ msgstr ""
 "diff          - Unterschiede zwischen HEAD und Index anzeigen\n"
 "add untracked - Inhalte von unversionierten Dateien zum Commit vormerken\n"
 
-#: git-add--interactive.perl:1685 git-add--interactive.perl:1690
-#: git-add--interactive.perl:1693 git-add--interactive.perl:1700
-#: git-add--interactive.perl:1704 git-add--interactive.perl:1710
+#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
+#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
+#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
 msgid "missing --"
 msgstr "-- fehlt"
 
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1662
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "Unbekannter --patch Modus: %s"
 
-#: git-add--interactive.perl:1712 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "ungültiges Argument %s, erwarte --"
 
-#: git-send-email.perl:121
+#: git-send-email.perl:126
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr ""
-"lokale Zeitzone unterscheidet sich von GMT nicht um einen Minutenintervall\n"
+"lokale Zeitzone unterscheidet sich von GMT nicht um ein Minutenintervall\n"
 
-#: git-send-email.perl:128 git-send-email.perl:134
+#: git-send-email.perl:133 git-send-email.perl:139
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "lokaler Zeit-Offset größer oder gleich 24 Stunden\n"
 
-#: git-send-email.perl:202 git-send-email.perl:208
+#: git-send-email.perl:208 git-send-email.perl:214
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "Der Editor wurde unsauber beendet, breche alles ab."
 
-#: git-send-email.perl:282
+#: git-send-email.perl:291
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr ""
 "'%s' enthält eine Zwischenversion der E-Mail, die Sie gerade verfassen.\n"
 
-#: git-send-email.perl:287
+#: git-send-email.perl:296
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' enthält die verfasste E-Mail.\n"
 
-#: git-send-email.perl:305
+#: git-send-email.perl:314
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases ist mit anderen Optionen inkompatibel\n"
 
-#: git-send-email.perl:368 git-send-email.perl:623
+#: git-send-email.perl:379 git-send-email.perl:634
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr ""
 "Kann 'git format-patch' nicht außerhalb eines Repositories ausführen.\n"
 
-#: git-send-email.perl:437
+#: git-send-email.perl:448
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Unbekanntes --suppress-cc Feld: '%s'\n"
 
-#: git-send-email.perl:466
+#: git-send-email.perl:477
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Unbekannte --confirm Einstellung: '%s'\n"
 
-#: git-send-email.perl:498
+#: git-send-email.perl:509
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr ""
 "Warnung: sendemail Alias mit Anführungsstrichen wird nicht unterstützt: %s\n"
 
-#: git-send-email.perl:500
+#: git-send-email.perl:511
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "Warnung: `:include:` wird nicht unterstützt: %s\n"
 
-#: git-send-email.perl:502
+#: git-send-email.perl:513
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "Warnung: `/file` oder `|pipe` Umleitung wird nicht unterstützt: %s\n"
 
-#: git-send-email.perl:507
+#: git-send-email.perl:518
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "Warnung: sendmail Zeile wird nicht erkannt: %s\n"
 
-#: git-send-email.perl:589
+#: git-send-email.perl:600
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -16344,12 +16469,12 @@ msgstr ""
 "    * die Option --format-patch angeben, wenn Sie einen Commit-Bereich "
 "meinen\n"
 
-#: git-send-email.perl:610
+#: git-send-email.perl:621
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Fehler beim Öffnen von %s: %s"
 
-#: git-send-email.perl:634
+#: git-send-email.perl:645
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
@@ -16358,7 +16483,7 @@ msgstr ""
 "fatal: %s: %s\n"
 "Warnung: Es wurden keine Patches versendet.\n"
 
-#: git-send-email.perl:645
+#: git-send-email.perl:656
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -16368,17 +16493,17 @@ msgstr ""
 "keine Patch-Dateien angegeben!\n"
 "\n"
 
-#: git-send-email.perl:658
+#: git-send-email.perl:669
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Keine Betreffzeile in %s?"
 
-#: git-send-email.perl:668
+#: git-send-email.perl:679
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Fehler beim Öffnen von '%s' zum Schreiben: %s"
 
-#: git-send-email.perl:678
+#: git-send-email.perl:689
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -16393,32 +16518,32 @@ msgstr ""
 "Leeren Sie den Inhalt des Bodys, wenn Sie keine Zusammenfassung senden "
 "möchten.\n"
 
-#: git-send-email.perl:701
+#: git-send-email.perl:712
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "Fehler beim Öffnen von %s.final: %s"
 
-#: git-send-email.perl:704
+#: git-send-email.perl:715
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Fehler beim Öffnen von %s: %s"
 
-#: git-send-email.perl:739
+#: git-send-email.perl:750
 msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
 msgstr ""
 "To/Cc/Bcc Felder wurden noch nicht interpretiert, sie wurden ignoriert\n"
 
-#: git-send-email.perl:748
+#: git-send-email.perl:759
 msgid "Summary email is empty, skipping it\n"
 msgstr "E-Mail mit Zusammenfassung ist leer, wird ausgelassen\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:780
+#: git-send-email.perl:791
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "Sind Sie sich sicher, <%s> zu benutzen [y/N]? "
 
-#: git-send-email.perl:809
+#: git-send-email.perl:820
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -16426,11 +16551,11 @@ msgstr ""
 "Die folgenden Dateien sind 8-Bit, aber deklarieren kein\n"
 "Content-Transfer-Encoding.\n"
 
-#: git-send-email.perl:814
+#: git-send-email.perl:825
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Welches 8-Bit-Encoding soll deklariert werden [UTF-8]? "
 
-#: git-send-email.perl:822
+#: git-send-email.perl:833
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -16444,22 +16569,22 @@ msgstr ""
 "an,\n"
 "wenn Sie den Patch wirklich versenden wollen.\n"
 
-#: git-send-email.perl:841
+#: git-send-email.perl:852
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "An wen sollen die E-Mails versendet werden (wenn überhaupt jemand)?"
 
-#: git-send-email.perl:859
+#: git-send-email.perl:870
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "fatal: Alias '%s' erweitert sich zu sich selbst\n"
 
-#: git-send-email.perl:871
+#: git-send-email.perl:882
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
 "Message-ID zur Verwendung als In-Reply-To für die erste E-Mail (wenn eine "
 "existiert)? "
 
-#: git-send-email.perl:921 git-send-email.perl:929
+#: git-send-email.perl:932 git-send-email.perl:940
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "Fehler: konnte keine gültige Adresse aus %s extrahieren\n"
@@ -16467,18 +16592,18 @@ msgstr "Fehler: konnte keine gültige Adresse aus %s extrahieren\n"
 #. TRANSLATORS: Make sure to include [q] [d] [e] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:933
+#: git-send-email.perl:944
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr ""
 "Was soll mit dieser Adresse geschehen? (Beenden [q]|Löschen [d]|Bearbeiten "
 "[e]): "
 
-#: git-send-email.perl:1234
+#: git-send-email.perl:1245
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "CA Pfad \"%s\" existiert nicht"
 
-#: git-send-email.perl:1309
+#: git-send-email.perl:1320
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -16507,130 +16632,174 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1324
+#: git-send-email.perl:1335
 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
 msgstr "Diese E-Mail versenden? (Ja [y]|Nein [n]|Beenden [q]|Alle [a]): "
 
-#: git-send-email.perl:1327
+#: git-send-email.perl:1338
 msgid "Send this email reply required"
 msgstr "Zum Versenden dieser E-Mail ist eine Antwort erforderlich."
 
-#: git-send-email.perl:1353
+#: git-send-email.perl:1364
 msgid "The required SMTP server is not properly defined."
 msgstr "Der erforderliche SMTP-Server ist nicht korrekt definiert."
 
-#: git-send-email.perl:1397
+#: git-send-email.perl:1411
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Server unterstützt kein STARTTLS! %s"
 
-#: git-send-email.perl:1403
+#: git-send-email.perl:1416 git-send-email.perl:1420
+#, perl-format
+msgid "STARTTLS failed! %s"
+msgstr "STARTTLS fehlgeschlagen! %s"
+
+#: git-send-email.perl:1430
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "Konnte SMTP nicht korrekt initialisieren. Bitte prüfen Sie Ihre "
 "Konfiguration\n"
 "und benutzen Sie --smtp-debug."
 
-#: git-send-email.perl:1421
+#: git-send-email.perl:1448
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Fehler beim Senden %s\n"
 
-#: git-send-email.perl:1424
+#: git-send-email.perl:1451
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Probeversand %s\n"
 
-#: git-send-email.perl:1424
+#: git-send-email.perl:1451
 #, perl-format
 msgid "Sent %s\n"
 msgstr "%s gesendet\n"
 
-#: git-send-email.perl:1426
+#: git-send-email.perl:1453
 msgid "Dry-OK. Log says:\n"
 msgstr "Probeversand OK. Log enthält:\n"
 
-#: git-send-email.perl:1426
+#: git-send-email.perl:1453
 msgid "OK. Log says:\n"
 msgstr "OK. Log enthält:\n"
 
-#: git-send-email.perl:1438
+#: git-send-email.perl:1465
 msgid "Result: "
 msgstr "Ergebnis: "
 
-#: git-send-email.perl:1441
+#: git-send-email.perl:1468
 msgid "Result: OK\n"
 msgstr "Ergebnis: OK\n"
 
-#: git-send-email.perl:1454
+#: git-send-email.perl:1481
 #, perl-format
 msgid "can't open file %s"
 msgstr "Kann Datei %s nicht öffnen"
 
-#: git-send-email.perl:1501 git-send-email.perl:1521
+#: git-send-email.perl:1528 git-send-email.perl:1548
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Füge cc: hinzu: %s von Zeile '%s'\n"
 
-#: git-send-email.perl:1507
+#: git-send-email.perl:1534
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Füge to: hinzu: %s von Zeile '%s'\n"
 
-#: git-send-email.perl:1555
+#: git-send-email.perl:1582
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) Füge cc: hinzu: %s von Zeile '%s'\n"
 
-#: git-send-email.perl:1578
+#: git-send-email.perl:1605
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) Füge cc: hinzu: %s von Zeile '%s'\n"
 
-#: git-send-email.perl:1676
+#: git-send-email.perl:1711
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Konnte '%s' nicht ausführen"
 
-#: git-send-email.perl:1683
+#: git-send-email.perl:1718
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Füge %s: %s hinzu von: '%s'\n"
 
-#: git-send-email.perl:1687
+#: git-send-email.perl:1722
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) Fehler beim Schließen der Pipe nach '%s'"
 
-#: git-send-email.perl:1714
+#: git-send-email.perl:1749
 msgid "cannot send message as 7bit"
 msgstr "Kann Nachricht nicht als 7bit versenden."
 
-#: git-send-email.perl:1722
+#: git-send-email.perl:1757
 msgid "invalid transfer encoding"
 msgstr "Ungültiges Transfer-Encoding"
 
-#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802
+#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "konnte %s nicht öffnen: %s\n"
 
-#: git-send-email.perl:1744
+#: git-send-email.perl:1798
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr "%s: Patch enthält eine Zeile, die länger als 998 Zeichen ist"
 
-#: git-send-email.perl:1760
+#: git-send-email.perl:1814
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr "Lasse %s mit Backup-Suffix '%s' aus.\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1764
+#: git-send-email.perl:1818
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Wollen Sie %s wirklich versenden? [y|N]: "
 
+#~ msgid "Could not open file '%s'"
+#~ msgstr "Konnte Datei '%s' nicht öffnen"
+
+#~ msgid "in %0.1f seconds automatically..."
+#~ msgstr "Automatische Ausführung in %0.1f Sekunden ..."
+
+#~ msgid "dup2(%d,%d) failed"
+#~ msgstr "dup2(%d,%d) fehlgeschlagen"
+
+#~ msgid "Initial commit on "
+#~ msgstr "Initialer Commit auf "
+
+#~ msgid "Patch is empty. Was it split wrong?"
+#~ msgstr "Patch ist leer. War dessen Aufteilung falsch?"
+
+#~ msgid ""
+#~ "You still have unmerged paths in your index.\n"
+#~ "Did you forget to use 'git add'?"
+#~ msgstr ""
+#~ "Sie haben immer noch nicht zusammengeführte Pfade im Index.\n"
+#~ "Haben Sie vergessen 'git add' zu benutzen?"
+
+#~ msgid ""
+#~ "Cannot update paths and switch to branch '%s' at the same time.\n"
+#~ "Did you intend to checkout '%s' which can not be resolved as commit?"
+#~ msgstr ""
+#~ "Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln.\n"
+#~ "Haben Sie beabsichtigt '%s' auszuchecken, welcher nicht als Commit "
+#~ "aufgelöst werden kann?"
+
+#~ msgid "Explicit paths specified without -i or -o; assuming --only paths..."
+#~ msgstr "Explizite Pfade ohne -i oder -o angegeben; nehme --only an"
+
+#~ msgid "default mode for recursion"
+#~ msgstr "Standard-Modus für Rekursion"
+
+#~ msgid "submodule--helper subcommand must be called with a subcommand"
+#~ msgstr "submodule--helper muss mit einem Unterbefehl aufgerufen werden"
+
 #~ msgid "tag: tagging "
 #~ msgstr "tag: tagge "
 
diff --git a/po/fr.po b/po/fr.po
index 0dd068de03..cb45f57b33 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -28,7 +28,7 @@
 #   to debug         |  déboguer
 #   debugging        |  débogage
 #   to deflate       |  compresser
-#   email            |  e-mail
+#   email            |  courriel
 #   entry            |  élément
 #   fast-forward     |  avance rapide
 #   fast-forwarded   |  mis à jour en avance rapide
@@ -73,8 +73,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-05-05 09:35+0800\n"
-"PO-Revision-Date: 2017-05-05 12:02+0200\n"
+"POT-Creation-Date: 2017-07-24 21:54+0800\n"
+"PO-Revision-Date: 2017-07-23 04:35+0200\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"
@@ -83,37 +83,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n"
 
-#: advice.c:55
+#: advice.c:58
 #, c-format
 msgid "hint: %.*s\n"
 msgstr "astuce: %.*s\n"
 
-#: advice.c:83
+#: advice.c:86
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "Impossible de picorer car vous avez des fichiers non fusionnés."
 
-#: advice.c:85
+#: advice.c:88
 msgid "Committing is not possible because you have unmerged files."
 msgstr "Impossible de valider car vous avez des fichiers non fusionnés."
 
-#: advice.c:87
+#: advice.c:90
 msgid "Merging is not possible because you have unmerged files."
 msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés."
 
-#: advice.c:89
+#: advice.c:92
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "Impossible de tirer car vous avez des fichiers non fusionnés."
 
-#: advice.c:91
+#: advice.c:94
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés."
 
-#: advice.c:93
+#: advice.c:96
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés."
 
-#: advice.c:101
+#: advice.c:104
 msgid ""
 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 "as appropriate to mark resolution and make a commit."
@@ -121,23 +121,23 @@ msgstr ""
 "Corrigez-les puis lancez 'git add/rm <fichier>'\n"
 "si nécessaire pour marquer la résolution et valider."
 
-#: advice.c:109
+#: advice.c:112
 msgid "Exiting because of an unresolved conflict."
 msgstr "Abandon à cause de conflit non résolu."
 
-#: advice.c:114 builtin/merge.c:1185
+#: advice.c:117 builtin/merge.c:1184
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."
 
-#: advice.c:116
+#: advice.c:119
 msgid "Please, commit your changes before merging."
 msgstr "Veuillez valider vos changements avant de fusionner."
 
-#: advice.c:117
+#: advice.c:120
 msgid "Exiting because of unfinished merge."
 msgstr "Abandon à cause d'une fusion non terminée."
 
-#: advice.c:123
+#: advice.c:126
 #, c-format
 msgid ""
 "Note: checking out '%s'.\n"
@@ -169,89 +169,99 @@ msgstr ""
 "  git checkout -b <nom-de-la-nouvelle-branche>\n"
 "\n"
 
-#: apply.c:57
+#: apply.c:58
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "option d'espace non reconnue '%s'"
 
-#: apply.c:73
+#: apply.c:74
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "option d'ignorance d'espace non reconnue '%s'"
 
-#: apply.c:125
+#: apply.c:126
 msgid "--reject and --3way cannot be used together."
 msgstr "--reject et --3way ne peuvent pas être utilisés ensemble."
 
-#: apply.c:127
+#: apply.c:128
 msgid "--cached and --3way cannot be used together."
 msgstr "--cached et --3way ne peuvent pas être utilisés ensemble."
 
-#: apply.c:130
+#: apply.c:131
 msgid "--3way outside a repository"
 msgstr "--3way hors d'un dépôt"
 
-#: apply.c:141
+#: apply.c:142
 msgid "--index outside a repository"
 msgstr "--index hors d'un dépôt"
 
-#: apply.c:144
+#: apply.c:145
 msgid "--cached outside a repository"
 msgstr "--cached hors d'un dépôt"
 
-#: apply.c:845
+#: apply.c:836
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "Impossible de préparer la regexp d'horodatage %s"
 
-#: apply.c:854
+#: apply.c:845
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec a retourné %d pour l'entrée : %s"
 
-#: apply.c:938
+#: apply.c:929
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "nom de fichier du patch introuvable à la ligne %d"
 
-#: apply.c:977
+#: apply.c:967
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 "git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la "
 "ligne %d"
 
-#: apply.c:983
+#: apply.c:973
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 "git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant "
 "à la ligne %d"
 
-#: apply.c:984
+#: apply.c:974
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 "git apply : mauvais format de git-diff - ancien nom de fichier inconsistant "
 "à la ligne %d"
 
-#: apply.c:990
+#: apply.c:979
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr ""
 "git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d"
 
-#: apply.c:1488
+#: apply.c:1008
+#, c-format
+msgid "invalid mode on line %d: %s"
+msgstr "mode invalide dans la ligne %d : %s"
+
+#: apply.c:1326
+#, c-format
+msgid "inconsistent header lines %d and %d"
+msgstr "lignes d'entête inconsistantes %d et %d"
+
+#: apply.c:1498
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recomptage : ligne inattendue : %.*s"
 
-#: apply.c:1557
+#: apply.c:1567
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "fragment de patch sans en-tête à la ligne %d : %.*s"
 
-#: apply.c:1577
+#: apply.c:1587
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -266,83 +276,83 @@ msgstr[1] ""
 "information de nom de fichier manquante dans l'en-tête de git diff lors de "
 "la suppression de %d composants de préfixe de chemin (ligne %d)"
 
-#: apply.c:1589
+#: apply.c:1600
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr ""
 "information de nom de fichier manquante dans l'en-tête de git diff (ligne %d)"
 
-#: apply.c:1759
+#: apply.c:1770
 msgid "new file depends on old contents"
 msgstr "le nouveau fichier dépend de contenus anciens"
 
-#: apply.c:1761
+#: apply.c:1772
 msgid "deleted file still has contents"
 msgstr "le fichier supprimé a encore du contenu"
 
-#: apply.c:1795
+#: apply.c:1806
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "patch corrompu à la ligne %d"
 
-#: apply.c:1832
+#: apply.c:1843
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "le nouveau fichier %s dépend de contenus anciens"
 
-#: apply.c:1834
+#: apply.c:1845
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "le fichier supprimé %s a encore du contenu"
 
-#: apply.c:1837
+#: apply.c:1848
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé"
 
-#: apply.c:1984
+#: apply.c:1995
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "patch binaire corrompu à la ligne %d : %.*s"
 
-#: apply.c:2021
+#: apply.c:2032
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "patch binaire non reconnu à la ligne %d"
 
-#: apply.c:2182
+#: apply.c:2193
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "patch totalement incompréhensible à la ligne %d"
 
-#: apply.c:2265
+#: apply.c:2276
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "lecture du lien symbolique %s impossible"
 
-#: apply.c:2269
+#: apply.c:2280
 #, c-format
 msgid "unable to open or read %s"
 msgstr "ouverture ou lecture de %s impossible"
 
-#: apply.c:2922
+#: apply.c:2933
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "début de ligne invalide : '%c'"
 
-#: apply.c:3041
+#: apply.c:3052
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "La section n°%d a réussi à la ligne %d (offset %d ligne)."
 msgstr[1] "La section n°%d a réussi à la ligne %d (offset %d lignes)."
 
-#: apply.c:3053
+#: apply.c:3064
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d"
 
-#: apply.c:3059
+#: apply.c:3070
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -351,580 +361,580 @@ msgstr ""
 "pendant la recherche de :\n"
 "%.*s"
 
-#: apply.c:3081
+#: apply.c:3092
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "données de patch binaire manquantes pour '%s'"
 
-#: apply.c:3089
+#: apply.c:3100
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 "impossible d'appliquer l'inverse d'un patch binaire à '%s' sans la section "
 "inverse"
 
-#: apply.c:3135
+#: apply.c:3146
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 "impossible d'appliquer un patch binaire à '%s' sans la ligne complète d'index"
 
-#: apply.c:3145
+#: apply.c:3156
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr ""
 "le patch s'applique à '%s' (%s), ce qui ne correspond pas au contenu actuel."
 
-#: apply.c:3153
+#: apply.c:3164
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "le patch s'applique à un '%s' vide mais ce n'est pas vide"
 
-#: apply.c:3171
+#: apply.c:3182
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "l'image postérieure nécessaire %s pour '%s' ne peut pas être lue"
 
-#: apply.c:3184
+#: apply.c:3195
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "le patch binaire ne s'applique par correctement à '%s'"
 
-#: apply.c:3190
+#: apply.c:3201
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s "
 "trouvé)"
 
-#: apply.c:3211
+#: apply.c:3222
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "le patch a échoué : %s:%ld"
 
-#: apply.c:3333
+#: apply.c:3344
 #, c-format
 msgid "cannot checkout %s"
 msgstr "extraction de %s impossible"
 
-#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253
+#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
 #, c-format
 msgid "failed to read %s"
 msgstr "échec de la lecture de %s"
 
-#: apply.c:3389
+#: apply.c:3400
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "lecture depuis '%s' au-delà d'un lien symbolique"
 
-#: apply.c:3418 apply.c:3658
+#: apply.c:3429 apply.c:3669
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "le chemin %s a été renommé/supprimé"
 
-#: apply.c:3501 apply.c:3672
+#: apply.c:3512 apply.c:3683
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s : n'existe pas dans l'index"
 
-#: apply.c:3510 apply.c:3680
+#: apply.c:3521 apply.c:3691
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s : ne correspond pas à l'index"
 
-#: apply.c:3545
+#: apply.c:3556
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr ""
 "le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
 "points."
 
-#: apply.c:3548
+#: apply.c:3559
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "Retour à une fusion à 3 points…\n"
 
-#: apply.c:3564 apply.c:3568
+#: apply.c:3575 apply.c:3579
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "impossible de lire le contenu actuel de '%s'"
 
-#: apply.c:3580
+#: apply.c:3591
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "Echec du retour à une fusion à 3 points…\n"
 
-#: apply.c:3594
+#: apply.c:3605
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Patch %s appliqué avec des conflits.\n"
 
-#: apply.c:3599
+#: apply.c:3610
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Patch %s appliqué proprement.\n"
 
-#: apply.c:3625
+#: apply.c:3636
 msgid "removal patch leaves file contents"
 msgstr "le patch de suppression laisse un contenu dans le fichier"
 
-#: apply.c:3697
+#: apply.c:3708
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s : type erroné"
 
-#: apply.c:3699
+#: apply.c:3710
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s est de type %o, mais %o attendu"
 
-#: apply.c:3850 apply.c:3852
+#: apply.c:3860 apply.c:3862
 #, c-format
 msgid "invalid path '%s'"
 msgstr "chemin invalide '%s'"
 
-#: apply.c:3908
+#: apply.c:3918
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s : existe déjà dans l'index"
 
-#: apply.c:3911
+#: apply.c:3921
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s : existe déjà dans la copie de travail"
 
-#: apply.c:3931
+#: apply.c:3941
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)"
 
-#: apply.c:3936
+#: apply.c:3946
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr ""
 "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s"
 
-#: apply.c:3956
+#: apply.c:3966
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique"
 
-#: apply.c:3960
+#: apply.c:3970
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s : le patch ne s'applique pas"
 
-#: apply.c:3975
+#: apply.c:3985
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Vérification du patch %s..."
 
-#: apply.c:4066
+#: apply.c:4076
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr ""
 "l'information sha1 est manquante ou inutilisable pour le sous-module %s"
 
-#: apply.c:4073
+#: apply.c:4083
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "le mode change pour %s, qui n'est pas dans la HEAD actuelle"
 
-#: apply.c:4076
+#: apply.c:4086
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "l'information de sha1 est manquante ou inutilisable (%s)."
 
-#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135
+#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "échec de make_cache_entry pour le chemin '%s'"
 
-#: apply.c:4085
+#: apply.c:4095
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "impossible d'ajouter %s à l'index temporaire"
 
-#: apply.c:4095
+#: apply.c:4105
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "impossible d'écrire l'index temporaire dans %s"
 
-#: apply.c:4233
+#: apply.c:4243
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "suppression de %s dans l'index impossible"
 
-#: apply.c:4268
+#: apply.c:4278
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "patch corrompu pour le sous-module %s"
 
-#: apply.c:4274
+#: apply.c:4284
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "stat du fichier nouvellement créé '%s' impossible"
 
-#: apply.c:4282
+#: apply.c:4292
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 "création du magasin de stockage pour le fichier nouvellement créé %s "
 "impossible"
 
-#: apply.c:4288 apply.c:4432
+#: apply.c:4298 apply.c:4442
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "ajout de l'élément de cache %s impossible"
 
-#: apply.c:4329
+#: apply.c:4339
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "échec de l'écriture dans '%s'"
 
-#: apply.c:4333
+#: apply.c:4343
 #, c-format
 msgid "closing file '%s'"
 msgstr "fermeture du fichier '%s'"
 
-#: apply.c:4403
+#: apply.c:4413
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "écriture du fichier '%s' mode %o impossible"
 
-#: apply.c:4501
+#: apply.c:4511
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Patch %s appliqué proprement."
 
-#: apply.c:4509
+#: apply.c:4519
 msgid "internal error"
 msgstr "erreur interne"
 
-#: apply.c:4512
+#: apply.c:4522
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "Application du patch %%s avec %d rejet..."
 msgstr[1] "Application du patch %%s avec %d rejets..."
 
-#: apply.c:4523
+#: apply.c:4533
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "troncature du nom de fichier .rej en %.*s.rej"
 
-#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988
+#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
 #, c-format
 msgid "cannot open %s"
 msgstr "impossible d'ouvrir %s"
 
-#: apply.c:4545
+#: apply.c:4555
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Section n°%d appliquée proprement."
 
-#: apply.c:4549
+#: apply.c:4559
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Section n°%d rejetée."
 
-#: apply.c:4659
+#: apply.c:4669
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Chemin '%s' non traité."
 
-#: apply.c:4667
+#: apply.c:4677
 msgid "unrecognized input"
 msgstr "entrée non reconnue"
 
-#: apply.c:4686
+#: apply.c:4696
 msgid "unable to read index file"
 msgstr "lecture du fichier d'index impossible"
 
-#: apply.c:4823
+#: apply.c:4833
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "ouverture impossible du patch '%s' :%s"
 
-#: apply.c:4850
+#: apply.c:4860
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "%d erreur d'espace ignorée"
 msgstr[1] "%d erreurs d'espace ignorées"
 
-#: apply.c:4856 apply.c:4871
+#: apply.c:4866 apply.c:4881
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d ligne a ajouté des erreurs d'espace."
 msgstr[1] "%d lignes ont ajouté des erreurs d'espace."
 
-#: apply.c:4864
+#: apply.c:4874
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] "%d ligne ajoutée après correction des erreurs d'espace."
 msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace."
 
-#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
+#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
 msgid "Unable to write new index file"
 msgstr "Impossible d'écrire le nouveau fichier d'index"
 
-#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279
-#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180
+#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
+#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
 #: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
 #: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
 #: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
-#: git-add--interactive.perl:239
+#: git-add--interactive.perl:197
 msgid "path"
 msgstr "chemin"
 
-#: apply.c:4912
+#: apply.c:4922
 msgid "don't apply changes matching the given path"
 msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
 
-#: apply.c:4915
+#: apply.c:4925
 msgid "apply changes matching the given path"
 msgstr "appliquer les modifications qui correspondent au chemin donné"
 
-#: apply.c:4917 builtin/am.c:2285
+#: apply.c:4927 builtin/am.c:2266
 msgid "num"
 msgstr "num"
 
-#: apply.c:4918
+#: apply.c:4928
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
 
-#: apply.c:4921
+#: apply.c:4931
 msgid "ignore additions made by the patch"
 msgstr "ignorer les additions réalisées par le patch"
 
-#: apply.c:4923
+#: apply.c:4933
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée"
 
-#: apply.c:4927
+#: apply.c:4937
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 "afficher le nombre de lignes ajoutées et supprimées en notation décimale"
 
-#: apply.c:4929
+#: apply.c:4939
 msgid "instead of applying the patch, output a summary for the input"
-msgstr "au lieu d'appliquer le patch, afficher un résumer de l'entrée"
+msgstr "au lieu d'appliquer le patch, afficher un résumé de l'entrée"
 
-#: apply.c:4931
+#: apply.c:4941
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "au lieu d'appliquer le patch, voir si le patch est applicable"
 
-#: apply.c:4933
+#: apply.c:4943
 msgid "make sure the patch is applicable to the current index"
 msgstr "s'assurer que le patch est applicable sur l'index actuel"
 
-#: apply.c:4935
+#: apply.c:4945
 msgid "apply a patch without touching the working tree"
 msgstr "appliquer les patch sans toucher à la copie de travail"
 
-#: apply.c:4937
+#: apply.c:4947
 msgid "accept a patch that touches outside the working area"
 msgstr "accepter un patch qui touche hors de la copie de travail"
 
-#: apply.c:4939
+#: apply.c:4949
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)"
 
-#: apply.c:4941
+#: apply.c:4951
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement"
 
-#: apply.c:4943
+#: apply.c:4953
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "construire un index temporaire fondé sur l'information de l'index embarqué"
 
-#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515
+#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
 msgid "paths are separated with NUL character"
 msgstr "les chemins sont séparés par un caractère NUL"
 
-#: apply.c:4948
+#: apply.c:4958
 msgid "ensure at least <n> lines of context match"
 msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
 
-#: apply.c:4949 builtin/am.c:2264
+#: apply.c:4959 builtin/am.c:2245
 msgid "action"
 msgstr "action"
 
-#: apply.c:4950
+#: apply.c:4960
 msgid "detect new or modified lines that have whitespace errors"
 msgstr ""
 "détecter des lignes nouvelles ou modifiées qui contiennent des erreurs "
 "d'espace"
 
-#: apply.c:4953 apply.c:4956
+#: apply.c:4963 apply.c:4966
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
 
-#: apply.c:4959
+#: apply.c:4969
 msgid "apply the patch in reverse"
 msgstr "appliquer le patch en sens inverse"
 
-#: apply.c:4961
+#: apply.c:4971
 msgid "don't expect at least one line of context"
 msgstr "ne pas s'attendre à au moins une ligne de contexte"
 
-#: apply.c:4963
+#: apply.c:4973
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
 
-#: apply.c:4965
+#: apply.c:4975
 msgid "allow overlapping hunks"
 msgstr "accepter les recouvrements de sections"
 
-#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19
-#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651
-#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134
+#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
+#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
+#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
 msgid "be verbose"
 msgstr "mode verbeux"
 
-#: apply.c:4968
+#: apply.c:4978
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 "tolérer des erreurs de détection de retours chariot manquants en fin de "
 "fichier"
 
-#: apply.c:4971
+#: apply.c:4981
 msgid "do not trust the line counts in the hunk headers"
 msgstr "ne pas se fier au compte de lignes dans les en-têtes de section"
 
-#: apply.c:4973 builtin/am.c:2273
+#: apply.c:4983 builtin/am.c:2254
 msgid "root"
 msgstr "racine"
 
-#: apply.c:4974
+#: apply.c:4984
 msgid "prepend <root> to all filenames"
 msgstr "préfixer tous les noms de fichier avec <root>"
 
-#: archive.c:12
+#: archive.c:13
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]"
 
-#: archive.c:13
+#: archive.c:14
 msgid "git archive --list"
 msgstr "git archive --list"
 
-#: archive.c:14
+#: archive.c:15
 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 msgstr ""
 "git archive --remote <dépôt> [--exec <commande>] [<options>] <arbre ou "
 "apparenté> [<chemin>...]"
 
-#: archive.c:15
+#: archive.c:16
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <dépôt> [--exec <commande>] --list"
 
-#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
+#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "le chemin '%s' ne correspond à aucun fichier"
 
-#: archive.c:417
+#: archive.c:418
 msgid "fmt"
 msgstr "fmt"
 
-#: archive.c:417
+#: archive.c:418
 msgid "archive format"
 msgstr "format d'archive"
 
-#: archive.c:418 builtin/log.c:1436
+#: archive.c:419 builtin/log.c:1446
 msgid "prefix"
 msgstr "préfixe"
 
-#: archive.c:419
+#: archive.c:420
 msgid "prepend prefix to each pathname in the archive"
 msgstr "préfixer chaque chemin de fichier dans l'archive"
 
-#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60
-#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061
-#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129
+#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
+#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
+#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
+#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
 #: parse-options.h:153
 msgid "file"
 msgstr "fichier"
 
-#: archive.c:421 builtin/archive.c:89
+#: archive.c:422 builtin/archive.c:89
 msgid "write the archive to this file"
 msgstr "écrire l'archive dans ce fichier"
 
-#: archive.c:423
+#: archive.c:424
 msgid "read .gitattributes in working directory"
 msgstr "lire .gitattributes dans le répertoire de travail"
 
-#: archive.c:424
+#: archive.c:425
 msgid "report archived files on stderr"
 msgstr "afficher les fichiers archivés sur stderr"
 
-#: archive.c:425
+#: archive.c:426
 msgid "store only"
 msgstr "stockage seulement"
 
-#: archive.c:426
+#: archive.c:427
 msgid "compress faster"
 msgstr "compression rapide"
 
-#: archive.c:434
+#: archive.c:435
 msgid "compress better"
 msgstr "compression efficace"
 
-#: archive.c:437
+#: archive.c:438
 msgid "list supported archive formats"
 msgstr "afficher les formats d'archive supportés"
 
-#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106
+#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
 #: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
 msgid "repo"
 msgstr "dépôt"
 
-#: archive.c:440 builtin/archive.c:91
+#: archive.c:441 builtin/archive.c:91
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "récupérer l'archive depuis le dépôt distant <dépôt>"
 
-#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485
+#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
 msgid "command"
 msgstr "commande"
 
-#: archive.c:442 builtin/archive.c:93
+#: archive.c:443 builtin/archive.c:93
 msgid "path to the remote git-upload-archive command"
 msgstr "chemin vers la commande distante git-upload-archive"
 
-#: archive.c:449
+#: archive.c:450
 msgid "Unexpected option --remote"
 msgstr "Option --remote inattendue"
 
-#: archive.c:451
+#: archive.c:452
 msgid "Option --exec can only be used together with --remote"
 msgstr "L'option --exec ne peut être utilisée qu'en complément de --remote"
 
-#: archive.c:453
+#: archive.c:454
 msgid "Unexpected option --output"
 msgstr "Option --output inattendue"
 
-#: archive.c:475
+#: archive.c:476
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Format d'archive inconnu '%s'"
 
-#: archive.c:482
+#: archive.c:483
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argument non supporté pour le format '%s' : -%d"
 
-#: attr.c:212
+#: attr.c:214
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s n'est pas un nom valide d'attribut"
 
-#: attr.c:408
+#: attr.c:410
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -932,27 +942,22 @@ msgstr ""
 "Les motifs de négation sont ignorés dans les attributs git\n"
 "Utilisez '\\!' pour un point d'exclamation littéral."
 
-#: bisect.c:444
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "impossible d'ouvrir le fichier '%s'"
-
-#: bisect.c:449
+#: bisect.c:447
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Contenu mal cité dans le fichier '%s' : %s"
 
-#: bisect.c:657
+#: bisect.c:655
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Impossible de pousser la bissection plus loin !\n"
 
-#: bisect.c:710
+#: bisect.c:708
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "%s n'est pas un nom de commit valide"
 
-#: bisect.c:734
+#: bisect.c:732
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -961,7 +966,7 @@ msgstr ""
 "La base de fusion %s est mauvaise.\n"
 "Cela signifie que le bogue été corrigé entre %s et [%s].\n"
 
-#: bisect.c:739
+#: bisect.c:737
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -970,7 +975,7 @@ msgstr ""
 "La base de fusion %s est nouvelle.\n"
 "La propriété a changé entre %s et [%s].\n"
 
-#: bisect.c:744
+#: bisect.c:742
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -979,7 +984,7 @@ msgstr ""
 "La base de fusion %s est %s.\n"
 "Ceci signifie que le premier commit '%s' est entre %s et [%s].\n"
 
-#: bisect.c:752
+#: bisect.c:750
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -990,7 +995,7 @@ msgstr ""
 "git bisect ne peut pas fonctionner correctement dans ce cas.\n"
 "Peut-être les révisions %s et %s ne sont-elles pas les bonnes ?\n"
 
-#: bisect.c:765
+#: bisect.c:763
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1002,36 +1007,36 @@ msgstr ""
 "et %s.\n"
 "On continue tout de même."
 
-#: bisect.c:800
+#: bisect.c:798
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Bissection : une base de fusion doit être testée\n"
 
-#: bisect.c:851
+#: bisect.c:849
 #, c-format
 msgid "a %s revision is needed"
 msgstr "une révision %s est nécessaire"
 
-#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255
+#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
 #, c-format
 msgid "could not create file '%s'"
 msgstr "impossible de créer le fichier '%s'"
 
-#: bisect.c:919
+#: bisect.c:917
 #, c-format
 msgid "could not read file '%s'"
 msgstr "impossible de lire le fichier '%s'"
 
-#: bisect.c:949
+#: bisect.c:947
 msgid "reading bisect refs failed"
 msgstr "impossible de lire les références de bissection"
 
-#: bisect.c:969
+#: bisect.c:967
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s était à la fois %s et %s\n"
 
-#: bisect.c:977
+#: bisect.c:975
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1040,15 +1045,16 @@ msgstr ""
 "Aucun commit testable n'a été trouvé\n"
 "Peut-être avez-vous démarré avec un mauvais paramètre de chemin ?\n"
 
-#: bisect.c:996
+#: bisect.c:994
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
 msgstr[0] "(à peu près %d étape)"
 msgstr[1] "(à peu près %d étapes)"
 
-#. TRANSLATORS: the last %s will be replaced with
-#. "(roughly %d steps)" translation
+#. TRANSLATORS: the last %s will be replaced with "(roughly %d
+#. steps)" translation.
+#.
 #: bisect.c:1000
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
@@ -1056,6 +1062,44 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "Bissection : %d révision à tester après cette %s\n"
 msgstr[1] "Bissection : %d révisions à tester après cette %s\n"
 
+#: blame.c:1757
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents et --reverse ne font pas bon ménage."
+
+#: blame.c:1768
+msgid "cannot use --contents with final commit object name"
+msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final"
+
+#: blame.c:1788
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+"--reverse et --first-parent ensemble nécessitent la spécification d'un "
+"dernier commit"
+
+#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
+#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
+#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
+#: builtin/shortlog.c:177
+msgid "revision walk setup failed"
+msgstr "échec de la préparation du parcours des révisions"
+
+#: blame.c:1815
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr ""
+"--reverse --first-parent ensemble nécessitent une portée avec la chaîne de "
+"premier parent"
+
+#: blame.c:1826
+#, c-format
+msgid "no such path %s in %s"
+msgstr "pas de chemin %s dans %s"
+
+#: blame.c:1837
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "impossible de lire le blob %s  pour le chemin %s"
+
 #: branch.c:53
 #, c-format
 msgid ""
@@ -1196,7 +1240,7 @@ msgstr "Point d'embranchement invalide : '%s'."
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' est déjà extrait dans '%s'"
 
-#: branch.c:364
+#: branch.c:366
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "la HEAD de la copie de travail %s n'est pas mise à jour"
@@ -1206,92 +1250,85 @@ msgstr "la HEAD de la copie de travail %s n'est pas mise à jour"
 msgid "'%s' does not look like a v2 bundle file"
 msgstr "'%s' ne semble pas être un fichier bundle v2"
 
-#: bundle.c:61
+#: bundle.c:62
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "en-tête non reconnu : %s%s (%d)"
 
-#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777
+#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
 #, c-format
 msgid "could not open '%s'"
 msgstr "impossible d'ouvrir '%s'"
 
-#: bundle.c:139
+#: bundle.c:140
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
 
-#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321
-#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353
-#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916
-#: builtin/merge.c:359 builtin/shortlog.c:176
-msgid "revision walk setup failed"
-msgstr "échec de la préparation du parcours des révisions"
-
-#: bundle.c:185
+#: bundle.c:186
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "Le colis contient cette référence :"
 msgstr[1] "Le colis contient ces %d références :"
 
-#: bundle.c:192
+#: bundle.c:193
 msgid "The bundle records a complete history."
 msgstr "Le colis enregistre l'historique complet."
 
-#: bundle.c:194
+#: bundle.c:195
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "Le colis exige cette référence :"
 msgstr[1] "Le colis exige ces %d références :"
 
-#: bundle.c:253
+#: bundle.c:254
 msgid "Could not spawn pack-objects"
 msgstr "Impossible de créer des objets groupés"
 
-#: bundle.c:264
+#: bundle.c:265
 msgid "pack-objects died"
 msgstr "les objets groupés ont disparu"
 
-#: bundle.c:304
+#: bundle.c:307
 msgid "rev-list died"
 msgstr "rev-list a disparu"
 
-#: bundle.c:353
+#: bundle.c:356
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "la référence '%s' est exclue par les options de rev-list"
 
-#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281
+#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "argument non reconnu : %s"
 
-#: bundle.c:451
+#: bundle.c:454
 msgid "Refusing to create empty bundle."
 msgstr "Refus de créer un colis vide."
 
-#: bundle.c:463
+#: bundle.c:466
 #, c-format
 msgid "cannot create '%s'"
 msgstr "impossible de créer '%s'"
 
-#: bundle.c:491
+#: bundle.c:494
 msgid "index-pack died"
 msgstr "l'index de groupe a disparu"
 
-#: color.c:300
+#: color.c:301
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "Valeur invalide de couleur : %.*s"
 
-#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455
-#: builtin/am.c:1489 builtin/am.c:2126
+#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
+#: builtin/am.c:1469 builtin/am.c:2107
 #, c-format
 msgid "could not parse %s"
 msgstr "impossible d'analyser %s"
 
-#: commit.c:42
+#: commit.c:43
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s n'est pas un commit !"
@@ -1312,180 +1349,180 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "plus de mémoire"
 
-#: config.c:191
+#: config.c:186
 msgid "relative config include conditionals must come from files"
 msgstr ""
 "les conditions d'inclusion de configuration relative doivent venir de "
 "fichiers"
 
-#: config.c:711
+#: config.c:720
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "ligne %d de config incorrecte dans le blob %s"
 
-#: config.c:715
+#: config.c:724
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "ligne %d de config incorrecte dans le fichier %s"
 
-#: config.c:719
+#: config.c:728
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "ligne %d de config incorrecte dans l'entrée standard"
 
-#: config.c:723
+#: config.c:732
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "ligne %d de config incorrecte dans le blob de sous-module %s"
 
-#: config.c:727
+#: config.c:736
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "ligne %d de config incorrecte dans la ligne de commande %s"
 
-#: config.c:731
+#: config.c:740
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "ligne %d de config incorrecte dans %s"
 
-#: config.c:859
+#: config.c:868
 msgid "out of range"
 msgstr "hors plage"
 
-#: config.c:859
+#: config.c:868
 msgid "invalid unit"
 msgstr "unité invalide"
 
-#: config.c:865
+#: config.c:874
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s"
 
-#: config.c:870
+#: config.c:879
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr ""
 "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob "
 "%s : %s"
 
-#: config.c:873
+#: config.c:882
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr ""
 "valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier "
 "%s : %s"
 
-#: config.c:876
+#: config.c:885
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr ""
 "valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée "
 "standard : %s"
 
-#: config.c:879
+#: config.c:888
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
 "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob de "
 "sous-module %s : %s"
 
-#: config.c:882
+#: config.c:891
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr ""
 "valeur numérique de configuration incorrecte '%s' pour '%s' dans la ligne de "
 "commande %s : %s"
 
-#: config.c:885
+#: config.c:894
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr ""
 "valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s"
 
-#: config.c:980
+#: config.c:989
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"
 
-#: config.c:1075 config.c:1086
+#: config.c:1084 config.c:1095
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "niveau de compression zlib incorrect %d"
 
-#: config.c:1203
+#: config.c:1212
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "mode invalide pour la création d'objet : %s"
 
-#: config.c:1359
+#: config.c:1368
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "niveau de compression du paquet %d"
 
-#: config.c:1557
+#: config.c:1564
 msgid "unable to parse command-line config"
 msgstr "lecture de la configuration de ligne de commande impossible"
 
-#: config.c:1611
+#: config.c:1894
 msgid "unknown error occurred while reading the configuration files"
 msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
 
-#: config.c:1970
+#: config.c:2064
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "%s invalide : '%s'"
 
-#: config.c:1991
+#: config.c:2085
 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr ""
 "valeur '%s' de core.untrackedCache inconnue ; utilisation de 'keep' par "
 "défaut"
 
-#: config.c:2017
+#: config.c:2111
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 "la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et "
 "100"
 
-#: config.c:2028
+#: config.c:2122
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr ""
 "impossible d'analyser '%s' depuis le configuration en ligne de commande"
 
-#: config.c:2030
+#: config.c:2124
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr ""
 "variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d"
 
-#: config.c:2089
+#: config.c:2183
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s a des valeurs multiples"
 
-#: config.c:2423 config.c:2648
+#: config.c:2517 config.c:2745
 #, c-format
 msgid "fstat on %s failed"
 msgstr "échec de fstat sur %s"
 
-#: config.c:2541
+#: config.c:2635
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "impossible de régler '%s' à '%s'"
 
-#: config.c:2543 builtin/remote.c:774
+#: config.c:2637 builtin/remote.c:775
 #, c-format
 msgid "could not unset '%s'"
 msgstr "impossible de désinitialiser '%s'"
 
-#: connect.c:49
+#: connect.c:50
 msgid "The remote end hung up upon initial contact"
 msgstr "L'hôte distant a fermé la connexion lors du contact initial"
 
-#: connect.c:51
+#: connect.c:52
 msgid ""
 "Could not read from remote repository.\n"
 "\n"
@@ -1497,7 +1534,7 @@ msgstr ""
 "Veuillez vérifier que vous avez les droits d'accès\n"
 "et que le dépôt existe."
 
-#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140
+#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
 msgid "Checking connectivity"
 msgstr "Vérification de la connectivité"
 
@@ -1513,7 +1550,7 @@ msgstr "impossible d'écrire dans la rev-list"
 msgid "failed to close rev-list's stdin"
 msgstr "impossible de fermer l'entrée standard du rev-list"
 
-#: convert.c:201
+#: convert.c:205
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
@@ -1523,12 +1560,12 @@ msgstr ""
 "Le fichier conservera ses fins de ligne d'origine dans votre copie de "
 "travail."
 
-#: convert.c:205
+#: convert.c:209
 #, c-format
 msgid "CRLF would be replaced by LF in %s."
 msgstr "Les CRLF seraient remplacés par des LF dans %s."
 
-#: convert.c:211
+#: convert.c:215
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -1538,78 +1575,78 @@ msgstr ""
 "Le fichier conservera ses fins de ligne d'origine dans votre copie de "
 "travail."
 
-#: convert.c:215
+#: convert.c:219
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr "Les LF seraient remplacés par des CRLF dans %s"
 
-#: date.c:97
+#: date.c:116
 msgid "in the future"
 msgstr "dans le futur"
 
-#: date.c:103
+#: date.c:122
 #, c-format
-msgid "%lu second ago"
-msgid_plural "%lu seconds ago"
-msgstr[0] "il y a %lu seconde"
-msgstr[1] "il y a %lu secondes"
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "il y a %<PRIuMAX> seconde"
+msgstr[1] "il y a %<PRIuMAX> secondes"
 
-#: date.c:110
+#: date.c:129
 #, c-format
-msgid "%lu minute ago"
-msgid_plural "%lu minutes ago"
-msgstr[0] "il y a %lu minute"
-msgstr[1] "il y a %lu minutes"
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "il y a %<PRIuMAX> minute"
+msgstr[1] "il y a %<PRIuMAX> minutes"
 
-#: date.c:117
+#: date.c:136
 #, c-format
-msgid "%lu hour ago"
-msgid_plural "%lu hours ago"
-msgstr[0] "il y a %lu heure"
-msgstr[1] "il y a %lu heures"
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "il y a %<PRIuMAX> heure"
+msgstr[1] "il y a %<PRIuMAX> heures"
 
-#: date.c:124
+#: date.c:143
 #, c-format
-msgid "%lu day ago"
-msgid_plural "%lu days ago"
-msgstr[0] "il y a %lu jour"
-msgstr[1] "il y a %lu jours"
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "il y a %<PRIuMAX> jour"
+msgstr[1] "il y a %<PRIuMAX> jours"
 
-#: date.c:130
+#: date.c:149
 #, c-format
-msgid "%lu week ago"
-msgid_plural "%lu weeks ago"
-msgstr[0] "il y a %lu semaine"
-msgstr[1] "il y a %lu semaines"
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "il y a %<PRIuMAX> semaine"
+msgstr[1] "il y a %<PRIuMAX> semaines"
 
-#: date.c:137
+#: date.c:156
 #, c-format
-msgid "%lu month ago"
-msgid_plural "%lu months ago"
-msgstr[0] "il y a %lu mois"
-msgstr[1] "il y a %lu mois"
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "il y a %<PRIuMAX> mois"
+msgstr[1] "il y a %<PRIuMAX> mois"
 
-#: date.c:148
+#: date.c:167
 #, c-format
-msgid "%lu year"
-msgid_plural "%lu years"
-msgstr[0] "%lu an"
-msgstr[1] "%lu ans"
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> an"
+msgstr[1] "%<PRIuMAX> ans"
 
 #. TRANSLATORS: "%s" is "<n> years"
-#: date.c:151
+#: date.c:170
 #, c-format
-msgid "%s, %lu month ago"
-msgid_plural "%s, %lu months ago"
-msgstr[0] "il y a %s et %lu mois"
-msgstr[1] "il y a %s et %lu mois"
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "il y a %s et %<PRIuMAX> mois"
+msgstr[1] "il y a %s et %<PRIuMAX> mois"
 
-#: date.c:156 date.c:161
+#: date.c:175 date.c:180
 #, c-format
-msgid "%lu year ago"
-msgid_plural "%lu years ago"
-msgstr[0] "il y a %lu an"
-msgstr[1] "il y a %lu ans"
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "il y a %<PRIuMAX> an"
+msgstr[1] "il y a %<PRIuMAX> ans"
 
 #: diffcore-order.c:24
 #, c-format
@@ -1620,29 +1657,29 @@ msgstr "impossible de lire le fichier de commande '%s'"
 msgid "Performing inexact rename detection"
 msgstr "Détection de renommage inexact en cours"
 
-#: diff.c:62
+#: diff.c:63
 #, c-format
 msgid "option '%s' requires a value"
 msgstr "le commutateur '%s' a besoin d'une valeur"
 
-#: diff.c:124
+#: diff.c:125
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr ""
 "  Impossible d'analyser le pourcentage de modification de dirstat '%s'\n"
 
-#: diff.c:129
+#: diff.c:130
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Paramètre dirstat inconnu '%s'\n"
 
-#: diff.c:281
+#: diff.c:282
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr ""
 "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"
 
-#: diff.c:344
+#: diff.c:342
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -1651,20 +1688,20 @@ msgstr ""
 "Erreurs dans la variable de configuration 'diff.dirstat' :\n"
 "%s"
 
-#: diff.c:3102
+#: diff.c:3101
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "l'application de diff externe a disparu, arrêt à %s"
 
-#: diff.c:3428
+#: diff.c:3427
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs"
 
-#: diff.c:3518
+#: diff.c:3517
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow a besoin d'une spécification de chemin unique"
 
-#: diff.c:3681
+#: diff.c:3680
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -1673,24 +1710,24 @@ msgstr ""
 "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
 "%s"
 
-#: diff.c:3695
+#: diff.c:3694
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'"
 
-#: diff.c:4719
+#: diff.c:4716
 msgid "inexact rename detection was skipped due to too many files."
 msgstr ""
 "détection de renommage inexact annulée à cause d'un trop grand nombre de "
 "fichiers."
 
-#: diff.c:4722
+#: diff.c:4719
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 "recherche uniquement des copies par modification de chemin à cause d'un trop "
 "grand nombre de fichiers."
 
-#: diff.c:4725
+#: diff.c:4722
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -1698,258 +1735,258 @@ msgstr ""
 "vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le "
 "commande."
 
-#: dir.c:1899
+#: dir.c:1948
 msgid "failed to get kernel name and information"
 msgstr "echec de l'obtention d'information de kernel"
 
-#: dir.c:2018
+#: dir.c:2067
 msgid "Untracked cache is disabled on this system or location."
 msgstr "Le cache non suivi est désactivé sur ce système ou sur cet endroit."
 
-#: dir.c:2776 dir.c:2781
+#: dir.c:2846 dir.c:2851
 #, c-format
 msgid "could not create directories for %s"
 msgstr "impossible de créer les répertoires pour %s"
 
-#: dir.c:2806
+#: dir.c:2876
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "impossible de migrer le répertoire git de '%s' vers '%s'"
 
-#: entry.c:280
+#: entry.c:281
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "impossible de stat le fichier '%s'"
 
-#: fetch-pack.c:249
+#: fetch-pack.c:251
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack : list courte attendue"
 
-#: fetch-pack.c:261
+#: fetch-pack.c:263
 msgid "git fetch-pack: expected ACK/NAK, got EOF"
 msgstr "git fetch-pack : ACK/NACK attendu, EOF reçu"
 
-#: fetch-pack.c:280 builtin/archive.c:63
+#: fetch-pack.c:282 builtin/archive.c:63
 #, c-format
 msgid "remote error: %s"
 msgstr "erreur distante : %s"
 
-#: fetch-pack.c:281
+#: fetch-pack.c:283
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"
 
-#: fetch-pack.c:333
+#: fetch-pack.c:335
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc nécessite multi_ack_detailed"
 
-#: fetch-pack.c:419
+#: fetch-pack.c:421
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "ligne de superficiel invalide : %s"
 
-#: fetch-pack.c:425
+#: fetch-pack.c:427
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "ligne de fin de superficiel invalide : %s"
 
-#: fetch-pack.c:427
+#: fetch-pack.c:429
 #, c-format
 msgid "object not found: %s"
 msgstr "objet non trouvé : %s"
 
-#: fetch-pack.c:430
+#: fetch-pack.c:432
 #, c-format
 msgid "error in object: %s"
 msgstr "Erreur dans l'objet : %s"
 
-#: fetch-pack.c:432
+#: fetch-pack.c:434
 #, c-format
 msgid "no shallow found: %s"
 msgstr "Pas de superficiel trouvé : %s"
 
-#: fetch-pack.c:435
+#: fetch-pack.c:437
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "superficiel/non superficiel attendu, %s trouvé"
 
-#: fetch-pack.c:474
+#: fetch-pack.c:476
 #, c-format
 msgid "got %s %d %s"
 msgstr "réponse %s %d %s"
 
-#: fetch-pack.c:488
+#: fetch-pack.c:490
 #, c-format
 msgid "invalid commit %s"
 msgstr "commit invalide %s"
 
-#: fetch-pack.c:521
+#: fetch-pack.c:523
 msgid "giving up"
 msgstr "abandon"
 
-#: fetch-pack.c:531 progress.c:235
+#: fetch-pack.c:533 progress.c:237
 msgid "done"
 msgstr "fait"
 
-#: fetch-pack.c:543
+#: fetch-pack.c:545
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "%s trouvé (%d) %s"
 
-#: fetch-pack.c:589
+#: fetch-pack.c:591
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Marquage de %s comme terminé"
 
-#: fetch-pack.c:737
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr "%s déjà possédé (%s)"
 
-#: fetch-pack.c:775
+#: fetch-pack.c:813
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral"
 
-#: fetch-pack.c:783
+#: fetch-pack.c:821
 msgid "protocol error: bad pack header"
 msgstr "erreur de protocole : mauvais entête de paquet"
 
-#: fetch-pack.c:839
+#: fetch-pack.c:877
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack : impossible de dupliquer %s"
 
-#: fetch-pack.c:855
+#: fetch-pack.c:893
 #, c-format
 msgid "%s failed"
 msgstr "échec de %s"
 
-#: fetch-pack.c:857
+#: fetch-pack.c:895
 msgid "error in sideband demultiplexer"
 msgstr "erreur dans le démultiplexer latéral"
 
-#: fetch-pack.c:884
+#: fetch-pack.c:922
 msgid "Server does not support shallow clients"
 msgstr "Le serveur ne supporte les clients superficiels"
 
-#: fetch-pack.c:888
+#: fetch-pack.c:926
 msgid "Server supports multi_ack_detailed"
 msgstr "Le serveur supporte multi_ack_detailed"
 
-#: fetch-pack.c:891
+#: fetch-pack.c:929
 msgid "Server supports no-done"
 msgstr "Le serveur support no-done"
 
-#: fetch-pack.c:897
+#: fetch-pack.c:935
 msgid "Server supports multi_ack"
 msgstr "Le serveur supporte multi_ack"
 
-#: fetch-pack.c:901
+#: fetch-pack.c:939
 msgid "Server supports side-band-64k"
 msgstr "Le serveur supporte side-band-64k"
 
-#: fetch-pack.c:905
+#: fetch-pack.c:943
 msgid "Server supports side-band"
 msgstr "Le serveru supporte side-band"
 
-#: fetch-pack.c:909
+#: fetch-pack.c:947
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "Le serveur supporte allow-tip-sha1-in-want"
 
-#: fetch-pack.c:913
+#: fetch-pack.c:951
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "Le serveur supporte allow-reachable-sha1-in-want"
 
-#: fetch-pack.c:923
+#: fetch-pack.c:961
 msgid "Server supports ofs-delta"
 msgstr "Le serveur support ofs-delta"
 
-#: fetch-pack.c:930
+#: fetch-pack.c:968
 #, c-format
 msgid "Server version is %.*s"
 msgstr "La version du serveur est %.*s"
 
-#: fetch-pack.c:936
+#: fetch-pack.c:974
 msgid "Server does not support --shallow-since"
 msgstr "Le receveur ne gère pas --shallow-since"
 
-#: fetch-pack.c:940
+#: fetch-pack.c:978
 msgid "Server does not support --shallow-exclude"
 msgstr "Le receveur ne gère pas --shallow-exclude"
 
-#: fetch-pack.c:942
+#: fetch-pack.c:980
 msgid "Server does not support --deepen"
 msgstr "Le receveur ne gère pas --deepen"
 
-#: fetch-pack.c:953
+#: fetch-pack.c:991
 msgid "no common commits"
 msgstr "pas de commit commun"
 
-#: fetch-pack.c:965
+#: fetch-pack.c:1003
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack : échec de le récupération."
 
-#: fetch-pack.c:1127
+#: fetch-pack.c:1165
 msgid "no matching remote head"
 msgstr "pas de HEAD distante correspondante"
 
-#: fetch-pack.c:1149
+#: fetch-pack.c:1187
 #, c-format
 msgid "no such remote ref %s"
 msgstr "référence distante inconnue %s"
 
-#: fetch-pack.c:1152
+#: fetch-pack.c:1190
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "Le serveur n'autorise pas de requête pour l'objet %s non annoncé"
 
-#: gpg-interface.c:185
+#: gpg-interface.c:181
 msgid "gpg failed to sign the data"
 msgstr "gpg n'a pas pu signer les données"
 
-#: gpg-interface.c:215
+#: gpg-interface.c:211
 msgid "could not create temporary file"
 msgstr "impossible de créer un fichier temporaire"
 
-#: gpg-interface.c:217
+#: gpg-interface.c:213
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "impossible d'écrire la signature détachée dans '%s'"
 
-#: graph.c:96
+#: graph.c:97
 #, c-format
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "couleur invalide '%.*s' ignorée dans log.graphColors"
 
-#: grep.c:1796
+#: grep.c:1981
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s' : lecture de %s impossible"
 
-#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133
+#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "échec du stat de '%s'"
 
-#: grep.c:1824
+#: grep.c:2009
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s' : lecture tronquée"
 
-#: help.c:218
+#: help.c:179
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "commandes git disponibles dans '%s'"
 
-#: help.c:225
+#: help.c:186
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "commandes git disponibles depuis un autre endroit de votre $PATH"
 
-#: help.c:256
+#: help.c:217
 msgid "These are common Git commands used in various situations:"
 msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :"
 
-#: help.c:321
+#: help.c:281
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -1958,50 +1995,70 @@ msgstr ""
 "'%s' semble être une commande git, mais elle n'a pas pu\n"
 "être exécutée. Peut-être git-%s est-elle cassée ?"
 
-#: help.c:376
+#: help.c:336
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "Ahem. Votre système n'indique aucune commande Git."
 
-#: help.c:398
+#: help.c:358
 #, c-format
-msgid ""
-"WARNING: You called a Git command named '%s', which does not exist.\n"
-"Continuing under the assumption that you meant '%s'"
+msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr ""
-"ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe "
-"pas.\n"
-"Continuons en supposant que vous avez voulu dire '%s'"
+"ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe pas."
 
-#: help.c:403
+#: help.c:363
 #, c-format
-msgid "in %0.1f seconds automatically..."
-msgstr "dans %0.1f secondes automatiquement..."
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "Continuons en supposant que vous avez voulu dire '%s'<"
 
-#: help.c:410
+#: help.c:368
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr ""
+"Continuons dans %0.1f secondes en supposant que vous avez voulu dire '%s'<"
+
+#: help.c:376
 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'."
 
-#: help.c:414 help.c:480
+#: help.c:380
 msgid ""
 "\n"
-"Did you mean this?"
+"The most similar command is"
 msgid_plural ""
 "\n"
-"Did you mean one of these?"
+"The most similar commands are"
 msgstr[0] ""
 "\n"
-"Vouliez-vous dire cela ?"
+"La commande la plus ressemblante est"
 msgstr[1] ""
 "\n"
-"Vouliez-vous dire un de ceux-là ?"
+"Les commandes les plus ressemblantes sont"
 
-#: help.c:476
+#: help.c:395
+msgid "git version [<options>]"
+msgstr "git version [<options>]"
+
+#: help.c:456
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
-#: ident.c:343
+#: help.c:460
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"Vouliez-vous dire cela ?"
+msgstr[1] ""
+"\n"
+"Vouliez-vous dire un de ceux-là ?"
+
+#: ident.c:342
 msgid ""
 "\n"
 "*** Please tell me who you are.\n"
@@ -2027,35 +2084,35 @@ msgstr ""
 "Éliminez --global pour ne faire les réglages que dans ce dépôt.\n"
 "\n"
 
-#: ident.c:367
+#: ident.c:366
 msgid "no email was given and auto-detection is disabled"
 msgstr "aucun courriel fourni et l'auto-détection est désactivée"
 
-#: ident.c:372
+#: ident.c:371
 #, c-format
 msgid "unable to auto-detect email address (got '%s')"
 msgstr "impossible de détecter automatiquement l'adresse ('%s' trouvé)"
 
-#: ident.c:382
+#: ident.c:381
 msgid "no name was given and auto-detection is disabled"
 msgstr "aucun nom fourni et l'auto-détection est désactivée"
 
-#: ident.c:388
+#: ident.c:387
 #, c-format
 msgid "unable to auto-detect name (got '%s')"
 msgstr "impossible de détecter automatiquement le nom ('%s' trouvé)"
 
-#: ident.c:396
+#: ident.c:395
 #, c-format
 msgid "empty ident name (for <%s>) not allowed"
 msgstr "nom d'identifiant vide (pour <%s>) non permis"
 
-#: ident.c:402
+#: ident.c:401
 #, c-format
 msgid "name consists only of disallowed characters: %s"
 msgstr "le nom n'est constitué que de caractères interdits : %s"
 
-#: ident.c:417 builtin/commit.c:611
+#: ident.c:416 builtin/commit.c:612
 #, c-format
 msgid "invalid date format: %s"
 msgstr "format de date invalide : %s"
@@ -2088,78 +2145,78 @@ msgstr "Impossible de créer '%s.lock' : %s"
 msgid "failed to read the cache"
 msgstr "impossible de lire le cache"
 
-#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393
-#: builtin/checkout.c:607 builtin/clone.c:749
+#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
+#: builtin/checkout.c:591 builtin/clone.c:753
 msgid "unable to write new index file"
 msgstr "impossible d'écrire le nouveau fichier d'index"
 
-#: merge-recursive.c:209
+#: merge-recursive.c:210
 msgid "(bad commit)\n"
 msgstr "(mauvais commit)\n"
 
-#: merge-recursive.c:231 merge-recursive.c:239
+#: merge-recursive.c:232 merge-recursive.c:240
 #, c-format
 msgid "addinfo_cache failed for path '%s'"
 msgstr "échec de addinfo_cache pour le chemin '%s'"
 
-#: merge-recursive.c:303
+#: merge-recursive.c:304
 msgid "error building trees"
 msgstr "erreur de construction des arbres"
 
-#: merge-recursive.c:727
+#: merge-recursive.c:728
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "impossible de créer le chemin '%s' %s"
 
-#: merge-recursive.c:738
+#: merge-recursive.c:739
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n"
 
-#: merge-recursive.c:752 merge-recursive.c:771
+#: merge-recursive.c:753 merge-recursive.c:772
 msgid ": perhaps a D/F conflict?"
 msgstr ": peut-être un conflit D/F ?"
 
-#: merge-recursive.c:761
+#: merge-recursive.c:762
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "refus de perdre le fichier non suivi '%s'"
 
-#: merge-recursive.c:803 builtin/cat-file.c:34
+#: merge-recursive.c:804 builtin/cat-file.c:36
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "impossible de lire l'objet %s '%s'"
 
-#: merge-recursive.c:805
+#: merge-recursive.c:806
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "blob attendu pour %s '%s'"
 
-#: merge-recursive.c:829
+#: merge-recursive.c:830
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "échec à l'ouverture de '%s' : %s"
 
-#: merge-recursive.c:840
+#: merge-recursive.c:841
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "échec à la création du lien symbolique '%s' : %s"
 
-#: merge-recursive.c:845
+#: merge-recursive.c:846
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "ne sait pas traiter %06o %s '%s'"
 
-#: merge-recursive.c:985
+#: merge-recursive.c:986
 msgid "Failed to execute internal merge"
 msgstr "Échec à l'exécution de la fusion interne"
 
-#: merge-recursive.c:989
+#: merge-recursive.c:990
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "Impossible d'ajouter %s à la base de données"
 
-#: merge-recursive.c:1092
+#: merge-recursive.c:1093
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2168,7 +2225,7 @@ msgstr ""
 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
 "%s laissée dans l'arbre."
 
-#: merge-recursive.c:1097
+#: merge-recursive.c:1098
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2177,7 +2234,7 @@ msgstr ""
 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
 "%s de %s laissée dans l'arbre."
 
-#: merge-recursive.c:1104
+#: merge-recursive.c:1105
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2186,7 +2243,7 @@ msgstr ""
 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
 "%s laissée dans l'arbre dans le fichier %s."
 
-#: merge-recursive.c:1109
+#: merge-recursive.c:1110
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2195,20 +2252,20 @@ msgstr ""
 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
 "%s de %s laissée dans l'arbre dans le fichier %s."
 
-#: merge-recursive.c:1143
+#: merge-recursive.c:1144
 msgid "rename"
 msgstr "renommage"
 
-#: merge-recursive.c:1143
+#: merge-recursive.c:1144
 msgid "renamed"
 msgstr "renommé"
 
-#: merge-recursive.c:1200
+#: merge-recursive.c:1201
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s est un répertoire dans %s ajouté plutôt comme %s"
 
-#: merge-recursive.c:1225
+#: merge-recursive.c:1226
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2217,137 +2274,137 @@ msgstr ""
 "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "
 "\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
 
-#: merge-recursive.c:1230
+#: merge-recursive.c:1231
 msgid " (left unresolved)"
 msgstr " (laissé non résolu)"
 
-#: merge-recursive.c:1292
+#: merge-recursive.c:1293
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-"
 ">'%s' dans %s"
 
-#: merge-recursive.c:1325
+#: merge-recursive.c:1326
 #, c-format
 msgid "Renaming %s to %s and %s to %s instead"
 msgstr "Renommage de %s en %s et de %s en %s à la place"
 
-#: merge-recursive.c:1528
+#: merge-recursive.c:1529
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 msgstr ""
 "CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s"
 
-#: merge-recursive.c:1543
+#: merge-recursive.c:1544
 #, c-format
 msgid "Adding merged %s"
 msgstr "Ajout de %s fusionné"
 
-#: merge-recursive.c:1550 merge-recursive.c:1780
+#: merge-recursive.c:1551 merge-recursive.c:1781
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Ajout plutôt comme %s"
 
-#: merge-recursive.c:1607
+#: merge-recursive.c:1608
 #, c-format
 msgid "cannot read object %s"
 msgstr "impossible de lire l'objet %s"
 
-#: merge-recursive.c:1610
+#: merge-recursive.c:1611
 #, c-format
 msgid "object %s is not a blob"
 msgstr "l'objet %s n'est pas un blob"
 
-#: merge-recursive.c:1679
+#: merge-recursive.c:1680
 msgid "modify"
 msgstr "modification"
 
-#: merge-recursive.c:1679
+#: merge-recursive.c:1680
 msgid "modified"
 msgstr "modifié"
 
-#: merge-recursive.c:1689
+#: merge-recursive.c:1690
 msgid "content"
 msgstr "contenu"
 
-#: merge-recursive.c:1696
+#: merge-recursive.c:1697
 msgid "add/add"
 msgstr "ajout/ajout"
 
-#: merge-recursive.c:1732
+#: merge-recursive.c:1733
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "%s sauté (fusion identique à l'existant)"
 
-#: merge-recursive.c:1746
+#: merge-recursive.c:1747
 #, c-format
 msgid "Auto-merging %s"
 msgstr "Fusion automatique de %s"
 
-#: merge-recursive.c:1750 git-submodule.sh:944
+#: merge-recursive.c:1751 git-submodule.sh:945
 msgid "submodule"
 msgstr "sous-module"
 
-#: merge-recursive.c:1751
+#: merge-recursive.c:1752
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
 
-#: merge-recursive.c:1845
+#: merge-recursive.c:1846
 #, c-format
 msgid "Removing %s"
 msgstr "Suppression de %s"
 
-#: merge-recursive.c:1871
+#: merge-recursive.c:1872
 msgid "file/directory"
 msgstr "fichier/répertoire"
 
-#: merge-recursive.c:1877
+#: merge-recursive.c:1878
 msgid "directory/file"
 msgstr "répertoire/fichier"
 
-#: merge-recursive.c:1883
+#: merge-recursive.c:1884
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s"
 
-#: merge-recursive.c:1892
+#: merge-recursive.c:1893
 #, c-format
 msgid "Adding %s"
 msgstr "Ajout de %s"
 
-#: merge-recursive.c:1929
+#: merge-recursive.c:1930
 msgid "Already up-to-date!"
 msgstr "Déjà à jour !"
 
-#: merge-recursive.c:1938
+#: merge-recursive.c:1939
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "échec de fusion des arbres %s et %s"
 
-#: merge-recursive.c:2021
+#: merge-recursive.c:2022
 msgid "Merging:"
 msgstr "Fusion :"
 
-#: merge-recursive.c:2034
+#: merge-recursive.c:2035
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "%u ancêtre commun trouvé :"
 msgstr[1] "%u ancêtres communs trouvés :"
 
-#: merge-recursive.c:2073
+#: merge-recursive.c:2074
 msgid "merge returned no commit"
 msgstr "la fusion n'a pas retourné de commit"
 
-#: merge-recursive.c:2136
+#: merge-recursive.c:2137
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Impossible d'analyser l'objet '%s'"
 
-#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792
+#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
 msgid "Unable to write index."
 msgstr "Impossible d'écrire l'index."
 
@@ -2367,23 +2424,25 @@ msgstr ""
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr "Vous n'avez pas terminé votre fusion de notes (%s existe)."
 
-#: notes-utils.c:41
+#: notes-utils.c:42
 msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr "Impossible de valider un arbre de notes non initialisé/référencé"
 
-#: notes-utils.c:100
+#: notes-utils.c:101
 #, c-format
 msgid "Bad notes.rewriteMode value: '%s'"
 msgstr "Mauvaise valeur de notes.rewriteMode : '%s'"
 
-#: notes-utils.c:110
+#: notes-utils.c:111
 #, c-format
 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)"
 
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: notes-utils.c:137
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#: notes-utils.c:141
 #, c-format
 msgid "Bad %s value: '%s'"
 msgstr "Mauvaise valeur de %s : '%s'"
@@ -2393,28 +2452,29 @@ msgstr "Mauvaise valeur de %s : '%s'"
 msgid "unable to parse object: %s"
 msgstr "impossible d'analyser l'objet : %s"
 
-#: parse-options.c:572
+#: parse-options.c:573
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:590
+#: parse-options.c:591
 #, c-format
 msgid "usage: %s"
 msgstr "usage : %s"
 
 #. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation
-#: parse-options.c:594
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:597
 #, c-format
 msgid "   or: %s"
 msgstr "   ou : %s"
 
-#: parse-options.c:597
+#: parse-options.c:600
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:631
+#: parse-options.c:634
 msgid "-NUM"
 msgstr "-NUM"
 
@@ -2423,37 +2483,37 @@ msgstr "-NUM"
 msgid "malformed object name '%s'"
 msgstr "nom d'objet malformé '%s'"
 
-#: path.c:810
+#: path.c:890
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Impossible de rendre %s inscriptible pour le groupe"
 
-#: pathspec.c:125
+#: pathspec.c:129
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr ""
 "Le caractère d'échappement '\\\\' interdit comme dernier caractère dans une "
 "valeur d'attribut"
 
-#: pathspec.c:143
+#: pathspec.c:147
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Une seule spécification 'attr:' est autorisée."
 
-#: pathspec.c:146
+#: pathspec.c:150
 msgid "attr spec must not be empty"
 msgstr "un spécificateur d'attribut ne peut pas être vide"
 
-#: pathspec.c:189
+#: pathspec.c:193
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "nom d'attribut invalide %s"
 
-#: pathspec.c:254
+#: pathspec.c:258
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 "les réglages de spécificateurs de chemin généraux 'glob' et 'noglob' sont "
 "incompatibles"
 
-#: pathspec.c:261
+#: pathspec.c:265
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -2461,53 +2521,48 @@ msgstr ""
 "le réglage global de spécificateur de chemin 'literal' est incompatible avec "
 "tous les autres réglages globaux de spécificateur de chemin"
 
-#: pathspec.c:301
+#: pathspec.c:305
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'"
 
-#: pathspec.c:322
+#: pathspec.c:326
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'"
 
-#: pathspec.c:327
+#: pathspec.c:331
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "')' manquante à la fin du spécificateur magique de chemin dans '%s'"
 
-#: pathspec.c:365
+#: pathspec.c:369
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "Spécificateur magique '%c' non implémenté dans '%s'"
 
-#: pathspec.c:421 pathspec.c:443
-#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "Le chemin '%s' est dans le sous-module '%.*s'"
-
-#: pathspec.c:483
+#: pathspec.c:428
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s : 'literal' et 'glob' sont incompatibles"
 
-#: pathspec.c:496
+#: pathspec.c:441
 #, c-format
 msgid "%s: '%s' is outside repository"
 msgstr "%s : '%s' est hors du dépôt"
 
-#: pathspec.c:584
+#: pathspec.c:515
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s' (mnémonique : '%c')"
 
-#: pathspec.c:594
+#: pathspec.c:525
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr ""
 "%s : le spécificateur magique de chemin n'est pas supporté par cette "
 "commande : %s"
 
-#: pathspec.c:644
+#: pathspec.c:575
 msgid ""
 "empty strings as pathspecs will be made invalid in upcoming releases. please "
 "use . instead if you meant to match all paths"
@@ -2516,16 +2571,16 @@ msgstr ""
 "invalides dans les prochaines versions. Veuillez utiliser . à la place pour "
 "correspondre à tous le chemins"
 
-#: pathspec.c:668
+#: pathspec.c:599
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "le chemin '%s' est au-delà d'un lien symbolique"
 
-#: pretty.c:982
+#: pretty.c:963
 msgid "unable to parse --pretty format"
 msgstr "impossible d'analyser le format --pretty"
 
-#: read-cache.c:1442
+#: read-cache.c:1443
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -2534,7 +2589,7 @@ msgstr ""
 "version d'index renseignée, mais la valeur est invalide.\n"
 "Utilisation de la version %i"
 
-#: read-cache.c:1452
+#: read-cache.c:1453
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2543,47 +2598,52 @@ msgstr ""
 "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
 "Utilisation de la version %i"
 
-#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048
+#: read-cache.c:2308 builtin/merge.c:1019
+#, c-format
+msgid "could not close '%s'"
+msgstr "impossible de fermer '%s'"
+
+#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
 #, c-format
 msgid "could not stat '%s'"
 msgstr "stat impossible de '%s'"
 
-#: read-cache.c:2388
+#: read-cache.c:2396
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "impossible d'ouvrir le répertoire git : %s"
 
-#: read-cache.c:2400
+#: read-cache.c:2408
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "échec lors de l'unlink : %s"
 
-#: refs.c:620 builtin/merge.c:844
+#: refs.c:622
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "Impossible d'ouvrir '%s' en écriture"
 
-#: refs.c:1667
+#: refs.c:1769
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "mises à jour des références interdites en environnement de quarantaine"
 
-#: refs/files-backend.c:1631
+#: refs/files-backend.c:1664
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "Impossible de supprimer la référence %s : %s"
 
-#: refs/files-backend.c:1634
+#: refs/files-backend.c:1667
 #, c-format
 msgid "could not delete references: %s"
 msgstr "impossible de supprimer les références : %s"
 
-#: refs/files-backend.c:1643
+#: refs/files-backend.c:1676
 #, c-format
 msgid "could not remove reference %s"
 msgstr "impossible de supprimer la référence %s"
 
 # à priori on parle d'une branche ici
-#: ref-filter.c:35 wt-status.c:1780
+#: ref-filter.c:35 wt-status.c:1811
 msgid "gone"
 msgstr "disparue"
 
@@ -2602,304 +2662,306 @@ msgstr "en retard de %d"
 msgid "ahead %d, behind %d"
 msgstr "en avance de %d, en retard de %d"
 
-#: ref-filter.c:104
+#: ref-filter.c:105
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "format attendu : %%(color:<couleur>)"
 
-#: ref-filter.c:106
+#: ref-filter.c:107
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "couleur non reconnue : %%(color:%s)"
 
-#: ref-filter.c:120
+#: ref-filter.c:121
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Valeur entière attendue refname:lstrip=%s"
 
-#: ref-filter.c:124
+#: ref-filter.c:125
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Valeur entière attendue refname:rstrip=%s"
 
-#: ref-filter.c:126
+#: ref-filter.c:127
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "argument %%(%s) non reconnu : %s"
 
-#: ref-filter.c:166
+#: ref-filter.c:167
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) n'accepte pas d'argument"
 
-#: ref-filter.c:173
+#: ref-filter.c:174
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "%%(subject) n'accepte pas d'argument"
 
-#: ref-filter.c:180
+#: ref-filter.c:181
 #, c-format
 msgid "%%(trailers) does not take arguments"
 msgstr "%%(trailers) n'accepte pas d'argument"
 
-#: ref-filter.c:199
+#: ref-filter.c:200
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "valeur positive attendue contents:lines=%s"
 
-#: ref-filter.c:201
+#: ref-filter.c:202
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "argument %%(contents) non reconnu : %s"
 
-#: ref-filter.c:214
+#: ref-filter.c:215
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "valeur positive attendue objectname:short=%s"
 
-#: ref-filter.c:218
+#: ref-filter.c:219
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "argument %%(objectname) non reconnu : %s"
 
-#: ref-filter.c:245
+#: ref-filter.c:246
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "format attendu : %%(align:<largeur>,<position>)"
 
-#: ref-filter.c:257
+#: ref-filter.c:258
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "position non reconnue : %s"
 
-#: ref-filter.c:261
+#: ref-filter.c:262
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "largeur non reconnue : %s"
 
-#: ref-filter.c:267
+#: ref-filter.c:268
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "argument %%(align) non reconnu : %s"
 
-#: ref-filter.c:271
+#: ref-filter.c:272
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "valeur positive attendue avec l'atome %%(align)"
 
-#: ref-filter.c:286
+#: ref-filter.c:287
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "argument %%(if) non reconnu : %s"
 
-#: ref-filter.c:371
+#: ref-filter.c:378
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "nom de champ malformé %.*s"
 
-#: ref-filter.c:397
+#: ref-filter.c:404
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "nom de champ inconnu : %.*s"
 
-#: ref-filter.c:501
+#: ref-filter.c:508
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "format : atome %%(if) utilisé sans un atome %%(then)"
 
-#: ref-filter.c:561
+#: ref-filter.c:568
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "format : atome %%(then) utilisé sans un atome %%(if)"
 
-#: ref-filter.c:563
+#: ref-filter.c:570
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "format : atome %%(then) utilisé plus d'une fois"
 
-#: ref-filter.c:565
+#: ref-filter.c:572
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: atome %%(then) utilisé après %%(else)"
 
-#: ref-filter.c:591
+#: ref-filter.c:598
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "format : atome %%(else) utilisé sans un atome %%(if)"
 
-#: ref-filter.c:593
+#: ref-filter.c:600
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "format : atome %%(else) utilisé sans un atome %%(then)"
 
-#: ref-filter.c:595
+#: ref-filter.c:602
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "format : atome %%(else) utilisé plus d'une fois"
 
-#: ref-filter.c:608
+#: ref-filter.c:615
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "format : atome %%(end) utilisé sans atome correspondant"
 
-#: ref-filter.c:663
+#: ref-filter.c:670
 #, c-format
 msgid "malformed format string %s"
 msgstr "Chaîne de formatage mal formée %s"
 
-#: ref-filter.c:1247
+#: ref-filter.c:1254
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(aucune branche, rebasage de %s)"
 
-#: ref-filter.c:1250
+#: ref-filter.c:1257
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(aucune branche, bisect a démarré sur %s)"
 
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached at " in wt-status.c
-#: ref-filter.c:1256
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached at " in wt-status.c
+#.
+#: ref-filter.c:1265
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD détachée sur %s)"
 
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached from " in wt-status.c
-#: ref-filter.c:1261
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached from " in wt-status.c
+#.
+#: ref-filter.c:1272
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD détachée depuis %s)"
 
-#: ref-filter.c:1265
+#: ref-filter.c:1276
 msgid "(no branch)"
 msgstr "(aucune branche)"
 
-#: ref-filter.c:1420 ref-filter.c:1451
+#: ref-filter.c:1426 ref-filter.c:1457
 #, c-format
 msgid "missing object %s for %s"
 msgstr "objet manquant %s pour %s"
 
-#: ref-filter.c:1423 ref-filter.c:1454
+#: ref-filter.c:1429 ref-filter.c:1460
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "echec de parse_object_buffer sur %s pour %s"
 
-#: ref-filter.c:1692
+#: ref-filter.c:1760
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "objet malformé à '%s'"
 
-#: ref-filter.c:1759
+#: ref-filter.c:1827
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "réf avec un nom cassé %s ignoré"
 
-#: ref-filter.c:1764
+#: ref-filter.c:1832
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "réf cassé %s ignoré"
 
-#: ref-filter.c:2028
+#: ref-filter.c:2095
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "format: atome %%(end) manquant"
 
-#: ref-filter.c:2109
+#: ref-filter.c:2176
 #, c-format
 msgid "malformed object name %s"
 msgstr "nom d'objet malformé %s"
 
-#: remote.c:754
+#: remote.c:747
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "Impossible de récupérer à la fois %s et %s pour %s"
 
-#: remote.c:758
+#: remote.c:751
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s suit habituellement %s, pas %s"
 
-#: remote.c:762
+#: remote.c:755
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s suit à la fois %s et %s"
 
-#: remote.c:770
+#: remote.c:763
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: remote.c:1685 remote.c:1787
+#: remote.c:1680 remote.c:1782
 msgid "HEAD does not point to a branch"
 msgstr "HEAD ne pointe pas sur une branche"
 
-#: remote.c:1694
+#: remote.c:1689
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "pas de branche '%s'"
 
-#: remote.c:1697
+#: remote.c:1692
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "aucune branche amont configurée pour la branche '%s'"
 
-#: remote.c:1703
+#: remote.c:1698
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi"
 
-#: remote.c:1718
+#: remote.c:1713
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 "la destination de poussée '%s' sur le serveur distant '%s' n'a pas de "
 "branche locale de suivi"
 
-#: remote.c:1730
+#: remote.c:1725
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "la branche '%s' n'a aucune branche distante de poussée"
 
-#: remote.c:1741
+#: remote.c:1736
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "les références de spec pour '%s' n'incluent pas '%s'"
 
-#: remote.c:1754
+#: remote.c:1749
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"
 
-#: remote.c:1776
+#: remote.c:1771
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr ""
 "impossible de résoudre une poussée 'simple' pour une destination unique"
 
-#: remote.c:2081
+#: remote.c:2076
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n"
 
-#: remote.c:2085
+#: remote.c:2080
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (utilisez \"git branch --unset-upstream\" pour corriger)\n"
 
-#: remote.c:2088
+#: remote.c:2083
 #, c-format
 msgid "Your branch is up-to-date with '%s'.\n"
 msgstr "Votre branche est à jour avec '%s'.\n"
 
-#: remote.c:2092
+#: remote.c:2087
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n"
 msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n"
 
-#: remote.c:2098
+#: remote.c:2093
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (utilisez \"git push\" pour publier vos commits locaux)\n"
 
-#: remote.c:2101
+#: remote.c:2096
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -2911,11 +2973,11 @@ msgstr[1] ""
 "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "
 "en avance rapide.\n"
 
-#: remote.c:2109
+#: remote.c:2104
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"
 
-#: remote.c:2112
+#: remote.c:2107
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -2930,52 +2992,47 @@ msgstr[1] ""
 "Votre branche et '%s' ont divergé,\n"
 "et ont %d et %d commits différents chacune respectivement.\n"
 
-#: remote.c:2122
+#: remote.c:2117
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 "  (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"
 
-#: revision.c:2158
+#: revision.c:2187
 msgid "your current branch appears to be broken"
 msgstr "votre branche actuelle semble cassée"
 
-#: revision.c:2161
+#: revision.c:2190
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "votre branche actuelle '%s' ne contient encore aucun commit"
 
-#: revision.c:2355
+#: revision.c:2384
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent est incompatible avec --bisect"
 
-#: run-command.c:125
+#: run-command.c:644
 msgid "open /dev/null failed"
 msgstr "échec de l'ouverture de /dev/null"
 
-#: run-command.c:127
-#, c-format
-msgid "dup2(%d,%d) failed"
-msgstr "échec de dup2(%d,%d)"
-
-#: send-pack.c:150
+#: send-pack.c:151
 #, c-format
 msgid "unable to parse remote unpack status: %s"
-msgstr "impossible d'analyser le status de dépaquetage remote : %s"
+msgstr "impossible d'analyser l'état de dépaquetage distant : %s"
 
-#: send-pack.c:152
+#: send-pack.c:153
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "le dépaquetage a échoué : %s"
 
-#: send-pack.c:315
+#: send-pack.c:316
 msgid "failed to sign the push certificate"
 msgstr "impossible de signer le certificat de poussée"
 
-#: send-pack.c:428
+#: send-pack.c:429
 msgid "the receiving end does not support --signed push"
 msgstr "Le receveur ne gère pas les poussées avec --signed"
 
-#: send-pack.c:430
+#: send-pack.c:431
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -2983,32 +3040,32 @@ msgstr ""
 "pas d'envoi de certificat de poussée car le receveur ne gère pas les "
 "poussées avec --signed"
 
-#: send-pack.c:442
+#: send-pack.c:443
 msgid "the receiving end does not support --atomic push"
 msgstr "Le receveur ne gère pas les poussées avec --atomic"
 
-#: send-pack.c:447
+#: send-pack.c:448
 msgid "the receiving end does not support push options"
 msgstr "Le receveur ne gère pas les options de poussées"
 
-#: sequencer.c:215
+#: sequencer.c:216
 msgid "revert"
 msgstr "revert"
 
-#: sequencer.c:217
+#: sequencer.c:218
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:219
+#: sequencer.c:220
 msgid "rebase -i"
 msgstr "rebase -i"
 
-#: sequencer.c:221
+#: sequencer.c:222
 #, c-format
 msgid "Unknown action: %d"
 msgstr "Action inconnue : %d"
 
-#: sequencer.c:278
+#: sequencer.c:279
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -3016,7 +3073,7 @@ msgstr ""
 "après résolution des conflits, marquez les chemins corrigés\n"
 "avec 'git add <chemins>' ou 'git rm <chemins>'"
 
-#: sequencer.c:281
+#: sequencer.c:282
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -3026,63 +3083,63 @@ msgstr ""
 "avec 'git add <chemins>' ou 'git rm <chemins>'\n"
 "puis validez le résultat avec 'git commit'"
 
-#: sequencer.c:294 sequencer.c:1682
+#: sequencer.c:295 sequencer.c:1685
 #, c-format
 msgid "could not lock '%s'"
 msgstr "impossible de verrouiller '%s'"
 
-#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701
+#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
 #, c-format
 msgid "could not write to '%s'"
 msgstr "impossible d'écrire dans '%s'"
 
-#: sequencer.c:301
+#: sequencer.c:302
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "impossible d'écrire la fin de ligne dans '%s'"
 
-#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689
+#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
 #, c-format
 msgid "failed to finalize '%s'."
 msgstr "échec lors de la finalisation de '%s'."
 
-#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257
-#: builtin/commit.c:749 builtin/merge.c:1018
+#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
+#: builtin/commit.c:750 builtin/merge.c:1017
 #, c-format
 msgid "could not read '%s'"
 msgstr "impossible de lire '%s'"
 
-#: sequencer.c:355
+#: sequencer.c:356
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "vos modifications locales seraient écrasées par %s."
 
-#: sequencer.c:359
+#: sequencer.c:360
 msgid "commit your changes or stash them to proceed."
 msgstr "validez vos modifications ou les remiser pour continuer."
 
-#: sequencer.c:388
+#: sequencer.c:389
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s : avance rapide"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. * "rebase -i".
+#. "rebase -i".
 #.
-#: sequencer.c:470
+#: sequencer.c:472
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Impossible d'écrire le nouveau fichier index"
 
-#: sequencer.c:489
+#: sequencer.c:491
 msgid "could not resolve HEAD commit\n"
 msgstr "impossible de résoudre le commit HEAD\n"
 
-#: sequencer.c:509
+#: sequencer.c:511
 msgid "unable to update cache tree\n"
 msgstr "impossible de mettre à jour l'arbre de cache\n"
 
-#: sequencer.c:592
+#: sequencer.c:595
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -3111,17 +3168,17 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:694
+#: sequencer.c:697
 #, c-format
 msgid "could not parse commit %s\n"
 msgstr "impossible d'analyser le commit %s\n"
 
-#: sequencer.c:699
+#: sequencer.c:702
 #, c-format
 msgid "could not parse parent commit %s\n"
 msgstr "impossible d'analyser le commit parent %s\n"
 
-#: sequencer.c:821
+#: sequencer.c:824
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
@@ -3132,7 +3189,7 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:827
+#: sequencer.c:830
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
@@ -3143,232 +3200,232 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:833 sequencer.c:858
+#: sequencer.c:836 sequencer.c:861
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Ceci est la combinaison de %d commits."
 
-#: sequencer.c:842
+#: sequencer.c:845
 msgid "need a HEAD to fixup"
 msgstr "une HEAD est nécessaire à la correction"
 
-#: sequencer.c:844
+#: sequencer.c:847
 msgid "could not read HEAD"
 msgstr "Impossible de lire HEAD"
 
-#: sequencer.c:846
+#: sequencer.c:849
 msgid "could not read HEAD's commit message"
 msgstr "impossible de lire le message de validation de HEAD"
 
-#: sequencer.c:852
+#: sequencer.c:855
 #, c-format
 msgid "cannot write '%s'"
 msgstr "impossible d'écrire '%s'"
 
-#: sequencer.c:861 git-rebase--interactive.sh:445
+#: sequencer.c:864 git-rebase--interactive.sh:445
 msgid "This is the 1st commit message:"
 msgstr "Ceci est le premier message de validation :"
 
-#: sequencer.c:869
+#: sequencer.c:872
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "impossible de lire le message de validation de %s"
 
-#: sequencer.c:876
+#: sequencer.c:879
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Ceci est le message de validation numéro %d :"
 
-#: sequencer.c:881
+#: sequencer.c:884
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Le message de validation %d sera ignoré :"
 
-#: sequencer.c:886
+#: sequencer.c:889
 #, c-format
 msgid "unknown command: %d"
 msgstr "commande inconnue : %d"
 
-#: sequencer.c:952
+#: sequencer.c:955
 msgid "your index file is unmerged."
 msgstr "votre fichier d'index n'est pas fusionné."
 
-#: sequencer.c:970
+#: sequencer.c:973
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "le commit %s est une fusion mais l'option -m n'a pas été spécifiée."
 
-#: sequencer.c:978
+#: sequencer.c:981
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "le commit %s n'a pas de parent %d"
 
-#: sequencer.c:982
+#: sequencer.c:985
 #, c-format
 msgid "mainline was specified but commit %s is not a merge."
 msgstr ""
 "une branche principale a été spécifiée mais le commit %s n'est pas une "
 "fusion."
 
-#: sequencer.c:988
+#: sequencer.c:991
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "impossible d'obtenir un message de validation pour %s"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1009
+#: sequencer.c:1012
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s : impossible d'analyser le commit parent %s"
 
-#: sequencer.c:1071 sequencer.c:1827
+#: sequencer.c:1075 sequencer.c:1830
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "impossible de renommer '%s' en '%s'"
 
-#: sequencer.c:1122
+#: sequencer.c:1126
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "impossible d'annuler %s... %s"
 
-#: sequencer.c:1123
+#: sequencer.c:1127
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "impossible d'appliquer %s... %s"
 
-#: sequencer.c:1165
+#: sequencer.c:1169
 msgid "empty commit set passed"
 msgstr "l'ensemble de commits spécifié est vide"
 
-#: sequencer.c:1175
+#: sequencer.c:1179
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s : échec à la lecture de l'index"
 
-#: sequencer.c:1182
+#: sequencer.c:1186
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s : échec du rafraîchissement de l'index"
 
-#: sequencer.c:1303
+#: sequencer.c:1306
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "ligne %d invalide : %.*s"
 
-#: sequencer.c:1311
+#: sequencer.c:1314
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "'%s' impossible avec le commit précédent"
 
-#: sequencer.c:1344
+#: sequencer.c:1347
 #, c-format
 msgid "could not read '%s'."
 msgstr "impossible de lire '%s'."
 
-#: sequencer.c:1356
+#: sequencer.c:1359
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
 
-#: sequencer.c:1358
+#: sequencer.c:1361
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "feuille d'instruction inutilisable : '%s'"
 
-#: sequencer.c:1363
+#: sequencer.c:1366
 msgid "no commits parsed."
 msgstr "aucun commit analysé."
 
-#: sequencer.c:1374
+#: sequencer.c:1377
 msgid "cannot cherry-pick during a revert."
 msgstr "impossible de picorer pendant l'annulation d'un commit."
 
-#: sequencer.c:1376
+#: sequencer.c:1379
 msgid "cannot revert during a cherry-pick."
 msgstr "impossible d'annuler un commit pendant un picorage."
 
-#: sequencer.c:1439
+#: sequencer.c:1442
 #, c-format
 msgid "invalid key: %s"
 msgstr "clé invalide : %s"
 
-#: sequencer.c:1442
+#: sequencer.c:1445
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valeur invalide pour %s : %s"
 
-#: sequencer.c:1499
+#: sequencer.c:1502
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "feuille d'options malformée : %s"
 
-#: sequencer.c:1537
+#: sequencer.c:1540
 msgid "a cherry-pick or revert is already in progress"
 msgstr "un picorage ou un retour est déjà en cours"
 
-#: sequencer.c:1538
+#: sequencer.c:1541
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""
 
-#: sequencer.c:1541
+#: sequencer.c:1544
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "impossible de créer le répertoire de séquenceur '%s'"
 
-#: sequencer.c:1555
+#: sequencer.c:1558
 msgid "could not lock HEAD"
 msgstr "impossible de verrouiller HEAD"
 
-#: sequencer.c:1611 sequencer.c:2181
+#: sequencer.c:1614 sequencer.c:2188
 msgid "no cherry-pick or revert in progress"
 msgstr "aucun picorage ou retour en cours"
 
-#: sequencer.c:1613
+#: sequencer.c:1616
 msgid "cannot resolve HEAD"
 msgstr "impossible de résoudre HEAD"
 
-#: sequencer.c:1615 sequencer.c:1649
+#: sequencer.c:1618 sequencer.c:1652
 msgid "cannot abort from a branch yet to be born"
 msgstr "impossible d'abandonner depuis une branche non encore créée"
 
-#: sequencer.c:1635 builtin/grep.c:910
+#: sequencer.c:1638 builtin/grep.c:929
 #, c-format
 msgid "cannot open '%s'"
 msgstr "impossible d'ouvrir '%s'"
 
-#: sequencer.c:1637
+#: sequencer.c:1640
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "impossible de lire '%s' : %s"
 
-#: sequencer.c:1638
+#: sequencer.c:1641
 msgid "unexpected end of file"
 msgstr "fin de fichier inattendue"
 
-#: sequencer.c:1644
+#: sequencer.c:1647
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu"
 
-#: sequencer.c:1655
+#: sequencer.c:1658
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 "Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !"
 
-#: sequencer.c:1792 sequencer.c:2080
+#: sequencer.c:1795 sequencer.c:2086
 msgid "cannot read HEAD"
 msgstr "impossible de lire HEAD"
 
-#: sequencer.c:1832 builtin/difftool.c:616
+#: sequencer.c:1835 builtin/difftool.c:633
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "impossible de copier '%s' vers '%s'"
 
-#: sequencer.c:1848
+#: sequencer.c:1851
 msgid "could not read index"
 msgstr "impossible de lire l'index"
 
-#: sequencer.c:1853
+#: sequencer.c:1856
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3383,11 +3440,11 @@ msgstr ""
 "git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1859
+#: sequencer.c:1862
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "et a mis à jour l'index ou l'arbre de travail\n"
 
-#: sequencer.c:1865
+#: sequencer.c:1868
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3404,17 +3461,17 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1920 git-rebase.sh:169
+#: sequencer.c:1925
 #, c-format
-msgid "Applied autostash."
-msgstr "Autoremisage appliqué."
+msgid "Applied autostash.\n"
+msgstr "Autoremisage appliqué.\n"
 
-#: sequencer.c:1932
+#: sequencer.c:1937
 #, c-format
 msgid "cannot store %s"
 msgstr "impossible de stocker %s"
 
-#: sequencer.c:1934 git-rebase.sh:173
+#: sequencer.c:1940 git-rebase.sh:173
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -3425,57 +3482,57 @@ msgstr ""
 "Vos  modifications sont à l'abri dans la remise.\n"
 "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"
 
-#: sequencer.c:2016
+#: sequencer.c:2022
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "arrêt à %s... %.*s\n"
 
-#: sequencer.c:2058
+#: sequencer.c:2064
 #, c-format
 msgid "unknown command %d"
 msgstr "commande inconnue %d"
 
-#: sequencer.c:2088
+#: sequencer.c:2094
 msgid "could not read orig-head"
 msgstr "impossible de lire orig-head"
 
-#: sequencer.c:2092
+#: sequencer.c:2099
 msgid "could not read 'onto'"
 msgstr "impossible de lire 'onto'"
 
-#: sequencer.c:2099
+#: sequencer.c:2106
 #, c-format
 msgid "could not update %s"
 msgstr "impossible de mettre à jour %s"
 
-#: sequencer.c:2106
+#: sequencer.c:2113
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "impossible de mettre à jour HEAD sur %s"
 
-#: sequencer.c:2190
+#: sequencer.c:2197
 msgid "cannot rebase: You have unstaged changes."
 msgstr "impossible de rebaser : vous avez des modifications non indexées."
 
-#: sequencer.c:2195
+#: sequencer.c:2202
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "impossible de supprimer CHERRY_PICK_HEAD"
 
-#: sequencer.c:2204
+#: sequencer.c:2211
 msgid "cannot amend non-existing commit"
 msgstr "impossible de corriger un commit non-existant"
 
-#: sequencer.c:2206
+#: sequencer.c:2213
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "fichier invalide : '%s'"
 
-#: sequencer.c:2208
+#: sequencer.c:2215
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contenu invalide : '%s'"
 
-#: sequencer.c:2211
+#: sequencer.c:2218
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3485,25 +3542,25 @@ msgstr ""
 "Vous avez des modifications non validées dans votre copie de travail.\n"
 "Veuillez les valider d'abord, puis relancer 'git rebase --continue'."
 
-#: sequencer.c:2221
+#: sequencer.c:2228
 msgid "could not commit staged changes."
 msgstr "impossible de valider les modifications indexées."
 
-#: sequencer.c:2301
+#: sequencer.c:2308
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s : impossible de picorer un %s"
 
-#: sequencer.c:2305
+#: sequencer.c:2312
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s : mauvaise révision"
 
-#: sequencer.c:2338
+#: sequencer.c:2345
 msgid "can't revert as initial commit"
 msgstr "impossible d'annuler en tant que commit initial"
 
-#: setup.c:165
+#: setup.c:171
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -3513,7 +3570,7 @@ msgstr ""
 "Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui "
 "n'existent pas localement."
 
-#: setup.c:178
+#: setup.c:184
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -3524,7 +3581,7 @@ msgstr ""
 "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
 "'git <commande> [<révision>...] -- [<chemin>...]'"
 
-#: setup.c:228
+#: setup.c:252
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -3535,34 +3592,34 @@ msgstr ""
 "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
 "'git <commande> [<révision>...] -- [<chemin>...]'"
 
-#: setup.c:475
+#: setup.c:504
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Version attendue du dépôt git <= %d, %d trouvée"
 
-#: setup.c:483
+#: setup.c:512
 msgid "unknown repository extensions found:"
 msgstr "extensions de dépôt inconnues trouvées :"
 
-#: setup.c:776
+#: setup.c:810
 #, c-format
 msgid "Not a git repository (or any of the parent directories): %s"
 msgstr "Ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s"
 
-#: setup.c:778 builtin/index-pack.c:1646
+#: setup.c:812 builtin/index-pack.c:1652
 msgid "Cannot come back to cwd"
 msgstr "Impossible de revenir au répertoire de travail courant"
 
-#: setup.c:1010
+#: setup.c:1050
 msgid "Unable to read current working directory"
 msgstr "Impossible d'accéder au répertoire de travail courant"
 
-#: setup.c:1022 setup.c:1028
+#: setup.c:1062 setup.c:1068
 #, c-format
 msgid "Cannot change to '%s'"
 msgstr "Impossible de modifié en '%s'"
 
-#: setup.c:1041
+#: setup.c:1081
 #, c-format
 msgid ""
 "Not a git repository (or any parent up to mount point %s)\n"
@@ -3573,7 +3630,7 @@ msgstr ""
 "Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
 "n'est pas activé)."
 
-#: setup.c:1106
+#: setup.c:1173
 #, c-format
 msgid ""
 "Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3583,29 +3640,29 @@ msgstr ""
 "Le propriétaire des fichiers doit toujours avoir les droits en lecture et "
 "écriture."
 
-#: sha1_file.c:559
+#: sha1_file.c:560
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "le chemin '%s' n'existe pas"
 
-#: sha1_file.c:585
+#: sha1_file.c:586
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 "extraire le dépôt de référence '%s' comme une extraction liée n'est pas "
 "encore supporté."
 
-#: sha1_file.c:591
+#: sha1_file.c:592
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "le dépôt de référence '%s' n'est pas un dépôt local."
 
-#: sha1_file.c:597
+#: sha1_file.c:598
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "le dépôt de référence '%s' est superficiel"
 
-#: sha1_file.c:605
+#: sha1_file.c:606
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "le dépôt de référence '%s' est greffé"
@@ -3614,27 +3671,27 @@ msgstr "le dépôt de référence '%s' est greffé"
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
 
-#: sha1_file.c:2721
+#: sha1_file.c:2729
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)"
 
-#: sha1_file.c:2725
+#: sha1_file.c:2733
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
 "offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)"
 
-#: sha1_name.c:409
+#: sha1_name.c:419
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "le SHA1 court %s est ambigu"
 
-#: sha1_name.c:420
+#: sha1_name.c:430
 msgid "The candidates are:"
 msgstr "Les candidats sont :"
 
-#: sha1_name.c:580
+#: sha1_name.c:589
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -3646,7 +3703,7 @@ msgid ""
 "examine these refs and maybe delete them. Turn this message off by\n"
 "running \"git config advice.objectNameWarning false\""
 msgstr ""
-"Git ne créé normalement jamais de référence qui se termine par 40 caractères "
+"Git ne crée normalement jamais de référence qui se termine par 40 caractères "
 "hexa\n"
 "car elle serait ignorée si vous spécifiiez 40-hexa. Ces références\n"
 "peuvent être créées par erreur. Par exemple,\n"
@@ -3659,57 +3716,67 @@ msgstr ""
 "message\n"
 "en lançant \"git config advice.objectNameWarning false\""
 
-#: submodule.c:67 submodule.c:101
+#: submodule.c:70 submodule.c:104
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 "Modification impossible de .gitmodules non fusionné, résolvez les conflits "
 "d'abord"
 
-#: submodule.c:71 submodule.c:105
+#: submodule.c:74 submodule.c:108
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "Impossible de trouver une section où path=%s dans .gitmodules"
 
-#: submodule.c:79
+#: submodule.c:82
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "Impossible de mettre à jour l'élément %s de .gitmodules"
 
 # ici %s est un chemin
-#: submodule.c:112
+#: submodule.c:115
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"
 
-#: submodule.c:123
+#: submodule.c:126
 msgid "staging updated .gitmodules failed"
 msgstr "échec de la mise en index du .gitmodules mis à jour"
 
-#: submodule.c:161
+#: submodule.c:165
 msgid "negative values not allowed for submodule.fetchJobs"
 msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"
 
-#: submodule.c:1194
+#: submodule.c:376
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "dans le sous-module '%s' non populé"
+
+#: submodule.c:407
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Le chemin '%s' est dans le sous-module '%.*s'"
+
+#: submodule.c:1337
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "'%s' n'est pas reconnu comme dépôt git"
 
-#: submodule.c:1332
+#: submodule.c:1475
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "impossible de démarrer 'git status' dans le sous-module '%s'"
 
-#: submodule.c:1345
+#: submodule.c:1488
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "impossible de lancer 'git status' dans le sous-module '%s'"
 
-#: submodule.c:1421
+#: submodule.c:1581
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "le sous-module '%s' a un index sale"
 
-#: submodule.c:1678
+#: submodule.c:1845
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3717,18 +3784,18 @@ msgstr ""
 "relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "
 "n'est pas supporté"
 
-#: submodule.c:1690 submodule.c:1746
+#: submodule.c:1857 submodule.c:1913
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "impossible de trouve le nom pour le sous-module '%s'"
 
-#: submodule.c:1694 builtin/submodule--helper.c:678
+#: submodule.c:1861 builtin/submodule--helper.c:678
 #: builtin/submodule--helper.c:688
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "impossible de créer le répertoire '%s'"
 
-#: submodule.c:1697
+#: submodule.c:1864
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3739,94 +3806,94 @@ msgstr ""
 "'%s' sur\n"
 "'%s'\n"
 
-#: submodule.c:1781
+#: submodule.c:1948
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "récursion impossible dans le sous-module '%s'"
 
-#: submodule.c:1825
+#: submodule.c:1992
 msgid "could not start ls-files in .."
 msgstr "impossible de démarrer ls-files dans .."
 
-#: submodule.c:1845
+#: submodule.c:2012
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr "BUG : le chemin renvoyé ne correspond pas à cwd ?"
 
-#: submodule.c:1864
+#: submodule.c:2031
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree a renvoyé un code de retour inattendu %d"
 
-#: submodule-config.c:380
+#: submodule-config.c:420
 #, c-format
 msgid "invalid value for %s"
 msgstr "Valeur invalide pour %s"
 
-#: trailer.c:240
+#: trailer.c:241
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "échec de la commande trailer '%s'"
 
-#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539
-#: trailer.c:543
+#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
+#: trailer.c:544
 #, c-format
 msgid "unknown value '%s' for key '%s'"
 msgstr "valeur inconnue '%s' pour la clé '%s'"
 
-#: trailer.c:525 trailer.c:530 builtin/remote.c:289
+#: trailer.c:526 trailer.c:531 builtin/remote.c:290
 #, c-format
 msgid "more than one %s"
 msgstr "plus d'un %s"
 
-#: trailer.c:702
+#: trailer.c:703
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "symbole vide dans la ligne de fin '%.*s'"
 
-#: trailer.c:722
+#: trailer.c:723
 #, c-format
 msgid "could not read input file '%s'"
 msgstr "impossible de lire le fichier d'entrée '%s'"
 
-#: trailer.c:725
+#: trailer.c:726
 msgid "could not read from stdin"
 msgstr "Impossible de lire depuis l'entrée standard"
 
-#: trailer.c:949 builtin/am.c:44
+#: trailer.c:950 builtin/am.c:45
 #, c-format
 msgid "could not stat %s"
 msgstr "stat impossible de %s"
 
-#: trailer.c:951
+#: trailer.c:952
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "%s n'est pas un fichier régulier"
 
-#: trailer.c:953
+#: trailer.c:954
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "le fichier %s n'est pas inscriptible par l'utilisateur"
 
-#: trailer.c:965
+#: trailer.c:966
 msgid "could not open temporary file"
 msgstr "impossible de créer un fichier temporaire"
 
-#: trailer.c:1001
+#: trailer.c:1002
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "impossible de renommer un fichier temporaire en %s"
 
-#: transport.c:62
+#: transport.c:63
 #, c-format
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n"
 
-#: transport.c:151
+#: transport.c:152
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transport : option de profondeur invalide '%s'"
 
-#: transport.c:889
+#: transport.c:890
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -3835,7 +3902,7 @@ msgstr ""
 "Les chemins suivant de sous-module contiennent des modifications\n"
 "qui ne peuvent être trouvées sur aucun distant :\n"
 
-#: transport.c:893
+#: transport.c:894
 #, c-format
 msgid ""
 "\n"
@@ -3862,11 +3929,11 @@ msgstr ""
 "pour les pousser vers un serveur distant.\n"
 "\n"
 
-#: transport.c:901
+#: transport.c:902
 msgid "Aborting."
 msgstr "Abandon."
 
-#: transport-helper.c:1080
+#: transport-helper.c:1071
 #, c-format
 msgid "Could not read ref %s"
 msgstr "impossible de lire la réf %s"
@@ -3887,7 +3954,7 @@ msgstr "nom de fichier vide dans une entrée de l'arbre"
 msgid "too-short tree file"
 msgstr "fichier arbre trop court"
 
-#: unpack-trees.c:104
+#: unpack-trees.c:105
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3898,7 +3965,7 @@ msgstr ""
 "%%sVeuillez valider ou remiser vos modifications avant de basculer de "
 "branche."
 
-#: unpack-trees.c:106
+#: unpack-trees.c:107
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3908,7 +3975,7 @@ msgstr ""
 "l'extraction :\n"
 "%%s"
 
-#: unpack-trees.c:109
+#: unpack-trees.c:110
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -3918,7 +3985,7 @@ msgstr ""
 "fusion :\n"
 "%%sVeuillez valider ou remiser vos modifications avant la fusion."
 
-#: unpack-trees.c:111
+#: unpack-trees.c:112
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -3928,7 +3995,7 @@ msgstr ""
 "fusion :\n"
 "%%s"
 
-#: unpack-trees.c:114
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -3937,7 +4004,7 @@ msgstr ""
 "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
 "%%sVeuillez valider ou remiser vos modifications avant %s."
 
-#: unpack-trees.c:116
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -3946,7 +4013,7 @@ msgstr ""
 "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
 "%%s"
 
-#: unpack-trees.c:121
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -3956,7 +4023,7 @@ msgstr ""
 "contenus :\n"
 "%s"
 
-#: unpack-trees.c:125
+#: unpack-trees.c:126
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -3966,7 +4033,7 @@ msgstr ""
 "l'extraction :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
 
-#: unpack-trees.c:127
+#: unpack-trees.c:128
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -3975,7 +4042,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient effacés par l'extraction :\n"
 "%%s"
 
-#: unpack-trees.c:130
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -3985,7 +4052,7 @@ msgstr ""
 "la fusion :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
 
-#: unpack-trees.c:132
+#: unpack-trees.c:133
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -3994,7 +4061,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient effacés par la fusion :\n"
 "%%s"
 
-#: unpack-trees.c:135
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4004,7 +4071,7 @@ msgstr ""
 "%s :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant %s."
 
-#: unpack-trees.c:137
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4013,7 +4080,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient effacés par %s :\n"
 "%%s"
 
-#: unpack-trees.c:142
+#: unpack-trees.c:143
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4024,7 +4091,7 @@ msgstr ""
 "l'extraction :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
 
-#: unpack-trees.c:144
+#: unpack-trees.c:145
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4034,7 +4101,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"
 "%%s"
 
-#: unpack-trees.c:147
+#: unpack-trees.c:148
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4044,7 +4111,7 @@ msgstr ""
 "la fusion :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
 
-#: unpack-trees.c:149
+#: unpack-trees.c:150
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4053,7 +4120,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient écrasés par la fusion :\n"
 "%%s"
 
-#: unpack-trees.c:152
+#: unpack-trees.c:153
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4063,7 +4130,7 @@ msgstr ""
 "%s :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant %s."
 
-#: unpack-trees.c:154
+#: unpack-trees.c:155
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4072,12 +4139,12 @@ msgstr ""
 "Les fichiers suivants non suivis seraient écrasés par %s :\n"
 "%%s"
 
-#: unpack-trees.c:161
+#: unpack-trees.c:162
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."
 
-#: unpack-trees.c:164
+#: unpack-trees.c:165
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up-to-date:\n"
@@ -4087,7 +4154,7 @@ msgstr ""
 "pas à jour :\n"
 "%s"
 
-#: unpack-trees.c:166
+#: unpack-trees.c:167
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -4098,7 +4165,7 @@ msgstr ""
 "jour par l'extraction creuse :\n"
 "%s"
 
-#: unpack-trees.c:168
+#: unpack-trees.c:169
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -4109,7 +4176,7 @@ msgstr ""
 "à jour par extraction creuse :\n"
 "%s"
 
-#: unpack-trees.c:170
+#: unpack-trees.c:171
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -4118,19 +4185,19 @@ msgstr ""
 "Mise à jour impossible pour le sous-module :\n"
 "%s"
 
-#: unpack-trees.c:247
+#: unpack-trees.c:248
 #, c-format
 msgid "Aborting\n"
 msgstr "Abandon\n"
 
-#: unpack-trees.c:272
+#: unpack-trees.c:277
 #, c-format
 msgid "submodule update strategy not supported for submodule '%s'"
 msgstr ""
 "stratégie de mise à jour de sous-module non supportée pour le sous-module "
 "'%s'"
 
-#: unpack-trees.c:340
+#: unpack-trees.c:346
 msgid "Checking out files"
 msgstr "Extraction des fichiers"
 
@@ -4163,192 +4230,198 @@ msgstr "numéro de port invalide"
 msgid "invalid '..' path segment"
 msgstr "segment de chemin '..' invalide"
 
-#: worktree.c:285
+#: worktree.c:245
 #, c-format
 msgid "failed to read '%s'"
 msgstr "échec de la lecture de '%s'"
 
-#: wrapper.c:222 wrapper.c:392
+#: wrapper.c:223 wrapper.c:393
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "impossible d'ouvrir '%s' en lecture/écriture"
 
-#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
+#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "impossible d'ouvrir '%s' en écriture"
 
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757
-#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015
-#: builtin/pull.c:341
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
+#: builtin/am.c:849 builtin/merge.c:1014
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "impossible d'ouvrir '%s' en lecture"
 
-#: wrapper.c:581 wrapper.c:602
+#: wrapper.c:424 wrapper.c:624
 #, c-format
 msgid "unable to access '%s'"
 msgstr "impossible d'accéder à '%s'"
 
-#: wrapper.c:610
+#: wrapper.c:632
 msgid "unable to get current working directory"
 msgstr "impossible d'accéder au répertoire de travail courant"
 
-#: wrapper.c:634
+#: wrapper.c:656
 #, c-format
 msgid "could not write to %s"
 msgstr "Impossible d'écrire dans %s"
 
-#: wrapper.c:636
+#: wrapper.c:658
 #, c-format
 msgid "could not close %s"
 msgstr "impossible de fermer %s"
 
-#: wt-status.c:151
+#: wt-status.c:152
 msgid "Unmerged paths:"
 msgstr "Chemins non fusionnés :"
 
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  (utilisez \"git reset %s <fichier>...\" pour désindexer)"
 
-#: wt-status.c:180 wt-status.c:207
+#: wt-status.c:181 wt-status.c:208
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  (utilisez \"git rm --cached <fichier>...\" pour désindexer)"
 
-#: wt-status.c:184
+#: wt-status.c:185
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (utilisez \"git add <fichier>...\" pour marquer comme résolu)"
 
-#: wt-status.c:186 wt-status.c:190
+#: wt-status.c:187 wt-status.c:191
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
 "  (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme "
 "résolu)"
 
-#: wt-status.c:188
+#: wt-status.c:189
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"
 
-#: wt-status.c:199 wt-status.c:958
+#: wt-status.c:200 wt-status.c:981
 msgid "Changes to be committed:"
 msgstr "Modifications qui seront validées :"
 
-#: wt-status.c:217 wt-status.c:967
+#: wt-status.c:218 wt-status.c:990
 msgid "Changes not staged for commit:"
 msgstr "Modifications qui ne seront pas validées :"
 
-#: wt-status.c:221
+#: wt-status.c:222
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
 "  (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)"
 
-#: wt-status.c:223
+#: wt-status.c:224
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
 "  (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera "
 "validé)"
 
-#: wt-status.c:224
+#: wt-status.c:225
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr ""
 "  (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications "
 "dans la copie de travail)"
 
-#: wt-status.c:226
+#: wt-status.c:227
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
 "  (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)"
 
-#: wt-status.c:238
+#: wt-status.c:239
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 "  (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)"
 
-#: wt-status.c:253
+#: wt-status.c:254
 msgid "both deleted:"
 msgstr "supprimé des deux côtés :"
 
-#: wt-status.c:255
+#: wt-status.c:256
 msgid "added by us:"
 msgstr "ajouté par nous :"
 
-#: wt-status.c:257
+#: wt-status.c:258
 msgid "deleted by them:"
 msgstr "supprimé par eux :"
 
-#: wt-status.c:259
+#: wt-status.c:260
 msgid "added by them:"
 msgstr "ajouté par eux :"
 
-#: wt-status.c:261
+#: wt-status.c:262
 msgid "deleted by us:"
 msgstr "supprimé par nous :"
 
-#: wt-status.c:263
+#: wt-status.c:264
 msgid "both added:"
 msgstr "ajouté de deux côtés :"
 
-#: wt-status.c:265
+#: wt-status.c:266
 msgid "both modified:"
 msgstr "modifié des deux côtés :"
 
-#: wt-status.c:275
+#: wt-status.c:276
 msgid "new file:"
 msgstr "nouveau fichier :"
 
-#: wt-status.c:277
+#: wt-status.c:278
 msgid "copied:"
 msgstr "copié :"
 
-#: wt-status.c:279
+#: wt-status.c:280
 msgid "deleted:"
 msgstr "supprimé :"
 
-#: wt-status.c:281
+#: wt-status.c:282
 msgid "modified:"
 msgstr "modifié :"
 
-#: wt-status.c:283
+#: wt-status.c:284
 msgid "renamed:"
 msgstr "renommé :"
 
-#: wt-status.c:285
+#: wt-status.c:286
 msgid "typechange:"
 msgstr "modif. type :"
 
-#: wt-status.c:287
+#: wt-status.c:288
 msgid "unknown:"
 msgstr "inconnu :"
 
-#: wt-status.c:289
+#: wt-status.c:290
 msgid "unmerged:"
 msgstr "non fusionné :"
 
-#: wt-status.c:371
+#: wt-status.c:372
 msgid "new commits, "
 msgstr "nouveaux commits, "
 
-#: wt-status.c:373
+#: wt-status.c:374
 msgid "modified content, "
 msgstr "contenu modifié, "
 
-#: wt-status.c:375
+#: wt-status.c:376
 msgid "untracked content, "
 msgstr "contenu non suivi, "
 
-#: wt-status.c:831
+#: wt-status.c:821
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "Votre remisage contient actuellement %d entrée"
+msgstr[1] "Votre remisage contient actuellement %d entrées"
+
+#: wt-status.c:853
 msgid "Submodules changed but not updated:"
 msgstr "Sous-modules modifiés mais non mis à jour :"
 
-#: wt-status.c:833
+#: wt-status.c:855
 msgid "Submodule changes to be committed:"
 msgstr "Changements du sous-module à valider :"
 
-#: wt-status.c:914
+#: wt-status.c:937
 msgid ""
 "Do not touch the line above.\n"
 "Everything below will be removed."
@@ -4356,107 +4429,107 @@ msgstr ""
 "Ne touchez pas à la ligne ci-dessus\n"
 "Tout ce qui suit sera éliminé."
 
-#: wt-status.c:1026
+#: wt-status.c:1049
 msgid "You have unmerged paths."
 msgstr "Vous avez des chemins non fusionnés."
 
-#: wt-status.c:1029
+#: wt-status.c:1052
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (réglez les conflits puis lancez \"git commit\")"
 
-#: wt-status.c:1031
+#: wt-status.c:1054
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (utilisez \"git merge --abort\" pour annuler la fusion)"
 
-#: wt-status.c:1036
+#: wt-status.c:1059
 msgid "All conflicts fixed but you are still merging."
 msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée."
 
-#: wt-status.c:1039
+#: wt-status.c:1062
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (utilisez \"git commit\" pour terminer la fusion)"
 
-#: wt-status.c:1049
+#: wt-status.c:1072
 msgid "You are in the middle of an am session."
 msgstr "Vous êtes au milieu d'une session am."
 
-#: wt-status.c:1052
+#: wt-status.c:1075
 msgid "The current patch is empty."
 msgstr "Le patch actuel est vide."
 
-#: wt-status.c:1056
+#: wt-status.c:1079
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (réglez les conflits puis lancez \"git am --continue\")"
 
-#: wt-status.c:1058
+#: wt-status.c:1081
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (utilisez \"git am --skip\" pour sauter ce patch)"
 
-#: wt-status.c:1060
+#: wt-status.c:1083
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (utilisez \"git am --abort\" pour restaurer la branche d'origine)"
 
-#: wt-status.c:1189
+#: wt-status.c:1214
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo est manquant."
 
-#: wt-status.c:1191
+#: wt-status.c:1216
 msgid "No commands done."
 msgstr "Aucune commande réalisée."
 
-#: wt-status.c:1194
+#: wt-status.c:1219
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "Dernière commande effectuée (%d commande effectuée) :"
 msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :"
 
-#: wt-status.c:1205
+#: wt-status.c:1230
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (voir plus dans le fichier %s)"
 
-#: wt-status.c:1210
+#: wt-status.c:1235
 msgid "No commands remaining."
 msgstr "Aucune commande restante."
 
-#: wt-status.c:1213
+#: wt-status.c:1238
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] "Prochaine commande à effectuer (%d commande restante) :"
 msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :"
 
-#: wt-status.c:1221
+#: wt-status.c:1246
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (utilisez \"git rebase --edit-todo\" pour voir et éditer)"
 
-#: wt-status.c:1234
+#: wt-status.c:1259
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'."
 
-#: wt-status.c:1239
+#: wt-status.c:1264
 msgid "You are currently rebasing."
 msgstr "Vous êtes en train de rebaser."
 
-#: wt-status.c:1253
+#: wt-status.c:1278
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (réglez les conflits puis lancez \"git rebase --continue\")"
 
-#: wt-status.c:1255
+#: wt-status.c:1280
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (utilisez \"git rebase --skip\" pour sauter ce patch)"
 
-#: wt-status.c:1257
+#: wt-status.c:1282
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  (utilisez \"git rebase --abort\" pour extraire la branche d'origine)"
 
-#: wt-status.c:1263
+#: wt-status.c:1288
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (tous les conflits sont réglés : lancez \"git rebase --continue\")"
 
-#: wt-status.c:1267
+#: wt-status.c:1292
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -4464,124 +4537,128 @@ msgstr ""
 "Vous êtes actuellement en train de fractionner un commit pendant un rebasage "
 "de la branche '%s' sur '%s'."
 
-#: wt-status.c:1272
+#: wt-status.c:1297
 msgid "You are currently splitting a commit during a rebase."
 msgstr ""
 "Vous êtes actuellement en train de fractionner un commit pendant un rebasage."
 
-#: wt-status.c:1275
+#: wt-status.c:1300
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 "  (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")"
 
-#: wt-status.c:1279
+#: wt-status.c:1304
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 "Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la "
 "branche '%s' sur '%s'."
 
-#: wt-status.c:1284
+#: wt-status.c:1309
 msgid "You are currently editing a commit during a rebase."
 msgstr ""
 "Vous êtes actuellement en train d'éditer un commit pendant un rebasage."
 
-#: wt-status.c:1287
+#: wt-status.c:1312
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  (utilisez \"git commit --amend\" pour corriger le commit actuel)"
 
-#: wt-status.c:1289
+#: wt-status.c:1314
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 "  (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos "
 "modifications)"
 
-#: wt-status.c:1299
+#: wt-status.c:1324
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Vous êtes actuellement en train de picorer le commit %s."
 
-#: wt-status.c:1304
+#: wt-status.c:1329
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (réglez les conflits puis lancez \"git cherry-pick --continue\")"
 
-#: wt-status.c:1307
+#: wt-status.c:1332
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")"
 
-#: wt-status.c:1309
+#: wt-status.c:1334
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr "  (utilisez \"git cherry-pick --abort\" pour annuler le picorage)"
 
-#: wt-status.c:1318
+#: wt-status.c:1343
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Vous êtes actuellement en train de rétablir le commit %s."
 
-#: wt-status.c:1323
+#: wt-status.c:1348
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (réglez les conflits puis lancez \"git revert --continue\")"
 
-#: wt-status.c:1326
+#: wt-status.c:1351
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (tous les conflits sont réglés : lancez \"git revert --continue\")"
 
-#: wt-status.c:1328
+#: wt-status.c:1353
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (utilisez \"git revert --abort\" pour annuler le rétablissement)"
 
-#: wt-status.c:1339
+#: wt-status.c:1364
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Vous êtes en cours de bissection, depuis la branche '%s'."
 
-#: wt-status.c:1343
+#: wt-status.c:1368
 msgid "You are currently bisecting."
 msgstr "Vous êtes en cours de bissection."
 
-#: wt-status.c:1346
+#: wt-status.c:1371
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (utilisez \"git bisect reset\" pour revenir à la branche d'origine)"
 
-#: wt-status.c:1543
+#: wt-status.c:1568
 msgid "On branch "
 msgstr "Sur la branche "
 
-#: wt-status.c:1549
+#: wt-status.c:1574
 msgid "interactive rebase in progress; onto "
 msgstr "rebasage interactif en cours ; sur "
 
-#: wt-status.c:1551
+#: wt-status.c:1576
 msgid "rebase in progress; onto "
 msgstr "rebasage en cours ; sur "
 
-#: wt-status.c:1556
+#: wt-status.c:1581
 msgid "HEAD detached at "
 msgstr "HEAD détachée sur "
 
-#: wt-status.c:1558
+#: wt-status.c:1583
 msgid "HEAD detached from "
 msgstr "HEAD détachée depuis "
 
-#: wt-status.c:1561
+#: wt-status.c:1586
 msgid "Not currently on any branch."
 msgstr "Actuellement sur aucun branche."
 
-#: wt-status.c:1579
+#: wt-status.c:1606
 msgid "Initial commit"
 msgstr "Validation initiale"
 
-#: wt-status.c:1593
+#: wt-status.c:1607
+msgid "No commits yet"
+msgstr "Aucun commit"
+
+#: wt-status.c:1621
 msgid "Untracked files"
 msgstr "Fichiers non suivis"
 
-#: wt-status.c:1595
+#: wt-status.c:1623
 msgid "Ignored files"
 msgstr "Fichiers ignorés"
 
-#: wt-status.c:1599
+#: wt-status.c:1627
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4593,32 +4670,32 @@ msgstr ""
 "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "
 "status')."
 
-#: wt-status.c:1605
+#: wt-status.c:1633
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Fichiers non suivis non affichés%s"
 
-#: wt-status.c:1607
+#: wt-status.c:1635
 msgid " (use -u option to show untracked files)"
 msgstr " (utilisez -u pour afficher les fichiers non suivis)"
 
-#: wt-status.c:1613
+#: wt-status.c:1641
 msgid "No changes"
 msgstr "Aucune modification"
 
-#: wt-status.c:1618
+#: wt-status.c:1646
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "
 "\"git commit -a\")\n"
 
-#: wt-status.c:1621
+#: wt-status.c:1649
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "aucune modification ajoutée à la validation\n"
 
-#: wt-status.c:1624
+#: wt-status.c:1652
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -4627,231 +4704,271 @@ msgstr ""
 "aucune modification ajoutée à la validation mais des fichiers non suivis "
 "sont présents (utilisez \"git add\" pour les suivre)\n"
 
-#: wt-status.c:1627
+#: wt-status.c:1655
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 "aucune modification ajoutée à la validation mais des fichiers non suivis "
 "sont présents\n"
 
-#: wt-status.c:1630
+#: wt-status.c:1658
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "
 "suivre)\n"
 
-#: wt-status.c:1633 wt-status.c:1638
+#: wt-status.c:1661 wt-status.c:1666
 #, c-format
 msgid "nothing to commit\n"
 msgstr "rien à valider\n"
 
-#: wt-status.c:1636
+#: wt-status.c:1664
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"
 
-#: wt-status.c:1640
+#: wt-status.c:1668
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "rien à valider, la copie de travail est propre\n"
 
-#: wt-status.c:1749
-msgid "Initial commit on "
-msgstr "Validation initiale sur "
+#: wt-status.c:1780
+msgid "No commits yet on "
+msgstr "Encore aucun commit sur  "
 
-#: wt-status.c:1753
+#: wt-status.c:1784
 msgid "HEAD (no branch)"
 msgstr "HEAD (aucune branche)"
 
-#: wt-status.c:1782 wt-status.c:1790
+#: wt-status.c:1813 wt-status.c:1821
 msgid "behind "
 msgstr "derrière "
 
-#: wt-status.c:1785 wt-status.c:1788
+#: wt-status.c:1816 wt-status.c:1819
 msgid "ahead "
 msgstr "devant "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2280
+#: wt-status.c:2311
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "Impossible de %s : vous avez des modifications non indexées."
 
-#: wt-status.c:2286
+#: wt-status.c:2317
 msgid "additionally, your index contains uncommitted changes."
 msgstr "de plus, votre index contient des modifications non validées."
 
-#: wt-status.c:2288
+#: wt-status.c:2319
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "%s impossible : votre index contient des modifications non validées."
 
-#: compat/precompose_utf8.c:57 builtin/clone.c:432
+#: compat/precompose_utf8.c:58 builtin/clone.c:436
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "échec lors de l'unlink de '%s'"
 
-#: builtin/add.c:22
+#: builtin/add.c:24
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<options>] [--] <chemin>..."
 
-#: builtin/add.c:80
+#: builtin/add.c:82
 #, c-format
 msgid "unexpected diff status %c"
-msgstr "status de diff inattendu %c"
+msgstr "état de diff inattendu %c"
 
-#: builtin/add.c:85 builtin/commit.c:291
+#: builtin/add.c:87 builtin/commit.c:292
 msgid "updating files failed"
 msgstr "échec de la mise à jour des fichiers"
 
-#: builtin/add.c:95
+#: builtin/add.c:97
 #, c-format
 msgid "remove '%s'\n"
 msgstr "suppression de '%s'\n"
 
-#: builtin/add.c:149
+#: builtin/add.c:151
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Modifications non indexées après rafraîchissement de l'index :"
 
-#: builtin/add.c:209 builtin/rev-parse.c:872
+#: builtin/add.c:211 builtin/rev-parse.c:873
 msgid "Could not read the index"
 msgstr "Impossible de lire l'index"
 
-#: builtin/add.c:220
+#: builtin/add.c:222
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "Impossible d'ouvrir '%s' en écriture."
 
-#: builtin/add.c:224
+#: builtin/add.c:226
 msgid "Could not write patch"
 msgstr "Impossible d'écrire le patch"
 
-#: builtin/add.c:227
+#: builtin/add.c:229
 msgid "editing patch failed"
 msgstr "échec de l'édition du patch"
 
-#: builtin/add.c:230
+#: builtin/add.c:232
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Stat de '%s' impossible"
 
-#: builtin/add.c:232
+#: builtin/add.c:234
 msgid "Empty patch. Aborted."
 msgstr "Patch vide. Abandon."
 
-#: builtin/add.c:237
+#: builtin/add.c:239
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Impossible d'appliquer '%s'"
 
-#: builtin/add.c:247
+#: builtin/add.c:249
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"
 
-#: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123
-#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524
-#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163
+#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
+#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
+#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
 msgstr "simuler l'action"
 
-#: builtin/add.c:269
+#: builtin/add.c:272
 msgid "interactive picking"
 msgstr "sélection interactive"
 
-#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286
+#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
 msgid "select hunks interactively"
 msgstr "sélection interactive des sections"
 
-#: builtin/add.c:271
+#: builtin/add.c:274
 msgid "edit current diff and apply"
 msgstr "édition du diff actuel et application"
 
-#: builtin/add.c:272
+#: builtin/add.c:275
 msgid "allow adding otherwise ignored files"
 msgstr "permettre l'ajout de fichiers ignorés"
 
-#: builtin/add.c:273
+#: builtin/add.c:276
 msgid "update tracked files"
 msgstr "mettre à jour les fichiers suivis"
 
-#: builtin/add.c:274
+#: builtin/add.c:277
 msgid "record only the fact that the path will be added later"
 msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard"
 
-#: builtin/add.c:275
+#: builtin/add.c:278
 msgid "add changes from all tracked and untracked files"
 msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"
 
-#: builtin/add.c:278
+#: builtin/add.c:281
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr ""
 "ignorer les chemins effacés dans la copie de travail (identique à --no-all)"
 
-#: builtin/add.c:280
+#: builtin/add.c:283
 msgid "don't add, only refresh the index"
 msgstr "ne pas ajouter, juste rafraîchir l'index"
 
-#: builtin/add.c:281
+#: builtin/add.c:284
 msgid "just skip files which cannot be added because of errors"
 msgstr ""
 "sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait "
 "d'erreurs"
 
-#: builtin/add.c:282
+#: builtin/add.c:285
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide"
 
-#: builtin/add.c:283 builtin/update-index.c:951
+#: builtin/add.c:286 builtin/update-index.c:952
 msgid "(+/-)x"
 msgstr "(+/-)x"
 
-#: builtin/add.c:283 builtin/update-index.c:952
+#: builtin/add.c:286 builtin/update-index.c:953
 msgid "override the executable bit of the listed files"
 msgstr "outrepasser le bit exécutable pour les fichiers listés"
 
-#: builtin/add.c:305
+#: builtin/add.c:288
+msgid "warn when adding an embedded repository"
+msgstr "avertir lors de l'ajout d'un dépôt embarqué"
+
+#: builtin/add.c:303
+#, c-format
+msgid ""
+"You've added another git repository inside your current repository.\n"
+"Clones of the outer repository will not contain the contents of\n"
+"the embedded repository and will not know how to obtain it.\n"
+"If you meant to add a submodule, use:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"If you added this path by mistake, you can remove it from the\n"
+"index with:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"See \"git help submodule\" for more information."
+msgstr ""
+"Vous avez ajouté un autre dépôt git dans votre dépôt actuel.\n"
+"Les clones du dépôt conteneur ne contiendrons pas le contenu\n"
+"du dépôt embarqué et ne sauront pas comment l'obtenir.\n"
+"Si vous vouliez ajouter un sous-module, utilisez :\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"Si vous avez ajouté ce chemin par erreur, vous pouvez le\n"
+"supprimer de l'index avec :\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"Référez-vous à \"git help submodule\" pour plus d'information."
+
+#: builtin/add.c:331
+#, c-format
+msgid "adding embedded git repository: %s"
+msgstr "dépôt git embarqué ajouté : %s"
+
+#: builtin/add.c:349
 #, c-format
 msgid "Use -f if you really want to add them.\n"
 msgstr "Utilisez -f si vous voulez réellement les ajouter.\n"
 
-#: builtin/add.c:312
+#: builtin/add.c:357
 msgid "adding files failed"
 msgstr "échec de l'ajout de fichiers"
 
-#: builtin/add.c:348
+#: builtin/add.c:394
 msgid "-A and -u are mutually incompatible"
 msgstr "-A et -u sont mutuellement incompatibles"
 
-#: builtin/add.c:355
+#: builtin/add.c:401
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr ""
 "L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run"
 
-#: builtin/add.c:359
+#: builtin/add.c:405
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x"
 
-#: builtin/add.c:374
+#: builtin/add.c:420
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Rien de spécifié, rien n'a été ajouté.\n"
 
-#: builtin/add.c:375
+#: builtin/add.c:421
 #, c-format
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Vous vouliez sûrement dire 'git add .' ?\n"
 
-#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298
-#: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350
-#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271
+#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
+#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
+#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
 #: builtin/submodule--helper.c:244
 msgid "index file corrupt"
 msgstr "fichier d'index corrompu"
 
-#: builtin/am.c:412
+#: builtin/am.c:413
 msgid "could not parse author script"
 msgstr "impossible d'analyser le script author"
 
@@ -4899,7 +5016,7 @@ msgstr "décalage horaire invalide"
 msgid "Patch format detection failed."
 msgstr "Échec de détection du format du patch."
 
-#: builtin/am.c:991 builtin/clone.c:397
+#: builtin/am.c:991 builtin/clone.c:401
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "échec de la création du répertoire '%s'"
@@ -4908,53 +5025,53 @@ msgstr "échec de la création du répertoire '%s'"
 msgid "Failed to split patches."
 msgstr "Échec de découpage des patchs."
 
-#: builtin/am.c:1127 builtin/commit.c:376
+#: builtin/am.c:1120 builtin/commit.c:377
 msgid "unable to write index file"
 msgstr "impossible d'écrire le fichier d'index"
 
-#: builtin/am.c:1178
+#: builtin/am.c:1171
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"."
 
-#: builtin/am.c:1179
+#: builtin/am.c:1172
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"."
 
-#: builtin/am.c:1180
+#: builtin/am.c:1173
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 "Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --"
 "abort\"."
 
-#: builtin/am.c:1315
-msgid "Patch is empty. Was it split wrong?"
-msgstr "Le patch est vide. Le découpage était-il bon ?"
+#: builtin/am.c:1304
+msgid "Patch is empty."
+msgstr "Le patch actuel est vide."
 
-#: builtin/am.c:1386 builtin/log.c:1557
+#: builtin/am.c:1370
 #, c-format
-msgid "invalid ident line: %s"
-msgstr "ligne d'identification invalide : %s"
+msgid "invalid ident line: %.*s"
+msgstr "ligne d'identification invalide : %.*s"
 
-#: builtin/am.c:1413
+#: builtin/am.c:1392
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "impossible d'analyser le commit %s"
 
-#: builtin/am.c:1606
+#: builtin/am.c:1586
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
 "points."
 
-#: builtin/am.c:1608
+#: builtin/am.c:1588
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 "Utilisation de l'information de l'index pour reconstruire un arbre de base..."
 
-#: builtin/am.c:1627
+#: builtin/am.c:1607
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -4962,38 +5079,38 @@ msgstr ""
 "Avez-vous édité le patch à la main ?\n"
 "Il ne s'applique pas aux blobs enregistrés dans son index."
 
-#: builtin/am.c:1633
+#: builtin/am.c:1613
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Retour à un patch de la base et fusion à 3 points..."
 
-#: builtin/am.c:1658
+#: builtin/am.c:1638
 msgid "Failed to merge in the changes."
 msgstr "Échec d'intégration des modifications."
 
-#: builtin/am.c:1682 builtin/merge.c:631
+#: builtin/am.c:1662 builtin/merge.c:632
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree a échoué à écrire un arbre"
 
-#: builtin/am.c:1689
+#: builtin/am.c:1669
 msgid "applying to an empty history"
 msgstr "application à un historique vide"
 
-#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802
-#: builtin/merge.c:827
+#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
+#: builtin/merge.c:828
 msgid "failed to write commit object"
 msgstr "échec de l'écriture de l'objet commit"
 
-#: builtin/am.c:1735 builtin/am.c:1739
+#: builtin/am.c:1715 builtin/am.c:1719
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "impossible de continuer : %s n'existe pas."
 
-#: builtin/am.c:1755
+#: builtin/am.c:1735
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr ""
 "impossible d'être interactif sans entrée standard connectée à un terminal."
 
-#: builtin/am.c:1760
+#: builtin/am.c:1740
 msgid "Commit Body is:"
 msgstr "Le corps de la validation est :"
 
@@ -5001,35 +5118,35 @@ msgstr "Le corps de la validation est :"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1770
+#: builtin/am.c:1750
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : "
 
-#: builtin/am.c:1820
+#: builtin/am.c:1800
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
 
-#: builtin/am.c:1860 builtin/am.c:1932
+#: builtin/am.c:1840 builtin/am.c:1912
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Application de  %.*s"
 
-#: builtin/am.c:1876
+#: builtin/am.c:1856
 msgid "No changes -- Patch already applied."
 msgstr "Pas de changement -- Patch déjà appliqué."
 
-#: builtin/am.c:1884
+#: builtin/am.c:1864
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "le patch a échoué à %s %.*s"
 
-#: builtin/am.c:1890
+#: builtin/am.c:1870
 #, c-format
 msgid "The copy of the patch that failed is found in: %s"
 msgstr "La copie du patch qui a échoué se trouve dans : %s"
 
-#: builtin/am.c:1935
+#: builtin/am.c:1915
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -5040,25 +5157,30 @@ msgstr ""
 "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
 "patch."
 
-#: builtin/am.c:1942
+#: builtin/am.c:1922
 msgid ""
 "You still have unmerged paths in your index.\n"
-"Did you forget to use 'git add'?"
+"You should 'git add' each file with resolved conflicts to mark them as "
+"such.\n"
+"You might run `git rm` on a file to accept \"deleted by them\" for it."
 msgstr ""
-"Vous avez toujours des chemins non fusionnés dans votre index\n"
-"Auriez-vous oublié de faire 'git add' ?"
+"Vous avez encore des chemin non-fusionnés dans votre index.\n"
+"Vous devriez lancer 'git add' sur chaque conflit résolu pour les marquer "
+"comme tel.\n"
+"Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour "
+"accepter son état."
 
-#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308
-#: builtin/reset.c:316
+#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
+#: builtin/reset.c:331
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Impossible d'analyser l'objet '%s'."
 
-#: builtin/am.c:2102
+#: builtin/am.c:2083
 msgid "failed to clean index"
 msgstr "échec du nettoyage de l'index"
 
-#: builtin/am.c:2136
+#: builtin/am.c:2117
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -5066,135 +5188,136 @@ msgstr ""
 "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
 "Pas de retour à ORIG_HEAD"
 
-#: builtin/am.c:2199
+#: builtin/am.c:2180
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Valeur invalide pour --patch-format : %s"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2213
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2233
+#: builtin/am.c:2214
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<options>] (--continue | --quit | --abort)"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2220
 msgid "run interactively"
 msgstr "exécution interactive"
 
-#: builtin/am.c:2241
+#: builtin/am.c:2222
 msgid "historical option -- no-op"
 msgstr "option historique -- no-op"
 
-#: builtin/am.c:2243
+#: builtin/am.c:2224
 msgid "allow fall back on 3way merging if needed"
 msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
 
-#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57
-#: builtin/repack.c:178
+#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/repack.c:180
 msgid "be quiet"
 msgstr "être silencieux"
 
-#: builtin/am.c:2246
+#: builtin/am.c:2227
 msgid "add a Signed-off-by line to the commit message"
 msgstr "ajouter une ligne Signed-off-by au message de validation"
 
-#: builtin/am.c:2249
+#: builtin/am.c:2230
 msgid "recode into utf8 (default)"
 msgstr "recoder en utf-8 (par défaut)"
 
-#: builtin/am.c:2251
+#: builtin/am.c:2232
 msgid "pass -k flag to git-mailinfo"
 msgstr "passer l'option -k à git-mailinfo"
 
-#: builtin/am.c:2253
+#: builtin/am.c:2234
 msgid "pass -b flag to git-mailinfo"
 msgstr "passer l'option -b à git-mailinfo"
 
-#: builtin/am.c:2255
+#: builtin/am.c:2236
 msgid "pass -m flag to git-mailinfo"
 msgstr "passer l'option -m à git-mailinfo"
 
-#: builtin/am.c:2257
+#: builtin/am.c:2238
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox"
 
-#: builtin/am.c:2260
+#: builtin/am.c:2241
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"
 
-#: builtin/am.c:2263
+#: builtin/am.c:2244
 msgid "strip everything before a scissors line"
 msgstr "retirer tout le contenu avant la ligne des ciseaux"
 
-#: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274
-#: builtin/am.c:2277 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286
-#: builtin/am.c:2292
+#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2273
 msgid "pass it through git-apply"
 msgstr "le passer jusqu'à git-apply"
 
-#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
-#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135
-#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191
-#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398
-#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
+#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
+#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193
+#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169
+#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134
+#: parse-options.h:245
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37
-#: builtin/replace.c:443 builtin/tag.c:433 builtin/verify-tag.c:38
+#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
+#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
 msgid "format"
 msgstr "format"
 
-#: builtin/am.c:2289
+#: builtin/am.c:2270
 msgid "format the patch(es) are in"
 msgstr "format de présentation des patchs"
 
-#: builtin/am.c:2295
+#: builtin/am.c:2276
 msgid "override error message when patch failure occurs"
 msgstr "surcharger le message d'erreur lors d'un échec d'application de patch"
 
-#: builtin/am.c:2297
+#: builtin/am.c:2278
 msgid "continue applying patches after resolving a conflict"
 msgstr "continuer à appliquer les patchs après résolution d'un conflit"
 
-#: builtin/am.c:2300
+#: builtin/am.c:2281
 msgid "synonyms for --continue"
 msgstr "synonymes de --continue"
 
-#: builtin/am.c:2303
+#: builtin/am.c:2284
 msgid "skip the current patch"
 msgstr "sauter le patch courant"
 
-#: builtin/am.c:2306
+#: builtin/am.c:2287
 msgid "restore the original branch and abort the patching operation."
 msgstr ""
 "restaurer la branche originale et abandonner les applications de patch."
 
-#: builtin/am.c:2310
+#: builtin/am.c:2291
 msgid "lie about committer date"
 msgstr "mentir sur la date de validation"
 
-#: builtin/am.c:2312
+#: builtin/am.c:2293
 msgid "use current timestamp for author date"
 msgstr "utiliser l'horodatage actuel pour la date d'auteur"
 
-#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232
-#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
+#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
+#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
 msgid "key-id"
 msgstr "id-clé"
 
-#: builtin/am.c:2315
+#: builtin/am.c:2296
 msgid "GPG-sign commits"
 msgstr "signer les commits avec GPG"
 
-#: builtin/am.c:2318
+#: builtin/am.c:2299
 msgid "(internal use for git-rebase)"
 msgstr "(utilisation interne pour git-rebase)"
 
-#: builtin/am.c:2333
+#: builtin/am.c:2317
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -5202,17 +5325,17 @@ msgstr ""
 "L'option -b/--binary ne fait plus rien depuis longtemps,\n"
 "et elle sera supprimée. Veuillez ne plus l'utiliser."
 
-#: builtin/am.c:2340
+#: builtin/am.c:2324
 msgid "failed to read the index"
 msgstr "échec à la lecture de l'index"
 
-#: builtin/am.c:2355
+#: builtin/am.c:2339
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 "le répertoire précédent de rebasage %s existe toujours mais mbox donnée."
 
-#: builtin/am.c:2379
+#: builtin/am.c:2363
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -5221,7 +5344,7 @@ msgstr ""
 "Répertoire abandonné %s trouvé.\n"
 "Utilisez \"git am --abort\" pour le supprimer."
 
-#: builtin/am.c:2385
+#: builtin/am.c:2369
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr ""
 "Pas de résolution de l'opération en cours, nous ne sommes pas dans une "
@@ -5273,204 +5396,175 @@ msgstr "effectuer 'git bisect next'"
 msgid "update BISECT_HEAD instead of checking out the current commit"
 msgstr "mettre à jour BISECT_HEAD au lieu d'extraire le commit actuel"
 
-#: builtin/blame.c:33
+#: builtin/blame.c:27
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<options>] [<options-de-révision>] [<rev>] [--] <fichier>"
 
-#: builtin/blame.c:38
+#: builtin/blame.c:32
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<options-de-révision> sont documentés dans git-rev-list(1)"
 
-#: builtin/blame.c:1777
-msgid "Blaming lines"
-msgstr "Assignation de blâme au lignes"
-
-#: builtin/blame.c:2573
+#: builtin/blame.c:668
 msgid "Show blame entries as we find them, incrementally"
 msgstr ""
 "Montrer les éléments de blâme au fur et à mesure de leur découverte, de "
 "manière incrémentale"
 
-#: builtin/blame.c:2574
+#: builtin/blame.c:669
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)"
 
-#: builtin/blame.c:2575
+#: builtin/blame.c:670
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr ""
 "Ne pas traiter les commits racine comme des limites (Défaut : désactivé)"
 
-#: builtin/blame.c:2576
+#: builtin/blame.c:671
 msgid "Show work cost statistics"
 msgstr "Montrer les statistiques de coût d'activité"
 
-#: builtin/blame.c:2577
+#: builtin/blame.c:672
 msgid "Force progress reporting"
 msgstr "Forcer l'affichage de l'état d'avancement"
 
-#: builtin/blame.c:2578
+#: builtin/blame.c:673
 msgid "Show output score for blame entries"
 msgstr "Montrer le score de sortie pour les éléments de blâme"
 
-#: builtin/blame.c:2579
+#: builtin/blame.c:674
 msgid "Show original filename (Default: auto)"
 msgstr "Montrer les noms de fichier originaux (Défaut : auto)"
 
-#: builtin/blame.c:2580
+#: builtin/blame.c:675
 msgid "Show original linenumber (Default: off)"
 msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)"
 
-#: builtin/blame.c:2581
+#: builtin/blame.c:676
 msgid "Show in a format designed for machine consumption"
 msgstr "Afficher dans un format propice à la consommation par machine"
 
-#: builtin/blame.c:2582
+#: builtin/blame.c:677
 msgid "Show porcelain format with per-line commit information"
 msgstr "Afficher en format porcelaine avec l'information de commit par ligne"
 
-#: builtin/blame.c:2583
+#: builtin/blame.c:678
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)"
 
-#: builtin/blame.c:2584
+#: builtin/blame.c:679
 msgid "Show raw timestamp (Default: off)"
 msgstr "Afficher les horodatages bruts (Défaut : désactivé)"
 
-#: builtin/blame.c:2585
+#: builtin/blame.c:680
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)"
 
-#: builtin/blame.c:2586
+#: builtin/blame.c:681
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)"
 
-#: builtin/blame.c:2587
+#: builtin/blame.c:682
 msgid "Show author email instead of name (Default: off)"
-msgstr "Afficher l'e-mail de l'auteur au lieu du nom (Défaut : désactivé)"
+msgstr "Afficher l'courriel de l'auteur au lieu du nom (Défaut : désactivé)"
 
-#: builtin/blame.c:2588
+#: builtin/blame.c:683
 msgid "Ignore whitespace differences"
 msgstr "Ignorer les différences d'espace"
 
-#: builtin/blame.c:2595
+#: builtin/blame.c:690
 msgid "Use an experimental heuristic to improve diffs"
 msgstr "Utiliser une heuristique expérimentale pour améliorer les diffs"
 
-#: builtin/blame.c:2597
+#: builtin/blame.c:692
 msgid "Spend extra cycles to find better match"
 msgstr ""
 "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance"
 
-#: builtin/blame.c:2598
+#: builtin/blame.c:693
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr ""
 "Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list"
 
-#: builtin/blame.c:2599
+#: builtin/blame.c:694
 msgid "Use <file>'s contents as the final image"
 msgstr "Utiliser le contenu de <fichier> comme image finale"
 
-#: builtin/blame.c:2600 builtin/blame.c:2601
+#: builtin/blame.c:695 builtin/blame.c:696
 msgid "score"
 msgstr "score"
 
-#: builtin/blame.c:2600
+#: builtin/blame.c:695
 msgid "Find line copies within and across files"
 msgstr "Trouver les copies de ligne dans et entre les fichiers"
 
-#: builtin/blame.c:2601
+#: builtin/blame.c:696
 msgid "Find line movements within and across files"
 msgstr "Trouver les mouvements de ligne dans et entre les fichiers"
 
-#: builtin/blame.c:2602
+#: builtin/blame.c:697
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:2602
+#: builtin/blame.c:697
 msgid "Process only line range n,m, counting from 1"
 msgstr ""
 "Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1"
 
-#: builtin/blame.c:2649
+#: builtin/blame.c:744
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "--progress ne peut pas être utilisé avec --incremental ou les formats "
 "porcelaine"
 
-#. TRANSLATORS: This string is used to tell us the maximum
-#. display width for a relative timestamp in "git blame"
-#. output.  For C locale, "4 years, 11 months ago", which
-#. takes 22 places, is the longest among various forms of
-#. relative timestamps, but your language may need more or
-#. fewer display columns.
-#: builtin/blame.c:2697
+#. TRANSLATORS: This string is used to tell us the
+#. maximum display width for a relative timestamp in
+#. "git blame" output.  For C locale, "4 years, 11
+#. months ago", which takes 22 places, is the longest
+#. among various forms of relative timestamps, but
+#. your language may need more or fewer display
+#. columns.
+#.
+#: builtin/blame.c:795
 msgid "4 years, 11 months ago"
 msgstr "il y a 10 ans et 11 mois"
 
-#: builtin/blame.c:2777
-msgid "--contents and --reverse do not blend well."
-msgstr "--contents et --reverse ne font pas bon ménage."
-
-#: builtin/blame.c:2797
-msgid "cannot use --contents with final commit object name"
-msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final"
-
-#: builtin/blame.c:2802
-msgid "--reverse and --first-parent together require specified latest commit"
-msgstr ""
-"--reverse et --first-parent ensemble nécessitent la spécification d'un "
-"dernier commit"
-
-#: builtin/blame.c:2829
-msgid ""
-"--reverse --first-parent together require range along first-parent chain"
-msgstr ""
-"--reverse --first-parent ensemble nécessitent une portée avec la chaîne de "
-"premier parent"
-
-#: builtin/blame.c:2840
-#, c-format
-msgid "no such path %s in %s"
-msgstr "pas de chemin %s dans %s"
-
-#: builtin/blame.c:2851
-#, c-format
-msgid "cannot read blob %s for path %s"
-msgstr "impossible de lire le blob %s  pour le chemin %s"
-
-#: builtin/blame.c:2870
+#: builtin/blame.c:882
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "le fichier %s n'a qu'%lu ligne"
 msgstr[1] "le fichier %s n'a que %lu lignes"
 
-#: builtin/branch.c:26
+#: builtin/blame.c:928
+msgid "Blaming lines"
+msgstr "Assignation de blâme au lignes"
+
+#: builtin/branch.c:27
 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
 msgstr "git branch [<options>] [-r | -a] [--merged | --no-merged]"
 
-#: builtin/branch.c:27
+#: builtin/branch.c:28
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
 msgstr "git branch [<options] [-l] [-f] <nom-de-branche> [<point-de-départ>]"
 
-#: builtin/branch.c:28
+#: builtin/branch.c:29
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<options>] [-r] (-d | -D) <nom-de-branche>..."
 
-#: builtin/branch.c:29
+#: builtin/branch.c:30
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr ""
 "git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>"
 
-#: builtin/branch.c:30
+#: builtin/branch.c:31
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<options>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:31
+#: builtin/branch.c:32
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<options>] [-r | -a] [--format]"
 
-#: builtin/branch.c:144
+#: builtin/branch.c:145
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -5479,7 +5573,7 @@ msgstr ""
 "suppression de la branche '%s' qui a été fusionnée dans\n"
 "         '%s', mais pas dans HEAD."
 
-#: builtin/branch.c:148
+#: builtin/branch.c:149
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -5488,12 +5582,12 @@ msgstr ""
 "branche '%s' non supprimée car elle n'a pas été fusionnée dans\n"
 "         '%s', même si elle est fusionnée dans HEAD."
 
-#: builtin/branch.c:162
+#: builtin/branch.c:163
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Impossible de rechercher l'objet commit pour '%s'"
 
-#: builtin/branch.c:166
+#: builtin/branch.c:167
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -5502,93 +5596,93 @@ msgstr ""
 "La branche '%s' n'est pas totalement fusionnée.\n"
 "Si vous souhaitez réellement la supprimer, lancez 'git branch -D %s'."
 
-#: builtin/branch.c:179
+#: builtin/branch.c:180
 msgid "Update of config-file failed"
 msgstr "Échec de la mise à jour du fichier de configuration"
 
-#: builtin/branch.c:210
+#: builtin/branch.c:211
 msgid "cannot use -a with -d"
 msgstr "impossible d'utiliser -a avec -d"
 
-#: builtin/branch.c:216
+#: builtin/branch.c:217
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Impossible de rechercher l'objet commit pour HEAD"
 
-#: builtin/branch.c:230
+#: builtin/branch.c:231
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'"
 
-#: builtin/branch.c:245
+#: builtin/branch.c:246
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "branche de suivi '%s' non trouvée."
 
-#: builtin/branch.c:246
+#: builtin/branch.c:247
 #, c-format
 msgid "branch '%s' not found."
 msgstr "branche '%s' non trouvée."
 
-#: builtin/branch.c:261
+#: builtin/branch.c:262
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr "Erreur lors de la suppression de la branche de suivi '%s'"
 
-#: builtin/branch.c:262
+#: builtin/branch.c:263
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "Erreur lors de la suppression de la branche '%s'"
 
-#: builtin/branch.c:269
+#: builtin/branch.c:270
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Branche de suivi %s supprimée (précédemment %s).\n"
 
-#: builtin/branch.c:270
+#: builtin/branch.c:271
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Branche %s supprimée (précédemment %s).\n"
 
-#: builtin/branch.c:441
+#: builtin/branch.c:445
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "La branche %s est en cours de rebasage sur %s"
 
-#: builtin/branch.c:445
+#: builtin/branch.c:449
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "La branche %s est en cours de bissection sur %s"
 
-#: builtin/branch.c:460
+#: builtin/branch.c:464
 msgid "cannot rename the current branch while not on any."
 msgstr "impossible de renommer la branche actuelle, il n'y en a pas."
 
-#: builtin/branch.c:470
+#: builtin/branch.c:474
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Nom de branche invalide : '%s'"
 
-#: builtin/branch.c:487
+#: builtin/branch.c:491
 msgid "Branch rename failed"
 msgstr "Échec de renommage de la branche"
 
-#: builtin/branch.c:490
+#: builtin/branch.c:494
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Renommage d'un branche mal nommée '%s'"
 
-#: builtin/branch.c:493
+#: builtin/branch.c:497
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !"
 
-#: builtin/branch.c:502
+#: builtin/branch.c:506
 msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 "La branche est renommée, mais la mise à jour du fichier de configuration a "
 "échoué"
 
-#: builtin/branch.c:518
+#: builtin/branch.c:522
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -5599,176 +5693,176 @@ msgstr ""
 "  %s\n"
 "Les lignes commençant par '%c' seront ignorées.\n"
 
-#: builtin/branch.c:551
+#: builtin/branch.c:555
 msgid "Generic options"
 msgstr "Options génériques"
 
-#: builtin/branch.c:553
+#: builtin/branch.c:557
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "afficher le hachage et le sujet, doublé pour la branche amont"
 
-#: builtin/branch.c:554
+#: builtin/branch.c:558
 msgid "suppress informational messages"
 msgstr "supprimer les messages d'information"
 
-#: builtin/branch.c:555
+#: builtin/branch.c:559
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "régler le mode de suivi (voir git-pull(1))"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:561
 msgid "change upstream info"
 msgstr "modifier l'information amont"
 
-#: builtin/branch.c:559
+#: builtin/branch.c:563
 msgid "upstream"
 msgstr "amont"
 
-#: builtin/branch.c:559
+#: builtin/branch.c:563
 msgid "change the upstream info"
 msgstr "modifier l'information amont"
 
-#: builtin/branch.c:560
+#: builtin/branch.c:564
 msgid "Unset the upstream info"
 msgstr "Désactiver l'information amont"
 
-#: builtin/branch.c:561
+#: builtin/branch.c:565
 msgid "use colored output"
 msgstr "utiliser la coloration dans la sortie"
 
-#: builtin/branch.c:562
+#: builtin/branch.c:566
 msgid "act on remote-tracking branches"
 msgstr "agir sur les branches de suivi distantes"
 
-#: builtin/branch.c:564 builtin/branch.c:566
+#: builtin/branch.c:568 builtin/branch.c:570
 msgid "print only branches that contain the commit"
 msgstr "afficher seulement les branches qui contiennent le commit"
 
-#: builtin/branch.c:565 builtin/branch.c:567
+#: builtin/branch.c:569 builtin/branch.c:571
 msgid "print only branches that don't contain the commit"
 msgstr "afficher seulement les branches qui ne contiennent pas le commit"
 
-#: builtin/branch.c:570
+#: builtin/branch.c:574
 msgid "Specific git-branch actions:"
 msgstr "Actions spécifiques à git-branch :"
 
-#: builtin/branch.c:571
+#: builtin/branch.c:575
 msgid "list both remote-tracking and local branches"
 msgstr "afficher à la fois les branches de suivi et les branches locales"
 
-#: builtin/branch.c:573
+#: builtin/branch.c:577
 msgid "delete fully merged branch"
 msgstr "supprimer une branche totalement fusionnée"
 
-#: builtin/branch.c:574
+#: builtin/branch.c:578
 msgid "delete branch (even if not merged)"
 msgstr "supprimer une branche (même non fusionnée)"
 
-#: builtin/branch.c:575
+#: builtin/branch.c:579
 msgid "move/rename a branch and its reflog"
 msgstr "déplacer/renommer une branche et son reflog"
 
-#: builtin/branch.c:576
+#: builtin/branch.c:580
 msgid "move/rename a branch, even if target exists"
 msgstr "déplacer/renommer une branche, même si la cible existe"
 
-#: builtin/branch.c:577
+#: builtin/branch.c:581
 msgid "list branch names"
 msgstr "afficher les noms des branches"
 
-#: builtin/branch.c:578
+#: builtin/branch.c:582
 msgid "create the branch's reflog"
 msgstr "créer le reflog de la branche"
 
-#: builtin/branch.c:580
+#: builtin/branch.c:584
 msgid "edit the description for the branch"
 msgstr "éditer la description de la branche"
 
-#: builtin/branch.c:581
+#: builtin/branch.c:585
 msgid "force creation, move/rename, deletion"
 msgstr "forcer la création, le déplacement/renommage, ou la suppression"
 
-#: builtin/branch.c:582
+#: builtin/branch.c:586
 msgid "print only branches that are merged"
 msgstr "afficher seulement les branches qui sont fusionnées"
 
-#: builtin/branch.c:583
+#: builtin/branch.c:587
 msgid "print only branches that are not merged"
 msgstr "afficher seulement les branches qui ne sont pas fusionnées"
 
-#: builtin/branch.c:584
+#: builtin/branch.c:588
 msgid "list branches in columns"
 msgstr "afficher les branches en colonnes"
 
-#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426
+#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
 msgid "key"
 msgstr "clé"
 
-#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
 msgid "field name to sort on"
 msgstr "nom du champ servant à trier"
 
-#: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404
-#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
-#: builtin/tag.c:429
+#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
+#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
+#: builtin/tag.c:430
 msgid "object"
 msgstr "objet"
 
-#: builtin/branch.c:589
+#: builtin/branch.c:593
 msgid "print only branches of the object"
 msgstr "afficher seulement les branches de l'objet"
 
-#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434
+#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
 msgid "sorting and filtering are case insensitive"
 msgstr "le tri et le filtrage sont non-sensibles à la casse"
 
-#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433
-#: builtin/verify-tag.c:38
+#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr "format à utiliser pour la sortie"
 
-#: builtin/branch.c:611
+#: builtin/branch.c:615
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Échec de résolution de HEAD comme référence valide."
 
-#: builtin/branch.c:615 builtin/clone.c:724
+#: builtin/branch.c:619 builtin/clone.c:728
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD non trouvée sous refs/heads !"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:642
 msgid "--column and --verbose are incompatible"
 msgstr "--column et --verbose sont incompatibles"
 
-#: builtin/branch.c:649 builtin/branch.c:701
+#: builtin/branch.c:653 builtin/branch.c:705
 msgid "branch name required"
 msgstr "le nom de branche est requis"
 
-#: builtin/branch.c:677
+#: builtin/branch.c:681
 msgid "Cannot give description to detached HEAD"
 msgstr "Impossible de décrire une HEAD détachée"
 
-#: builtin/branch.c:682
+#: builtin/branch.c:686
 msgid "cannot edit description of more than one branch"
 msgstr "impossible d'éditer la description de plus d'une branche"
 
-#: builtin/branch.c:689
+#: builtin/branch.c:693
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Aucun commit sur la branche '%s'."
 
-#: builtin/branch.c:692
+#: builtin/branch.c:696
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Aucune branche nommée '%s'."
 
-#: builtin/branch.c:707
+#: builtin/branch.c:711
 msgid "too many branches for a rename operation"
 msgstr "trop de branches pour une opération de renommage"
 
-#: builtin/branch.c:712
+#: builtin/branch.c:716
 msgid "too many branches to set new upstream"
 msgstr "trop de branches pour spécifier une branche amont"
 
-#: builtin/branch.c:716
+#: builtin/branch.c:720
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -5776,41 +5870,41 @@ msgstr ""
 "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "
 "aucune branche."
 
-#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762
+#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
 #, c-format
 msgid "no such branch '%s'"
 msgstr "pas de branche '%s'"
 
-#: builtin/branch.c:723
+#: builtin/branch.c:727
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "la branche '%s' n'existe pas"
 
-#: builtin/branch.c:735
+#: builtin/branch.c:739
 msgid "too many branches to unset upstream"
 msgstr "trop de branches pour désactiver un amont"
 
-#: builtin/branch.c:739
+#: builtin/branch.c:743
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur "
 "aucune branche."
 
-#: builtin/branch.c:745
+#: builtin/branch.c:749
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "La branche '%s' n'a aucune information de branche amont"
 
-#: builtin/branch.c:759
+#: builtin/branch.c:763
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr "créer manuellement 'HEAD' n'a pas de sens"
 
-#: builtin/branch.c:765
+#: builtin/branch.c:769
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr ""
 "les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche"
 
-#: builtin/branch.c:768
+#: builtin/branch.c:772
 #, c-format
 msgid ""
 "The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -5819,7 +5913,7 @@ msgstr ""
 "l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --"
 "track ou --set-upstream-to\n"
 
-#: builtin/branch.c:785
+#: builtin/branch.c:789
 #, c-format
 msgid ""
 "\n"
@@ -5843,7 +5937,7 @@ msgstr "La création d'un colis requiert un dépôt."
 msgid "Need a repository to unbundle."
 msgstr "Le dépaquetage d'un colis requiert un dépôt."
 
-#: builtin/cat-file.c:513
+#: builtin/cat-file.c:519
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -5851,7 +5945,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p "
 "| <type> | --textconv | --filters) [--path=<chemin>] <objet>"
 
-#: builtin/cat-file.c:514
+#: builtin/cat-file.c:520
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -5859,309 +5953,309 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:551
+#: builtin/cat-file.c:557
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<type> peut être : blob, tree, commit ou tag"
 
-#: builtin/cat-file.c:552
+#: builtin/cat-file.c:558
 msgid "show object type"
 msgstr "afficher le type de l'objet"
 
-#: builtin/cat-file.c:553
+#: builtin/cat-file.c:559
 msgid "show object size"
 msgstr "afficher la taille de l'objet"
 
-#: builtin/cat-file.c:555
+#: builtin/cat-file.c:561
 msgid "exit with zero when there's no error"
 msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur"
 
-#: builtin/cat-file.c:556
+#: builtin/cat-file.c:562
 msgid "pretty-print object's content"
 msgstr "afficher avec mise en forme le contenu de l'objet"
 
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:564
 msgid "for blob objects, run textconv on object's content"
 msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet"
 
-#: builtin/cat-file.c:560
+#: builtin/cat-file.c:566
 msgid "for blob objects, run filters on object's content"
 msgstr "pour les objets blob, lancer les filtres sur le contenu de l'objet"
 
-#: builtin/cat-file.c:561 git-submodule.sh:943
+#: builtin/cat-file.c:567 git-submodule.sh:944
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:568
 msgid "use a specific path for --textconv/--filters"
 msgstr "utiliser un chemin spécifique pour --textconv/--filters"
 
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:570
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "autoriser -s et -t à travailler sur des objets cassés/corrompus"
 
-#: builtin/cat-file.c:565
+#: builtin/cat-file.c:571
 msgid "buffer --batch output"
 msgstr "bufferiser la sortie de --batch"
 
-#: builtin/cat-file.c:567
+#: builtin/cat-file.c:573
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 "afficher l'information et le contenu des objets passés en entrée standard"
 
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:576
 msgid "show info about objects fed from the standard input"
 msgstr "afficher l'information des objets passés en entrée standard"
 
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:579
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "suivre les liens symbolique internes à la copie de travail (utilisé avec --"
 "batch ou --batch-check)"
 
-#: builtin/cat-file.c:575
+#: builtin/cat-file.c:581
 msgid "show all objects with --batch or --batch-check"
 msgstr "montrer tous les objets avec --batch ou --batch-check"
 
-#: builtin/check-attr.c:11
+#: builtin/check-attr.c:12
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
 msgstr "git check-attr [-a | --all | <attr>...] [--] <chemin>..."
 
-#: builtin/check-attr.c:12
+#: builtin/check-attr.c:13
 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 
-#: builtin/check-attr.c:19
+#: builtin/check-attr.c:20
 msgid "report all attributes set on file"
 msgstr "afficher tous les attributs associés au fichier"
 
-#: builtin/check-attr.c:20
+#: builtin/check-attr.c:21
 msgid "use .gitattributes only from the index"
 msgstr "utiliser .gitattributes seulement depuis l'index"
 
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
 msgid "read file names from stdin"
 msgstr "lire les noms de fichier depuis l'entrée standard"
 
-#: builtin/check-attr.c:23 builtin/check-ignore.c:24
+#: builtin/check-attr.c:24 builtin/check-ignore.c:26
 msgid "terminate input and output records by a NUL character"
 msgstr ""
 "terminer les enregistrements en entrée et en sortie par un caractère NUL"
 
-#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356
+#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
 msgid "suppress progress reporting"
 msgstr "supprimer l'état d'avancement"
 
-#: builtin/check-ignore.c:26
+#: builtin/check-ignore.c:28
 msgid "show non-matching input paths"
 msgstr "afficher les chemins en entrée qui ne correspondent pas"
 
-#: builtin/check-ignore.c:28
+#: builtin/check-ignore.c:30
 msgid "ignore index when checking"
 msgstr "ignorer l'index pendant la vérification"
 
-#: builtin/check-ignore.c:154
+#: builtin/check-ignore.c:158
 msgid "cannot specify pathnames with --stdin"
 msgstr "impossible de spécifier les chemins avec --stdin"
 
-#: builtin/check-ignore.c:157
+#: builtin/check-ignore.c:161
 msgid "-z only makes sense with --stdin"
 msgstr "-z n'a de sens qu'avec l'option --stdin"
 
-#: builtin/check-ignore.c:159
+#: builtin/check-ignore.c:163
 msgid "no path specified"
 msgstr "aucun chemin spécifié"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:167
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet n'est valide qu'avec un seul chemin"
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:169
 msgid "cannot have both --quiet and --verbose"
 msgstr "impossible d'avoir --quiet et --verbose"
 
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c:172
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching n'est valide qu'avec --verbose"
 
-#: builtin/check-mailmap.c:8
+#: builtin/check-mailmap.c:9
 msgid "git check-mailmap [<options>] <contact>..."
 msgstr "git check-mailmap [<options>] <contact>..."
 
-#: builtin/check-mailmap.c:13
+#: builtin/check-mailmap.c:14
 msgid "also read contacts from stdin"
 msgstr "lire aussi les contacts depuis l'entrée standard"
 
-#: builtin/check-mailmap.c:24
+#: builtin/check-mailmap.c:25
 #, c-format
 msgid "unable to parse contact: %s"
 msgstr "impossible d'analyser le contact : %s"
 
-#: builtin/check-mailmap.c:47
+#: builtin/check-mailmap.c:48
 msgid "no contacts specified"
 msgstr "aucun contact spécifié"
 
-#: builtin/checkout-index.c:127
+#: builtin/checkout-index.c:128
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<options>] [--] [<fichier>...]"
 
-#: builtin/checkout-index.c:144
+#: builtin/checkout-index.c:145
 msgid "stage should be between 1 and 3 or all"
 msgstr "stage doit valoir entre 1 et 3, ou all"
 
-#: builtin/checkout-index.c:160
+#: builtin/checkout-index.c:161
 msgid "check out all files in the index"
 msgstr "extraire tous les fichiers présents dans l'index"
 
-#: builtin/checkout-index.c:161
+#: builtin/checkout-index.c:162
 msgid "force overwrite of existing files"
 msgstr "forcer l'écrasement des fichiers existants"
 
-#: builtin/checkout-index.c:163
+#: builtin/checkout-index.c:164
 msgid "no warning for existing files and files not in index"
 msgstr ""
 "pas d'avertissement pour les fichiers existants et les fichiers absents de "
 "l'index"
 
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:166
 msgid "don't checkout new files"
 msgstr "ne pas extraire les nouveaux fichiers"
 
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:168
 msgid "update stat information in the index file"
 msgstr "mettre à jour l'information de stat dans le fichier d'index"
 
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:172
 msgid "read list of paths from the standard input"
 msgstr "lire la liste des chemins depuis l'entrée standard"
 
-#: builtin/checkout-index.c:173
+#: builtin/checkout-index.c:174
 msgid "write the content to temporary files"
 msgstr "écrire le contenu dans des fichiers temporaires"
 
-#: builtin/checkout-index.c:174 builtin/column.c:30
+#: builtin/checkout-index.c:175 builtin/column.c:31
 #: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
 #: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:477
+#: builtin/worktree.c:478
 msgid "string"
 msgstr "chaîne"
 
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:176
 msgid "when creating files, prepend <string>"
 msgstr "lors de la création de fichiers, préfixer par <chaîne>"
 
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:178
 msgid "copy out the files from named stage"
 msgstr "copier les fichiers depuis l'index nommé"
 
-#: builtin/checkout.c:27
+#: builtin/checkout.c:26
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<options>] <branche>"
 
-#: builtin/checkout.c:28
+#: builtin/checkout.c:27
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<options>] [<branche>] -- <fichier>..."
 
-#: builtin/checkout.c:153 builtin/checkout.c:186
+#: builtin/checkout.c:135 builtin/checkout.c:168
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "le chemin '%s' n'a pas notre version"
 
-#: builtin/checkout.c:155 builtin/checkout.c:188
+#: builtin/checkout.c:137 builtin/checkout.c:170
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "le chemin '%s' n'a pas leur version"
 
-#: builtin/checkout.c:171
+#: builtin/checkout.c:153
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "le chemin '%s' n'a aucune des versions nécessaires"
 
-#: builtin/checkout.c:215
+#: builtin/checkout.c:197
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "le chemin '%s' n'a pas les versions nécessaires"
 
-#: builtin/checkout.c:232
+#: builtin/checkout.c:214
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "chemin '%s' : impossible de fusionner"
 
-#: builtin/checkout.c:249
+#: builtin/checkout.c:231
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"
 
-#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275
-#: builtin/checkout.c:278
+#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
+#: builtin/checkout.c:262
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins"
 
-#: builtin/checkout.c:281 builtin/checkout.c:284
+#: builtin/checkout.c:265 builtin/checkout.c:268
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' ne peut pas être utilisé avec %s"
 
-#: builtin/checkout.c:287
+#: builtin/checkout.c:271
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "Impossible de mettre à jour les chemins et basculer sur la branche '%s' en "
 "même temps."
 
-#: builtin/checkout.c:358 builtin/checkout.c:365
+#: builtin/checkout.c:342 builtin/checkout.c:349
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "le chemin '%s' n'est pas fusionné"
 
-#: builtin/checkout.c:513
+#: builtin/checkout.c:497
 msgid "you need to resolve your current index first"
 msgstr "vous devez d'abord résoudre votre index courant"
 
-#: builtin/checkout.c:644
+#: builtin/checkout.c:628
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Impossible de faire un reflog pour '%s' : %s\n"
 
-#: builtin/checkout.c:685
+#: builtin/checkout.c:669
 msgid "HEAD is now at"
 msgstr "HEAD est maintenant sur"
 
-#: builtin/checkout.c:689 builtin/clone.c:678
+#: builtin/checkout.c:673 builtin/clone.c:682
 msgid "unable to update HEAD"
 msgstr "impossible de mettre à jour HEAD"
 
-#: builtin/checkout.c:693
+#: builtin/checkout.c:677
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Remise à zéro de la branche '%s'\n"
 
-#: builtin/checkout.c:696
+#: builtin/checkout.c:680
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Déjà sur '%s'\n"
 
-#: builtin/checkout.c:700
+#: builtin/checkout.c:684
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Basculement et remise à zéro de la branche '%s'\n"
 
-#: builtin/checkout.c:702 builtin/checkout.c:1090
+#: builtin/checkout.c:686 builtin/checkout.c:1075
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Basculement sur la nouvelle branche '%s'\n"
 
-#: builtin/checkout.c:704
+#: builtin/checkout.c:688
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Basculement sur la branche '%s'\n"
 
-#: builtin/checkout.c:755
+#: builtin/checkout.c:739
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... et %d en plus.\n"
 
-#: builtin/checkout.c:761
+#: builtin/checkout.c:745
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -6184,7 +6278,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:780
+#: builtin/checkout.c:764
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6213,166 +6307,162 @@ msgstr[1] ""
 "git branch <nouvelle-branche> %s\n"
 "\n"
 
-#: builtin/checkout.c:816
+#: builtin/checkout.c:800
 msgid "internal error in revision walk"
 msgstr "erreur interne lors du parcours des révisions"
 
-#: builtin/checkout.c:820
+#: builtin/checkout.c:804
 msgid "Previous HEAD position was"
 msgstr "La position précédente de HEAD était sur"
 
-#: builtin/checkout.c:847 builtin/checkout.c:1085
+#: builtin/checkout.c:832 builtin/checkout.c:1070
 msgid "You are on a branch yet to be born"
 msgstr "Vous êtes sur une branche qui doit encore naître"
 
-#: builtin/checkout.c:991
+#: builtin/checkout.c:976
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "une seule référence attendue, %d fournies."
 
-#: builtin/checkout.c:1031 builtin/worktree.c:214
+#: builtin/checkout.c:1016 builtin/worktree.c:215
 #, c-format
 msgid "invalid reference: %s"
 msgstr "référence invalide : %s"
 
-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1045
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "la référence n'est pas un arbre : %s"
 
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1084
 msgid "paths cannot be used with switching branches"
 msgstr "impossible d'utiliser des chemins avec un basculement de branches"
 
-#: builtin/checkout.c:1102 builtin/checkout.c:1106
+#: builtin/checkout.c:1087 builtin/checkout.c:1091
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' ne peut pas être utilisé avec un basculement de branches"
 
-#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118
-#: builtin/checkout.c:1121
+#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
+#: builtin/checkout.c:1106
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' ne peut pas être utilisé avec '%s'"
 
-#: builtin/checkout.c:1126
+#: builtin/checkout.c:1111
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit"
 
-#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:329
-#: builtin/worktree.c:331
+#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
+#: builtin/worktree.c:330
 msgid "branch"
 msgstr "branche"
 
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1145
 msgid "create and checkout a new branch"
 msgstr "créer et extraire une nouvelle branche"
 
-#: builtin/checkout.c:1162
+#: builtin/checkout.c:1147
 msgid "create/reset and checkout a branch"
 msgstr "créer/réinitialiser et extraire une branche"
 
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1148
 msgid "create reflog for new branch"
 msgstr "créer un reflog pour une nouvelle branche"
 
-#: builtin/checkout.c:1164 builtin/worktree.c:333
+#: builtin/checkout.c:1149 builtin/worktree.c:332
 msgid "detach HEAD at named commit"
 msgstr "détacher la HEAD au commit nommé"
 
-#: builtin/checkout.c:1165
+#: builtin/checkout.c:1150
 msgid "set upstream info for new branch"
 msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
 
-#: builtin/checkout.c:1167
+#: builtin/checkout.c:1152
 msgid "new-branch"
 msgstr "nouvelle branche"
 
-#: builtin/checkout.c:1167
+#: builtin/checkout.c:1152
 msgid "new unparented branch"
 msgstr "nouvelle branche sans parent"
 
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1153
 msgid "checkout our version for unmerged files"
 msgstr "extraire notre version pour les fichiers non fusionnés"
 
-#: builtin/checkout.c:1170
+#: builtin/checkout.c:1155
 msgid "checkout their version for unmerged files"
 msgstr "extraire leur version pour les fichiers non fusionnés"
 
-#: builtin/checkout.c:1172
+#: builtin/checkout.c:1157
 msgid "force checkout (throw away local modifications)"
 msgstr "forcer l'extraction (laisser tomber les modifications locales)"
 
-#: builtin/checkout.c:1173
+#: builtin/checkout.c:1158
 msgid "perform a 3-way merge with the new branch"
 msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
 
-#: builtin/checkout.c:1174 builtin/merge.c:234
+#: builtin/checkout.c:1159 builtin/merge.c:235
 msgid "update ignored files (default)"
 msgstr "mettre à jour les fichiers ignorés (par défaut)"
 
-#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251
+#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
 msgid "style"
 msgstr "style"
 
-#: builtin/checkout.c:1176
+#: builtin/checkout.c:1161
 msgid "conflict style (merge or diff3)"
 msgstr "style de conflit (merge (fusion) ou diff3)"
 
-#: builtin/checkout.c:1179
+#: builtin/checkout.c:1164
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux"
 
-#: builtin/checkout.c:1181
+#: builtin/checkout.c:1166
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'"
 
-#: builtin/checkout.c:1183
+#: builtin/checkout.c:1168
 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 "ne pas vérifier si une autre copie de travail contient le référence fournie"
 
-#: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119
-#: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539
-#: builtin/send-pack.c:172
+#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
+#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: builtin/send-pack.c:173
 msgid "force progress reporting"
 msgstr "forcer l'affichage de l'état d'avancement"
 
-#: builtin/checkout.c:1224
+#: builtin/checkout.c:1203
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b, -B et --orphan sont mutuellement exclusifs"
 
-#: builtin/checkout.c:1241
+#: builtin/checkout.c:1220
 msgid "--track needs a branch name"
 msgstr "--track requiert un nom de branche"
 
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1225
 msgid "Missing branch name; try -b"
 msgstr "Nom de branche manquant ; essayez -b"
 
-#: builtin/checkout.c:1282
+#: builtin/checkout.c:1261
 msgid "invalid path specification"
 msgstr "spécification de chemin invalide"
 
-#: builtin/checkout.c:1289
+#: builtin/checkout.c:1268
 #, c-format
-msgid ""
-"Cannot update paths and switch to branch '%s' at the same time.\n"
-"Did you intend to checkout '%s' which can not be resolved as commit?"
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr ""
-"Impossible de mettre à jour les chemins et de basculer sur la branche '%s' "
-"en même temps.\n"
-"Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"
+"'%s' n'est pas un commit et une branche '%s' ne peut pas être créée depuis."
 
-#: builtin/checkout.c:1294
+#: builtin/checkout.c:1272
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"
 
-#: builtin/checkout.c:1298
+#: builtin/checkout.c:1276
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -6380,38 +6470,38 @@ msgstr ""
 "git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n"
 "de l'extraction de l'index."
 
-#: builtin/clean.c:25
+#: builtin/clean.c:26
 msgid ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
 msgstr ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <motif>] [-x | -X] [--] <chemins>..."
 
-#: builtin/clean.c:29
+#: builtin/clean.c:30
 #, c-format
 msgid "Removing %s\n"
 msgstr "Suppression de %s\n"
 
-#: builtin/clean.c:30
+#: builtin/clean.c:31
 #, c-format
 msgid "Would remove %s\n"
 msgstr "Supprimerait %s\n"
 
-#: builtin/clean.c:31
+#: builtin/clean.c:32
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "Ignore le dépôt %s\n"
 
-#: builtin/clean.c:32
+#: builtin/clean.c:33
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "Ignorerait le dépôt %s\n"
 
-#: builtin/clean.c:33
+#: builtin/clean.c:34
 #, c-format
 msgid "failed to remove %s"
 msgstr "échec de la suppression de %s"
 
-#: builtin/clean.c:297 git-add--interactive.perl:614
+#: builtin/clean.c:298 git-add--interactive.perl:572
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6424,7 +6514,7 @@ msgstr ""
 "foo         - sélectionner un élément par un préfixe unique\n"
 "            - (vide) ne rien sélectionner\n"
 
-#: builtin/clean.c:301 git-add--interactive.perl:623
+#: builtin/clean.c:302 git-add--interactive.perl:581
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6445,38 +6535,38 @@ msgstr ""
 "*          - choisir tous les éléments\n"
 "           - (vide) terminer la sélection\n"
 
-#: builtin/clean.c:517 git-add--interactive.perl:589
-#: git-add--interactive.perl:594
+#: builtin/clean.c:518 git-add--interactive.perl:547
+#: git-add--interactive.perl:552
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Hein (%s) ?\n"
 
-#: builtin/clean.c:659
+#: builtin/clean.c:660
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Entrez les motifs à ignorer>> "
 
-#: builtin/clean.c:696
+#: builtin/clean.c:697
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"
 
-#: builtin/clean.c:717
+#: builtin/clean.c:718
 msgid "Select items to delete"
 msgstr "Sélectionner les éléments à supprimer"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:758
+#: builtin/clean.c:759
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Supprimer %s [y/N] ? "
 
-#: builtin/clean.c:783 git-add--interactive.perl:1660
+#: builtin/clean.c:784 git-add--interactive.perl:1616
 #, c-format
 msgid "Bye.\n"
 msgstr "Au revoir.\n"
 
-#: builtin/clean.c:791
+#: builtin/clean.c:792
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -6494,15 +6584,15 @@ msgstr ""
 "help                - cet écran\n"
 "?                   - aide pour la sélection en ligne"
 
-#: builtin/clean.c:818 git-add--interactive.perl:1736
+#: builtin/clean.c:819 git-add--interactive.perl:1692
 msgid "*** Commands ***"
 msgstr "*** Commandes ***"
 
-#: builtin/clean.c:819 git-add--interactive.perl:1733
+#: builtin/clean.c:820 git-add--interactive.perl:1689
 msgid "What now"
 msgstr "Et maintenant ?"
 
-#: builtin/clean.c:827
+#: builtin/clean.c:828
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Supprimerait l'élément suivant :"
@@ -6512,45 +6602,45 @@ msgstr[1] "Supprimerait les éléments suivants :"
 msgid "No more files to clean, exiting."
 msgstr "Plus de fichier à nettoyer, sortie."
 
-#: builtin/clean.c:875
+#: builtin/clean.c:906
 msgid "do not print names of files removed"
 msgstr "ne pas afficher les noms des fichiers supprimés"
 
-#: builtin/clean.c:877
+#: builtin/clean.c:908
 msgid "force"
 msgstr "forcer"
 
-#: builtin/clean.c:878
+#: builtin/clean.c:909
 msgid "interactive cleaning"
 msgstr "nettoyage interactif"
 
-#: builtin/clean.c:880
+#: builtin/clean.c:911
 msgid "remove whole directories"
 msgstr "supprimer les répertoires entiers"
 
-#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451
-#: builtin/grep.c:1063 builtin/ls-files.c:546 builtin/name-rev.c:348
-#: builtin/name-rev.c:350 builtin/show-ref.c:176
+#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
+#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
+#: builtin/name-rev.c:399 builtin/show-ref.c:176
 msgid "pattern"
 msgstr "motif"
 
-#: builtin/clean.c:882
+#: builtin/clean.c:913
 msgid "add <pattern> to ignore rules"
 msgstr "ajouter <motif> aux règles ignore"
 
-#: builtin/clean.c:883
+#: builtin/clean.c:914
 msgid "remove ignored files, too"
 msgstr "supprimer les fichiers ignorés, aussi"
 
-#: builtin/clean.c:885
+#: builtin/clean.c:916
 msgid "remove only ignored files"
 msgstr "supprimer seulement les fichiers ignorés"
 
-#: builtin/clean.c:903
+#: builtin/clean.c:934
 msgid "-x and -X cannot be used together"
 msgstr "-x et -X ne peuvent pas être utilisés ensemble"
 
-#: builtin/clean.c:907
+#: builtin/clean.c:938
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -6558,7 +6648,7 @@ msgstr ""
 "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "
 "nettoyer"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:941
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -6566,139 +6656,145 @@ msgstr ""
 "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de "
 "nettoyer"
 
-#: builtin/clone.c:37
+#: builtin/clone.c:38
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"
 
-#: builtin/clone.c:80
+#: builtin/clone.c:82
 msgid "don't create a checkout"
 msgstr "ne pas créer d'extraction"
 
-#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478
+#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
 msgid "create a bare repository"
 msgstr "créer un dépôt nu"
 
-#: builtin/clone.c:85
+#: builtin/clone.c:87
 msgid "create a mirror repository (implies bare)"
 msgstr "créer un dépôt miroir (implique dépôt nu)"
 
-#: builtin/clone.c:87
+#: builtin/clone.c:89
 msgid "to clone from a local repository"
 msgstr "pour cloner depuis un dépôt local"
 
-#: builtin/clone.c:89
+#: builtin/clone.c:91
 msgid "don't use local hardlinks, always copy"
 msgstr "ne pas utiliser de liens durs locaux, toujours copier"
 
-#: builtin/clone.c:91
+#: builtin/clone.c:93
 msgid "setup as shared repository"
 msgstr "régler comme dépôt partagé"
 
-#: builtin/clone.c:93 builtin/clone.c:97
+#: builtin/clone.c:95 builtin/clone.c:99
 msgid "pathspec"
 msgstr "spécificateur de chemin"
 
-#: builtin/clone.c:93 builtin/clone.c:97
+#: builtin/clone.c:95 builtin/clone.c:99
 msgid "initialize submodules in the clone"
 msgstr "initialiser les sous-modules dans le clone"
 
-#: builtin/clone.c:100
+#: builtin/clone.c:102
 msgid "number of submodules cloned in parallel"
 msgstr "nombre de sous-modules clonés en parallèle"
 
-#: builtin/clone.c:101 builtin/init-db.c:475
+#: builtin/clone.c:103 builtin/init-db.c:476
 msgid "template-directory"
 msgstr "répertoire-modèle"
 
-#: builtin/clone.c:102 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:477
 msgid "directory from which templates will be used"
 msgstr "répertoire depuis lequel les modèles vont être utilisés"
 
-#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642
+#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
 #: builtin/submodule--helper.c:983
 msgid "reference repository"
 msgstr "dépôt de référence"
 
-#: builtin/clone.c:108
+#: builtin/clone.c:110
 msgid "use --reference only while cloning"
 msgstr "utiliser seulement --reference pour cloner"
 
-#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43
+#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
 msgid "name"
 msgstr "nom"
 
-#: builtin/clone.c:110
+#: builtin/clone.c:112
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"
 
-#: builtin/clone.c:112
+#: builtin/clone.c:114
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"
 
-#: builtin/clone.c:114
+#: builtin/clone.c:116
 msgid "path to git-upload-pack on the remote"
 msgstr "chemin vers git-upload-pack sur le serveur distant"
 
-#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006
-#: builtin/pull.c:202
+#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
+#: builtin/pull.c:205
 msgid "depth"
 msgstr "profondeur"
 
-#: builtin/clone.c:116
+#: builtin/clone.c:118
 msgid "create a shallow clone of that depth"
 msgstr "créer un clone superficiel de cette profondeur"
 
-#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918
+#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
 #: parse-options.h:142
 msgid "time"
 msgstr "heure"
 
-#: builtin/clone.c:118
+#: builtin/clone.c:120
 msgid "create a shallow clone since a specific time"
 msgstr "créer un clone superficiel depuis une date spécifique"
 
-#: builtin/clone.c:119 builtin/fetch.c:124
+#: builtin/clone.c:121 builtin/fetch.c:119
 msgid "revision"
 msgstr "révision"
 
-#: builtin/clone.c:120 builtin/fetch.c:125
+#: builtin/clone.c:122 builtin/fetch.c:120
 msgid "deepen history of shallow clone, excluding rev"
 msgstr ""
 "approfondir l'historique d'un clone superficiel en excluant une révision"
 
-#: builtin/clone.c:122
+#: builtin/clone.c:124
 msgid "clone only one branch, HEAD or --branch"
 msgstr "cloner seulement une branche, HEAD ou --branch"
 
-#: builtin/clone.c:124
+#: builtin/clone.c:126
+msgid "don't clone any tags, and make later fetches not to follow them"
+msgstr ""
+"ne pas cloner les tags et indiquer au récupérations futures de ne pas le "
+"faire"
+
+#: builtin/clone.c:128
 msgid "any cloned submodules will be shallow"
 msgstr "tous les sous-modules clonés seront superficiels"
 
-#: builtin/clone.c:125 builtin/init-db.c:484
+#: builtin/clone.c:129 builtin/init-db.c:485
 msgid "gitdir"
 msgstr "gitdir"
 
-#: builtin/clone.c:126 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:486
 msgid "separate git dir from working tree"
 msgstr "séparer le répertoire git de la copie de travail"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:131
 msgid "key=value"
 msgstr "clé=valeur"
 
-#: builtin/clone.c:128
+#: builtin/clone.c:132
 msgid "set config inside the new repository"
 msgstr "régler la configuration dans le nouveau dépôt"
 
-#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550
+#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
 msgid "use IPv4 addresses only"
 msgstr "n'utiliser que des adresses IPv4"
 
-#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552
+#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
 msgid "use IPv6 addresses only"
 msgstr "n'utiliser que des adresses IPv6"
 
-#: builtin/clone.c:268
+#: builtin/clone.c:272
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -6706,42 +6802,42 @@ msgstr ""
 "Aucun nom de répertoire n'a pu être deviné\n"
 "Veuillez spécifier un répertoire dans la ligne de commande"
 
-#: builtin/clone.c:321
+#: builtin/clone.c:325
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info : impossible d'ajouter une alternative pour '%s' : %s\n"
 
-#: builtin/clone.c:393
+#: builtin/clone.c:397
 #, c-format
 msgid "failed to open '%s'"
 msgstr "échec à l'ouverture de '%s'"
 
-#: builtin/clone.c:401
+#: builtin/clone.c:405
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existe et n'est pas un répertoire"
 
-#: builtin/clone.c:415
+#: builtin/clone.c:419
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "échec du stat de %s\n"
 
-#: builtin/clone.c:437
+#: builtin/clone.c:441
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "échec de la création du lien '%s'"
 
-#: builtin/clone.c:441
+#: builtin/clone.c:445
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "échec de la copie vers '%s'"
 
-#: builtin/clone.c:466
+#: builtin/clone.c:470
 #, c-format
 msgid "done.\n"
 msgstr "fait.\n"
 
-#: builtin/clone.c:478
+#: builtin/clone.c:482
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -6751,102 +6847,102 @@ msgstr ""
 "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"
 "et réessayer l'extraction avec 'git checkout -f HEAD'\n"
 
-#: builtin/clone.c:555
+#: builtin/clone.c:559
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Impossible de trouver la branche distante '%s' à cloner."
 
-#: builtin/clone.c:650
+#: builtin/clone.c:654
 msgid "remote did not send all necessary objects"
 msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
 
-#: builtin/clone.c:666
+#: builtin/clone.c:670
 #, c-format
 msgid "unable to update %s"
 msgstr "impossible de mettre à jour %s"
 
-#: builtin/clone.c:715
+#: builtin/clone.c:719
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "la HEAD distante réfère à une référence non existante, impossible de "
 "l'extraire.\n"
 
-#: builtin/clone.c:746
+#: builtin/clone.c:750
 msgid "unable to checkout working tree"
 msgstr "impossible d'extraire la copie de travail"
 
-#: builtin/clone.c:786
+#: builtin/clone.c:792
 msgid "unable to write parameters to config file"
 msgstr "impossible d'écrire les paramètres dans le fichier de configuration"
 
-#: builtin/clone.c:849
+#: builtin/clone.c:855
 msgid "cannot repack to clean up"
 msgstr "impossible de remballer pour nettoyer"
 
-#: builtin/clone.c:851
+#: builtin/clone.c:857
 msgid "cannot unlink temporary alternates file"
 msgstr "impossible de unlinker le fichier temporaire alternates"
 
-#: builtin/clone.c:884 builtin/receive-pack.c:1900
+#: builtin/clone.c:890 builtin/receive-pack.c:1945
 msgid "Too many arguments."
 msgstr "Trop d'arguments."
 
-#: builtin/clone.c:888
+#: builtin/clone.c:894
 msgid "You must specify a repository to clone."
 msgstr "Vous devez spécifier un dépôt à cloner."
 
-#: builtin/clone.c:901
+#: builtin/clone.c:907
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "les options --bare et --origin %s sont incompatibles."
 
-#: builtin/clone.c:904
+#: builtin/clone.c:910
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare et --separate-git-dir sont incompatibles."
 
-#: builtin/clone.c:917
+#: builtin/clone.c:923
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "le dépôt '%s' n'existe pas"
 
-#: builtin/clone.c:923 builtin/fetch.c:1337
+#: builtin/clone.c:929 builtin/fetch.c:1337
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "la profondeur %s n'est pas un entier positif"
 
-#: builtin/clone.c:933
+#: builtin/clone.c:939
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr ""
 "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."
 
-#: builtin/clone.c:943
+#: builtin/clone.c:949
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "la copie de travail '%s' existe déjà."
 
-#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
-#: builtin/worktree.c:221 builtin/worktree.c:251
+#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
+#: builtin/worktree.c:222 builtin/worktree.c:252
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "impossible de créer les répertoires de premier niveau dans '%s'"
 
-#: builtin/clone.c:961
+#: builtin/clone.c:967
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "impossible de créer le répertoire de la copie de travail '%s'"
 
-#: builtin/clone.c:973
+#: builtin/clone.c:979
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Clonage dans le dépôt nu '%s'\n"
 
-#: builtin/clone.c:975
+#: builtin/clone.c:981
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Clonage dans '%s'...\n"
 
-#: builtin/clone.c:999
+#: builtin/clone.c:1005
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -6854,86 +6950,86 @@ msgstr ""
 "clone --recursive n'est pas compatible avec à la fois --reference et --"
 "reference-if-able"
 
-#: builtin/clone.c:1055
+#: builtin/clone.c:1067
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."
 
-#: builtin/clone.c:1057
+#: builtin/clone.c:1069
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-since est ignoré dans les clones locaux : utilisez plutôt \"file://"
 "\"."
 
-#: builtin/clone.c:1059
+#: builtin/clone.c:1071
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-exclude est ignoré dans les clones locaux : utilisez plutôt "
 "\"file://\"."
 
-#: builtin/clone.c:1062
+#: builtin/clone.c:1074
 msgid "source repository is shallow, ignoring --local"
 msgstr "le dépôt source est superficiel, option --local ignorée"
 
-#: builtin/clone.c:1067
+#: builtin/clone.c:1079
 msgid "--local is ignored"
 msgstr "--local est ignoré"
 
-#: builtin/clone.c:1071
+#: builtin/clone.c:1083
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr "Je ne sais pas cloner %s"
 
-#: builtin/clone.c:1126 builtin/clone.c:1134
+#: builtin/clone.c:1138 builtin/clone.c:1146
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s"
 
-#: builtin/clone.c:1137
+#: builtin/clone.c:1149
 msgid "You appear to have cloned an empty repository."
 msgstr "Vous semblez avoir cloné un dépôt vide."
 
-#: builtin/column.c:9
+#: builtin/column.c:10
 msgid "git column [<options>]"
 msgstr "git column [<options>]"
 
-#: builtin/column.c:26
+#: builtin/column.c:27
 msgid "lookup config vars"
 msgstr "rechercher les variables de configuration"
 
-#: builtin/column.c:27 builtin/column.c:28
+#: builtin/column.c:28 builtin/column.c:29
 msgid "layout to use"
 msgstr "mise en page à utiliser"
 
-#: builtin/column.c:29
+#: builtin/column.c:30
 msgid "Maximum width"
 msgstr "Largeur maximale"
 
-#: builtin/column.c:30
+#: builtin/column.c:31
 msgid "Padding space on left border"
 msgstr "Remplissage d'espace sur la bordure gauche"
 
-#: builtin/column.c:31
+#: builtin/column.c:32
 msgid "Padding space on right border"
 msgstr "Remplissage d'espace sur le côté droit"
 
-#: builtin/column.c:32
+#: builtin/column.c:33
 msgid "Padding space between columns"
 msgstr "Remplissage d'espace entre les colonnes"
 
-#: builtin/column.c:51
+#: builtin/column.c:52
 msgid "--command must be the first argument"
 msgstr "--command doit être le premier argument"
 
-#: builtin/commit.c:38
+#: builtin/commit.c:39
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<options>] [--] <spécification-de-chemin>..."
 
-#: builtin/commit.c:43
+#: builtin/commit.c:44
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<options>] [--] <spécification-de-chemin>..."
 
-#: builtin/commit.c:48
+#: builtin/commit.c:49
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -6947,7 +7043,8 @@ msgid ""
 "\n"
 "    git commit --amend --reset-author\n"
 msgstr ""
-"Votre nom et votre adresse e-mail ont été configurés automatiquement en se\n"
+"Votre nom et votre adresse courriel ont été configurés automatiquement en "
+"se\n"
 "fondant sur votre nom d'utilisateur et le nom de votre machine. Veuillez \n"
 "vérifier qu'ils sont corrects. Vous pouvez supprimer ce message en les \n"
 "paramétrant explicitement. Lancez les commandes suivantes et suivez les\n"
@@ -6960,7 +7057,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: builtin/commit.c:61
+#: builtin/commit.c:62
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -6973,7 +7070,7 @@ msgid ""
 "\n"
 "    git commit --amend --reset-author\n"
 msgstr ""
-"Votre nom et votre adresse e-mail ont été configurés automatiquement en se "
+"Votre nom et votre adresse courriel ont été configurés automatiquement en se "
 "fondant\n"
 "sur votre nom d'utilisateur et le nom de votre machine. Veuillez vérifier "
 "qu'ils sont corrects.\n"
@@ -6986,7 +7083,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: builtin/commit.c:73
+#: builtin/commit.c:74
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -6997,7 +7094,7 @@ msgstr ""
 "vide. Vous pouvez répéter votre commande avec --allow-empty, ou vous pouvez\n"
 "supprimer complètement le commit avec \"git reset HEAD^\".\n"
 
-#: builtin/commit.c:78
+#: builtin/commit.c:79
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -7012,11 +7109,11 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:85
+#: builtin/commit.c:86
 msgid "Otherwise, please use 'git reset'\n"
 msgstr "Sinon, veuillez utiliser 'git reset'\n"
 
-#: builtin/commit.c:88
+#: builtin/commit.c:89
 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"
@@ -7032,61 +7129,61 @@ msgstr ""
 "Puis \"git cherry-pick --continue\" continuera le picorage \n"
 "des commits restants.\n"
 
-#: builtin/commit.c:318
+#: builtin/commit.c:319
 msgid "failed to unpack HEAD tree object"
 msgstr "échec du dépaquetage de l'objet arbre HEAD"
 
-#: builtin/commit.c:359
+#: builtin/commit.c:360
 msgid "unable to create temporary index"
 msgstr "impossible de créer l'index temporaire"
 
-#: builtin/commit.c:365
+#: builtin/commit.c:366
 msgid "interactive add failed"
 msgstr "échec de l'ajout interactif"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:379
 msgid "unable to update temporary index"
 msgstr "impossible de mettre à jour l'index temporaire"
 
-#: builtin/commit.c:380
+#: builtin/commit.c:381
 msgid "Failed to update main cache tree"
 msgstr "Impossible de mettre à jour l'arbre de cache principal"
 
-#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
+#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
 msgid "unable to write new_index file"
 msgstr "impossible d'écrire le fichier new_index"
 
-#: builtin/commit.c:458
+#: builtin/commit.c:459
 msgid "cannot do a partial commit during a merge."
 msgstr "impossible de faire une validation partielle pendant une fusion."
 
-#: builtin/commit.c:460
+#: builtin/commit.c:461
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "impossible de faire une validation partielle pendant un picorage."
 
-#: builtin/commit.c:469
+#: builtin/commit.c:470
 msgid "cannot read the index"
 msgstr "impossible de lire l'index"
 
-#: builtin/commit.c:488
+#: builtin/commit.c:489
 msgid "unable to write temporary index file"
 msgstr "impossible d'écrire le fichier d'index temporaire"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:583
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "entête d'auteur manquant dans le commit '%s'"
 
-#: builtin/commit.c:584
+#: builtin/commit.c:585
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "le commit '%s' a une ligne d'auteur malformée"
 
-#: builtin/commit.c:603
+#: builtin/commit.c:604
 msgid "malformed --author parameter"
 msgstr "paramètre --author mal formé"
 
-#: builtin/commit.c:655
+#: builtin/commit.c:656
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -7094,38 +7191,38 @@ msgstr ""
 "impossible de sélectionner un caractère de commentaire\n"
 "qui n'est pas utilisé dans le message de validation actuel"
 
-#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
+#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "impossible de rechercher le commit %s"
 
-#: builtin/commit.c:704 builtin/shortlog.c:294
+#: builtin/commit.c:705 builtin/shortlog.c:295
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(lecture du message de journal depuis l'entrée standard)\n"
 
-#: builtin/commit.c:706
+#: builtin/commit.c:707
 msgid "could not read log from standard input"
 msgstr "impossible de lire le journal depuis l'entrée standard"
 
-#: builtin/commit.c:710
+#: builtin/commit.c:711
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "impossible de lire le fichier de journal '%s'"
 
-#: builtin/commit.c:737 builtin/commit.c:745
+#: builtin/commit.c:738 builtin/commit.c:746
 msgid "could not read SQUASH_MSG"
 msgstr "impossible de lire SQUASH_MSG"
 
-#: builtin/commit.c:742
+#: builtin/commit.c:743
 msgid "could not read MERGE_MSG"
 msgstr "impossible de lire MERGE_MSG"
 
-#: builtin/commit.c:796
+#: builtin/commit.c:797
 msgid "could not write commit template"
 msgstr "impossible d'écrire le modèle de commit"
 
-#: builtin/commit.c:814
+#: builtin/commit.c:815
 #, c-format
 msgid ""
 "\n"
@@ -7140,7 +7237,7 @@ msgstr ""
 "\t%s\n"
 "et essayez à nouveau.\n"
 
-#: builtin/commit.c:819
+#: builtin/commit.c:820
 #, c-format
 msgid ""
 "\n"
@@ -7155,7 +7252,7 @@ msgstr ""
 "\t%s\n"
 "et essayez à nouveau.\n"
 
-#: builtin/commit.c:832
+#: builtin/commit.c:833
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7165,7 +7262,7 @@ msgstr ""
 "commençant par '%c' seront ignorées, et un message vide abandonne la "
 "validation.\n"
 
-#: builtin/commit.c:839
+#: builtin/commit.c:840
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7176,150 +7273,150 @@ msgstr ""
 "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n"
 "si vous le souhaitez. Un message vide abandonne la validation.\n"
 
-#: builtin/commit.c:859
+#: builtin/commit.c:857
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAuteur :     %.*s <%.*s>"
 
-#: builtin/commit.c:867
+#: builtin/commit.c:865
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sDate :       %s"
 
-#: builtin/commit.c:874
+#: builtin/commit.c:872
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sValidateur : %.*s <%.*s>"
 
-#: builtin/commit.c:892
+#: builtin/commit.c:889
 msgid "Cannot read index"
 msgstr "Impossible de lire l'index"
 
-#: builtin/commit.c:954
+#: builtin/commit.c:951
 msgid "Error building trees"
 msgstr "Erreur lors de la construction des arbres"
 
-#: builtin/commit.c:968 builtin/tag.c:273
+#: builtin/commit.c:965 builtin/tag.c:274
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"
 
-#: builtin/commit.c:1071
+#: builtin/commit.c:1068
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun "
 "auteur existant"
 
-#: builtin/commit.c:1086 builtin/commit.c:1325
+#: builtin/commit.c:1083 builtin/commit.c:1328
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Mode de fichier non suivi invalide '%s'"
 
-#: builtin/commit.c:1124
+#: builtin/commit.c:1121
 msgid "--long and -z are incompatible"
 msgstr "--long et -z sont incompatibles"
 
-#: builtin/commit.c:1154
+#: builtin/commit.c:1151
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens"
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1160
 msgid "You have nothing to amend."
 msgstr "Il n'y a rien à corriger."
 
-#: builtin/commit.c:1166
+#: builtin/commit.c:1163
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
 
-#: builtin/commit.c:1168
+#: builtin/commit.c:1165
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."
 
-#: builtin/commit.c:1171
+#: builtin/commit.c:1168
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble"
 
-#: builtin/commit.c:1181
+#: builtin/commit.c:1178
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée."
 
-#: builtin/commit.c:1183
+#: builtin/commit.c:1180
 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
 msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup."
 
-#: builtin/commit.c:1191
+#: builtin/commit.c:1188
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend."
 
-#: builtin/commit.c:1208
+#: builtin/commit.c:1205
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Une seule option parmi --include/--only/--all/--interactive/--patch peut "
 "être utilisée."
 
-#: builtin/commit.c:1210
+#: builtin/commit.c:1207
 msgid "No paths with --include/--only does not make sense."
 msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."
 
-#: builtin/commit.c:1212
-msgid "Explicit paths specified without -i or -o; assuming --only paths..."
-msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."
-
-#: builtin/commit.c:1224 builtin/tag.c:551
+#: builtin/commit.c:1219 builtin/tag.c:552
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Mode de nettoyage invalide %s"
 
-#: builtin/commit.c:1229
+#: builtin/commit.c:1224
 msgid "Paths with -a does not make sense."
 msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."
 
-#: builtin/commit.c:1339 builtin/commit.c:1612
+#: builtin/commit.c:1342 builtin/commit.c:1617
 msgid "show status concisely"
-msgstr "afficher le statut avec concision"
+msgstr "afficher l'état avec concision"
 
-#: builtin/commit.c:1341 builtin/commit.c:1614
+#: builtin/commit.c:1344 builtin/commit.c:1619
 msgid "show branch information"
 msgstr "afficher l'information de branche"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1346
+msgid "show stash information"
+msgstr "afficher l'information de remisage"
+
+#: builtin/commit.c:1348
 msgid "version"
 msgstr "version"
 
-#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
-#: builtin/worktree.c:448
+#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
+#: builtin/worktree.c:449
 msgid "machine-readable output"
 msgstr "sortie pour traitement automatique"
 
-#: builtin/commit.c:1346 builtin/commit.c:1618
+#: builtin/commit.c:1351 builtin/commit.c:1623
 msgid "show status in long format (default)"
-msgstr "afficher le statut en format long (par défaut)"
+msgstr "afficher l'état en format long (par défaut)"
 
-#: builtin/commit.c:1349 builtin/commit.c:1621
+#: builtin/commit.c:1354 builtin/commit.c:1626
 msgid "terminate entries with NUL"
 msgstr "terminer les éléments par NUL"
 
-#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:411
+#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
+#: builtin/fast-export.c:986 builtin/tag.c:412
 msgid "mode"
 msgstr "mode"
 
-#: builtin/commit.c:1352 builtin/commit.c:1624
+#: builtin/commit.c:1357 builtin/commit.c:1629
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "
 "no. (Défaut : all)"
 
-#: builtin/commit.c:1355
+#: builtin/commit.c:1360
 msgid "show ignored files"
 msgstr "afficher les fichiers ignorés"
 
-#: builtin/commit.c:1356 parse-options.h:155
+#: builtin/commit.c:1361 parse-options.h:155
 msgid "when"
 msgstr "quand"
 
-#: builtin/commit.c:1357
+#: builtin/commit.c:1362
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -7327,201 +7424,201 @@ msgstr ""
 "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
 "(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
 
-#: builtin/commit.c:1359
+#: builtin/commit.c:1364
 msgid "list untracked files in columns"
 msgstr "afficher les fichiers non suivis en colonnes"
 
-#: builtin/commit.c:1435
+#: builtin/commit.c:1440
 msgid "couldn't look up newly created commit"
 msgstr "impossible de retrouver le commit nouvellement créé"
 
-#: builtin/commit.c:1437
+#: builtin/commit.c:1442
 msgid "could not parse newly created commit"
 msgstr "impossible d'analyser le commit nouvellement créé"
 
-#: builtin/commit.c:1482
+#: builtin/commit.c:1487
 msgid "detached HEAD"
 msgstr "HEAD détachée"
 
-#: builtin/commit.c:1485
+#: builtin/commit.c:1490
 msgid " (root-commit)"
 msgstr " (commit racine)"
 
-#: builtin/commit.c:1582
+#: builtin/commit.c:1587
 msgid "suppress summary after successful commit"
 msgstr "supprimer le résumé après une validation réussie"
 
-#: builtin/commit.c:1583
+#: builtin/commit.c:1588
 msgid "show diff in commit message template"
 msgstr "afficher les diff dans le modèle de message de validation"
 
-#: builtin/commit.c:1585
+#: builtin/commit.c:1590
 msgid "Commit message options"
 msgstr "Options du message de validation"
 
-#: builtin/commit.c:1586 builtin/tag.c:409
+#: builtin/commit.c:1591 builtin/tag.c:410
 msgid "read message from file"
 msgstr "lire le message depuis un fichier"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1592
 msgid "author"
 msgstr "auteur"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1592
 msgid "override author for commit"
 msgstr "remplacer l'auteur pour la validation"
 
-#: builtin/commit.c:1588 builtin/gc.c:357
+#: builtin/commit.c:1593 builtin/gc.c:358
 msgid "date"
 msgstr "date"
 
-#: builtin/commit.c:1588
+#: builtin/commit.c:1593
 msgid "override date for commit"
 msgstr "remplacer la date pour la validation"
 
-#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/tag.c:407
+#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
+#: builtin/notes.c:564 builtin/tag.c:408
 msgid "message"
 msgstr "message"
 
-#: builtin/commit.c:1589
+#: builtin/commit.c:1594
 msgid "commit message"
 msgstr "message de validation"
 
-#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592
-#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
+#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
 msgid "commit"
 msgstr "commit"
 
-#: builtin/commit.c:1590
+#: builtin/commit.c:1595
 msgid "reuse and edit message from specified commit"
 msgstr "réutiliser et éditer le message du commit spécifié"
 
-#: builtin/commit.c:1591
+#: builtin/commit.c:1596
 msgid "reuse message from specified commit"
 msgstr "réutiliser le message du commit spécifié"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1597
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "utiliser un message au format autosquash pour corriger le commit spécifié"
 
-#: builtin/commit.c:1593
+#: builtin/commit.c:1598
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "utiliser un message au format autosquash pour compresser le commit spécifié"
 
-#: builtin/commit.c:1594
+#: builtin/commit.c:1599
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"
 
-#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104
+#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr "ajouter une entrée Signed-off-by :"
 
-#: builtin/commit.c:1596
+#: builtin/commit.c:1601
 msgid "use specified template file"
 msgstr "utiliser le fichier de modèle spécifié"
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1602
 msgid "force edit of commit"
 msgstr "forcer l'édition du commit"
 
-#: builtin/commit.c:1598
+#: builtin/commit.c:1603
 msgid "default"
 msgstr "défaut"
 
-#: builtin/commit.c:1598 builtin/tag.c:412
+#: builtin/commit.c:1603 builtin/tag.c:413
 msgid "how to strip spaces and #comments from message"
 msgstr "comment éliminer les espaces et les commentaires # du message"
 
-#: builtin/commit.c:1599
+#: builtin/commit.c:1604
 msgid "include status in commit message template"
-msgstr "inclure le statut dans le modèle de message de validation"
+msgstr "inclure l'état dans le modèle de message de validation"
 
-#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166
-#: builtin/revert.c:112
+#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr "signer la validation avec GPG"
 
-#: builtin/commit.c:1604
+#: builtin/commit.c:1609
 msgid "Commit contents options"
 msgstr "Valider les options des contenus"
 
-#: builtin/commit.c:1605
+#: builtin/commit.c:1610
 msgid "commit all changed files"
 msgstr "valider tous les fichiers modifiés"
 
-#: builtin/commit.c:1606
+#: builtin/commit.c:1611
 msgid "add specified files to index for commit"
 msgstr "ajouter les fichiers spécifiés à l'index pour la validation"
 
-#: builtin/commit.c:1607
+#: builtin/commit.c:1612
 msgid "interactively add files"
 msgstr "ajouter des fichiers en mode interactif"
 
-#: builtin/commit.c:1608
+#: builtin/commit.c:1613
 msgid "interactively add changes"
 msgstr "ajouter les modifications en mode interactif"
 
-#: builtin/commit.c:1609
+#: builtin/commit.c:1614
 msgid "commit only specified files"
 msgstr "valider seulement les fichiers spécifiés"
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1615
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "éviter d'utiliser les crochets pre-commit et commit-msg"
 
-#: builtin/commit.c:1611
+#: builtin/commit.c:1616
 msgid "show what would be committed"
 msgstr "afficher ce qui serait validé"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c:1627
 msgid "amend previous commit"
 msgstr "corriger la validation précédente"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1628
 msgid "bypass post-rewrite hook"
 msgstr "éviter d'utiliser le crochet post-rewrite"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1633
 msgid "ok to record an empty change"
 msgstr "accepter d'enregistrer une modification vide"
 
-#: builtin/commit.c:1630
+#: builtin/commit.c:1635
 msgid "ok to record a change with an empty message"
 msgstr "accepter d'enregistrer une modification avec un message vide"
 
-#: builtin/commit.c:1659
+#: builtin/commit.c:1665
 msgid "could not parse HEAD commit"
 msgstr "impossible d'analyser le commit HEAD"
 
-#: builtin/commit.c:1707
+#: builtin/commit.c:1710
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Fichier MERGE_HEAD corrompu (%s)"
 
-#: builtin/commit.c:1714
+#: builtin/commit.c:1717
 msgid "could not read MERGE_MODE"
 msgstr "impossible de lire MERGE_MODE"
 
-#: builtin/commit.c:1733
+#: builtin/commit.c:1736
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "impossible de lire le message de validation : %s"
 
-#: builtin/commit.c:1744
+#: builtin/commit.c:1747
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"
 
-#: builtin/commit.c:1749
+#: builtin/commit.c:1752
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Abandon de la validation dû à un message de validation vide.\n"
 
-#: builtin/commit.c:1797
+#: builtin/commit.c:1800
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -7531,146 +7628,146 @@ msgstr ""
 "new_index. Vérifiez que le disque n'est pas plein ou que le quota\n"
 "n'a pas été dépassé, puis lancez \"git reset HEAD\" pour réparer."
 
-#: builtin/config.c:9
+#: builtin/config.c:10
 msgid "git config [<options>]"
 msgstr "git config [<options>]"
 
-#: builtin/config.c:56
+#: builtin/config.c:57
 msgid "Config file location"
 msgstr "Emplacement du fichier de configuration"
 
-#: builtin/config.c:57
+#: builtin/config.c:58
 msgid "use global config file"
 msgstr "utiliser les fichier de configuration global"
 
-#: builtin/config.c:58
+#: builtin/config.c:59
 msgid "use system config file"
 msgstr "utiliser le fichier de configuration du système"
 
-#: builtin/config.c:59
+#: builtin/config.c:60
 msgid "use repository config file"
 msgstr "utiliser le fichier de configuration du dépôt"
 
-#: builtin/config.c:60
+#: builtin/config.c:61
 msgid "use given config file"
 msgstr "utiliser le fichier de configuration spécifié"
 
-#: builtin/config.c:61
+#: builtin/config.c:62
 msgid "blob-id"
 msgstr "blob-id"
 
-#: builtin/config.c:61
+#: builtin/config.c:62
 msgid "read config from given blob object"
 msgstr "lire la configuration depuis l'objet blob fourni"
 
-#: builtin/config.c:62
+#: builtin/config.c:63
 msgid "Action"
 msgstr "Action"
 
-#: builtin/config.c:63
+#: builtin/config.c:64
 msgid "get value: name [value-regex]"
 msgstr "obtenir la valeur : nom [regex-de-valeur]"
 
-#: builtin/config.c:64
+#: builtin/config.c:65
 msgid "get all values: key [value-regex]"
 msgstr "obtenir toutes les valeurs : clé [regex-de-valeur]"
 
-#: builtin/config.c:65
+#: builtin/config.c:66
 msgid "get values for regexp: name-regex [value-regex]"
 msgstr "obtenir les valeur pour la regexp : regex-de-nom [regex-de-valeur]"
 
-#: builtin/config.c:66
+#: builtin/config.c:67
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL"
 
-#: builtin/config.c:67
+#: builtin/config.c:68
 msgid "replace all matching variables: name value [value_regex]"
 msgstr ""
 "remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]"
 
-#: builtin/config.c:68
+#: builtin/config.c:69
 msgid "add a new variable: name value"
 msgstr "ajouter une nouvelle variable : nom valeur"
 
-#: builtin/config.c:69
+#: builtin/config.c:70
 msgid "remove a variable: name [value-regex]"
 msgstr "supprimer une variable : nom [regex-de-valeur]"
 
-#: builtin/config.c:70
+#: builtin/config.c:71
 msgid "remove all matches: name [value-regex]"
 msgstr "supprimer toutes les correspondances nom [regex-de-valeur]"
 
-#: builtin/config.c:71
+#: builtin/config.c:72
 msgid "rename section: old-name new-name"
 msgstr "renommer une section : ancien-nom nouveau-nom"
 
-#: builtin/config.c:72
+#: builtin/config.c:73
 msgid "remove a section: name"
 msgstr "supprimer une section : nom"
 
-#: builtin/config.c:73
+#: builtin/config.c:74
 msgid "list all"
 msgstr "afficher tout"
 
-#: builtin/config.c:74
+#: builtin/config.c:75
 msgid "open an editor"
 msgstr "ouvrir un éditeur"
 
-#: builtin/config.c:75
+#: builtin/config.c:76
 msgid "find the color configured: slot [default]"
 msgstr "trouver la couleur configurée : slot [par défaut]"
 
-#: builtin/config.c:76
+#: builtin/config.c:77
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "trouver le réglage de la couleur : slot [stdout-est-tty]"
 
-#: builtin/config.c:77
+#: builtin/config.c:78
 msgid "Type"
 msgstr "Type"
 
-#: builtin/config.c:78
+#: builtin/config.c:79
 msgid "value is \"true\" or \"false\""
 msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)"
 
-#: builtin/config.c:79
+#: builtin/config.c:80
 msgid "value is decimal number"
 msgstr "la valeur est un nombre décimal"
 
-#: builtin/config.c:80
+#: builtin/config.c:81
 msgid "value is --bool or --int"
 msgstr "la valeur est --bool ou --int"
 
-#: builtin/config.c:81
+#: builtin/config.c:82
 msgid "value is a path (file or directory name)"
 msgstr "la valeur est un chemin (vers un fichier ou un répertoire)"
 
-#: builtin/config.c:82
+#: builtin/config.c:83
 msgid "Other"
 msgstr "Autre"
 
-#: builtin/config.c:83
+#: builtin/config.c:84
 msgid "terminate values with NUL byte"
 msgstr "terminer les valeurs avec un caractère NUL"
 
-#: builtin/config.c:84
+#: builtin/config.c:85
 msgid "show variable names only"
 msgstr "n'afficher que les noms de variable"
 
-#: builtin/config.c:85
+#: builtin/config.c:86
 msgid "respect include directives on lookup"
 msgstr "respecter les directives d'inclusion lors de la recherche"
 
-#: builtin/config.c:86
+#: builtin/config.c:87
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 "afficher l'origine de la configuration (fichier, entrée standard, blob, "
 "ligne de commande)"
 
-#: builtin/config.c:328
+#: builtin/config.c:327
 msgid "unable to parse default color value"
 msgstr "impossible de lire la valeur de couleur par défaut"
 
-#: builtin/config.c:472
+#: builtin/config.c:471
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -7685,12 +7782,16 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:615
+#: builtin/config.c:499
+msgid "--local can only be used inside a git repository"
+msgstr "--local ne peut être utilisé qu'à l'intérieur d'un dépôt git"
+
+#: builtin/config.c:621
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "création impossible du fichier de configuration '%s'"
 
-#: builtin/config.c:627
+#: builtin/config.c:633
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -7699,75 +7800,75 @@ msgstr ""
 "impossible de surcharger des valeurs multiples avec une seule valeur\n"
 "       Utilisez une regexp, --add ou --replace-all pour modifier %s."
 
-#: builtin/count-objects.c:86
+#: builtin/count-objects.c:87
 msgid "git count-objects [-v] [-H | --human-readable]"
 msgstr "git count-objects [-v] [-H | --human-readable]"
 
-#: builtin/count-objects.c:96
+#: builtin/count-objects.c:97
 msgid "print sizes in human readable format"
 msgstr "affiche les tailles dans un format humainement lisible"
 
-#: builtin/describe.c:18
+#: builtin/describe.c:19
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<options>] <commit ou apparenté>*"
 
-#: builtin/describe.c:19
+#: builtin/describe.c:20
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<options>] --dirty"
 
-#: builtin/describe.c:53
+#: builtin/describe.c:54
 msgid "head"
 msgstr "tête"
 
-#: builtin/describe.c:53
+#: builtin/describe.c:54
 msgid "lightweight"
 msgstr "léger"
 
-#: builtin/describe.c:53
+#: builtin/describe.c:54
 msgid "annotated"
 msgstr "annoté"
 
-#: builtin/describe.c:250
+#: builtin/describe.c:253
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "l'étiquette annotée %s n'est pas disponible"
 
-#: builtin/describe.c:254
+#: builtin/describe.c:257
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "l'étiquette annotée %s n'a pas de nom embarqué"
 
-#: builtin/describe.c:256
+#: builtin/describe.c:259
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "l'étiquette '%s' est en fait '%s'"
 
-#: builtin/describe.c:283 builtin/log.c:487
+#: builtin/describe.c:286 builtin/log.c:489
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "%s n'est pas un nom d'objet valide"
 
-#: builtin/describe.c:286
+#: builtin/describe.c:289
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s n'est pas un objet '%s' valide"
 
-#: builtin/describe.c:303
+#: builtin/describe.c:306
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "aucune étiquette ne correspond parfaitement à '%s'"
 
-#: builtin/describe.c:305
+#: builtin/describe.c:308
 #, c-format
 msgid "searching to describe %s\n"
 msgstr "recherche de la description de %s\n"
 
-#: builtin/describe.c:352
+#: builtin/describe.c:355
 #, c-format
 msgid "finished search at %s\n"
 msgstr "recherche terminée à %s\n"
 
-#: builtin/describe.c:379
+#: builtin/describe.c:382
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -7776,7 +7877,7 @@ msgstr ""
 "Aucune étiquette annotée ne peut décrire '%s'.\n"
 "Cependant, il existe des étiquettes non-annotées : essayez avec --tags."
 
-#: builtin/describe.c:383
+#: builtin/describe.c:386
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -7785,12 +7886,12 @@ msgstr ""
 "Aucune étiquette ne peut décrire '%s'.\n"
 "Essayez --always, ou créez des étiquettes."
 
-#: builtin/describe.c:413
+#: builtin/describe.c:416
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu commits parcourus\n"
 
-#: builtin/describe.c:416
+#: builtin/describe.c:419
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -7800,77 +7901,77 @@ msgstr ""
 "affichées\n"
 "abandon de la recherche à %s\n"
 
-#: builtin/describe.c:438
+#: builtin/describe.c:441
 msgid "find the tag that comes after the commit"
 msgstr "rechercher l'étiquette qui suit le commit"
 
-#: builtin/describe.c:439
+#: builtin/describe.c:442
 msgid "debug search strategy on stderr"
 msgstr "déboguer la stratégie de recherche sur stderr"
 
-#: builtin/describe.c:440
+#: builtin/describe.c:443
 msgid "use any ref"
 msgstr "utiliser n'importe quelle référence"
 
-#: builtin/describe.c:441
+#: builtin/describe.c:444
 msgid "use any tag, even unannotated"
 msgstr "utiliser n'importe quelle étiquette, même non-annotée"
 
-#: builtin/describe.c:442
+#: builtin/describe.c:445
 msgid "always use long format"
 msgstr "toujours utiliser le format long"
 
-#: builtin/describe.c:443
+#: builtin/describe.c:446
 msgid "only follow first parent"
 msgstr "ne suivre que le premier parent"
 
-#: builtin/describe.c:446
+#: builtin/describe.c:449
 msgid "only output exact matches"
 msgstr "n'afficher que les correspondances exactes"
 
-#: builtin/describe.c:448
+#: builtin/describe.c:451
 msgid "consider <n> most recent tags (default: 10)"
 msgstr ""
 "considérer uniquement les <n> étiquettes le plus récentes (défaut : 10)"
 
-#: builtin/describe.c:450
+#: builtin/describe.c:453
 msgid "only consider tags matching <pattern>"
 msgstr "ne considérer que les étiquettes correspondant à <motif>"
 
-#: builtin/describe.c:452
+#: builtin/describe.c:455
 msgid "do not consider tags matching <pattern>"
 msgstr "ne pas considérer les étiquettes correspondant à <motif>"
 
-#: builtin/describe.c:454 builtin/name-rev.c:357
+#: builtin/describe.c:457 builtin/name-rev.c:406
 msgid "show abbreviated commit object as fallback"
 msgstr "afficher les objets commits abrégés en dernier recours"
 
-#: builtin/describe.c:455 builtin/describe.c:458
+#: builtin/describe.c:458 builtin/describe.c:461
 msgid "mark"
 msgstr "marque"
 
-#: builtin/describe.c:456
+#: builtin/describe.c:459
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")"
 
-#: builtin/describe.c:459
+#: builtin/describe.c:462
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 "ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")"
 
-#: builtin/describe.c:477
+#: builtin/describe.c:480
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long et --abbrev=0 sont incompatibles"
 
-#: builtin/describe.c:506
+#: builtin/describe.c:509
 msgid "No names found, cannot describe anything."
 msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit."
 
-#: builtin/describe.c:549
+#: builtin/describe.c:552
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty est incompatible avec la spécification de commits ou assimilés"
 
-#: builtin/describe.c:551
+#: builtin/describe.c:554
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken est incompatible avec les commits ou assimilés"
 
@@ -7879,55 +7980,55 @@ msgstr "--broken est incompatible avec les commits ou assimilés"
 msgid "'%s': not a regular file or symlink"
 msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique"
 
-#: builtin/diff.c:234
+#: builtin/diff.c:235
 #, c-format
 msgid "invalid option: %s"
 msgstr "option invalide : %s"
 
-#: builtin/diff.c:358
+#: builtin/diff.c:359
 msgid "Not a git repository"
 msgstr "Ce n'est pas un dépôt git !"
 
-#: builtin/diff.c:401
+#: builtin/diff.c:402
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "objet spécifié '%s' invalide."
 
-#: builtin/diff.c:410
+#: builtin/diff.c:411
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "plus de deux blobs spécifiés : '%s'"
 
-#: builtin/diff.c:417
+#: builtin/diff.c:416
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "objet non géré '%s' spécifié."
 
-#: builtin/difftool.c:28
+#: builtin/difftool.c:29
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<chemin>...]"
 
-#: builtin/difftool.c:241
+#: builtin/difftool.c:249
 #, c-format
 msgid "failed: %d"
 msgstr "échec : %d"
 
-#: builtin/difftool.c:283
+#: builtin/difftool.c:291
 #, c-format
 msgid "could not read symlink %s"
 msgstr "lecture du lien symbolique %s impossible"
 
-#: builtin/difftool.c:285
+#: builtin/difftool.c:293
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "impossible de lire le fichier symlink %s"
 
-#: builtin/difftool.c:293
+#: builtin/difftool.c:301
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "Impossible de lire l'objet %s pour le symlink %s"
 
-#: builtin/difftool.c:395
+#: builtin/difftool.c:403
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
@@ -7935,53 +8036,53 @@ msgstr ""
 "les formats de diff combinés ('-c' et '--cc') ne sont pas supportés\n"
 "dans le mode de diff de répertoire ('-d' et '--dir-diff')."
 
-#: builtin/difftool.c:609
+#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "les deux fichiers sont modifiés : '%s' et '%s'."
 
-#: builtin/difftool.c:611
+#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "le fichier dans l'arbre de travail a été laissé."
 
-#: builtin/difftool.c:622
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "des fichiers temporaires existent dans '%s'."
 
-#: builtin/difftool.c:623
+#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "vous pourriez souhaiter les nettoyer ou les récupérer."
 
-#: builtin/difftool.c:669
+#: builtin/difftool.c:689
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "utiliser `diff.guitool` au lieu de `diff.tool`"
 
-#: builtin/difftool.c:671
+#: builtin/difftool.c:691
 msgid "perform a full-directory diff"
 msgstr "réalise un diff de répertoire complet"
 
-#: builtin/difftool.c:673
+#: builtin/difftool.c:693
 msgid "do not prompt before launching a diff tool"
 msgstr "ne pas confirmer avant de lancer l'outil de diff"
 
-#: builtin/difftool.c:679
+#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "utiliser les liens symboliques en mode de diff de répertoire"
 
-#: builtin/difftool.c:680
+#: builtin/difftool.c:700
 msgid "<tool>"
 msgstr "<outil>"
 
-#: builtin/difftool.c:681
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "utiliser l'outil de diff spécifié"
 
-#: builtin/difftool.c:683
+#: builtin/difftool.c:703
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr "afficher une liste des outils de diff utilisables avec `--tool`"
 
-#: builtin/difftool.c:686
+#: builtin/difftool.c:706
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
@@ -7989,243 +8090,247 @@ msgstr ""
 "provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code "
 "non-nul"
 
-#: builtin/difftool.c:688
+#: builtin/difftool.c:708
 msgid "<command>"
 msgstr "<commande>"
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr "spécifier une commande personnalisée pour visualiser les différences"
 
-#: builtin/difftool.c:713
+#: builtin/difftool.c:733
 msgid "no <tool> given for --tool=<tool>"
 msgstr "pas d'<outil> spécifié pour --tool=<outil>"
 
-#: builtin/difftool.c:720
+#: builtin/difftool.c:740
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "pas de <commande> spécifié pour --extcmd=<commande>"
 
-#: builtin/fast-export.c:25
+#: builtin/fast-export.c:26
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [options-de-liste-de-révisions]"
 
-#: builtin/fast-export.c:980
+#: builtin/fast-export.c:982
 msgid "show progress after <n> objects"
 msgstr "afficher la progression après <n> objets"
 
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:984
 msgid "select handling of signed tags"
 msgstr "sélectionner la gestion des étiquettes signées"
 
-#: builtin/fast-export.c:985
+#: builtin/fast-export.c:987
 msgid "select handling of tags that tag filtered objects"
 msgstr ""
 "sélectionner la gestion des étiquettes qui pointent sur des objets filtrés"
 
-#: builtin/fast-export.c:988
+#: builtin/fast-export.c:990
 msgid "Dump marks to this file"
 msgstr "Enregistrer les marques dans ce fichier"
 
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:992
 msgid "Import marks from this file"
 msgstr "importer les marques depuis ce fichier"
 
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:994
 msgid "Fake a tagger when tags lack one"
 msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas"
 
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:996
 msgid "Output full tree for each commit"
 msgstr "Afficher l'arbre complet pour chaque commit"
 
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:998
 msgid "Use the done feature to terminate the stream"
 msgstr "Utiliser la fonction \"done\" pour terminer le flux"
 
-#: builtin/fast-export.c:997
+#: builtin/fast-export.c:999
 msgid "Skip output of blob data"
 msgstr "Sauter l'affichage de données de blob"
 
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1000
 msgid "refspec"
 msgstr "spécificateur de référence"
 
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1001
 msgid "Apply refspec to exported refs"
 msgstr "Appliquer le spécificateur de référence aux références exportées"
 
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1002
 msgid "anonymize output"
 msgstr "anonymise la sortie"
 
-#: builtin/fetch.c:21
+#: builtin/fetch.c:22
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]"
 
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<options>] <groupe>"
 
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<options>]"
 
-#: builtin/fetch.c:95 builtin/pull.c:175
+#: builtin/fetch.c:90 builtin/pull.c:182
 msgid "fetch from all remotes"
 msgstr "récupérer depuis tous les dépôts distants"
 
-#: builtin/fetch.c:97 builtin/pull.c:178
+#: builtin/fetch.c:92 builtin/pull.c:185
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"
 
-#: builtin/fetch.c:99 builtin/pull.c:181
+#: builtin/fetch.c:94 builtin/pull.c:188
 msgid "path to upload pack on remote end"
 msgstr "chemin vers lequel télécharger le paquet sur le poste distant"
 
-#: builtin/fetch.c:100 builtin/pull.c:183
+#: builtin/fetch.c:95 builtin/pull.c:190
 msgid "force overwrite of local branch"
 msgstr "forcer l'écrasement de la branche locale"
 
-#: builtin/fetch.c:102
+#: builtin/fetch.c:97
 msgid "fetch from multiple remotes"
 msgstr "récupérer depuis plusieurs dépôts distants"
 
-#: builtin/fetch.c:104 builtin/pull.c:185
+#: builtin/fetch.c:99 builtin/pull.c:192
 msgid "fetch all tags and associated objects"
 msgstr "récupérer toutes les étiquettes et leurs objets associés"
 
-#: builtin/fetch.c:106
+#: builtin/fetch.c:101
 msgid "do not fetch all tags (--no-tags)"
 msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"
 
-#: builtin/fetch.c:108
+#: builtin/fetch.c:103
 msgid "number of submodules fetched in parallel"
 msgstr "nombre de sous-modules récupérés en parallèle"
 
-#: builtin/fetch.c:110 builtin/pull.c:188
+#: builtin/fetch.c:105 builtin/pull.c:195
 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 "éliminer les branches de suivi distant si la branche n'existe plus dans le "
 "dépôt distant"
 
-#: builtin/fetch.c:111 builtin/pull.c:191
+#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
 msgid "on-demand"
 msgstr "à la demande"
 
-#: builtin/fetch.c:112 builtin/pull.c:192
+#: builtin/fetch.c:107
 msgid "control recursive fetching of submodules"
 msgstr "contrôler la récupération récursive dans les sous-modules"
 
-#: builtin/fetch.c:116 builtin/pull.c:200
+#: builtin/fetch.c:111 builtin/pull.c:203
 msgid "keep downloaded pack"
 msgstr "conserver le paquet téléchargé"
 
-#: builtin/fetch.c:118
+#: builtin/fetch.c:113
 msgid "allow updating of HEAD ref"
 msgstr "permettre la mise à jour de la référence HEAD"
 
-#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
+#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
 msgid "deepen history of shallow clone"
 msgstr "approfondir l'historique d'un clone superficiel"
 
-#: builtin/fetch.c:123
+#: builtin/fetch.c:118
 msgid "deepen history of shallow repository based on time"
 msgstr "approfondir l'historique d'un clone superficiel en fonction d'une date"
 
-#: builtin/fetch.c:129 builtin/pull.c:206
+#: builtin/fetch.c:124 builtin/pull.c:209
 msgid "convert to a complete repository"
 msgstr "convertir en un dépôt complet"
 
-#: builtin/fetch.c:131 builtin/log.c:1440
+#: builtin/fetch.c:126 builtin/log.c:1450
 msgid "dir"
 msgstr "répertoire"
 
-#: builtin/fetch.c:132
+#: builtin/fetch.c:127
 msgid "prepend this to submodule path output"
 msgstr "préfixer ceci à la sortie du chemin du sous-module"
 
-#: builtin/fetch.c:135
-msgid "default mode for recursion"
-msgstr "mode par défaut pour la récursion"
+#: builtin/fetch.c:130
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr ""
+"par défaut pour la récupération récursive de sous-modules (priorité plus "
+"basse que les fichiers de config)"
 
-#: builtin/fetch.c:137 builtin/pull.c:209
+#: builtin/fetch.c:134 builtin/pull.c:212
 msgid "accept refs that update .git/shallow"
 msgstr "accepter les références qui mettent à jour .git/shallow"
 
-#: builtin/fetch.c:138 builtin/pull.c:211
+#: builtin/fetch.c:135 builtin/pull.c:214
 msgid "refmap"
 msgstr "correspondance de référence"
 
-#: builtin/fetch.c:139 builtin/pull.c:212
+#: builtin/fetch.c:136 builtin/pull.c:215
 msgid "specify fetch refmap"
 msgstr "spécifier une correspondance de référence pour la récupération"
 
-#: builtin/fetch.c:395
+#: builtin/fetch.c:394
 msgid "Couldn't find remote ref HEAD"
 msgstr "impossible de trouver la référence HEAD distante"
 
-#: builtin/fetch.c:513
+#: builtin/fetch.c:512
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr ""
 "le paramètre de configuration fetch.output contient une valeur invalide %s"
 
-#: builtin/fetch.c:606
+#: builtin/fetch.c:605
 #, c-format
 msgid "object %s not found"
 msgstr "objet %s non trouvé"
 
-#: builtin/fetch.c:610
+#: builtin/fetch.c:609
 msgid "[up to date]"
 msgstr "[à jour]"
 
-#: builtin/fetch.c:623 builtin/fetch.c:703
+#: builtin/fetch.c:622 builtin/fetch.c:702
 msgid "[rejected]"
 msgstr "[rejeté]"
 
-#: builtin/fetch.c:624
+#: builtin/fetch.c:623
 msgid "can't fetch in current branch"
 msgstr "impossible de récupérer dans la branche actuelle"
 
-#: builtin/fetch.c:633
+#: builtin/fetch.c:632
 msgid "[tag update]"
 msgstr "[mise à jour de l'étiquette]"
 
-#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683
-#: builtin/fetch.c:698
+#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
+#: builtin/fetch.c:697
 msgid "unable to update local ref"
 msgstr "impossible de mettre à jour la référence locale"
 
-#: builtin/fetch.c:653
+#: builtin/fetch.c:652
 msgid "[new tag]"
 msgstr "[nouvelle étiquette]"
 
-#: builtin/fetch.c:656
+#: builtin/fetch.c:655
 msgid "[new branch]"
 msgstr "[nouvelle branche]"
 
-#: builtin/fetch.c:659
+#: builtin/fetch.c:658
 msgid "[new ref]"
 msgstr "[nouvelle référence]"
 
-#: builtin/fetch.c:698
+#: builtin/fetch.c:697
 msgid "forced update"
 msgstr "mise à jour forcée"
 
-#: builtin/fetch.c:703
+#: builtin/fetch.c:702
 msgid "non-fast-forward"
 msgstr "pas en avance rapide"
 
-#: builtin/fetch.c:748
+#: builtin/fetch.c:747
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s n'a pas envoyé tous les objets nécessaires\n"
 
-#: builtin/fetch.c:768
+#: builtin/fetch.c:767
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr ""
@@ -8259,7 +8364,7 @@ msgstr "   (%s est devenu en suspens)"
 msgid "[deleted]"
 msgstr "[supprimé]"
 
-#: builtin/fetch.c:955 builtin/remote.c:1022
+#: builtin/fetch.c:955 builtin/remote.c:1023
 msgid "(none)"
 msgstr "(aucun(e))"
 
@@ -8288,7 +8393,7 @@ msgstr "Je ne sais pas récupérer depuis %s"
 msgid "Fetching %s\n"
 msgstr "Récupération de %s\n"
 
-#: builtin/fetch.c:1238 builtin/remote.c:96
+#: builtin/fetch.c:1238 builtin/remote.c:97
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Impossible de récupérer %s"
@@ -8321,104 +8426,104 @@ msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow sur un dépôt complet n'a pas de sens"
 
-#: builtin/fetch.c:1352
+#: builtin/fetch.c:1349
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all n'accepte pas d'argument de dépôt"
 
-#: builtin/fetch.c:1354
+#: builtin/fetch.c:1351
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all n'a pas de sens avec des spécifications de référence"
 
-#: builtin/fetch.c:1365
+#: builtin/fetch.c:1362
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "distant ou groupe distant inexistant : %s"
 
-#: builtin/fetch.c:1373
+#: builtin/fetch.c:1370
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 "La récupération d'un groupe et les spécifications de référence n'ont pas de "
 "sens"
 
-#: builtin/fmt-merge-msg.c:14
+#: builtin/fmt-merge-msg.c:15
 msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]"
 
-#: builtin/fmt-merge-msg.c:663
+#: builtin/fmt-merge-msg.c:664
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "peupler le journal avec au plus <n> éléments depuis le journal court"
 
-#: builtin/fmt-merge-msg.c:666
+#: builtin/fmt-merge-msg.c:667
 msgid "alias for --log (deprecated)"
 msgstr "alias pour --log (obsolète)"
 
-#: builtin/fmt-merge-msg.c:669
+#: builtin/fmt-merge-msg.c:670
 msgid "text"
 msgstr "texte"
 
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:671
 msgid "use <text> as start of message"
 msgstr "utiliser <texte> comme début de message"
 
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
 msgid "file to read from"
 msgstr "fichier d'où lire"
 
-#: builtin/for-each-ref.c:9
+#: builtin/for-each-ref.c:10
 msgid "git for-each-ref [<options>] [<pattern>]"
 msgstr "git for-each-ref [<options>] [<motif>]"
 
-#: builtin/for-each-ref.c:10
+#: builtin/for-each-ref.c:11
 msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--point-at <objet>]"
 
-#: builtin/for-each-ref.c:11
+#: builtin/for-each-ref.c:12
 msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
 msgstr "git for-each-ref [(--merged | --no-merged) [<commit>]]"
 
-#: builtin/for-each-ref.c:12
+#: builtin/for-each-ref.c:13
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 
-#: builtin/for-each-ref.c:27
+#: builtin/for-each-ref.c:28
 msgid "quote placeholders suitably for shells"
 msgstr "échapper les champs réservés pour les interpréteurs de commandes"
 
-#: builtin/for-each-ref.c:29
+#: builtin/for-each-ref.c:30
 msgid "quote placeholders suitably for perl"
 msgstr "échapper les champs réservés pour perl"
 
-#: builtin/for-each-ref.c:31
+#: builtin/for-each-ref.c:32
 msgid "quote placeholders suitably for python"
 msgstr "échapper les champs réservés pour python"
 
-#: builtin/for-each-ref.c:33
+#: builtin/for-each-ref.c:34
 msgid "quote placeholders suitably for Tcl"
 msgstr "échapper les champs réservés pour compatibilité avec Tcl"
 
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
 msgid "show only <n> matched refs"
 msgstr "n'afficher que <n> références correspondant"
 
-#: builtin/for-each-ref.c:41
+#: builtin/for-each-ref.c:42
 msgid "print only refs which points at the given object"
 msgstr "afficher seulement les références pointant sur l'objet"
 
-#: builtin/for-each-ref.c:43
+#: builtin/for-each-ref.c:44
 msgid "print only refs that are merged"
 msgstr "afficher seulement les références qui sont fusionnées"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 msgid "print only refs that are not merged"
 msgstr "afficher seulement les références qui ne sont pas fusionnées"
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
 msgid "print only refs which contain the commit"
 msgstr "afficher seulement les références qui contiennent le commit"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
 msgid "print only refs which don't contain the commit"
 msgstr "afficher seulement les références qui ne contiennent pas le commit"
 
@@ -8483,21 +8588,21 @@ msgstr "afficher les noms étendus pour les objets inaccessibles"
 msgid "Checking objects"
 msgstr "Vérification des objets"
 
-#: builtin/gc.c:25
+#: builtin/gc.c:26
 msgid "git gc [<options>]"
 msgstr "git gc [<options>]"
 
-#: builtin/gc.c:78
+#: builtin/gc.c:79
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "Échec du stat de %s : %s"
 
-#: builtin/gc.c:310
+#: builtin/gc.c:311
 #, c-format
 msgid "Can't stat %s"
 msgstr "impossible de faire un stat de %s"
 
-#: builtin/gc.c:319
+#: builtin/gc.c:320
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -8506,54 +8611,54 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Le dernier lancement de gc a rapporter l'erreur suivante. Veuillez corriger\n"
+"Le dernier lancement de gc a rapporté l'erreur suivante. Veuillez corriger\n"
 "la cause et supprimer %s.\n"
 "Le nettoyage automatique n'aura pas lieu jusqu'à ce que le fichier soit "
 "supprimé.\n"
 "\n"
 "%s"
 
-#: builtin/gc.c:358
+#: builtin/gc.c:359
 msgid "prune unreferenced objects"
 msgstr "éliminer les objets non référencés"
 
-#: builtin/gc.c:360
+#: builtin/gc.c:361
 msgid "be more thorough (increased runtime)"
 msgstr "être plus consciencieux (durée de traitement allongée)"
 
-#: builtin/gc.c:361
+#: builtin/gc.c:362
 msgid "enable auto-gc mode"
 msgstr "activer le mode auto-gc"
 
-#: builtin/gc.c:362
+#: builtin/gc.c:363
 msgid "force running gc even if there may be another gc running"
 msgstr ""
 "forcer le lancement du ramasse-miettes même si un autre ramasse-miettes "
 "tourne déjà"
 
-#: builtin/gc.c:379
+#: builtin/gc.c:380
 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr "impossible de lire la valeur de gc.logexpiry %s"
 
-#: builtin/gc.c:407
+#: builtin/gc.c:408
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "Compression automatique du dépôt en tâche de fond pour optimiser les "
 "performances.\n"
 
-#: builtin/gc.c:409
+#: builtin/gc.c:410
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "Compression du dépôt pour optimiser les performances.\n"
 
-#: builtin/gc.c:410
+#: builtin/gc.c:411
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n"
 
-#: builtin/gc.c:431
+#: builtin/gc.c:436
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8561,274 +8666,287 @@ msgstr ""
 "un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> "
 "(utilisez --force si ce n'est pas le cas)"
 
-#: builtin/gc.c:475
+#: builtin/gc.c:480
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Il y a trop d'objets seuls inaccessibles ; lancez 'git prune' pour les "
 "supprimer."
 
-#: builtin/grep.c:25
+#: builtin/grep.c:27
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]"
 
-#: builtin/grep.c:232
+#: builtin/grep.c:235
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep : échec de création du fil: %s"
 
-#: builtin/grep.c:290
+#: builtin/grep.c:293
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "nombre de fils spécifié invalide (%d) pour %s"
 
-#: builtin/grep.c:769 builtin/grep.c:810
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#, c-format
+msgid "no threads support, ignoring %s"
+msgstr "pas de support des fils, ignore %s"
+
+#: builtin/grep.c:788 builtin/grep.c:829
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "impossible de lire l'arbre (%s)"
 
-#: builtin/grep.c:829
+#: builtin/grep.c:848
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "impossible de faire un grep sur un objet de type %s"
 
-#: builtin/grep.c:893
+#: builtin/grep.c:912
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "l'option '%c' attend un valeur numérique"
 
-#: builtin/grep.c:980
+#: builtin/grep.c:999
 msgid "search in index instead of in the work tree"
 msgstr "rechercher dans l'index plutôt que dans la copie de travail"
 
-#: builtin/grep.c:982
+#: builtin/grep.c:1001
 msgid "find in contents not managed by git"
 msgstr "rechercher dans les contenus non gérés par git"
 
-#: builtin/grep.c:984
+#: builtin/grep.c:1003
 msgid "search in both tracked and untracked files"
 msgstr "rechercher dans les fichiers suivis et non-suivis"
 
-#: builtin/grep.c:986
+#: builtin/grep.c:1005
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignorer les fichiers spécifiés via '.gitignore'"
 
-#: builtin/grep.c:988
+#: builtin/grep.c:1007
 msgid "recursively search in each submodule"
 msgstr "rechercher récursivement dans chaque sous-module"
 
-#: builtin/grep.c:990
+#: builtin/grep.c:1009
 msgid "basename"
 msgstr "nom de base"
 
-#: builtin/grep.c:991
+#: builtin/grep.c:1010
 msgid "prepend parent project's basename to output"
 msgstr "préfixer le nom de base du projet parent à la sortie"
 
-#: builtin/grep.c:994
+#: builtin/grep.c:1013
 msgid "show non-matching lines"
 msgstr "afficher les lignes qui ne correspondent pas"
 
-#: builtin/grep.c:996
+#: builtin/grep.c:1015
 msgid "case insensitive matching"
 msgstr "correspondance insensible à la casse"
 
-#: builtin/grep.c:998
+#: builtin/grep.c:1017
 msgid "match patterns only at word boundaries"
 msgstr "rechercher les motifs aux séparateurs de mots"
 
-#: builtin/grep.c:1000
+#: builtin/grep.c:1019
 msgid "process binary files as text"
 msgstr "traiter les fichiers binaires comme texte"
 
-#: builtin/grep.c:1002
+#: builtin/grep.c:1021
 msgid "don't match patterns in binary files"
 msgstr "ne pas chercher les motifs dans les fichiers binaires"
 
-#: builtin/grep.c:1005
+#: builtin/grep.c:1024
 msgid "process binary files with textconv filters"
 msgstr "traiter les fichiers binaires avec les filtres textconv"
 
-#: builtin/grep.c:1007
+#: builtin/grep.c:1026
 msgid "descend at most <depth> levels"
 msgstr "descendre au plus de <profondeur> dans l'arborescence"
 
-#: builtin/grep.c:1011
+#: builtin/grep.c:1030
 msgid "use extended POSIX regular expressions"
 msgstr "utiliser des expressions régulières étendues POSIX"
 
-#: builtin/grep.c:1014
+#: builtin/grep.c:1033
 msgid "use basic POSIX regular expressions (default)"
 msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"
 
-#: builtin/grep.c:1017
+#: builtin/grep.c:1036
 msgid "interpret patterns as fixed strings"
 msgstr "interpréter les motifs comme de chaînes fixes"
 
-#: builtin/grep.c:1020
+#: builtin/grep.c:1039
 msgid "use Perl-compatible regular expressions"
 msgstr "utiliser des expressions régulières compatibles avec Perl"
 
-#: builtin/grep.c:1023
+#: builtin/grep.c:1042
 msgid "show line numbers"
 msgstr "afficher les numéros de ligne"
 
-#: builtin/grep.c:1024
+#: builtin/grep.c:1043
 msgid "don't show filenames"
 msgstr "ne pas pas afficher les noms de fichier"
 
-#: builtin/grep.c:1025
+#: builtin/grep.c:1044
 msgid "show filenames"
 msgstr "afficher les noms de fichier"
 
-#: builtin/grep.c:1027
+#: builtin/grep.c:1046
 msgid "show filenames relative to top directory"
 msgstr "afficher les noms de fichiers relativement au répertoire de base"
 
-#: builtin/grep.c:1029
+#: builtin/grep.c:1048
 msgid "show only filenames instead of matching lines"
 msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"
 
-#: builtin/grep.c:1031
+#: builtin/grep.c:1050
 msgid "synonym for --files-with-matches"
 msgstr "synonyme pour --files-with-matches"
 
-#: builtin/grep.c:1034
+#: builtin/grep.c:1053
 msgid "show only the names of files without match"
 msgstr "n'afficher que les noms des fichiers sans correspondance"
 
-#: builtin/grep.c:1036
+#: builtin/grep.c:1055
 msgid "print NUL after filenames"
 msgstr "imprimer une caractère NUL après le noms de fichier"
 
-#: builtin/grep.c:1038
+#: builtin/grep.c:1057
 msgid "show the number of matches instead of matching lines"
 msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"
 
-#: builtin/grep.c:1039
+#: builtin/grep.c:1058
 msgid "highlight matches"
 msgstr "mettre en évidence les correspondances"
 
-#: builtin/grep.c:1041
+#: builtin/grep.c:1060
 msgid "print empty line between matches from different files"
 msgstr ""
 "imprimer une ligne vide entre les correspondances de fichiers différents"
 
-#: builtin/grep.c:1043
+#: builtin/grep.c:1062
 msgid "show filename only once above matches from same file"
 msgstr ""
 "afficher le nom de fichier une fois au dessus des correspondances du même "
 "fichier"
 
-#: builtin/grep.c:1046
+#: builtin/grep.c:1065
 msgid "show <n> context lines before and after matches"
 msgstr "afficher <n> lignes de contexte avant et après les correspondances"
 
-#: builtin/grep.c:1049
+#: builtin/grep.c:1068
 msgid "show <n> context lines before matches"
 msgstr "afficher <n> lignes de contexte avant les correspondances"
 
-#: builtin/grep.c:1051
+#: builtin/grep.c:1070
 msgid "show <n> context lines after matches"
 msgstr "afficher <n> lignes de contexte après les correspondances"
 
-#: builtin/grep.c:1053
+#: builtin/grep.c:1072
 msgid "use <n> worker threads"
 msgstr "utiliser <n> fils de travail"
 
-#: builtin/grep.c:1054
+#: builtin/grep.c:1073
 msgid "shortcut for -C NUM"
 msgstr "raccourci pour -C NUM"
 
-#: builtin/grep.c:1057
+#: builtin/grep.c:1076
 msgid "show a line with the function name before matches"
 msgstr ""
 "afficher une ligne avec le nom de la fonction avant les correspondances"
 
-#: builtin/grep.c:1059
+#: builtin/grep.c:1078
 msgid "show the surrounding function"
 msgstr "afficher la fonction contenante"
 
-#: builtin/grep.c:1062
+#: builtin/grep.c:1081
 msgid "read patterns from file"
 msgstr "lire les motifs depuis fichier"
 
-#: builtin/grep.c:1064
+#: builtin/grep.c:1083
 msgid "match <pattern>"
 msgstr "rechercher <motif>"
 
-#: builtin/grep.c:1066
+#: builtin/grep.c:1085
 msgid "combine patterns specified with -e"
 msgstr "combiner les motifs spécifiés par -e"
 
-#: builtin/grep.c:1078
+#: builtin/grep.c:1097
 msgid "indicate hit with exit status without output"
 msgstr ""
 "indiquer des correspondances avec le code de sortie mais sans rien afficher"
 
-#: builtin/grep.c:1080
+#: builtin/grep.c:1099
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "n'afficher que les correspondances de fichiers qui correspondent à tous les "
 "motifs"
 
-#: builtin/grep.c:1082
+#: builtin/grep.c:1101
 msgid "show parse tree for grep expression"
 msgstr "afficher l'arbre d'analyse pour le motif grep"
 
-#: builtin/grep.c:1086
+#: builtin/grep.c:1105
 msgid "pager"
 msgstr "pagineur"
 
-#: builtin/grep.c:1086
+#: builtin/grep.c:1105
 msgid "show matching files in the pager"
 msgstr "afficher les fichiers correspondant dans le pagineur"
 
-#: builtin/grep.c:1089
+#: builtin/grep.c:1108
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "permettre l'appel de grep(1) (ignoré par ce build)"
 
-#: builtin/grep.c:1153
+#: builtin/grep.c:1172
 msgid "no pattern given."
 msgstr "aucun motif fourni."
 
-#: builtin/grep.c:1189
+#: builtin/grep.c:1204
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr ""
 "--no-index ou --untracked ne peuvent pas être utilisés avec des révisions"
 
-#: builtin/grep.c:1195
+#: builtin/grep.c:1211
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "impossible de résoudre la révision : %s"
 
-#: builtin/grep.c:1228 builtin/index-pack.c:1485
+#: builtin/grep.c:1245 builtin/index-pack.c:1490
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "nombre de fils spécifié invalide (%d)"
 
-#: builtin/grep.c:1251
+#: builtin/grep.c:1250
+msgid "no threads support, ignoring --threads"
+msgstr "pas de support des fils, ignore --threads"
+
+#: builtin/grep.c:1281
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail"
 
-#: builtin/grep.c:1274
+#: builtin/grep.c:1304
 msgid "option not supported with --recurse-submodules."
 msgstr "option non supportée avec --recurse-submodules."
 
-#: builtin/grep.c:1280
+#: builtin/grep.c:1310
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index."
 
-#: builtin/grep.c:1286
+#: builtin/grep.c:1316
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr ""
 "--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi."
 
-#: builtin/grep.c:1294
+#: builtin/grep.c:1324
 msgid "both --cached and trees are given."
 msgstr "--cached et des arbres sont fournis en même temps."
 
-#: builtin/hash-object.c:81
+#: builtin/hash-object.c:82
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -8836,93 +8954,93 @@ msgstr ""
 "git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters] [--stdin] "
 "[--] <fichier>..."
 
-#: builtin/hash-object.c:82
+#: builtin/hash-object.c:83
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
 msgid "type"
 msgstr "type"
 
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
 msgid "object type"
 msgstr "type d'objet"
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "write the object into the object database"
 msgstr "écrire l'objet dans la base de donnée d'objets"
 
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98
 msgid "read the object from stdin"
 msgstr "lire l'objet depuis l'entrée standard"
 
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:100
 msgid "store file as is without filters"
 msgstr "stocker le fichier tel quel sans filtrage"
 
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr ""
 "juste hasher n'importe quel contenu pour créer des objets corrompus pour "
 "debugger Git"
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:102
 msgid "process file as it were from this path"
 msgstr "traiter le fichier comme s'il venait de ce chemin"
 
-#: builtin/help.c:42
+#: builtin/help.c:43
 msgid "print all available commands"
 msgstr "afficher toutes les commandes disponibles"
 
-#: builtin/help.c:43
+#: builtin/help.c:44
 msgid "exclude guides"
 msgstr "exclure les guides"
 
-#: builtin/help.c:44
+#: builtin/help.c:45
 msgid "print list of useful guides"
 msgstr "afficher une liste de guides utiles"
 
-#: builtin/help.c:45
+#: builtin/help.c:46
 msgid "show man page"
 msgstr "afficher la page de manuel"
 
-#: builtin/help.c:46
+#: builtin/help.c:47
 msgid "show manual in web browser"
 msgstr "afficher le manuel dans un navigateur web"
 
-#: builtin/help.c:48
+#: builtin/help.c:49
 msgid "show info page"
 msgstr "afficher la page info"
 
-#: builtin/help.c:54
+#: builtin/help.c:55
 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
 msgstr "git help [--all] [--guides] [--man | --web | --info] [<commande>]"
 
-#: builtin/help.c:66
+#: builtin/help.c:67
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "format d'aide non reconnu '%s'"
 
-#: builtin/help.c:93
+#: builtin/help.c:94
 msgid "Failed to start emacsclient."
 msgstr "échec de démarrage d'emacsclient."
 
-#: builtin/help.c:106
+#: builtin/help.c:107
 msgid "Failed to parse emacsclient version."
 msgstr "échec d'analyse de la version d'emacsclient."
 
-#: builtin/help.c:114
+#: builtin/help.c:115
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "la version d'emacsclient '%d' est trop ancienne (<22)."
 
-#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
+#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "échec de l'exécution de '%s'"
 
-#: builtin/help.c:207
+#: builtin/help.c:208
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -8931,7 +9049,7 @@ msgstr ""
 "'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n"
 "Veuillez utiliser plutôt 'man.<outil>.cmd'."
 
-#: builtin/help.c:219
+#: builtin/help.c:220
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -8940,133 +9058,133 @@ msgstr ""
 "'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n"
 "Veuillez utiliser plutôt 'man.<outil>.cmd'."
 
-#: builtin/help.c:336
+#: builtin/help.c:337
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s' : visualiseur de manuel inconnu."
 
-#: builtin/help.c:353
+#: builtin/help.c:354
 msgid "no man viewer handled the request"
 msgstr "aucun visualiseur de manuel n'a pris en charge la demande"
 
-#: builtin/help.c:361
+#: builtin/help.c:362
 msgid "no info viewer handled the request"
 msgstr "aucun visualiseur de 'info' n'a pris en charge la demande"
 
-#: builtin/help.c:403
+#: builtin/help.c:404
 msgid "Defining attributes per path"
 msgstr "Définition des attributs par chemin"
 
-#: builtin/help.c:404
+#: builtin/help.c:405
 msgid "Everyday Git With 20 Commands Or So"
 msgstr "Git de tous les jours avec à peu près 20 commandes"
 
-#: builtin/help.c:405
+#: builtin/help.c:406
 msgid "A Git glossary"
 msgstr "Un glossaire Git"
 
-#: builtin/help.c:406
+#: builtin/help.c:407
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement"
 
-#: builtin/help.c:407
+#: builtin/help.c:408
 msgid "Defining submodule properties"
 msgstr "Définition des propriétés de sous-module"
 
-#: builtin/help.c:408
+#: builtin/help.c:409
 msgid "Specifying revisions and ranges for Git"
 msgstr "Spécification des révisions et portées pour Git"
 
-#: builtin/help.c:409
+#: builtin/help.c:410
 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
 msgstr ""
 "Une introduction pratique à Git (pour les versions 1.5.1 et supérieures)"
 
-#: builtin/help.c:410
+#: builtin/help.c:411
 msgid "An overview of recommended workflows with Git"
 msgstr "Un aperçu des flux de travail recommandés avec Git"
 
-#: builtin/help.c:422
+#: builtin/help.c:423
 msgid "The common Git guides are:\n"
 msgstr "Les guides Git populaires sont : \n"
 
-#: builtin/help.c:440
+#: builtin/help.c:441
 #, c-format
 msgid "`git %s' is aliased to `%s'"
 msgstr "`git %s\" est un alias de `%s'"
 
-#: builtin/help.c:462 builtin/help.c:479
+#: builtin/help.c:463 builtin/help.c:480
 #, c-format
 msgid "usage: %s%s"
 msgstr "usage : %s%s"
 
-#: builtin/index-pack.c:154
+#: builtin/index-pack.c:155
 #, c-format
 msgid "unable to open %s"
 msgstr "impossible d'ouvrir %s"
 
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "type d'objet non correspondant à %s"
 
-#: builtin/index-pack.c:224
+#: builtin/index-pack.c:225
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "objet attendu non reçu %s"
 
-#: builtin/index-pack.c:227
+#: builtin/index-pack.c:228
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "objet %s : type attendu %s, reçu %s"
 
-#: builtin/index-pack.c:269
+#: builtin/index-pack.c:270
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "impossible de remplir %d octet"
 msgstr[1] "impossible de remplir %d octets"
 
-#: builtin/index-pack.c:279
+#: builtin/index-pack.c:280
 msgid "early EOF"
 msgstr "fin de fichier prématurée"
 
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
 msgid "read error on input"
 msgstr "erreur de lecture sur l'entrée"
 
-#: builtin/index-pack.c:292
+#: builtin/index-pack.c:293
 msgid "used more bytes than were available"
 msgstr "plus d'octets utilisés que disponibles"
 
-#: builtin/index-pack.c:299
+#: builtin/index-pack.c:300
 msgid "pack too large for current definition of off_t"
 msgstr "le paquet est trop grand pour la définition actuelle de off_t"
 
-#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
+#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
 msgid "pack exceeds maximum allowed size"
 msgstr "le paquet dépasse la taille maximale permise"
 
-#: builtin/index-pack.c:317
+#: builtin/index-pack.c:318
 #, c-format
 msgid "unable to create '%s'"
 msgstr "impossible de créer '%s'"
 
-#: builtin/index-pack.c:323
+#: builtin/index-pack.c:324
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "impossible d'ouvrir le fichier paquet '%s'"
 
-#: builtin/index-pack.c:337
+#: builtin/index-pack.c:338
 msgid "pack signature mismatch"
 msgstr "la signature du paquet ne correspond pas"
 
-#: builtin/index-pack.c:339
+#: builtin/index-pack.c:340
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "la version de paquet %<PRIu32> non supportée"
 
-#: builtin/index-pack.c:357
+#: builtin/index-pack.c:358
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "le paquet a un mauvais objet à l'offset %<PRIuMAX> : %s"
@@ -9104,14 +9222,14 @@ msgstr[1] "fin prématurée du fichier paquet, %<PRIuMAX> octets lus"
 msgid "serious inflate inconsistency"
 msgstr "grave incohérence dans la décompression (inflate)"
 
-#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
 #: builtin/index-pack.c:816 builtin/index-pack.c:825
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"
 
-#: builtin/index-pack.c:752 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:257
+#: builtin/index-pack.c:751 builtin/pack-objects.c:167
+#: builtin/pack-objects.c:261
 #, c-format
 msgid "unable to read %s"
 msgstr "impossible de lire %s"
@@ -9131,251 +9249,246 @@ msgstr "impossible de lire l'objet existant %s"
 msgid "invalid blob object %s"
 msgstr "objet blob invalide %s"
 
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:851
 #, c-format
 msgid "invalid %s"
 msgstr "%s invalide"
 
-#: builtin/index-pack.c:853
+#: builtin/index-pack.c:854
 msgid "Error in object"
 msgstr "Erreur dans l'objet"
 
-#: builtin/index-pack.c:855
+#: builtin/index-pack.c:856
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Tous les objets enfants de %s ne sont pas accessibles"
 
-#: builtin/index-pack.c:927 builtin/index-pack.c:958
+#: builtin/index-pack.c:928 builtin/index-pack.c:959
 msgid "failed to apply delta"
 msgstr "échec d'application du delta"
 
-#: builtin/index-pack.c:1128
+#: builtin/index-pack.c:1130
 msgid "Receiving objects"
 msgstr "Réception d'objets"
 
-#: builtin/index-pack.c:1128
+#: builtin/index-pack.c:1130
 msgid "Indexing objects"
 msgstr "Indexation d'objets"
 
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1164
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "le paquet est corrompu (SHA1 ne correspond pas)"
 
-#: builtin/index-pack.c:1165
+#: builtin/index-pack.c:1169
 msgid "cannot fstat packfile"
 msgstr "impossible d'obtenir le statut (fstat) du fichier paquet"
 
-#: builtin/index-pack.c:1168
+#: builtin/index-pack.c:1172
 msgid "pack has junk at the end"
 msgstr "le paquet est invalide à la fin"
 
-#: builtin/index-pack.c:1179
+#: builtin/index-pack.c:1184
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "confusion extrême dans parse_pack_objects()"
 
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1207
 msgid "Resolving deltas"
 msgstr "Résolution des deltas"
 
-#: builtin/index-pack.c:1213
+#: builtin/index-pack.c:1218
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "impossible de créer le fil : %s"
 
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1260
 msgid "confusion beyond insanity"
 msgstr "confusion extrême"
 
-#: builtin/index-pack.c:1261
+#: builtin/index-pack.c:1266
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "complété avec %d objet local"
 msgstr[1] "complété avec %d objets locaux"
 
-#: builtin/index-pack.c:1273
+#: builtin/index-pack.c:1278
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr ""
 "Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)"
 
-#: builtin/index-pack.c:1277
+#: builtin/index-pack.c:1282
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "le paquet a %d delta non résolu"
 msgstr[1] "le paquet a %d deltas non résolus"
 
-#: builtin/index-pack.c:1301
+#: builtin/index-pack.c:1306
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "impossible de compresser l'objet ajouté (%d)"
 
-#: builtin/index-pack.c:1377
+#: builtin/index-pack.c:1382
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "l'objet local %s est corrompu"
 
-#: builtin/index-pack.c:1403
+#: builtin/index-pack.c:1408
 msgid "error while closing pack file"
 msgstr "erreur en fermeture du fichier paquet"
 
-#: builtin/index-pack.c:1415
+#: builtin/index-pack.c:1420
 #, c-format
 msgid "cannot write keep file '%s'"
 msgstr "impossible d'écrire le fichier \"keep\" '%s'"
 
-#: builtin/index-pack.c:1423
+#: builtin/index-pack.c:1428
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr "impossible de fermer le fichier \"keep\" '%s'"
 
-#: builtin/index-pack.c:1433
+#: builtin/index-pack.c:1438
 msgid "cannot store pack file"
 msgstr "impossible de stocker le fichier paquet"
 
-#: builtin/index-pack.c:1441
+#: builtin/index-pack.c:1446
 msgid "cannot store index file"
 msgstr "impossible de stocker le fichier d'index"
 
-#: builtin/index-pack.c:1479
+#: builtin/index-pack.c:1484
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "mauvais pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1489 builtin/index-pack.c:1686
-#, c-format
-msgid "no threads support, ignoring %s"
-msgstr "pas de support des fils, ignore %s"
-
-#: builtin/index-pack.c:1547
+#: builtin/index-pack.c:1552
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"
 
-#: builtin/index-pack.c:1549
+#: builtin/index-pack.c:1554
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'"
 
-#: builtin/index-pack.c:1596
+#: builtin/index-pack.c:1602
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "pas un delta : %d objet"
 msgstr[1] "pas un delta : %d objets"
 
-#: builtin/index-pack.c:1603
+#: builtin/index-pack.c:1609
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "longueur chaînée = %d : %lu objet"
 msgstr[1] "longueur chaînée = %d : %lu objets"
 
-#: builtin/index-pack.c:1616
+#: builtin/index-pack.c:1622
 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'"
 
-#: builtin/index-pack.c:1698 builtin/index-pack.c:1701
-#: builtin/index-pack.c:1717 builtin/index-pack.c:1721
+#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
+#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
 #, c-format
 msgid "bad %s"
 msgstr "mauvais %s"
 
-#: builtin/index-pack.c:1737
+#: builtin/index-pack.c:1743
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
 
-#: builtin/index-pack.c:1739
+#: builtin/index-pack.c:1745
 msgid "--stdin requires a git repository"
 msgstr "--stdin requiert un dépôt git"
 
-#: builtin/index-pack.c:1747
+#: builtin/index-pack.c:1753
 msgid "--verify with no packfile name given"
 msgstr "--verify sans nom de fichier paquet donné"
 
-#: builtin/init-db.c:54
+#: builtin/init-db.c:55
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "impossible de faire un stat de '%s'"
 
-#: builtin/init-db.c:60
+#: builtin/init-db.c:61
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "impossible de faire un stat du modèle '%s'"
 
-#: builtin/init-db.c:65
+#: builtin/init-db.c:66
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "impossible d'ouvrir (opendir) '%s'"
 
-#: builtin/init-db.c:76
+#: builtin/init-db.c:77
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "impossible de readlink '%s'"
 
-#: builtin/init-db.c:78
+#: builtin/init-db.c:79
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "impossible de créer un lien symbolique de '%s' '%s'"
 
-#: builtin/init-db.c:84
+#: builtin/init-db.c:85
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "impossible de copier '%s' vers '%s'"
 
-#: builtin/init-db.c:88
+#: builtin/init-db.c:89
 #, c-format
 msgid "ignoring template %s"
 msgstr "modèle %s ignoré"
 
-#: builtin/init-db.c:119
+#: builtin/init-db.c:120
 #, c-format
 msgid "templates not found %s"
 msgstr "modèles non trouvés %s"
 
-#: builtin/init-db.c:134
+#: builtin/init-db.c:135
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "pas de copie des modèles depuis '%s' : %s"
 
-#: builtin/init-db.c:327
+#: builtin/init-db.c:328
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "impossible de traiter le fichier de type %d"
 
-#: builtin/init-db.c:330
+#: builtin/init-db.c:331
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "impossible de déplacer %s vers %s"
 
-#: builtin/init-db.c:347 builtin/init-db.c:350
+#: builtin/init-db.c:348 builtin/init-db.c:351
 #, c-format
 msgid "%s already exists"
 msgstr "%s existe déjà"
 
-#: builtin/init-db.c:403
+#: builtin/init-db.c:404
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "Dépôt Git existant partagé réinitialisé dans %s%s\n"
 
-#: builtin/init-db.c:404
+#: builtin/init-db.c:405
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "Dépôt Git existant réinitialisé dans %s%s\n"
 
-#: builtin/init-db.c:408
+#: builtin/init-db.c:409
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "Dépôt Git vide partagé initialisé dans %s%s\n"
 
-#: builtin/init-db.c:409
+#: builtin/init-db.c:410
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "Dépôt Git vide initialisé dans %s%s\n"
 
-#: builtin/init-db.c:457
+#: builtin/init-db.c:458
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -9383,25 +9496,25 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--"
 "shared[=<permissions>]] [<répertoire>]"
 
-#: builtin/init-db.c:480
+#: builtin/init-db.c:481
 msgid "permissions"
 msgstr "permissions"
 
-#: builtin/init-db.c:481
+#: builtin/init-db.c:482
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs"
 
-#: builtin/init-db.c:515 builtin/init-db.c:520
+#: builtin/init-db.c:516 builtin/init-db.c:521
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "impossible de créer le répertoire (mkdir) %s"
 
-#: builtin/init-db.c:524
+#: builtin/init-db.c:525
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "impossible de se déplacer vers le répertoire (chdir) %s"
 
-#: builtin/init-db.c:545
+#: builtin/init-db.c:546
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -9410,7 +9523,7 @@ msgstr ""
 "%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --"
 "git-dir=<répertoire>)"
 
-#: builtin/init-db.c:573
+#: builtin/init-db.c:574
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Impossible d'accéder à l'arbre de travail '%s'"
@@ -9443,114 +9556,114 @@ msgstr "ligne(s) de fin à ajouter"
 msgid "no input file given for in-place editing"
 msgstr "aucun fichier en entrée pour l'éditon sur place"
 
-#: builtin/log.c:44
+#: builtin/log.c:45
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]"
 
-#: builtin/log.c:45
+#: builtin/log.c:46
 msgid "git show [<options>] <object>..."
 msgstr "git show [<options>] <objet>..."
 
-#: builtin/log.c:89
+#: builtin/log.c:90
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "option --decorate invalide : %s"
 
-#: builtin/log.c:144
+#: builtin/log.c:147
 msgid "suppress diff output"
 msgstr "supprimer la sortie des différences"
 
-#: builtin/log.c:145
+#: builtin/log.c:148
 msgid "show source"
 msgstr "afficher la source"
 
-#: builtin/log.c:146
+#: builtin/log.c:149
 msgid "Use mail map file"
 msgstr "Utiliser le fichier de correspondance de mail"
 
-#: builtin/log.c:147
+#: builtin/log.c:150
 msgid "decorate options"
 msgstr "décorer les options"
 
-#: builtin/log.c:150
+#: builtin/log.c:153
 msgid "Process line range n,m in file, counting from 1"
 msgstr ""
 "Traiter seulement l'intervalle de lignes n,m du fichier en commençant le "
 "compte à 1"
 
-#: builtin/log.c:246
+#: builtin/log.c:249
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Sortie finale : %d %s\n"
 
-#: builtin/log.c:493
+#: builtin/log.c:497
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s : fichier incorrect"
 
-#: builtin/log.c:507 builtin/log.c:601
+#: builtin/log.c:512 builtin/log.c:606
 #, c-format
 msgid "Could not read object %s"
 msgstr "Impossible de lire l'objet %s"
 
-#: builtin/log.c:625
+#: builtin/log.c:630
 #, c-format
 msgid "Unknown type: %d"
 msgstr "Type inconnu : %d"
 
-#: builtin/log.c:746
+#: builtin/log.c:751
 msgid "format.headers without value"
 msgstr "format.headers sans valeur"
 
-#: builtin/log.c:846
+#: builtin/log.c:852
 msgid "name of output directory is too long"
 msgstr "le nom du répertoire de sortie est trop long"
 
-#: builtin/log.c:861
+#: builtin/log.c:868
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "Impossible d'ouvrir le fichier correctif %s"
 
-#: builtin/log.c:875
+#: builtin/log.c:885
 msgid "Need exactly one range."
 msgstr "Exactement une plage nécessaire."
 
-#: builtin/log.c:885
+#: builtin/log.c:895
 msgid "Not a range."
 msgstr "Ceci n'est pas une plage."
 
-#: builtin/log.c:991
+#: builtin/log.c:1001
 msgid "Cover letter needs email format"
-msgstr "La lettre de motivation doit être au format e-mail"
+msgstr "La lettre de motivation doit être au format courriel"
 
-#: builtin/log.c:1071
+#: builtin/log.c:1081
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to aberrant : %s"
 
-#: builtin/log.c:1098
+#: builtin/log.c:1108
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"
 
-#: builtin/log.c:1148
+#: builtin/log.c:1158
 msgid "Two output directories?"
 msgstr "Deux répertoires de sortie ?"
 
-#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912
+#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
 #, c-format
 msgid "Unknown commit %s"
 msgstr "Commit inconnu %s"
 
-#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532
+#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Impossible de résoudre '%s' comme une référence valide."
 
-#: builtin/log.c:1270
+#: builtin/log.c:1280
 msgid "Could not find exact merge base."
 msgstr "Impossible de trouver la base de fusion exacte."
 
-#: builtin/log.c:1274
+#: builtin/log.c:1284
 msgid ""
 "Failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
@@ -9563,216 +9676,221 @@ msgstr ""
 "ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> "
 "manuellement."
 
-#: builtin/log.c:1294
+#: builtin/log.c:1304
 msgid "Failed to find exact merge base"
 msgstr "Impossible de trouver la base de fusion exacte"
 
-#: builtin/log.c:1305
+#: builtin/log.c:1315
 msgid "base commit should be the ancestor of revision list"
 msgstr "le commit de base devrait être l'ancêtre de la liste de révisions"
 
-#: builtin/log.c:1309
+#: builtin/log.c:1319
 msgid "base commit shouldn't be in revision list"
 msgstr "le commit de base ne devrait pas faire partie de la liste de révisions"
 
-#: builtin/log.c:1358
+#: builtin/log.c:1368
 msgid "cannot get patch id"
 msgstr "impossible d'obtenir l'id du patch"
 
-#: builtin/log.c:1415
+#: builtin/log.c:1425
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "utiliser [PATCH n/m] même avec un patch unique"
 
-#: builtin/log.c:1418
+#: builtin/log.c:1428
 msgid "use [PATCH] even with multiple patches"
 msgstr "utiliser [PATCH] même avec des patchs multiples"
 
-#: builtin/log.c:1422
+#: builtin/log.c:1432
 msgid "print patches to standard out"
 msgstr "afficher les patchs sur la sortie standard"
 
-#: builtin/log.c:1424
+#: builtin/log.c:1434
 msgid "generate a cover letter"
 msgstr "générer une lettre de motivation"
 
-#: builtin/log.c:1426
+#: builtin/log.c:1436
 msgid "use simple number sequence for output file names"
 msgstr ""
 "utiliser une séquence simple de nombres pour les nom des fichiers de sortie"
 
-#: builtin/log.c:1427
+#: builtin/log.c:1437
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1428
+#: builtin/log.c:1438
 msgid "use <sfx> instead of '.patch'"
 msgstr "utiliser <sfx> au lieu de '.patch'"
 
-#: builtin/log.c:1430
+#: builtin/log.c:1440
 msgid "start numbering patches at <n> instead of 1"
 msgstr "démarrer la numérotation des patchs à <n> au lieu de 1"
 
-#: builtin/log.c:1432
+#: builtin/log.c:1442
 msgid "mark the series as Nth re-roll"
 msgstr "marquer la série comme une Nième réédition"
 
-#: builtin/log.c:1434
+#: builtin/log.c:1444
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "utiliser [RFC PATCH] au lieu de [PATCH]"
 
-#: builtin/log.c:1437
+#: builtin/log.c:1447
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
 
-#: builtin/log.c:1440
+#: builtin/log.c:1450
 msgid "store resulting files in <dir>"
 msgstr "stocker les fichiers résultats dans <répertoire>"
 
-#: builtin/log.c:1443
+#: builtin/log.c:1453
 msgid "don't strip/add [PATCH]"
 msgstr "ne pas retirer/ajouter [PATCH]"
 
-#: builtin/log.c:1446
+#: builtin/log.c:1456
 msgid "don't output binary diffs"
 msgstr "ne pas imprimer les diffs binaires"
 
-#: builtin/log.c:1448
+#: builtin/log.c:1458
 msgid "output all-zero hash in From header"
 msgstr "écrire une empreinte à zéro dans l'entête From"
 
-#: builtin/log.c:1450
+#: builtin/log.c:1460
 msgid "don't include a patch matching a commit upstream"
 msgstr "ne pas inclure un patch correspondant à un commit amont"
 
-#: builtin/log.c:1452
+#: builtin/log.c:1462
 msgid "show patch format instead of default (patch + stat)"
 msgstr "afficher le format du patch au lieu du défaut (patch + stat)"
 
-#: builtin/log.c:1454
+#: builtin/log.c:1464
 msgid "Messaging"
 msgstr "Communication"
 
-#: builtin/log.c:1455
+#: builtin/log.c:1465
 msgid "header"
 msgstr "en-tête"
 
-#: builtin/log.c:1456
+#: builtin/log.c:1466
 msgid "add email header"
-msgstr "ajouter l'en-tête d'e-mail"
+msgstr "ajouter l'en-tête d'courriel"
 
-#: builtin/log.c:1457 builtin/log.c:1459
+#: builtin/log.c:1467 builtin/log.c:1469
 msgid "email"
-msgstr "e-mail"
+msgstr "courriel"
 
-#: builtin/log.c:1457
+#: builtin/log.c:1467
 msgid "add To: header"
 msgstr "ajouter l'en-tête \"To:\""
 
-#: builtin/log.c:1459
+#: builtin/log.c:1469
 msgid "add Cc: header"
 msgstr "ajouter l'en-tête \"Cc:\""
 
-#: builtin/log.c:1461
+#: builtin/log.c:1471
 msgid "ident"
 msgstr "ident"
 
-#: builtin/log.c:1462
+#: builtin/log.c:1472
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)"
 
-#: builtin/log.c:1464
+#: builtin/log.c:1474
 msgid "message-id"
 msgstr "id-message"
 
-#: builtin/log.c:1465
+#: builtin/log.c:1475
 msgid "make first mail a reply to <message-id>"
 msgstr "répondre dans le premier message à <id-message>"
 
-#: builtin/log.c:1466 builtin/log.c:1469
+#: builtin/log.c:1476 builtin/log.c:1479
 msgid "boundary"
 msgstr "limite"
 
-#: builtin/log.c:1467
+#: builtin/log.c:1477
 msgid "attach the patch"
 msgstr "attacher le patch"
 
-#: builtin/log.c:1470
+#: builtin/log.c:1480
 msgid "inline the patch"
 msgstr "patch à l'intérieur"
 
-#: builtin/log.c:1474
+#: builtin/log.c:1484
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
 
-#: builtin/log.c:1476
+#: builtin/log.c:1486
 msgid "signature"
 msgstr "signature"
 
-#: builtin/log.c:1477
+#: builtin/log.c:1487
 msgid "add a signature"
 msgstr "ajouter une signature"
 
-#: builtin/log.c:1478
+#: builtin/log.c:1488
 msgid "base-commit"
 msgstr "commit-de-base"
 
-#: builtin/log.c:1479
+#: builtin/log.c:1489
 msgid "add prerequisite tree info to the patch series"
 msgstr "Ajouter un arbre prérequis à la série de patchs"
 
-#: builtin/log.c:1481
+#: builtin/log.c:1491
 msgid "add a signature from a file"
 msgstr "ajouter une signature depuis un fichier"
 
-#: builtin/log.c:1482
+#: builtin/log.c:1492
 msgid "don't print the patch filenames"
 msgstr "ne pas afficher les noms de fichiers des patchs"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1567
+#, c-format
+msgid "invalid ident line: %s"
+msgstr "ligne d'identification invalide : %s"
+
+#: builtin/log.c:1582
 msgid "-n and -k are mutually exclusive."
 msgstr "-n et -k sont mutuellement exclusifs."
 
-#: builtin/log.c:1574
+#: builtin/log.c:1584
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs."
 
-#: builtin/log.c:1582
+#: builtin/log.c:1592
 msgid "--name-only does not make sense"
 msgstr "--name-only n'a pas de sens"
 
-#: builtin/log.c:1584
+#: builtin/log.c:1594
 msgid "--name-status does not make sense"
 msgstr "--name-status n'a pas de sens"
 
-#: builtin/log.c:1586
+#: builtin/log.c:1596
 msgid "--check does not make sense"
 msgstr "--check n'a pas de sens"
 
-#: builtin/log.c:1616
+#: builtin/log.c:1626
 msgid "standard output, or directory, which one?"
 msgstr "sortie standard, ou répertoire, lequel ?"
 
-#: builtin/log.c:1618
+#: builtin/log.c:1628
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "Impossible de créer le répertoire '%s'"
 
-#: builtin/log.c:1712
+#: builtin/log.c:1722
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "lecture du fichier de signature '%s' impossible"
 
-#: builtin/log.c:1784
+#: builtin/log.c:1794
 msgid "Failed to create output files"
 msgstr "Échec de création des fichiers en sortie"
 
-#: builtin/log.c:1833
+#: builtin/log.c:1843
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
 
-#: builtin/log.c:1887
+#: builtin/log.c:1897
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -9786,7 +9904,7 @@ msgstr "git ls-files [<options>] [<fichier>...]"
 
 #: builtin/ls-files.c:517
 msgid "identify the file status with tags"
-msgstr "identifier le statut de fichier avec les étiquettes"
+msgstr "identifier l'état de fichier avec les étiquettes"
 
 #: builtin/ls-files.c:519
 msgid "use lowercase letters for 'assume unchanged' files"
@@ -9931,219 +10049,224 @@ msgstr ""
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "afficher la réf sous-jacente en plus de l'objet pointé par elle"
 
-#: builtin/ls-tree.c:28
+#: builtin/ls-tree.c:29
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
 msgstr "git ls-tree [<options>] <arbre ou apparenté> [<chemin>...]"
 
-#: builtin/ls-tree.c:126
+#: builtin/ls-tree.c:127
 msgid "only show trees"
 msgstr "afficher seulement les arbres"
 
-#: builtin/ls-tree.c:128
+#: builtin/ls-tree.c:129
 msgid "recurse into subtrees"
 msgstr "parcourir les sous-arbres"
 
-#: builtin/ls-tree.c:130
+#: builtin/ls-tree.c:131
 msgid "show trees when recursing"
 msgstr "afficher les arbres en les parcourant"
 
-#: builtin/ls-tree.c:133
+#: builtin/ls-tree.c:134
 msgid "terminate entries with NUL byte"
 msgstr "terminer les éléments avec un octet NUL"
 
-#: builtin/ls-tree.c:134
+#: builtin/ls-tree.c:135
 msgid "include object size"
 msgstr "inclure la taille d'objet"
 
-#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
+#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
 msgid "list only filenames"
 msgstr "afficher seulement les noms de fichiers"
 
-#: builtin/ls-tree.c:141
+#: builtin/ls-tree.c:142
 msgid "use full path names"
 msgstr "utiliser les noms de chemins complets"
 
-#: builtin/ls-tree.c:143
+#: builtin/ls-tree.c:144
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr ""
 "afficher l'arbre entier ; pas seulement le répertoire courant (implique --"
 "full-name)"
 
-#: builtin/merge.c:46
+#: builtin/mailsplit.c:241
+#, c-format
+msgid "empty mbox: '%s'"
+msgstr "mbox vide : '%s'"
+
+#: builtin/merge.c:47
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<options>] [<commit>...]"
 
-#: builtin/merge.c:47
+#: builtin/merge.c:48
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:48
+#: builtin/merge.c:49
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:103
+#: builtin/merge.c:104
 msgid "switch `m' requires a value"
 msgstr "le commutateur `m' a besoin d'une valeur"
 
-#: builtin/merge.c:140
+#: builtin/merge.c:141
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Impossible de trouver la stratégie de fusion '%s'.\n"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:142
 #, c-format
 msgid "Available strategies are:"
 msgstr "Les stratégies disponibles sont :"
 
-#: builtin/merge.c:146
+#: builtin/merge.c:147
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Les stratégies personnalisées sont :"
 
-#: builtin/merge.c:196 builtin/pull.c:127
+#: builtin/merge.c:197 builtin/pull.c:134
 msgid "do not show a diffstat at the end of the merge"
 msgstr "ne pas afficher un diffstat à la fin de la fusion"
 
-#: builtin/merge.c:199 builtin/pull.c:130
+#: builtin/merge.c:200 builtin/pull.c:137
 msgid "show a diffstat at the end of the merge"
 msgstr "afficher un diffstat à la fin de la fusion"
 
-#: builtin/merge.c:200 builtin/pull.c:133
+#: builtin/merge.c:201 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(synonyme de --stat)"
 
-#: builtin/merge.c:202 builtin/pull.c:136
+#: builtin/merge.c:203 builtin/pull.c:143
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "ajouter (au plus <n>) éléments du journal court au message de validation de "
 "la fusion"
 
-#: builtin/merge.c:205 builtin/pull.c:139
+#: builtin/merge.c:206 builtin/pull.c:146
 msgid "create a single commit instead of doing a merge"
 msgstr "créer une validation unique au lieu de faire une fusion"
 
-#: builtin/merge.c:207 builtin/pull.c:142
+#: builtin/merge.c:208 builtin/pull.c:149
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "effectuer une validation si la fusion réussit (défaut)"
 
-#: builtin/merge.c:209 builtin/pull.c:145
+#: builtin/merge.c:210 builtin/pull.c:152
 msgid "edit message before committing"
 msgstr "éditer le message avant la validation"
 
-#: builtin/merge.c:210
+#: builtin/merge.c:211
 msgid "allow fast-forward (default)"
 msgstr "autoriser l'avance rapide (défaut)"
 
-#: builtin/merge.c:212 builtin/pull.c:151
+#: builtin/merge.c:213 builtin/pull.c:158
 msgid "abort if fast-forward is not possible"
 msgstr "abandonner si l'avance rapide n'est pas possible"
 
-#: builtin/merge.c:216 builtin/pull.c:154
+#: builtin/merge.c:217 builtin/pull.c:161
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "vérifier que le commit nommé a une signature GPG valide"
 
-#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158
-#: builtin/revert.c:108
+#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/revert.c:109
 msgid "strategy"
 msgstr "stratégie"
 
-#: builtin/merge.c:218 builtin/pull.c:159
+#: builtin/merge.c:219 builtin/pull.c:166
 msgid "merge strategy to use"
 msgstr "stratégie de fusion à utiliser"
 
-#: builtin/merge.c:219 builtin/pull.c:162
+#: builtin/merge.c:220 builtin/pull.c:169
 msgid "option=value"
 msgstr "option=valeur"
 
-#: builtin/merge.c:220 builtin/pull.c:163
+#: builtin/merge.c:221 builtin/pull.c:170
 msgid "option for selected merge strategy"
 msgstr "option pour la stratégie de fusion sélectionnée"
 
-#: builtin/merge.c:222
+#: builtin/merge.c:223
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr ""
 "message de validation de la fusion (pour une fusion sans avance rapide)"
 
-#: builtin/merge.c:226
+#: builtin/merge.c:227
 msgid "abort the current in-progress merge"
 msgstr "abandonner la fusion en cours"
 
-#: builtin/merge.c:228
+#: builtin/merge.c:229
 msgid "continue the current in-progress merge"
 msgstr "continuer la fusion en cours"
 
-#: builtin/merge.c:230 builtin/pull.c:170
+#: builtin/merge.c:231 builtin/pull.c:177
 msgid "allow merging unrelated histories"
 msgstr "permettre la fusion d'historiques sans rapport"
 
-#: builtin/merge.c:258
+#: builtin/merge.c:259
 msgid "could not run stash."
 msgstr "impossible de lancer le remisage."
 
-#: builtin/merge.c:263
+#: builtin/merge.c:264
 msgid "stash failed"
 msgstr "échec du remisage"
 
-#: builtin/merge.c:268
+#: builtin/merge.c:269
 #, c-format
 msgid "not a valid object: %s"
 msgstr "pas un objet valide : %s"
 
-#: builtin/merge.c:287 builtin/merge.c:304
+#: builtin/merge.c:288 builtin/merge.c:305
 msgid "read-tree failed"
 msgstr "read-tree a échoué"
 
-#: builtin/merge.c:334
+#: builtin/merge.c:335
 msgid " (nothing to squash)"
 msgstr " (rien à compresser)"
 
-#: builtin/merge.c:345
+#: builtin/merge.c:346
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Validation compressée -- HEAD non mise à jour\n"
 
-#: builtin/merge.c:395
+#: builtin/merge.c:396
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n"
 
-#: builtin/merge.c:446
+#: builtin/merge.c:447
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' ne pointe pas sur un commit"
 
-#: builtin/merge.c:536
+#: builtin/merge.c:537
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"
 
-#: builtin/merge.c:656
+#: builtin/merge.c:657
 msgid "Not handling anything other than two heads merge."
 msgstr "Impossible de gérer autre chose que la fusion de deux têtes."
 
-#: builtin/merge.c:670
+#: builtin/merge.c:671
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Options inconnue pour merge-recursive : -X%s"
 
-#: builtin/merge.c:685
+#: builtin/merge.c:686
 #, c-format
 msgid "unable to write %s"
 msgstr "impossible d'écrire %s"
 
-#: builtin/merge.c:737
+#: builtin/merge.c:738
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Impossible de lire depuis '%s'"
 
-#: builtin/merge.c:746
+#: builtin/merge.c:747
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 "Pas de validation de la fusion ; utilisez 'git commit' pour terminer la "
 "fusion.\n"
 
-#: builtin/merge.c:752
+#: builtin/merge.c:753
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -10160,75 +10283,70 @@ msgstr ""
 "Les lignes commençant par '%c' seront ignorées, et un message vide\n"
 "abandonne la validation.\n"
 
-#: builtin/merge.c:776
+#: builtin/merge.c:777
 msgid "Empty commit message."
 msgstr "Message de validation vide."
 
-#: builtin/merge.c:796
+#: builtin/merge.c:797
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Merveilleux.\n"
 
-#: builtin/merge.c:851
+#: builtin/merge.c:850
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "La fusion automatique a échoué ; réglez les conflits et validez le "
 "résultat.\n"
 
-#: builtin/merge.c:890
+#: builtin/merge.c:889
 msgid "No current branch."
 msgstr "Pas de branche courante."
 
-#: builtin/merge.c:892
+#: builtin/merge.c:891
 msgid "No remote for the current branch."
 msgstr "Pas de branche distante pour la branche courante."
 
-#: builtin/merge.c:894
+#: builtin/merge.c:893
 msgid "No default upstream defined for the current branch."
 msgstr "Pas de branche amont par défaut définie pour la branche courante."
 
-#: builtin/merge.c:899
+#: builtin/merge.c:898
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Pas de branche de suivi pour %s depuis %s"
 
-#: builtin/merge.c:946
+#: builtin/merge.c:945
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Mauvaise valeur '%s' dans l'environnement '%s'"
 
-#: builtin/merge.c:1020
-#, c-format
-msgid "could not close '%s'"
-msgstr "impossible de fermer '%s'"
-
-#: builtin/merge.c:1047
+#: builtin/merge.c:1046
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "pas possible de fusionner ceci dans %s : %s"
 
-#: builtin/merge.c:1081
+#: builtin/merge.c:1080
 msgid "not something we can merge"
 msgstr "pas possible de fusionner ceci"
 
-#: builtin/merge.c:1146
+#: builtin/merge.c:1145
 msgid "--abort expects no arguments"
 msgstr "--abort n'accepte pas d'argument"
 
-#: builtin/merge.c:1150
+#: builtin/merge.c:1149
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)."
 
-#: builtin/merge.c:1162
+#: builtin/merge.c:1161
 msgid "--continue expects no arguments"
 msgstr "--continue ne supporte aucun argument"
 
-#: builtin/merge.c:1166
+#: builtin/merge.c:1165
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Il n'y a pas de fusion en cours (MERGE_HEAD manquant)."
 
-#: builtin/merge.c:1182
+#: builtin/merge.c:1181
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10236,7 +10354,7 @@ msgstr ""
 "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"
 "Veuillez valider vos modifications avant de pouvoir fusionner."
 
-#: builtin/merge.c:1189
+#: builtin/merge.c:1188
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10244,160 +10362,160 @@ msgstr ""
 "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"
 "Veuillez valider vos modifications avant de pouvoir fusionner."
 
-#: builtin/merge.c:1192
+#: builtin/merge.c:1191
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)."
 
-#: builtin/merge.c:1201
+#: builtin/merge.c:1200
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
 
-#: builtin/merge.c:1209
+#: builtin/merge.c:1208
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 "Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini."
 
-#: builtin/merge.c:1226
+#: builtin/merge.c:1225
 msgid "Squash commit into empty head not supported yet"
 msgstr "La validation compressée vers une tête vide n'est pas encore supportée"
 
-#: builtin/merge.c:1228
+#: builtin/merge.c:1227
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide"
 
-#: builtin/merge.c:1233
+#: builtin/merge.c:1232
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - pas possible de fusionner ceci"
 
-#: builtin/merge.c:1235
+#: builtin/merge.c:1234
 msgid "Can merge only exactly one commit into empty head"
 msgstr ""
 "Possible de fusionner exactement une seule validation dans une tête vide"
 
-#: builtin/merge.c:1269
+#: builtin/merge.c:1268
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "La validation %s a une signature GPG non fiable, prétendument par %s."
 
-#: builtin/merge.c:1272
+#: builtin/merge.c:1271
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "La validation %s a une mauvaise signature GPG prétendument par %s."
 
-#: builtin/merge.c:1275
+#: builtin/merge.c:1274
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "La validation %s n'a pas de signature GPG."
 
-#: builtin/merge.c:1278
+#: builtin/merge.c:1277
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "La validation %s a une signature GPG correcte par %s\n"
 
-#: builtin/merge.c:1340
+#: builtin/merge.c:1339
 msgid "refusing to merge unrelated histories"
 msgstr "refus de fusionner des historiques sans relation"
 
-#: builtin/merge.c:1349
+#: builtin/merge.c:1348
 msgid "Already up-to-date."
 msgstr "Déjà à jour."
 
-#: builtin/merge.c:1359
+#: builtin/merge.c:1358
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Mise à jour %s..%s\n"
 
-#: builtin/merge.c:1400
+#: builtin/merge.c:1399
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Essai de fusion vraiment triviale dans l'index...\n"
 
-#: builtin/merge.c:1407
+#: builtin/merge.c:1406
 #, c-format
 msgid "Nope.\n"
 msgstr "Non.\n"
 
-#: builtin/merge.c:1432
+#: builtin/merge.c:1431
 msgid "Already up-to-date. Yeeah!"
 msgstr "Déjà à jour. Ouais !"
 
-#: builtin/merge.c:1438
+#: builtin/merge.c:1437
 msgid "Not possible to fast-forward, aborting."
 msgstr "Pas possible d'avancer rapidement, abandon."
 
-#: builtin/merge.c:1461 builtin/merge.c:1540
+#: builtin/merge.c:1460 builtin/merge.c:1539
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Retour de l'arbre à l'original...\n"
 
-#: builtin/merge.c:1465
+#: builtin/merge.c:1464
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Essai de la stratégie de fusion %s...\n"
 
-#: builtin/merge.c:1531
+#: builtin/merge.c:1530
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n"
 
-#: builtin/merge.c:1533
+#: builtin/merge.c:1532
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "La fusion avec la stratégie %s a échoué.\n"
 
-#: builtin/merge.c:1542
+#: builtin/merge.c:1541
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "Utilisation de %s pour préparer la résolution à la main.\n"
 
-#: builtin/merge.c:1554
+#: builtin/merge.c:1553
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
 "La fusion automatique a réussi ; stoppée avant la validation comme demandé\n"
 
-#: builtin/merge-base.c:29
+#: builtin/merge-base.c:30
 msgid "git merge-base [-a | --all] <commit> <commit>..."
 msgstr "git merge-base [-a | --all] <commit> <commit>..."
 
-#: builtin/merge-base.c:30
+#: builtin/merge-base.c:31
 msgid "git merge-base [-a | --all] --octopus <commit>..."
 msgstr "git merge-base [-a | --all] --octopus <commit>..."
 
-#: builtin/merge-base.c:31
+#: builtin/merge-base.c:32
 msgid "git merge-base --independent <commit>..."
 msgstr "git merge-base --independent <validation>..."
 
-#: builtin/merge-base.c:32
+#: builtin/merge-base.c:33
 msgid "git merge-base --is-ancestor <commit> <commit>"
 msgstr "git merge-base --is-ancestor <validation> <validation>"
 
-#: builtin/merge-base.c:33
+#: builtin/merge-base.c:34
 msgid "git merge-base --fork-point <ref> [<commit>]"
 msgstr "git merge-base --fork-point <référence> [<validation>]"
 
-#: builtin/merge-base.c:217
+#: builtin/merge-base.c:218
 msgid "output all common ancestors"
 msgstr "afficher tous les ancêtres communs"
 
-#: builtin/merge-base.c:219
+#: builtin/merge-base.c:220
 msgid "find ancestors for a single n-way merge"
 msgstr "trouver les ancêtres pour une fusion simple à n points"
 
-#: builtin/merge-base.c:221
+#: builtin/merge-base.c:222
 msgid "list revs not reachable from others"
 msgstr "afficher les révisions inaccessibles depuis les autres"
 
-#: builtin/merge-base.c:223
+#: builtin/merge-base.c:224
 msgid "is the first one ancestor of the other?"
 msgstr "est le premier ancêtre de l'autre ?"
 
-#: builtin/merge-base.c:225
+#: builtin/merge-base.c:226
 msgid "find where <commit> forked from reflog of <ref>"
 msgstr "trouver où <validation> a divergé du reflog de <référence>"
 
-#: builtin/merge-file.c:8
+#: builtin/merge-file.c:9
 msgid ""
 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
 "<orig-file> <file2>"
@@ -10405,35 +10523,35 @@ msgstr ""
 "git merge-file [<options>] [-L <nom1> [-L <orig> [-L <nom2>]]] <fichier1> "
 "<fichier-orig> <fichier2>"
 
-#: builtin/merge-file.c:32
+#: builtin/merge-file.c:33
 msgid "send results to standard output"
 msgstr "envoyer les résultats sur la sortie standard"
 
-#: builtin/merge-file.c:33
+#: builtin/merge-file.c:34
 msgid "use a diff3 based merge"
 msgstr "utiliser une fusion basée sur diff3"
 
-#: builtin/merge-file.c:34
+#: builtin/merge-file.c:35
 msgid "for conflicts, use our version"
 msgstr "pour les conflits, utiliser notre version (our)"
 
-#: builtin/merge-file.c:36
+#: builtin/merge-file.c:37
 msgid "for conflicts, use their version"
 msgstr "pour les conflits, utiliser leur version (their)"
 
-#: builtin/merge-file.c:38
+#: builtin/merge-file.c:39
 msgid "for conflicts, use a union version"
 msgstr "pour les conflits, utiliser l'ensemble des versions"
 
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:42
 msgid "for conflicts, use this marker size"
 msgstr "pour les conflits, utiliser cette taille de marqueur"
 
-#: builtin/merge-file.c:42
+#: builtin/merge-file.c:43
 msgid "do not warn about conflicts"
 msgstr "ne pas avertir à propos des conflits"
 
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:45
 msgid "set labels for file1/orig-file/file2"
 msgstr "définir les labels pour fichier1/fichier-orig/fichier2"
 
@@ -10472,162 +10590,162 @@ msgstr "Fusion de %s avec %s\n"
 msgid "git mktree [-z] [--missing] [--batch]"
 msgstr "git mktree [-z] [--missing] [--batch]"
 
-#: builtin/mktree.c:152
+#: builtin/mktree.c:153
 msgid "input is NUL terminated"
 msgstr "l'entrée se termine par NUL"
 
-#: builtin/mktree.c:153 builtin/write-tree.c:24
+#: builtin/mktree.c:154 builtin/write-tree.c:25
 msgid "allow missing objects"
 msgstr "autoriser les objets manquants"
 
-#: builtin/mktree.c:154
+#: builtin/mktree.c:155
 msgid "allow creation of more than one tree"
 msgstr "autoriser la création de plus d'un arbre"
 
-#: builtin/mv.c:16
+#: builtin/mv.c:17
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<options>] <source>... <destination>"
 
-#: builtin/mv.c:82
+#: builtin/mv.c:83
 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr "Le répertoire %s est dans l'index et pourtant aucun sous-module ?"
 
-#: builtin/mv.c:84 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:290
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "Veuillez indexer vos modifications de .gitmodules ou les remiser pour "
 "continuer"
 
-#: builtin/mv.c:102
+#: builtin/mv.c:103
 #, c-format
 msgid "%.*s is in index"
 msgstr "%.*s est dans l'index"
 
-#: builtin/mv.c:124
+#: builtin/mv.c:125
 msgid "force move/rename even if target exists"
 msgstr "forcer le déplacement/renommage même si la cible existe"
 
-#: builtin/mv.c:125
+#: builtin/mv.c:126
 msgid "skip move/rename errors"
 msgstr "sauter les erreurs de déplacement/renommage"
 
-#: builtin/mv.c:167
+#: builtin/mv.c:168
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "la destination '%s' n'est pas un répertoire"
 
-#: builtin/mv.c:178
+#: builtin/mv.c:179
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Vérification du renommage de '%s' en '%s'\n"
 
-#: builtin/mv.c:182
+#: builtin/mv.c:183
 msgid "bad source"
 msgstr "mauvaise source"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:186
 msgid "can not move directory into itself"
 msgstr "impossible de déplacer un répertoire dans lui-même"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:189
 msgid "cannot move directory over file"
 msgstr "impossible de déplacer un répertoire sur un fichier"
 
-#: builtin/mv.c:197
+#: builtin/mv.c:198
 msgid "source directory is empty"
 msgstr "le répertoire source est vide"
 
-#: builtin/mv.c:222
+#: builtin/mv.c:223
 msgid "not under version control"
 msgstr "pas sous le contrôle de version"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:226
 msgid "destination exists"
 msgstr "la destination existe"
 
-#: builtin/mv.c:233
+#: builtin/mv.c:234
 #, c-format
 msgid "overwriting '%s'"
 msgstr "écrasement de '%s'"
 
-#: builtin/mv.c:236
+#: builtin/mv.c:237
 msgid "Cannot overwrite"
 msgstr "Impossible d'écraser"
 
-#: builtin/mv.c:239
+#: builtin/mv.c:240
 msgid "multiple sources for the same target"
 msgstr "multiples sources pour la même destination"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:242
 msgid "destination directory does not exist"
 msgstr "le répertoire de destination n'existe pas"
 
-#: builtin/mv.c:248
+#: builtin/mv.c:249
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, source=%s, destination=%s"
 
-#: builtin/mv.c:269
+#: builtin/mv.c:270
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Renommage de %s en %s\n"
 
-#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384
+#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "le renommage de '%s' a échoué"
 
-#: builtin/name-rev.c:289
+#: builtin/name-rev.c:338
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<options>] <validation>..."
 
-#: builtin/name-rev.c:290
+#: builtin/name-rev.c:339
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<options>] --all"
 
-#: builtin/name-rev.c:291
+#: builtin/name-rev.c:340
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<options>] --stdin"
 
-#: builtin/name-rev.c:346
+#: builtin/name-rev.c:395
 msgid "print only names (no SHA-1)"
 msgstr "afficher seulement les noms (pas de SHA-1)"
 
-#: builtin/name-rev.c:347
+#: builtin/name-rev.c:396
 msgid "only use tags to name the commits"
 msgstr "utiliser seulement les étiquettes pour nommer les validations"
 
-#: builtin/name-rev.c:349
+#: builtin/name-rev.c:398
 msgid "only use refs matching <pattern>"
 msgstr "utiliser seulement les références correspondant à <motif>"
 
-#: builtin/name-rev.c:351
+#: builtin/name-rev.c:400
 msgid "ignore refs matching <pattern>"
 msgstr "ignorer les références correspondant à <motif>"
 
-#: builtin/name-rev.c:353
+#: builtin/name-rev.c:402
 msgid "list all commits reachable from all refs"
 msgstr ""
 "afficher toutes les validations accessibles depuis toutes les références"
 
-#: builtin/name-rev.c:354
+#: builtin/name-rev.c:403
 msgid "read from stdin"
 msgstr "lire depuis l'entrée standard"
 
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:404
 msgid "allow to print `undefined` names (default)"
 msgstr "autoriser l'affichage des noms `non définis` (par défaut)"
 
-#: builtin/name-rev.c:361
+#: builtin/name-rev.c:410
 msgid "dereference tags in the input (internal use)"
 msgstr "déréférencer les étiquettes en entrée (usage interne)"
 
-#: builtin/notes.c:25
+#: builtin/notes.c:26
 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
 msgstr "git notes [--ref <références-notes>] [list [<object>]]"
 
-#: builtin/notes.c:26
+#: builtin/notes.c:27
 msgid ""
 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
 "| (-c | -C) <object>] [<object>]"
@@ -10635,12 +10753,12 @@ msgstr ""
 "git notes [--ref <références-notes>] add [-f] [--allow-empty] [-m <message> "
 "| -F <fichier> | (-c | -C) <objet>] [<objet>]"
 
-#: builtin/notes.c:27
+#: builtin/notes.c:28
 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
 msgstr ""
 "git notes [--ref <références-notes>] copy [-f] <depuis-objet> <vers-objet>"
 
-#: builtin/notes.c:28
+#: builtin/notes.c:29
 msgid ""
 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
 "(-c | -C) <object>] [<object>]"
@@ -10648,204 +10766,205 @@ msgstr ""
 "git notes [--ref <références-notes>] append [--allow-empty] [-m <message> | -"
 "F <fichier> | (-c | -C) <objet>] [<objet>]"
 
-#: builtin/notes.c:29
+#: builtin/notes.c:30
 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
 msgstr "git notes [--ref <références-notes>] edit [--allow-empty] [<objet>]"
 
-#: builtin/notes.c:30
+#: builtin/notes.c:31
 msgid "git notes [--ref <notes-ref>] show [<object>]"
 msgstr "git notes [--ref <références-notes>] show [<objet>]"
 
-#: builtin/notes.c:31
+#: builtin/notes.c:32
 msgid ""
 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
 msgstr ""
 "git notes [--ref <références-notes>] merge [-v | -q] [-s <stratégie> ] "
 "<références-notes>"
 
-#: builtin/notes.c:32
+#: builtin/notes.c:33
 msgid "git notes merge --commit [-v | -q]"
 msgstr "git notes merge --commit [-v | -q]"
 
-#: builtin/notes.c:33
+#: builtin/notes.c:34
 msgid "git notes merge --abort [-v | -q]"
 msgstr "git notes merge --abort [-v | -q]"
 
-#: builtin/notes.c:34
+#: builtin/notes.c:35
 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
 msgstr "git notes [--ref <références-notes>] remove [<objet>...]"
 
-#: builtin/notes.c:35
+#: builtin/notes.c:36
 msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
 msgstr "git notes [--ref <références-notes>] prune [-n | -v]"
 
-#: builtin/notes.c:36
+#: builtin/notes.c:37
 msgid "git notes [--ref <notes-ref>] get-ref"
 msgstr "git notes [--ref <références-notes>] get-ref"
 
-#: builtin/notes.c:41
+#: builtin/notes.c:42
 msgid "git notes [list [<object>]]"
 msgstr "git notes [list [<objet>]]"
 
-#: builtin/notes.c:46
+#: builtin/notes.c:47
 msgid "git notes add [<options>] [<object>]"
 msgstr "git notes add [<options>] [<objet>]"
 
-#: builtin/notes.c:51
+#: builtin/notes.c:52
 msgid "git notes copy [<options>] <from-object> <to-object>"
 msgstr "git notes copy [<options>] <depuis-objet> <vers-objet>"
 
-#: builtin/notes.c:52
+#: builtin/notes.c:53
 msgid "git notes copy --stdin [<from-object> <to-object>]..."
 msgstr "git notes copy --stdin [<depuis-objet> <vers-objet>]..."
 
-#: builtin/notes.c:57
+#: builtin/notes.c:58
 msgid "git notes append [<options>] [<object>]"
 msgstr "git notes append [<options>] [<objet>]"
 
-#: builtin/notes.c:62
+#: builtin/notes.c:63
 msgid "git notes edit [<object>]"
 msgstr "git notes edit [<objet>]"
 
-#: builtin/notes.c:67
+#: builtin/notes.c:68
 msgid "git notes show [<object>]"
 msgstr "git notes show [<objet>]"
 
-#: builtin/notes.c:72
+#: builtin/notes.c:73
 msgid "git notes merge [<options>] <notes-ref>"
 msgstr "git notes merge [<options>] <références-notes>"
 
-#: builtin/notes.c:73
+#: builtin/notes.c:74
 msgid "git notes merge --commit [<options>]"
 msgstr "git notes merge --commit [<options>]"
 
-#: builtin/notes.c:74
+#: builtin/notes.c:75
 msgid "git notes merge --abort [<options>]"
 msgstr "git notes merge --abort [<options>]"
 
-#: builtin/notes.c:79
+#: builtin/notes.c:80
 msgid "git notes remove [<object>]"
 msgstr "git notes remove [<objet>]"
 
-#: builtin/notes.c:84
+#: builtin/notes.c:85
 msgid "git notes prune [<options>]"
 msgstr "git notes prune [<options>]"
 
-#: builtin/notes.c:89
+#: builtin/notes.c:90
 msgid "git notes get-ref"
 msgstr "git notes get-ref"
 
-#: builtin/notes.c:94
+#: builtin/notes.c:95
 msgid "Write/edit the notes for the following object:"
 msgstr "Écrire/éditer les notes pour l'objet suivant :"
 
-#: builtin/notes.c:147
+#: builtin/notes.c:148
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "impossible de démarrer 'show' pour l'objet '%s'"
 
-#: builtin/notes.c:151
+#: builtin/notes.c:152
 msgid "could not read 'show' output"
 msgstr "impossible de lire la sortie de 'show'"
 
-#: builtin/notes.c:159
+#: builtin/notes.c:160
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "impossible de finir 'show' pour l'objet '%s'"
 
-#: builtin/notes.c:194
+#: builtin/notes.c:195
 msgid "please supply the note contents using either -m or -F option"
 msgstr "veuillez fournir le contenu de la note en utilisant l'option -m ou -F"
 
-#: builtin/notes.c:203
+#: builtin/notes.c:204
 msgid "unable to write note object"
 msgstr "impossible d'écrire l'objet note"
 
-#: builtin/notes.c:205
+#: builtin/notes.c:206
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr "le contenu de la note a été laissé dans %s"
 
-#: builtin/notes.c:233 builtin/tag.c:516
+#: builtin/notes.c:234 builtin/tag.c:517
 #, c-format
 msgid "cannot read '%s'"
 msgstr "impossible de lire '%s'"
 
-#: builtin/notes.c:235 builtin/tag.c:519
+#: builtin/notes.c:236 builtin/tag.c:520
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "impossible d'ouvrir ou lire '%s'"
 
-#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
-#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
-#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658
+#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
+#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
+#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr "impossible de résoudre '%s' comme une référence valide."
 
-#: builtin/notes.c:257
+#: builtin/notes.c:258
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "impossible de lire l'objet '%s'."
 
-#: builtin/notes.c:261
+#: builtin/notes.c:262
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr "impossible de lire les informations de note d'un objet non-blob '%s'."
 
-#: builtin/notes.c:301
+#: builtin/notes.c:302
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "ligne en entrée malformée : '%s'."
 
-#: builtin/notes.c:316
+#: builtin/notes.c:317
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr "impossible de copier les notes de '%s' vers '%s'"
 
-#. TRANSLATORS: the first %s will be replaced by a
-#. git notes command: 'add', 'merge', 'remove', etc.
-#: builtin/notes.c:345
+#. TRANSLATORS: the first %s will be replaced by a git
+#. notes command: 'add', 'merge', 'remove', etc.
+#.
+#: builtin/notes.c:348
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "Refus de faire %s sur des notes dans %s (hors de refs/notes/)"
 
-#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
-#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651
-#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969
+#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
+#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
+#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
 msgid "too many parameters"
 msgstr "trop de paramètres"
 
-#: builtin/notes.c:378 builtin/notes.c:664
+#: builtin/notes.c:381 builtin/notes.c:667
 #, c-format
 msgid "no note found for object %s."
 msgstr "pas de note trouvée pour l'objet %s."
 
-#: builtin/notes.c:399 builtin/notes.c:562
+#: builtin/notes.c:402 builtin/notes.c:565
 msgid "note contents as a string"
 msgstr "contenu de la note sous forme de chaîne"
 
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:405 builtin/notes.c:568
 msgid "note contents in a file"
 msgstr "contenu de la note dans un fichier"
 
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:408 builtin/notes.c:571
 msgid "reuse and edit specified note object"
 msgstr "réutiliser et éditer l'objet de note spécifié"
 
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:411 builtin/notes.c:574
 msgid "reuse specified note object"
 msgstr "réutiliser l'objet de note spécifié"
 
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:414 builtin/notes.c:577
 msgid "allow storing empty note"
 msgstr "permettre de stocker une note vide"
 
-#: builtin/notes.c:412 builtin/notes.c:483
+#: builtin/notes.c:415 builtin/notes.c:486
 msgid "replace existing notes"
 msgstr "remplacer les notes existantes"
 
-#: builtin/notes.c:437
+#: builtin/notes.c:440
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -10854,30 +10973,30 @@ msgstr ""
 "Impossible d'ajouter des notes. Des notes ont été trouvées pour l'objet %s. "
 "Utilisez '-f' pour écraser les notes existantes"
 
-#: builtin/notes.c:452 builtin/notes.c:531
+#: builtin/notes.c:455 builtin/notes.c:534
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Écrasement des notes existantes pour l'objet %s\n"
 
-#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888
+#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Suppression de la note pour l'objet %s\n"
 
-#: builtin/notes.c:484
+#: builtin/notes.c:487
 msgid "read objects from stdin"
 msgstr "lire les objets depuis l'entrée standard"
 
-#: builtin/notes.c:486
+#: builtin/notes.c:489
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr ""
 "charger la configuration de réécriture pour <commande> (implique --stdin)"
 
-#: builtin/notes.c:504
+#: builtin/notes.c:507
 msgid "too few parameters"
 msgstr "pas assez de paramètres"
 
-#: builtin/notes.c:525
+#: builtin/notes.c:528
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -10886,12 +11005,12 @@ msgstr ""
 "Impossible de copier des notes. Des notes ont été trouvées pour l'objet %s. "
 "Utilisez '-f' pour écraser les notes existantes"
 
-#: builtin/notes.c:537
+#: builtin/notes.c:540
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "notes manquantes sur l'objet source %s. Impossible de copier."
 
-#: builtin/notes.c:589
+#: builtin/notes.c:592
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -10900,52 +11019,52 @@ msgstr ""
 "Les options -m/-F/-c/-C sont obsolètes pour la sous-commande 'edit'.\n"
 "Veuillez utiliser 'git notes add -f -m/-F/-c/-C' à la place.\n"
 
-#: builtin/notes.c:684
+#: builtin/notes.c:687
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "échec de la suppression de la référence NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:686
+#: builtin/notes.c:689
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "échec de la suppression de la référence NOTES_MERGE_REF"
 
-#: builtin/notes.c:688
+#: builtin/notes.c:691
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "échec de la suppression de la copie de travail 'git notes merge'"
 
-#: builtin/notes.c:708
+#: builtin/notes.c:711
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "échec de la lecture de la référence NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:710
+#: builtin/notes.c:713
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "impossible de trouver le commit de NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:712
+#: builtin/notes.c:715
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "impossible d'analyser le commit de NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:725
+#: builtin/notes.c:728
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "échec de la résolution de NOTES_MERGE_REF"
 
-#: builtin/notes.c:728
+#: builtin/notes.c:731
 msgid "failed to finalize notes merge"
 msgstr "impossible de finaliser la fusion de notes"
 
-#: builtin/notes.c:754
+#: builtin/notes.c:757
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "stratégie de fusion de notes inconnue %s"
 
-#: builtin/notes.c:770
+#: builtin/notes.c:773
 msgid "General options"
 msgstr "Options générales"
 
-#: builtin/notes.c:772
+#: builtin/notes.c:775
 msgid "Merge options"
 msgstr "Options de fusion"
 
-#: builtin/notes.c:774
+#: builtin/notes.c:777
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -10953,47 +11072,47 @@ msgstr ""
 "résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/"
 "theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:776
+#: builtin/notes.c:779
 msgid "Committing unmerged notes"
 msgstr "Validation des notes non fusionnées"
 
-#: builtin/notes.c:778
+#: builtin/notes.c:781
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "finaliser la fusion de notes en validant les notes non fusionnées"
 
-#: builtin/notes.c:780
+#: builtin/notes.c:783
 msgid "Aborting notes merge resolution"
 msgstr "Abandon de la résolution de fusion des notes"
 
-#: builtin/notes.c:782
+#: builtin/notes.c:785
 msgid "abort notes merge"
 msgstr "abandonner la fusion de notes"
 
-#: builtin/notes.c:793
+#: builtin/notes.c:796
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "--commit, --abort et -s/--strategy sont mutuellement incompatibles"
 
-#: builtin/notes.c:798
+#: builtin/notes.c:801
 msgid "must specify a notes ref to merge"
 msgstr "vous devez spécifier une référence de notes à fusionner"
 
-#: builtin/notes.c:822
+#: builtin/notes.c:825
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "-s/--strategy inconnu : %s"
 
-#: builtin/notes.c:859
+#: builtin/notes.c:862
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "une fusion de notes dans %s est déjà en cours avec %s"
 
-#: builtin/notes.c:862
+#: builtin/notes.c:865
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr ""
 "impossible de stocker le lien vers la référence actuelle aux notes (%s)"
 
-#: builtin/notes.c:864
+#: builtin/notes.c:867
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -11004,235 +11123,235 @@ msgstr ""
 "valide le résultat avec 'git notes merges --commit', ou abandonnez la fusion "
 "avec 'git notes merge --abort'.\n"
 
-#: builtin/notes.c:886
+#: builtin/notes.c:889
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "L'objet %s n'a pas de note\n"
 
-#: builtin/notes.c:898
+#: builtin/notes.c:901
 msgid "attempt to remove non-existent note is not an error"
 msgstr ""
 "la tentative de suppression d'une note non existante n'est pas une erreur"
 
-#: builtin/notes.c:901
+#: builtin/notes.c:904
 msgid "read object names from the standard input"
 msgstr "lire les noms d'objet depuis l'entrée standard"
 
-#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
 msgid "do not remove, show only"
 msgstr "ne pas supprimer, afficher seulement"
 
-#: builtin/notes.c:940
+#: builtin/notes.c:943
 msgid "report pruned notes"
 msgstr "afficher les notes éliminées"
 
-#: builtin/notes.c:982
+#: builtin/notes.c:985
 msgid "notes-ref"
 msgstr "références-notes"
 
-#: builtin/notes.c:983
+#: builtin/notes.c:986
 msgid "use notes from <notes-ref>"
 msgstr "utiliser les notes depuis <références-notes>"
 
-#: builtin/notes.c:1018
+#: builtin/notes.c:1021
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "sous-commande inconnue : %s"
 
-#: builtin/pack-objects.c:29
+#: builtin/pack-objects.c:30
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [options...] [< <liste-références> | < <liste-"
 "objets>]"
 
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:31
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [options...] base-name [< <liste-références> | < <liste-"
 "objets>]"
 
-#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
+#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
 #, c-format
 msgid "deflate error (%d)"
 msgstr "erreur de compression (%d)"
 
-#: builtin/pack-objects.c:770
+#: builtin/pack-objects.c:776
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "désactivation de l'écriture en bitmap, les fichiers paquets sont scindés à "
 "cause de pack.packSizeLimit"
 
-#: builtin/pack-objects.c:783
+#: builtin/pack-objects.c:789
 msgid "Writing objects"
 msgstr "Écriture des objets"
 
-#: builtin/pack-objects.c:1063
+#: builtin/pack-objects.c:1069
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 "désactivation de l'écriture en bitmap car certains objets ne sont pas "
 "compressés"
 
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2434
 msgid "Compressing objects"
 msgstr "Compression des objets"
 
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2843
 #, c-format
 msgid "unsupported index version %s"
 msgstr "version d'index non supportée %s"
 
-#: builtin/pack-objects.c:2833
+#: builtin/pack-objects.c:2847
 #, c-format
 msgid "bad index version '%s'"
 msgstr "mauvaise version d'index '%s'"
 
-#: builtin/pack-objects.c:2863
+#: builtin/pack-objects.c:2877
 msgid "do not show progress meter"
 msgstr "ne pas afficher la barre de progression"
 
-#: builtin/pack-objects.c:2865
+#: builtin/pack-objects.c:2879
 msgid "show progress meter"
 msgstr "afficher la barre de progression"
 
-#: builtin/pack-objects.c:2867
+#: builtin/pack-objects.c:2881
 msgid "show progress meter during object writing phase"
 msgstr "afficher la barre de progression durant la phase d'écrite des objets"
 
-#: builtin/pack-objects.c:2870
+#: builtin/pack-objects.c:2884
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "similaire à --all-progress quand la barre de progression est affichée"
 
-#: builtin/pack-objects.c:2871
+#: builtin/pack-objects.c:2885
 msgid "version[,offset]"
 msgstr "version[,offset]"
 
-#: builtin/pack-objects.c:2872
+#: builtin/pack-objects.c:2886
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "écrire le fichier d'index du paquet dans le format d'index de version "
 "spécifié"
 
-#: builtin/pack-objects.c:2875
+#: builtin/pack-objects.c:2889
 msgid "maximum size of each output pack file"
 msgstr "taille maximum de chaque fichier paquet en sortie"
 
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2891
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignorer les objets empruntés à un autre magasin d'objets"
 
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2893
 msgid "ignore packed objects"
 msgstr "ignorer les objets empaquetés"
 
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2895
 msgid "limit pack window by objects"
 msgstr "limiter la fenêtre d'empaquetage par objets"
 
-#: builtin/pack-objects.c:2883
+#: builtin/pack-objects.c:2897
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets"
 
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2899
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 "longueur maximum de la chaîne de delta autorisée dans le paquet résultant"
 
-#: builtin/pack-objects.c:2887
+#: builtin/pack-objects.c:2901
 msgid "reuse existing deltas"
 msgstr "réutiliser les deltas existants"
 
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2903
 msgid "reuse existing objects"
 msgstr "réutiliser les objets existants"
 
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2905
 msgid "use OFS_DELTA objects"
 msgstr "utiliser les objets OFS_DELTA"
 
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2907
 msgid "use threads when searching for best delta matches"
 msgstr ""
 "utiliser des fils lors de la recherche pour une meilleurs correspondance des "
 "deltas"
 
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2909
 msgid "do not create an empty pack output"
 msgstr "ne pas créer un paquet vide"
 
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2911
 msgid "read revision arguments from standard input"
 msgstr "lire les paramètres de révision depuis l'entrée standard"
 
-#: builtin/pack-objects.c:2899
+#: builtin/pack-objects.c:2913
 msgid "limit the objects to those that are not yet packed"
 msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés"
 
-#: builtin/pack-objects.c:2902
+#: builtin/pack-objects.c:2916
 msgid "include objects reachable from any reference"
 msgstr "inclure les objets accessibles depuis toute référence"
 
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2919
 msgid "include objects referred by reflog entries"
 msgstr "inclure les objets référencés par les éléments de reflog"
 
-#: builtin/pack-objects.c:2908
+#: builtin/pack-objects.c:2922
 msgid "include objects referred to by the index"
 msgstr "inclure les objets référencés par l'index"
 
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2925
 msgid "output pack to stdout"
 msgstr "afficher l'empaquetage sur la sortie standard"
 
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2927
 msgid "include tag objects that refer to objects to be packed"
 msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter"
 
-#: builtin/pack-objects.c:2915
+#: builtin/pack-objects.c:2929
 msgid "keep unreachable objects"
 msgstr "garder les objets inaccessibles"
 
-#: builtin/pack-objects.c:2917
+#: builtin/pack-objects.c:2931
 msgid "pack loose unreachable objects"
 msgstr "empaqueter les objets inaccessibles détachés"
 
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2933
 msgid "unpack unreachable objects newer than <time>"
 msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"
 
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:2936
 msgid "create thin packs"
 msgstr "créer des paquets légers"
 
-#: builtin/pack-objects.c:2924
+#: builtin/pack-objects.c:2938
 msgid "create packs suitable for shallow fetches"
 msgstr "créer des paquets permettant des récupérations superficielles"
 
-#: builtin/pack-objects.c:2926
+#: builtin/pack-objects.c:2940
 msgid "ignore packs that have companion .keep file"
 msgstr "ignorer les paquets qui ont un fichier .keep"
 
-#: builtin/pack-objects.c:2928
+#: builtin/pack-objects.c:2942
 msgid "pack compression level"
 msgstr "niveau de compression du paquet"
 
-#: builtin/pack-objects.c:2930
+#: builtin/pack-objects.c:2944
 msgid "do not hide commits by grafts"
 msgstr "ne pas cacher les validations par greffes"
 
-#: builtin/pack-objects.c:2932
+#: builtin/pack-objects.c:2946
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "utiliser un index en bitmap si disponible pour accélerer le décompte des "
 "objets"
 
-#: builtin/pack-objects.c:2934
+#: builtin/pack-objects.c:2948
 msgid "write a bitmap index together with the pack index"
 msgstr "écrire un index en bitmap associé à l'index de paquet"
 
-#: builtin/pack-objects.c:3061
+#: builtin/pack-objects.c:3075
 msgid "Counting objects"
 msgstr "Décompte des objets"
 
@@ -11272,45 +11391,49 @@ msgstr "faire expirer les objets plus vieux que <heure>"
 msgid "cannot prune in a precious-objects repo"
 msgstr "impossible de nettoyer dans un dépôt d'objets précieux"
 
-#: builtin/pull.c:51 builtin/pull.c:53
+#: builtin/pull.c:54 builtin/pull.c:56
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "Valeur invalide pour %s : %s"
 
-#: builtin/pull.c:73
+#: builtin/pull.c:76
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]"
 
-#: builtin/pull.c:121
+#: builtin/pull.c:124
+msgid "control for recursive fetching of submodules"
+msgstr "contrôler la récupération récursive dans les sous-modules"
+
+#: builtin/pull.c:128
 msgid "Options related to merging"
 msgstr "Options relatives à la fusion"
 
-#: builtin/pull.c:124
+#: builtin/pull.c:131
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant"
 
-#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120
+#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
 msgid "allow fast-forward"
 msgstr "autoriser l'avance rapide"
 
-#: builtin/pull.c:157
+#: builtin/pull.c:164
 msgid "automatically stash/stash pop before and after rebase"
 msgstr "remiser avant et réappliquer après le rebasage automatiquement"
 
-#: builtin/pull.c:173
+#: builtin/pull.c:180
 msgid "Options related to fetching"
 msgstr "Options relatives au rapatriement"
 
-#: builtin/pull.c:195
+#: builtin/pull.c:198
 msgid "number of submodules pulled in parallel"
 msgstr "nombre de sous-modules tirés en parallèle"
 
-#: builtin/pull.c:284
+#: builtin/pull.c:287
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Valeur invalide pour pull.ff : %s"
 
-#: builtin/pull.c:397
+#: builtin/pull.c:399
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -11318,14 +11441,14 @@ msgstr ""
 "Il n'y a pas de candidate sur laquelle rebaser parmi les références que vous "
 "venez de récupérer."
 
-#: builtin/pull.c:399
+#: builtin/pull.c:401
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "Il n'y a pas de candidate avec laquelle fusionner parmi les références que "
 "vous venez de récupérer."
 
-#: builtin/pull.c:400
+#: builtin/pull.c:402
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -11333,7 +11456,7 @@ msgstr ""
 "Généralement, cela signifie que vous avez indiqué un spécificateur\n"
 "de référence joker qui n'a pas eu de correspondance sur le serveur distant."
 
-#: builtin/pull.c:403
+#: builtin/pull.c:405
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -11345,44 +11468,44 @@ msgstr ""
 "configuration\n"
 "pour la branche actuelle, vous devez spécifier la branche avec la commande."
 
-#: builtin/pull.c:408 git-parse-remote.sh:73
+#: builtin/pull.c:410 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Vous n'êtes actuellement sur aucune branche."
 
-#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
+#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser."
 
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
+#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "Veuillez spécifier une branche avec laquelle fusionner."
 
-#: builtin/pull.c:413 builtin/pull.c:428
+#: builtin/pull.c:415 builtin/pull.c:430
 msgid "See git-pull(1) for details."
 msgstr "Référez-vous à git-pull(1) pour de plus amples détails."
 
-#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
+#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
 #: git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<distant>"
 
-#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456
+#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<branche>"
 
-#: builtin/pull.c:423 git-parse-remote.sh:75
+#: builtin/pull.c:425 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "Pas d'information de suivi distant pour la branche actuelle."
 
-#: builtin/pull.c:432 git-parse-remote.sh:95
+#: builtin/pull.c:434 git-parse-remote.sh:95
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
 "Si vous souhaitez indiquer l'information de suivi distant pour cette "
 "branche, vous pouvez le faire avec :"
 
-#: builtin/pull.c:437
+#: builtin/pull.c:439
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -11392,29 +11515,29 @@ msgstr ""
 "'%s'\n"
 "du serveur distant, mais cette référence n'a pas été récupérée."
 
-#: builtin/pull.c:754
+#: builtin/pull.c:792
 msgid "ignoring --verify-signatures for rebase"
 msgstr "--verify-signatures est ignoré pour un rebasage"
 
-#: builtin/pull.c:801
+#: builtin/pull.c:840
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase."
 
-#: builtin/pull.c:809
+#: builtin/pull.c:848
 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 "Mise à jour d'une branche non encore créée avec les changements ajoutés dans "
 "l'index."
 
-#: builtin/pull.c:812
+#: builtin/pull.c:851
 msgid "pull with rebase"
 msgstr "tirer avec un rebasage"
 
-#: builtin/pull.c:813
+#: builtin/pull.c:852
 msgid "please commit or stash them."
 msgstr "veuillez les valider ou les remiser."
 
-#: builtin/pull.c:838
+#: builtin/pull.c:877
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -11425,7 +11548,7 @@ msgstr ""
 "avance rapide de votre copie de travail\n"
 "depuis le commit %s."
 
-#: builtin/pull.c:843
+#: builtin/pull.c:882
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -11442,27 +11565,33 @@ msgstr ""
 "$ git reset --hard\n"
 "pour régénérer."
 
-#: builtin/pull.c:858
+#: builtin/pull.c:897
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Impossible de fusionner de multiples branches sur une tête vide."
 
-#: builtin/pull.c:862
+#: builtin/pull.c:901
 msgid "Cannot rebase onto multiple branches."
 msgstr "Impossible de rebaser sur de multiples branches."
 
-#: builtin/push.c:16
+#: builtin/pull.c:908
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr ""
+"impossible de rebaser avec des modifications de sous-modules enregistrées "
+"localement"
+
+#: builtin/push.c:17
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [<options>] [<dépôt> [<spécification-de-référence>...]]"
 
-#: builtin/push.c:89
+#: builtin/push.c:90
 msgid "tag shorthand without <tag>"
 msgstr "raccourci d'étiquette sans <étiquette>"
 
-#: builtin/push.c:99
+#: builtin/push.c:100
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete accepte seulement des noms entiers de références cibles"
 
-#: builtin/push.c:143
+#: builtin/push.c:144
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
@@ -11471,7 +11600,7 @@ msgstr ""
 "Pour choisir l'option de manière permanente, voir push.default dans 'git "
 "help config'."
 
-#: builtin/push.c:146
+#: builtin/push.c:147
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -11496,7 +11625,7 @@ msgstr ""
 "    git push %s %s\n"
 "%s"
 
-#: builtin/push.c:161
+#: builtin/push.c:162
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -11511,7 +11640,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<nom-de-la-branche-amont>\n"
 
-#: builtin/push.c:175
+#: builtin/push.c:176
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -11525,13 +11654,13 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:183
+#: builtin/push.c:184
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr ""
 "La branche courante %s a de multiples branches amont, impossible de pousser."
 
-#: builtin/push.c:186
+#: builtin/push.c:187
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -11542,14 +11671,14 @@ msgstr ""
 "pas une branche amont de votre branche courante '%s', sans me dire\n"
 "quoi pousser pour mettre à jour quelle branche amont."
 
-#: builtin/push.c:245
+#: builtin/push.c:246
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 "Vous n'avez pas spécifié de spécifications de référence à pousser, et push."
 "default est \"nothing\"."
 
-#: builtin/push.c:252
+#: builtin/push.c:253
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -11564,7 +11693,7 @@ msgstr ""
 "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
 "d'information."
 
-#: builtin/push.c:258
+#: builtin/push.c:259
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -11579,7 +11708,7 @@ msgstr ""
 "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
 "d'information."
 
-#: builtin/push.c:264
+#: builtin/push.c:265
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -11597,13 +11726,13 @@ msgstr ""
 "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
 "d'information."
 
-#: builtin/push.c:271
+#: builtin/push.c:272
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 "Les mises à jour ont été rejetées car l'étiquette existe déjà dans la "
 "branche distante."
 
-#: builtin/push.c:274
+#: builtin/push.c:275
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -11615,22 +11744,22 @@ msgstr ""
 "pointer\n"
 "vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n"
 
-#: builtin/push.c:334
+#: builtin/push.c:335
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Poussée vers %s\n"
 
-#: builtin/push.c:338
+#: builtin/push.c:339
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "impossible de pousser des références vers '%s'"
 
-#: builtin/push.c:369
+#: builtin/push.c:370
 #, c-format
 msgid "bad repository '%s'"
 msgstr "mauvais dépôt '%s'"
 
-#: builtin/push.c:370
+#: builtin/push.c:371
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -11652,113 +11781,113 @@ msgstr ""
 "\n"
 "    git push <nom>\n"
 
-#: builtin/push.c:388
+#: builtin/push.c:389
 msgid "--all and --tags are incompatible"
 msgstr "--all et --tags sont incompatibles"
 
-#: builtin/push.c:389
+#: builtin/push.c:390
 msgid "--all can't be combined with refspecs"
 msgstr "--all ne peut pas être combiné avec des spécifications de référence"
 
-#: builtin/push.c:394
+#: builtin/push.c:395
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror et --tags sont incompatibles"
 
-#: builtin/push.c:395
+#: builtin/push.c:396
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror ne peut pas être combiné avec des spécifications de référence"
 
-#: builtin/push.c:400
+#: builtin/push.c:401
 msgid "--all and --mirror are incompatible"
 msgstr "--all et --mirror sont incompatibles"
 
-#: builtin/push.c:518
+#: builtin/push.c:523
 msgid "repository"
 msgstr "dépôt"
 
-#: builtin/push.c:519 builtin/send-pack.c:162
+#: builtin/push.c:524 builtin/send-pack.c:163
 msgid "push all refs"
 msgstr "pousser toutes les références"
 
-#: builtin/push.c:520 builtin/send-pack.c:164
+#: builtin/push.c:525 builtin/send-pack.c:165
 msgid "mirror all refs"
 msgstr "refléter toutes les références"
 
-#: builtin/push.c:522
+#: builtin/push.c:527
 msgid "delete refs"
 msgstr "supprimer les références"
 
-#: builtin/push.c:523
+#: builtin/push.c:528
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr ""
 "pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)"
 
-#: builtin/push.c:526 builtin/send-pack.c:165
+#: builtin/push.c:531 builtin/send-pack.c:166
 msgid "force updates"
 msgstr "forcer les mises à jour"
 
-#: builtin/push.c:528 builtin/send-pack.c:179
+#: builtin/push.c:533 builtin/send-pack.c:180
 msgid "refname>:<expect"
 msgstr "nom de référence>:<attendu"
 
-#: builtin/push.c:529 builtin/send-pack.c:180
+#: builtin/push.c:534 builtin/send-pack.c:181
 msgid "require old value of ref to be at this value"
 msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur"
 
-#: builtin/push.c:532
+#: builtin/push.c:537
 msgid "control recursive pushing of submodules"
 msgstr "contrôler la poussée récursive des sous-modules"
 
-#: builtin/push.c:534 builtin/send-pack.c:173
+#: builtin/push.c:539 builtin/send-pack.c:174
 msgid "use thin pack"
 msgstr "utiliser un empaquetage léger"
 
-#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159
-#: builtin/send-pack.c:160
+#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
+#: builtin/send-pack.c:161
 msgid "receive pack program"
 msgstr "recevoir le programme d'empaquetage"
 
-#: builtin/push.c:537
+#: builtin/push.c:542
 msgid "set upstream for git pull/status"
 msgstr "définir la branche amont pour git pull/status"
 
-#: builtin/push.c:540
+#: builtin/push.c:545
 msgid "prune locally removed refs"
 msgstr "éliminer les références locales supprimées"
 
-#: builtin/push.c:542
+#: builtin/push.c:547
 msgid "bypass pre-push hook"
 msgstr "éviter d'utiliser le crochet pre-push"
 
-#: builtin/push.c:543
+#: builtin/push.c:548
 msgid "push missing but relevant tags"
 msgstr "pousser les étiquettes manquantes mais pertinentes"
 
-#: builtin/push.c:546 builtin/send-pack.c:167
+#: builtin/push.c:551 builtin/send-pack.c:168
 msgid "GPG sign the push"
 msgstr "signer la poussée avec GPG"
 
-#: builtin/push.c:548 builtin/send-pack.c:174
+#: builtin/push.c:553 builtin/send-pack.c:175
 msgid "request atomic transaction on remote side"
 msgstr "demande une transaction atomique sur le serveur distant"
 
-#: builtin/push.c:549 builtin/send-pack.c:170
+#: builtin/push.c:554 builtin/send-pack.c:171
 msgid "server-specific"
 msgstr "spécifique au serveur"
 
-#: builtin/push.c:549 builtin/send-pack.c:171
+#: builtin/push.c:554 builtin/send-pack.c:172
 msgid "option to transmit"
 msgstr "option à transmettre"
 
-#: builtin/push.c:563
+#: builtin/push.c:568
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete est incompatible avec --all, --mirror et --tags"
 
-#: builtin/push.c:565
+#: builtin/push.c:570
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete n'a pas de sens sans aucune référence"
 
-#: builtin/push.c:584
+#: builtin/push.c:589
 msgid "push options must not have new line characters"
 msgstr ""
 "les options de poussée ne peuvent pas contenir de caractères de nouvelle "
@@ -11775,87 +11904,87 @@ msgstr ""
 "sparse-checkout] [--index-output=<fichier>] (--empty | <arbre ou apparenté "
 "1> [<arbre ou apparenté 2> [<arbre ou apparenté 3>]])"
 
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:121
 msgid "write resulting index to <file>"
 msgstr "écrire l'index résultant dans <fichier>"
 
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:124
 msgid "only empty the index"
 msgstr "juste vider l'index"
 
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:126
 msgid "Merging"
 msgstr "Fusion"
 
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:128
 msgid "perform a merge in addition to a read"
 msgstr "effectuer une fusion en plus d'une lecture"
 
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:130
 msgid "3-way merge if no file level merging required"
 msgstr "fusion à 3 points si aucune fusion de niveau fichier n'est requise"
 
-#: builtin/read-tree.c:141
+#: builtin/read-tree.c:132
 msgid "3-way merge in presence of adds and removes"
 msgstr "fusion à 3 points en présence d'ajouts et suppressions"
 
-#: builtin/read-tree.c:143
+#: builtin/read-tree.c:134
 msgid "same as -m, but discard unmerged entries"
 msgstr "comme -m, mais annule les éléments non fusionnés"
 
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:135
 msgid "<subdirectory>/"
 msgstr "<sous-répertoire>/"
 
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:136
 msgid "read the tree into the index under <subdirectory>/"
 msgstr "lire l'arbre dans l'index dans <sous-répertoire>/"
 
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:139
 msgid "update working tree with merge result"
 msgstr "mettre à jour la copie de travail avec le résultat de la fusion"
 
-#: builtin/read-tree.c:150
+#: builtin/read-tree.c:141
 msgid "gitignore"
 msgstr "gitignore"
 
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:142
 msgid "allow explicitly ignored files to be overwritten"
 msgstr "autoriser explicitement les fichiers ignorés à être écrasés"
 
-#: builtin/read-tree.c:154
+#: builtin/read-tree.c:145
 msgid "don't check the working tree after merging"
 msgstr "ne pas vérifier la copie de travail après la fusion"
 
-#: builtin/read-tree.c:155
+#: builtin/read-tree.c:146
 msgid "don't update the index or the work tree"
 msgstr "ne pas mettre à jour l'index ou la copie de travail"
 
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:148
 msgid "skip applying sparse checkout filter"
 msgstr "sauter l'application du filtre d'extraction creuse"
 
-#: builtin/read-tree.c:159
+#: builtin/read-tree.c:150
 msgid "debug unpack-trees"
 msgstr "déboguer unpack-trees"
 
-#: builtin/rebase--helper.c:7
+#: builtin/rebase--helper.c:8
 msgid "git rebase--helper [<options>]"
 msgstr "git rebase-helper [<options>]"
 
-#: builtin/rebase--helper.c:19
+#: builtin/rebase--helper.c:20
 msgid "continue rebase"
 msgstr "continuer le rebasage"
 
-#: builtin/rebase--helper.c:21
+#: builtin/rebase--helper.c:22
 msgid "abort rebase"
 msgstr "abandonner le rebasage"
 
-#: builtin/receive-pack.c:27
+#: builtin/receive-pack.c:28
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <répertoire-git>"
 
-#: builtin/receive-pack.c:795
+#: builtin/receive-pack.c:838
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -11885,7 +12014,7 @@ msgstr ""
 "Pour éliminer ce message et conserver le comportement par défaut,\n"
 "réglez « receive.denyCurrentBranch » à 'refuse'."
 
-#: builtin/receive-pack.c:815
+#: builtin/receive-pack.c:858
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -11905,29 +12034,29 @@ msgstr ""
 "\n"
 "Pour éliminer ce message, réglez-le à 'refuse'."
 
-#: builtin/receive-pack.c:1888
+#: builtin/receive-pack.c:1933
 msgid "quiet"
 msgstr "quiet"
 
-#: builtin/receive-pack.c:1902
+#: builtin/receive-pack.c:1947
 msgid "You must specify a directory."
 msgstr "Vous devez spécifier un répertoire."
 
-#: builtin/reflog.c:423
+#: builtin/reflog.c:424
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "'%s' pour '%s' n'est pas un horodatage valide"
 
-#: builtin/reflog.c:540 builtin/reflog.c:545
+#: builtin/reflog.c:541 builtin/reflog.c:546
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' n'est pas un horodatage valide"
 
-#: builtin/remote.c:12
+#: builtin/remote.c:13
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
-#: builtin/remote.c:13
+#: builtin/remote.c:14
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -11935,83 +12064,83 @@ msgstr ""
 "git remote add [-t <branche>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <nom> <url>"
 
-#: builtin/remote.c:14 builtin/remote.c:34
+#: builtin/remote.c:15 builtin/remote.c:35
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename <ancienne> <nouvelle>"
 
-#: builtin/remote.c:15 builtin/remote.c:39
+#: builtin/remote.c:16 builtin/remote.c:40
 msgid "git remote remove <name>"
 msgstr "git remote remove <nom>"
 
-#: builtin/remote.c:16 builtin/remote.c:44
+#: builtin/remote.c:17 builtin/remote.c:45
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branche>)"
 
-#: builtin/remote.c:17
+#: builtin/remote.c:18
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <nom>"
 
-#: builtin/remote.c:18
+#: builtin/remote.c:19
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <nom>"
 
-#: builtin/remote.c:19
+#: builtin/remote.c:20
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<groupe> | "
 "<distante>)...]"
 
-#: builtin/remote.c:20
+#: builtin/remote.c:21
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <nom> <branche>..."
 
-#: builtin/remote.c:21 builtin/remote.c:70
+#: builtin/remote.c:22 builtin/remote.c:71
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <nom>"
 
-#: builtin/remote.c:22 builtin/remote.c:75
+#: builtin/remote.c:23 builtin/remote.c:76
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <nom> <nouvelle-URL> [<ancienne-URL>]"
 
-#: builtin/remote.c:23 builtin/remote.c:76
+#: builtin/remote.c:24 builtin/remote.c:77
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <nom> <nouvelle-URL>"
 
-#: builtin/remote.c:24 builtin/remote.c:77
+#: builtin/remote.c:25 builtin/remote.c:78
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <nom> <URL>"
 
-#: builtin/remote.c:29
+#: builtin/remote.c:30
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<options>] <nom> <URL>"
 
-#: builtin/remote.c:49
+#: builtin/remote.c:50
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <nom> <branche>..."
 
-#: builtin/remote.c:50
+#: builtin/remote.c:51
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <nom> <branche>..."
 
-#: builtin/remote.c:55
+#: builtin/remote.c:56
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<options>] <nom>"
 
-#: builtin/remote.c:60
+#: builtin/remote.c:61
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<options>] <nom>"
 
-#: builtin/remote.c:65
+#: builtin/remote.c:66
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<options>] [<groupe> | <distante>]..."
 
-#: builtin/remote.c:94
+#: builtin/remote.c:95
 #, c-format
 msgid "Updating %s"
 msgstr "Mise à jour de %s"
 
-#: builtin/remote.c:126
+#: builtin/remote.c:127
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -12019,92 +12148,92 @@ msgstr ""
 "--mirror est dangereux et obsolète ; merci\n"
 "\t d'utiliser --mirror=fetch ou --mirror=push à la place"
 
-#: builtin/remote.c:143
+#: builtin/remote.c:144
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "argument miroir inconnu : %s"
 
-#: builtin/remote.c:159
+#: builtin/remote.c:160
 msgid "fetch the remote branches"
 msgstr "rapatrier les branches distantes"
 
-#: builtin/remote.c:161
+#: builtin/remote.c:162
 msgid "import all tags and associated objects when fetching"
 msgstr ""
 "importer toutes les étiquettes et les objets associés lors du rapatriement"
 
-#: builtin/remote.c:164
+#: builtin/remote.c:165
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "ou ne rapatrier aucune étiquette (--no-tags)"
 
-#: builtin/remote.c:166
+#: builtin/remote.c:167
 msgid "branch(es) to track"
 msgstr "branche(s) à suivre"
 
-#: builtin/remote.c:167
+#: builtin/remote.c:168
 msgid "master branch"
 msgstr "branche maîtresse"
 
-#: builtin/remote.c:168
+#: builtin/remote.c:169
 msgid "push|fetch"
 msgstr "push|fetch"
 
-#: builtin/remote.c:169
+#: builtin/remote.c:170
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr ""
 "paramétrer la distante comme miroir pour pousser ou pour rapatrier depuis"
 
-#: builtin/remote.c:181
+#: builtin/remote.c:182
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "spécifier une branche maîtresse n'a pas de sens avec --mirror"
 
-#: builtin/remote.c:183
+#: builtin/remote.c:184
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr ""
 "spécifier les branches à suivre n'a de sens qu'avec des miroirs de "
 "rapatriement"
 
-#: builtin/remote.c:190 builtin/remote.c:629
+#: builtin/remote.c:191 builtin/remote.c:630
 #, c-format
 msgid "remote %s already exists."
 msgstr "la distante %s existe déjà."
 
-#: builtin/remote.c:194 builtin/remote.c:633
+#: builtin/remote.c:195 builtin/remote.c:634
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' n'est pas un nom valide de distante"
 
-#: builtin/remote.c:234
+#: builtin/remote.c:235
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "Impossible de paramétrer la maîtresse '%s'"
 
-#: builtin/remote.c:336
+#: builtin/remote.c:337
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr ""
 "Impossible d'obtenir une correspondance distante pour la spécification de "
 "référence %s"
 
-#: builtin/remote.c:437 builtin/remote.c:445
+#: builtin/remote.c:438 builtin/remote.c:446
 msgid "(matching)"
 msgstr "(correspond)"
 
-#: builtin/remote.c:449
+#: builtin/remote.c:450
 msgid "(delete)"
 msgstr "(supprimer)"
 
-#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856
+#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
 #, c-format
 msgid "No such remote: %s"
 msgstr "Distante inconnue : %s"
 
-#: builtin/remote.c:639
+#: builtin/remote.c:640
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Impossible de renommer la section de configuration '%s' en '%s'"
 
-#: builtin/remote.c:659
+#: builtin/remote.c:660
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -12115,17 +12244,17 @@ msgstr ""
 "\t%s\n"
 "\tVeuillez mettre à jour la configuration manuellement si nécessaire."
 
-#: builtin/remote.c:695
+#: builtin/remote.c:696
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "échec de suppression de '%s'"
 
-#: builtin/remote.c:729
+#: builtin/remote.c:730
 #, c-format
 msgid "creating '%s' failed"
 msgstr "échec de création de '%s'"
 
-#: builtin/remote.c:794
+#: builtin/remote.c:795
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -12140,137 +12269,139 @@ msgstr[1] ""
 "supprimées ;\n"
 "pour les supprimer, utilisez :"
 
-#: builtin/remote.c:808
+#: builtin/remote.c:809
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Impossible de supprimer la section de configuration '%s'"
 
-#: builtin/remote.c:909
+#: builtin/remote.c:910
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)"
 
-#: builtin/remote.c:912
+#: builtin/remote.c:913
 msgid " tracked"
 msgstr " suivi"
 
-#: builtin/remote.c:914
+#: builtin/remote.c:915
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " dépassé (utilisez 'git remote prune' pour supprimer)"
 
-#: builtin/remote.c:916
+#: builtin/remote.c:917
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:957
+#: builtin/remote.c:958
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "branch.%s.merge invalide ; ne peut pas rebaser sur plus d'une branche"
 
-#: builtin/remote.c:965
+#: builtin/remote.c:966
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "rebase de manière interactive sur la distante %s"
 
-#: builtin/remote.c:966
+#: builtin/remote.c:967
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "rebase sur la distante %s"
 
-#: builtin/remote.c:969
+#: builtin/remote.c:970
 #, c-format
 msgid " merges with remote %s"
 msgstr " fusionne avec la distante %s"
 
-#: builtin/remote.c:972
+#: builtin/remote.c:973
 #, c-format
 msgid "merges with remote %s"
 msgstr "fusionne avec la distante %s"
 
-#: builtin/remote.c:975
+#: builtin/remote.c:976
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    et avec la distante %s\n"
 
-#: builtin/remote.c:1018
+#: builtin/remote.c:1019
 msgid "create"
 msgstr "créer"
 
-#: builtin/remote.c:1021
+#: builtin/remote.c:1022
 msgid "delete"
 msgstr "supprimer"
 
-#: builtin/remote.c:1025
+#: builtin/remote.c:1026
 msgid "up to date"
 msgstr "à jour"
 
-#: builtin/remote.c:1028
+#: builtin/remote.c:1029
 msgid "fast-forwardable"
 msgstr "peut être mis à jour en avance rapide"
 
-#: builtin/remote.c:1031
+#: builtin/remote.c:1032
 msgid "local out of date"
 msgstr "le local n'est pas à jour"
 
-#: builtin/remote.c:1038
+#: builtin/remote.c:1039
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s force vers %-*s (%s)"
 
-#: builtin/remote.c:1041
+#: builtin/remote.c:1042
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s pousse vers %-*s (%s)"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1046
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s force vers %s"
 
-#: builtin/remote.c:1048
+#: builtin/remote.c:1049
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s pousse vers %s"
 
-#: builtin/remote.c:1116
+#: builtin/remote.c:1117
 msgid "do not query remotes"
 msgstr "ne pas interroger les distantes"
 
-#: builtin/remote.c:1143
+#: builtin/remote.c:1144
 #, c-format
 msgid "* remote %s"
 msgstr "* distante %s"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL de rapatriement : %s"
 
-#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297
+#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
 msgid "(no URL)"
 msgstr "(pas d'URL)"
 
-#. TRANSLATORS: the colon ':' should align with
-#. the one in "  Fetch URL: %s" translation
-#: builtin/remote.c:1156 builtin/remote.c:1158
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#: builtin/remote.c:1160 builtin/remote.c:1162
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL push : %s"
 
-#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164
+#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Branche HEAD : %s"
 
-#: builtin/remote.c:1160
+#: builtin/remote.c:1164
 msgid "(not queried)"
 msgstr "(non demandé)"
 
-#: builtin/remote.c:1162
+#: builtin/remote.c:1166
 msgid "(unknown)"
 msgstr "(inconnu)"
 
-#: builtin/remote.c:1166
+#: builtin/remote.c:1170
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -12278,171 +12409,171 @@ msgstr ""
 "  Branche HEAD (la HEAD distante est ambiguë, peut être l'une des "
 "suivantes) :\n"
 
-#: builtin/remote.c:1178
+#: builtin/remote.c:1182
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Branche distante :%s"
 msgstr[1] "  Branches distantes :%s"
 
-#: builtin/remote.c:1181 builtin/remote.c:1207
+#: builtin/remote.c:1185 builtin/remote.c:1211
 msgid " (status not queried)"
-msgstr " (statut non demandé)"
+msgstr " (état non demandé)"
 
-#: builtin/remote.c:1190
+#: builtin/remote.c:1194
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Branche locale configurée pour 'git pull' :"
 msgstr[1] "  Branches locales configurées pour 'git pull' :"
 
-#: builtin/remote.c:1198
+#: builtin/remote.c:1202
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Les références locales seront reflétées par 'git push'"
 
-#: builtin/remote.c:1204
+#: builtin/remote.c:1208
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Référence locale configurée pour 'git push'%s :"
 msgstr[1] "  Références locales configurées pour 'git push'%s :"
 
-#: builtin/remote.c:1225
+#: builtin/remote.c:1229
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "définir refs/remotes/<nom>/HEAD selon la distante"
 
-#: builtin/remote.c:1227
+#: builtin/remote.c:1231
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "supprimer refs/remotes/<nom>/HEAD"
 
-#: builtin/remote.c:1242
+#: builtin/remote.c:1246
 msgid "Cannot determine remote HEAD"
 msgstr "Impossible de déterminer la HEAD distante"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1248
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 "Il y a de multiples branches HEAD distantes. Veuillez en choisir une "
 "explicitement avec :"
 
-#: builtin/remote.c:1254
+#: builtin/remote.c:1258
 #, c-format
 msgid "Could not delete %s"
 msgstr "Impossible de supprimer %s"
 
-#: builtin/remote.c:1262
+#: builtin/remote.c:1266
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Référence non valide : %s"
 
-#: builtin/remote.c:1264
+#: builtin/remote.c:1268
 #, c-format
 msgid "Could not setup %s"
 msgstr "Impossible de paramétrer %s"
 
-#: builtin/remote.c:1282
+#: builtin/remote.c:1286
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s se retrouvera en suspens !"
 
-#: builtin/remote.c:1283
+#: builtin/remote.c:1287
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s se retrouve en suspens !"
 
-#: builtin/remote.c:1293
+#: builtin/remote.c:1297
 #, c-format
 msgid "Pruning %s"
 msgstr "Élimination de %s"
 
-#: builtin/remote.c:1294
+#: builtin/remote.c:1298
 #, c-format
 msgid "URL: %s"
 msgstr "URL : %s"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1314
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [serait éliminé] %s"
 
-#: builtin/remote.c:1313
+#: builtin/remote.c:1317
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [éliminé] %s"
 
-#: builtin/remote.c:1358
+#: builtin/remote.c:1362
 msgid "prune remotes after fetching"
 msgstr "éliminer les distants après le rapatriement"
 
-#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Pas de serveur remote '%s'"
 
-#: builtin/remote.c:1437
+#: builtin/remote.c:1441
 msgid "add branch"
 msgstr "ajouter une branche"
 
-#: builtin/remote.c:1444
+#: builtin/remote.c:1448
 msgid "no remote specified"
 msgstr "pas de serveur distant spécifié"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1465
 msgid "query push URLs rather than fetch URLs"
 msgstr "interroger les URLs de poussée plutôt que les URLs de récupération"
 
-#: builtin/remote.c:1463
+#: builtin/remote.c:1467
 msgid "return all URLs"
 msgstr "retourner toutes les URLs"
 
-#: builtin/remote.c:1491
+#: builtin/remote.c:1495
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "aucune URL configurée pour le dépôt distant '%s'"
 
-#: builtin/remote.c:1517
+#: builtin/remote.c:1521
 msgid "manipulate push URLs"
 msgstr "manipuler les URLs push"
 
-#: builtin/remote.c:1519
+#: builtin/remote.c:1523
 msgid "add URL"
 msgstr "ajouter une URL"
 
-#: builtin/remote.c:1521
+#: builtin/remote.c:1525
 msgid "delete URLs"
 msgstr "supprimer des URLs"
 
-#: builtin/remote.c:1528
+#: builtin/remote.c:1532
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete n'a aucun sens"
 
-#: builtin/remote.c:1569
+#: builtin/remote.c:1573
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Motif d'URL ancien invalide : %s"
 
-#: builtin/remote.c:1577
+#: builtin/remote.c:1581
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Pas d'URL trouvée : %s"
 
-#: builtin/remote.c:1579
+#: builtin/remote.c:1583
 msgid "Will not delete all non-push URLs"
 msgstr "Pas de suppression de toutes les URLs non-push"
 
-#: builtin/remote.c:1593
+#: builtin/remote.c:1597
 msgid "be verbose; must be placed before a subcommand"
 msgstr "être verbeux : doit être placé avant une sous-commande"
 
-#: builtin/remote.c:1624
+#: builtin/remote.c:1628
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Sous-commande inconnue : %s"
 
-#: builtin/repack.c:17
+#: builtin/repack.c:18
 msgid "git repack [<options>]"
 msgstr "git repack [<options>]"
 
-#: builtin/repack.c:22
+#: builtin/repack.c:23
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -12451,124 +12582,128 @@ msgstr ""
 "Utilisez\n"
 "--no-write-bitmap-index ou désactivez le paramètre pack.writebitmaps."
 
-#: builtin/repack.c:166
+#: builtin/repack.c:168
 msgid "pack everything in a single pack"
 msgstr "empaqueter tout dans un seul paquet"
 
-#: builtin/repack.c:168
+#: builtin/repack.c:170
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "identique à -a et transformer les objets inaccessibles en suspens"
 
-#: builtin/repack.c:171
+#: builtin/repack.c:173
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "supprimer les paquets redondants et lancer git-prune-packed"
 
-#: builtin/repack.c:173
+#: builtin/repack.c:175
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "passer --no-reuse-delta à git-pack-objects"
 
-#: builtin/repack.c:175
+#: builtin/repack.c:177
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "passer --no-reuse-object à git-pack-objects"
 
-#: builtin/repack.c:177
+#: builtin/repack.c:179
 msgid "do not run git-update-server-info"
 msgstr "ne pas lancer git update-server-info"
 
-#: builtin/repack.c:180
+#: builtin/repack.c:182
 msgid "pass --local to git-pack-objects"
 msgstr "passer --local à git-pack-objects"
 
-#: builtin/repack.c:182
+#: builtin/repack.c:184
 msgid "write bitmap index"
 msgstr "écrire un index en bitmap"
 
-#: builtin/repack.c:183
+#: builtin/repack.c:185
 msgid "approxidate"
 msgstr "date approximative"
 
-#: builtin/repack.c:184
+#: builtin/repack.c:186
 msgid "with -A, do not loosen objects older than this"
 msgstr "avec -A, ne pas suspendre les objets plus vieux que celui-ci"
 
-#: builtin/repack.c:186
+#: builtin/repack.c:188
 msgid "with -a, repack unreachable objects"
 msgstr "avec -a, repaquétiser les objets inaccessibles"
 
-#: builtin/repack.c:188
+#: builtin/repack.c:190
 msgid "size of the window used for delta compression"
 msgstr "taille de la fenêtre utilisée pour la compression des deltas"
 
-#: builtin/repack.c:189 builtin/repack.c:193
+#: builtin/repack.c:191 builtin/repack.c:197
 msgid "bytes"
 msgstr "octets"
 
-#: builtin/repack.c:190
+#: builtin/repack.c:192
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 "idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments"
 
-#: builtin/repack.c:192
+#: builtin/repack.c:194
 msgid "limits the maximum delta depth"
 msgstr "limite la profondeur maximale des deltas"
 
-#: builtin/repack.c:194
+#: builtin/repack.c:196
+msgid "limits the maximum number of threads"
+msgstr "limite le nombre maximal de fils"
+
+#: builtin/repack.c:198
 msgid "maximum size of each packfile"
 msgstr "taille maximum de chaque fichier paquet"
 
-#: builtin/repack.c:196
+#: builtin/repack.c:200
 msgid "repack objects in packs marked with .keep"
 msgstr "réempaqueter les objets dans des paquets marqués avec .keep"
 
-#: builtin/repack.c:206
+#: builtin/repack.c:210
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "impossible de supprimer les paquets dans un dépôt d'objets précieux"
 
-#: builtin/repack.c:210
+#: builtin/repack.c:214
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable et -A sont incompatibles"
 
-#: builtin/repack.c:400 builtin/worktree.c:115
+#: builtin/repack.c:406 builtin/worktree.c:116
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "échec de la suppression de '%s'"
 
-#: builtin/replace.c:19
+#: builtin/replace.c:20
 msgid "git replace [-f] <object> <replacement>"
 msgstr "git replace [-f] <objet> <remplacement>"
 
-#: builtin/replace.c:20
+#: builtin/replace.c:21
 msgid "git replace [-f] --edit <object>"
 msgstr "git replace [-f] --edit <objet>"
 
-#: builtin/replace.c:21
+#: builtin/replace.c:22
 msgid "git replace [-f] --graft <commit> [<parent>...]"
 msgstr "git replace [-f] --graft <commit> [<parent>...]"
 
-#: builtin/replace.c:22
+#: builtin/replace.c:23
 msgid "git replace -d <object>..."
 msgstr "git replace -d <objet>..."
 
-#: builtin/replace.c:23
+#: builtin/replace.c:24
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr "git replace [--format=<format>] [-l [<motif>]]"
 
-#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396
+#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
 #, c-format
 msgid "Not a valid object name: '%s'"
 msgstr "Nom d'objet invalide : '%s'"
 
-#: builtin/replace.c:360
+#: builtin/replace.c:361
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "mauvaise étiquette de fusion dans le commit '%s'"
 
-#: builtin/replace.c:362
+#: builtin/replace.c:363
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "étiquette de fusion malformée dans le commit '%s'"
 
-#: builtin/replace.c:373
+#: builtin/replace.c:374
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -12577,208 +12712,208 @@ msgstr ""
 "le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; "
 "utilisez --edit au lieu de --graft"
 
-#: builtin/replace.c:406
+#: builtin/replace.c:407
 #, c-format
 msgid "the original commit '%s' has a gpg signature."
 msgstr "le commit original '%s' contient une signature GPG."
 
-#: builtin/replace.c:407
+#: builtin/replace.c:408
 msgid "the signature will be removed in the replacement commit!"
 msgstr "la signature sera éliminée dans la validation de remplacement !"
 
-#: builtin/replace.c:413
+#: builtin/replace.c:414
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "Impossible d'écrire le commit de remplacement pour '%s'"
 
-#: builtin/replace.c:437
+#: builtin/replace.c:438
 msgid "list replace refs"
 msgstr "afficher les références de remplacement"
 
-#: builtin/replace.c:438
+#: builtin/replace.c:439
 msgid "delete replace refs"
 msgstr "supprimer les références de remplacement"
 
-#: builtin/replace.c:439
+#: builtin/replace.c:440
 msgid "edit existing object"
 msgstr "éditer l'objet existant"
 
-#: builtin/replace.c:440
+#: builtin/replace.c:441
 msgid "change a commit's parents"
 msgstr "Modifier les parents d'un commit"
 
-#: builtin/replace.c:441
+#: builtin/replace.c:442
 msgid "replace the ref if it exists"
 msgstr "remplacer la référence si elle existe"
 
-#: builtin/replace.c:442
+#: builtin/replace.c:443
 msgid "do not pretty-print contents for --edit"
 msgstr "afficher sans mise en forme pour --edit"
 
-#: builtin/replace.c:443
+#: builtin/replace.c:444
 msgid "use this format"
 msgstr "utiliser ce format"
 
-#: builtin/rerere.c:12
+#: builtin/rerere.c:13
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr ""
 "git rerere [clear | forget <chemin>... | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:58
+#: builtin/rerere.c:59
 msgid "register clean resolutions in index"
 msgstr "enregistrer des résolutions propres dans l'index"
 
-#: builtin/reset.c:26
+#: builtin/reset.c:29
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 
-#: builtin/reset.c:27
+#: builtin/reset.c:30
 msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
 msgstr "git reset [-q] [<arbre ou apparenté>] [--] <chemins>..."
 
-#: builtin/reset.c:28
+#: builtin/reset.c:31
 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
 msgstr "git reset --patch [<arbre ou apparenté>] [--] [<chemins>...]"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:37
 msgid "mixed"
 msgstr "mixed"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:37
 msgid "soft"
 msgstr "soft"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:37
 msgid "hard"
 msgstr "hard"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:37
 msgid "merge"
 msgstr "merge"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:37
 msgid "keep"
 msgstr "keep"
 
-#: builtin/reset.c:74
+#: builtin/reset.c:77
 msgid "You do not have a valid HEAD."
 msgstr "Vous n'avez pas une HEAD valide."
 
-#: builtin/reset.c:76
+#: builtin/reset.c:79
 msgid "Failed to find tree of HEAD."
 msgstr "Impossible de trouver l'arbre pour HEAD."
 
-#: builtin/reset.c:82
+#: builtin/reset.c:85
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Impossible de trouver l'arbre pour %s."
 
-#: builtin/reset.c:100
+#: builtin/reset.c:103
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD est maintenant à %s"
 
-#: builtin/reset.c:183
+#: builtin/reset.c:186
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "Impossible de faire un \"reset %s\" au milieu d'une fusion."
 
-#: builtin/reset.c:276
+#: builtin/reset.c:286
 msgid "be quiet, only report errors"
 msgstr "être silencieux, afficher seulement les erreurs"
 
-#: builtin/reset.c:278
+#: builtin/reset.c:288
 msgid "reset HEAD and index"
 msgstr "réinitialiser HEAD et l'index"
 
-#: builtin/reset.c:279
+#: builtin/reset.c:289
 msgid "reset only HEAD"
 msgstr "réinitialiser seulement HEAD"
 
-#: builtin/reset.c:281 builtin/reset.c:283
+#: builtin/reset.c:291 builtin/reset.c:293
 msgid "reset HEAD, index and working tree"
 msgstr "réinitialiser HEAD, l'index et la copie de travail"
 
-#: builtin/reset.c:285
+#: builtin/reset.c:295
 msgid "reset HEAD but keep local changes"
 msgstr "réinitialiser HEAD mais garder les changements locaux"
 
-#: builtin/reset.c:288
+#: builtin/reset.c:301
 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 "enregistrer seulement le fait que les chemins effacés seront ajoutés plus "
 "tard"
 
-#: builtin/reset.c:305
+#: builtin/reset.c:320
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Échec de résolution de '%s' comme une révision valide."
 
-#: builtin/reset.c:313
+#: builtin/reset.c:328
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "Échec de résolution de '%s' comme un arbre valide."
 
-#: builtin/reset.c:322
+#: builtin/reset.c:337
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch est incompatible avec --{hard,mixed,soft}"
 
-#: builtin/reset.c:331
+#: builtin/reset.c:346
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "--mixed avec des chemins est obsolète ; utilisez 'git reset -- <paths>' à la "
 "place."
 
-#: builtin/reset.c:333
+#: builtin/reset.c:348
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Impossible de faire un \"%s reset\" avec des chemins."
 
-#: builtin/reset.c:343
+#: builtin/reset.c:358
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "Le \"%s reset\" n'est pas permis dans un dépôt nu"
 
-#: builtin/reset.c:347
+#: builtin/reset.c:362
 msgid "-N can only be used with --mixed"
 msgstr "-N ne peut être utilisé qu'avec --mixed"
 
-#: builtin/reset.c:364
+#: builtin/reset.c:379
 msgid "Unstaged changes after reset:"
 msgstr "Modifications non indexées après reset :"
 
-#: builtin/reset.c:370
+#: builtin/reset.c:385
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Impossible de réinitialiser le fichier d'index à la révision '%s'."
 
-#: builtin/reset.c:374
+#: builtin/reset.c:389
 msgid "Could not write new index file."
 msgstr "Impossible d'écrire le nouveau fichier d'index."
 
-#: builtin/rev-list.c:354
+#: builtin/rev-list.c:358
 msgid "rev-list does not support display of notes"
 msgstr "rev-list ne supporte l'affichage des notes"
 
-#: builtin/rev-parse.c:393
+#: builtin/rev-parse.c:394
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<options>] -- [<arguments>...]"
 
-#: builtin/rev-parse.c:398
+#: builtin/rev-parse.c:399
 msgid "keep the `--` passed as an arg"
 msgstr "garder le `--` passé en argument"
 
-#: builtin/rev-parse.c:400
+#: builtin/rev-parse.c:401
 msgid "stop parsing after the first non-option argument"
 msgstr "arrêt de l'analyse après le premier argument qui n'est pas une option"
 
-#: builtin/rev-parse.c:403
+#: builtin/rev-parse.c:404
 msgid "output in stuck long form"
 msgstr "sortie en forme longue fixée"
 
-#: builtin/rev-parse.c:534
+#: builtin/rev-parse.c:535
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12793,96 +12928,96 @@ msgstr ""
 "Lancez \"git rev-parse --parseopt -h\" pour plus d'information sur "
 "l'utilisation principale."
 
-#: builtin/revert.c:22
+#: builtin/revert.c:23
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<options>] <commit ou apparenté>..."
 
-#: builtin/revert.c:23
+#: builtin/revert.c:24
 msgid "git revert <subcommand>"
 msgstr "git revert <sous-commande>"
 
-#: builtin/revert.c:28
+#: builtin/revert.c:29
 msgid "git cherry-pick [<options>] <commit-ish>..."
 msgstr "git cherry-pick [<options>] <commit ou apparenté>..."
 
-#: builtin/revert.c:29
+#: builtin/revert.c:30
 msgid "git cherry-pick <subcommand>"
 msgstr "git cherry-pick <sous-commande>"
 
-#: builtin/revert.c:89
+#: builtin/revert.c:90
 #, c-format
 msgid "%s: %s cannot be used with %s"
 msgstr "%s : %s ne peut pas être utilisé avec %s"
 
-#: builtin/revert.c:98
+#: builtin/revert.c:99
 msgid "end revert or cherry-pick sequence"
 msgstr "mettre fin au retour ou picorage"
 
-#: builtin/revert.c:99
+#: builtin/revert.c:100
 msgid "resume revert or cherry-pick sequence"
 msgstr "reprendre le retour ou picorage"
 
-#: builtin/revert.c:100
+#: builtin/revert.c:101
 msgid "cancel revert or cherry-pick sequence"
 msgstr "annuler le retour ou picorage"
 
-#: builtin/revert.c:101
+#: builtin/revert.c:102
 msgid "don't automatically commit"
 msgstr "ne pas valider automatiquement"
 
-#: builtin/revert.c:102
+#: builtin/revert.c:103
 msgid "edit the commit message"
 msgstr "éditer le message de validation"
 
-#: builtin/revert.c:105
+#: builtin/revert.c:106
 msgid "parent-number"
 msgstr "numéro-de-parent"
 
-#: builtin/revert.c:106
+#: builtin/revert.c:107
 msgid "select mainline parent"
 msgstr "sélectionner le parent principal"
 
-#: builtin/revert.c:108
+#: builtin/revert.c:109
 msgid "merge strategy"
 msgstr "stratégie de fusion"
 
-#: builtin/revert.c:109
+#: builtin/revert.c:110
 msgid "option"
 msgstr "option"
 
-#: builtin/revert.c:110
+#: builtin/revert.c:111
 msgid "option for merge strategy"
 msgstr "option pour la stratégie de fusion"
 
-#: builtin/revert.c:119
+#: builtin/revert.c:120
 msgid "append commit name"
 msgstr "ajouter le nom de validation"
 
-#: builtin/revert.c:121
+#: builtin/revert.c:122
 msgid "preserve initially empty commits"
 msgstr "préserver les validations vides initialement"
 
-#: builtin/revert.c:122
+#: builtin/revert.c:123
 msgid "allow commits with empty messages"
 msgstr "autoriser les validations avec des messages vides"
 
-#: builtin/revert.c:123
+#: builtin/revert.c:124
 msgid "keep redundant, empty commits"
 msgstr "garder les validations redondantes, vides"
 
-#: builtin/revert.c:211
+#: builtin/revert.c:212
 msgid "revert failed"
 msgstr "revert a échoué"
 
-#: builtin/revert.c:224
+#: builtin/revert.c:225
 msgid "cherry-pick failed"
 msgstr "le picorage a échoué"
 
-#: builtin/rm.c:17
+#: builtin/rm.c:18
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<options>] [--] <fichier>..."
 
-#: builtin/rm.c:205
+#: builtin/rm.c:206
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -12896,7 +13031,7 @@ msgstr[1] ""
 "les fichiers suivants ont du contenu indexé différent\n"
 "du fichier et de HEAD :"
 
-#: builtin/rm.c:210
+#: builtin/rm.c:211
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -12904,13 +13039,13 @@ msgstr ""
 "\n"
 "(utilisez -f pour forcer la suppression)"
 
-#: builtin/rm.c:214
+#: builtin/rm.c:215
 msgid "the following file has changes staged in the index:"
 msgid_plural "the following files have changes staged in the index:"
 msgstr[0] "le fichier suivant a des changements indexés :"
 msgstr[1] "les fichiers suivants ont des changements indexés :"
 
-#: builtin/rm.c:218 builtin/rm.c:227
+#: builtin/rm.c:219 builtin/rm.c:228
 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
@@ -12918,31 +13053,31 @@ msgstr ""
 "\n"
 "(utilisez --cached pour garder le fichier, ou -f pour forcer la suppression)"
 
-#: builtin/rm.c:224
+#: builtin/rm.c:225
 msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] "le fichier suivant a des modifications locales :"
 msgstr[1] "les fichiers suivants ont des modifications locales :"
 
-#: builtin/rm.c:242
+#: builtin/rm.c:243
 msgid "do not list removed files"
 msgstr "ne pas afficher les fichiers supprimés"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:244
 msgid "only remove from the index"
 msgstr "supprimer seulement de l'index"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "override the up-to-date check"
 msgstr "outrepasser la vérification des fichiers à jour"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "allow recursive removal"
 msgstr "autoriser la suppression récursive"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "exit with a zero status even if nothing matched"
-msgstr "sortir avec un statut zéro même si rien ne correspondait"
+msgstr "sortir avec un état zéro même si rien ne correspondait"
 
 #: builtin/rm.c:308
 #, c-format
@@ -12959,7 +13094,7 @@ msgstr "git rm : impossible de supprimer %s"
 msgid "could not remove '%s'"
 msgstr "impossible de supprimer '%s'"
 
-#: builtin/send-pack.c:18
+#: builtin/send-pack.c:19
 msgid ""
 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
 "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
@@ -12972,53 +13107,53 @@ msgstr ""
 "  --all et la spécification explicite de <référence> sont mutuellement "
 "exclusifs."
 
-#: builtin/send-pack.c:161
+#: builtin/send-pack.c:162
 msgid "remote name"
 msgstr "nom distant"
 
-#: builtin/send-pack.c:175
+#: builtin/send-pack.c:176
 msgid "use stateless RPC protocol"
 msgstr "utiliser un protocole RPC sans état"
 
-#: builtin/send-pack.c:176
+#: builtin/send-pack.c:177
 msgid "read refs from stdin"
 msgstr "lire les références depuis l'entrée standard"
 
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:178
 msgid "print status from remote helper"
 msgstr "afficher les messages du greffon de protocole distant"
 
-#: builtin/shortlog.c:13
+#: builtin/shortlog.c:14
 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
 msgstr "git shortlog [<options>] [<intervalle-révisions>] [[--] [<chemin>...]]"
 
-#: builtin/shortlog.c:248
+#: builtin/shortlog.c:249
 msgid "Group by committer rather than author"
 msgstr "Grouper par validateur plutôt que par auteur"
 
-#: builtin/shortlog.c:250
+#: builtin/shortlog.c:251
 msgid "sort output according to the number of commits per author"
 msgstr "trier la sortie sur le nombre de validations par auteur"
 
-#: builtin/shortlog.c:252
+#: builtin/shortlog.c:253
 msgid "Suppress commit descriptions, only provides commit count"
 msgstr ""
 "Supprimer les descriptions de validation, fournit seulement le nombre de "
 "validations"
 
-#: builtin/shortlog.c:254
+#: builtin/shortlog.c:255
 msgid "Show the email address of each author"
-msgstr "Afficher l'adresse e-mail de chaque auteur"
+msgstr "Afficher l'adresse courriel de chaque auteur"
 
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:256
 msgid "w[,i1[,i2]]"
 msgstr "w[,i1[,i2]]"
 
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:257
 msgid "Linewrap output"
 msgstr "Couper les lignes"
 
-#: builtin/show-branch.c:10
+#: builtin/show-branch.c:12
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -13030,128 +13165,128 @@ msgstr ""
 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
 "\t\t[--no-name | --sha1-name] [--topics] [(<rév> | <glob>)...]"
 
-#: builtin/show-branch.c:14
+#: builtin/show-branch.c:16
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
 msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<référence>]"
 
-#: builtin/show-branch.c:374
+#: builtin/show-branch.c:376
 #, c-format
 msgid "ignoring %s; cannot handle more than %d ref"
 msgid_plural "ignoring %s; cannot handle more than %d refs"
 msgstr[0] "%s ignoré; impossible de gérer plus de %d référence"
 msgstr[1] "%s ignoré; impossible de gérer plus de %d références"
 
-#: builtin/show-branch.c:536
+#: builtin/show-branch.c:530
 #, c-format
 msgid "no matching refs with %s"
 msgstr "aucune référence correspond à %s"
 
-#: builtin/show-branch.c:632
+#: builtin/show-branch.c:626
 msgid "show remote-tracking and local branches"
 msgstr "afficher les branches de suivi distantes et les branches locales"
 
-#: builtin/show-branch.c:634
+#: builtin/show-branch.c:628
 msgid "show remote-tracking branches"
 msgstr "afficher les branches de suivi distantes"
 
-#: builtin/show-branch.c:636
+#: builtin/show-branch.c:630
 msgid "color '*!+-' corresponding to the branch"
 msgstr "couleur '*!+-' correspondant à la branche"
 
-#: builtin/show-branch.c:638
+#: builtin/show-branch.c:632
 msgid "show <n> more commits after the common ancestor"
 msgstr "afficher <n> validations de plus après l'ancêtre commun"
 
-#: builtin/show-branch.c:640
+#: builtin/show-branch.c:634
 msgid "synonym to more=-1"
 msgstr "synonyme de more=-1"
 
-#: builtin/show-branch.c:641
+#: builtin/show-branch.c:635
 msgid "suppress naming strings"
 msgstr "supprimer les chaînes de nommage"
 
-#: builtin/show-branch.c:643
+#: builtin/show-branch.c:637
 msgid "include the current branch"
 msgstr "inclure la branche courante"
 
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:639
 msgid "name commits with their object names"
 msgstr "nommer les validations avec leurs noms d'objet"
 
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:641
 msgid "show possible merge bases"
 msgstr "afficher les bases possibles de fusion"
 
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:643
 msgid "show refs unreachable from any other ref"
 msgstr "afficher les références inaccessibles depuis toute autre référence"
 
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:645
 msgid "show commits in topological order"
 msgstr "afficher les validations dans l'ordre topologique"
 
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:648
 msgid "show only commits not on the first branch"
 msgstr ""
 "afficher seulement les validations qui ne sont pas sur la première branche"
 
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:650
 msgid "show merges reachable from only one tip"
 msgstr "afficher les fusions accessibles depuis une seule pointe"
 
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:652
 msgid "topologically sort, maintaining date order where possible"
 msgstr "tri topologique, maintenant l'ordre par date si possible"
 
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:655
 msgid "<n>[,<base>]"
 msgstr "<n>[,<base>]"
 
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:656
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr ""
 "afficher les <n> plus récents éléments de ref-log en commençant à la base"
 
-#: builtin/show-branch.c:696
+#: builtin/show-branch.c:690
 msgid ""
 "--reflog is incompatible with --all, --remotes, --independent or --merge-base"
 msgstr ""
 "--reflog est incompatible avec --all, --remotes, --independant et --merge-"
 "base"
 
-#: builtin/show-branch.c:720
+#: builtin/show-branch.c:714
 msgid "no branches given, and HEAD is not valid"
 msgstr "aucune branche spécifiée, et HEAD est invalide"
 
-#: builtin/show-branch.c:723
+#: builtin/show-branch.c:717
 msgid "--reflog option needs one branch name"
 msgstr "--reflog requiert un nom de branche"
 
-#: builtin/show-branch.c:726
+#: builtin/show-branch.c:720
 #, c-format
 msgid "only %d entry can be shown at one time."
 msgid_plural "only %d entries can be shown at one time."
 msgstr[0] "%d entrée seulement ne peut être montrée en même temps."
 msgstr[1] "%d entrées seulement ne peuvent être montrée en même temps."
 
-#: builtin/show-branch.c:730
+#: builtin/show-branch.c:724
 #, c-format
 msgid "no such ref %s"
 msgstr "référence inexistante %s"
 
-#: builtin/show-branch.c:814
+#: builtin/show-branch.c:808
 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
 msgstr[0] "impossible de gérer plus de %d révision."
 msgstr[1] "impossible de gérer plus de %d révisions."
 
-#: builtin/show-branch.c:818
+#: builtin/show-branch.c:812
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "'%s' n'est pas une référence valide."
 
-#: builtin/show-branch.c:821
+#: builtin/show-branch.c:815
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "impossible de trouver le commit %s (%s)"
@@ -13205,35 +13340,35 @@ msgstr ""
 "afficher les références de l'entrée standard qui ne sont pas dans le dépôt "
 "local"
 
-#: builtin/stripspace.c:17
+#: builtin/stripspace.c:18
 msgid "git stripspace [-s | --strip-comments]"
 msgstr "git stripspace [-s | --strip-comments]"
 
-#: builtin/stripspace.c:18
+#: builtin/stripspace.c:19
 msgid "git stripspace [-c | --comment-lines]"
 msgstr "git stripspace [-c | --comment-lines]"
 
-#: builtin/stripspace.c:35
+#: builtin/stripspace.c:36
 msgid "skip and remove all lines starting with comment character"
 msgstr ""
 "sauter et supprimer toutes les lignes commençant par le caractère de "
 "commentaire"
 
-#: builtin/stripspace.c:38
+#: builtin/stripspace.c:39
 msgid "prepend comment character and space to each line"
 msgstr "ajouter devant chaque ligne le caractère de commentaire et un espace"
 
-#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
 #, c-format
 msgid "No such ref: %s"
 msgstr "Référence inexistante : %s"
 
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Nom de référence complet attendu, %s obtenu"
 
-#: builtin/submodule--helper.c:71
+#: builtin/submodule--helper.c:72
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "impossible de supprimer un composant de l'URL '%s'"
@@ -13440,51 +13575,46 @@ msgstr "parcourir récursivement les sous-modules"
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper embed-git-dir [<chemin>...]"
 
-#: builtin/submodule--helper.c:1226
-msgid "submodule--helper subcommand must be called with a subcommand"
-msgstr ""
-"la sous-commande submodule--helper doit être appelée avec une sous-commande"
-
-#: builtin/submodule--helper.c:1233
+#: builtin/submodule--helper.c:1232
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s ne gère pas --super-prefix"
 
-#: builtin/submodule--helper.c:1239
+#: builtin/submodule--helper.c:1238
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' n'est pas une sous-commande valide de submodule--helper"
 
-#: builtin/symbolic-ref.c:7
+#: builtin/symbolic-ref.c:8
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
 msgstr "git symbolic-ref [<options>] nom [<référence>]"
 
-#: builtin/symbolic-ref.c:8
+#: builtin/symbolic-ref.c:9
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <nom>"
 
-#: builtin/symbolic-ref.c:40
+#: builtin/symbolic-ref.c:41
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr ""
 "supprimer le message d'erreur pour une référence non symbolique (détachée)"
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:42
 msgid "delete symbolic ref"
 msgstr "supprimer la référence symbolique"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:43
 msgid "shorten ref output"
 msgstr "raccourcir l'affichage de la référence"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
 msgid "reason"
 msgstr "raison"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
 msgid "reason of the update"
 msgstr "raison de la mise à jour"
 
-#: builtin/tag.c:23
+#: builtin/tag.c:24
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
 "[<head>]"
@@ -13492,11 +13622,11 @@ msgstr ""
 "git tag [-a | -s | -u <id-clé>] [-f] [-m <message> | -F <file>] <nom-"
 "étiquette> [<head>]"
 
-#: builtin/tag.c:24
+#: builtin/tag.c:25
 msgid "git tag -d <tagname>..."
 msgstr "git tag -d <nométiquette>..."
 
-#: builtin/tag.c:25
+#: builtin/tag.c:26
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
@@ -13506,21 +13636,21 @@ msgstr ""
 "points-at <objet>]\n"
 "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<motif>...]"
 
-#: builtin/tag.c:27
+#: builtin/tag.c:28
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<format>] <nométiquette>..."
 
-#: builtin/tag.c:83
+#: builtin/tag.c:84
 #, c-format
 msgid "tag '%s' not found."
 msgstr "étiquette '%s' non trouvée."
 
-#: builtin/tag.c:99
+#: builtin/tag.c:100
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Étiquette '%s' supprimée (elle était sur %s)\n"
 
-#: builtin/tag.c:128
+#: builtin/tag.c:129
 #, c-format
 msgid ""
 "\n"
@@ -13533,7 +13663,7 @@ msgstr ""
 "  %s\n"
 "Les lignes commençant par '%c' seront ignorées.\n"
 
-#: builtin/tag.c:132
+#: builtin/tag.c:133
 #, c-format
 msgid ""
 "\n"
@@ -13548,343 +13678,343 @@ msgstr ""
 "Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-"
 "même si vous le souhaitez.\n"
 
-#: builtin/tag.c:210
+#: builtin/tag.c:211
 msgid "unable to sign the tag"
 msgstr "impossible de signer l'étiquette"
 
-#: builtin/tag.c:212
+#: builtin/tag.c:213
 msgid "unable to write tag file"
 msgstr "impossible d'écrire le fichier d'étiquettes"
 
-#: builtin/tag.c:236
+#: builtin/tag.c:237
 msgid "bad object type."
 msgstr "mauvais type d'objet."
 
-#: builtin/tag.c:282
+#: builtin/tag.c:283
 msgid "no tag message?"
 msgstr "pas de message pour l'étiquette ?"
 
-#: builtin/tag.c:289
+#: builtin/tag.c:290
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Le message pour l'étiquette a été laissé dans %s\n"
 
-#: builtin/tag.c:397
+#: builtin/tag.c:398
 msgid "list tag names"
 msgstr "afficher les noms des étiquettes"
 
-#: builtin/tag.c:399
+#: builtin/tag.c:400
 msgid "print <n> lines of each tag message"
 msgstr "affiche <n> lignes de chaque message d'étiquette"
 
-#: builtin/tag.c:401
+#: builtin/tag.c:402
 msgid "delete tags"
 msgstr "supprimer des étiquettes"
 
-#: builtin/tag.c:402
+#: builtin/tag.c:403
 msgid "verify tags"
 msgstr "vérifier des étiquettes"
 
-#: builtin/tag.c:404
+#: builtin/tag.c:405
 msgid "Tag creation options"
 msgstr "Options de création de l'étiquette"
 
-#: builtin/tag.c:406
+#: builtin/tag.c:407
 msgid "annotated tag, needs a message"
 msgstr "étiquette annotée, nécessite un message"
 
-#: builtin/tag.c:408
+#: builtin/tag.c:409
 msgid "tag message"
 msgstr "message pour l'étiquette"
 
-#: builtin/tag.c:410
+#: builtin/tag.c:411
 msgid "annotated and GPG-signed tag"
 msgstr "étiquette annotée et signée avec GPG"
 
-#: builtin/tag.c:414
+#: builtin/tag.c:415
 msgid "use another key to sign the tag"
 msgstr "utiliser une autre clé pour signer l'étiquette"
 
-#: builtin/tag.c:415
+#: builtin/tag.c:416
 msgid "replace the tag if exists"
 msgstr "remplacer l'étiquette si elle existe"
 
-#: builtin/tag.c:416 builtin/update-ref.c:368
+#: builtin/tag.c:417 builtin/update-ref.c:369
 msgid "create a reflog"
 msgstr "créer un reflog"
 
-#: builtin/tag.c:418
+#: builtin/tag.c:419
 msgid "Tag listing options"
 msgstr "Options d'affichage des étiquettes"
 
-#: builtin/tag.c:419
+#: builtin/tag.c:420
 msgid "show tag list in columns"
 msgstr "afficher la liste des étiquettes sous forme de colonnes"
 
-#: builtin/tag.c:420 builtin/tag.c:422
+#: builtin/tag.c:421 builtin/tag.c:423
 msgid "print only tags that contain the commit"
 msgstr "afficher seulement les étiquettes qui contiennent la validation"
 
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:422 builtin/tag.c:424
 msgid "print only tags that don't contain the commit"
 msgstr "afficher seulement les étiquettes qui ne contiennent pas la validation"
 
-#: builtin/tag.c:424
+#: builtin/tag.c:425
 msgid "print only tags that are merged"
 msgstr "afficher seulement les étiquettes qui sont fusionnées"
 
-#: builtin/tag.c:425
+#: builtin/tag.c:426
 msgid "print only tags that are not merged"
 msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées"
 
-#: builtin/tag.c:430
+#: builtin/tag.c:431
 msgid "print only tags of the object"
 msgstr "afficher seulement les étiquettes de l'objet"
 
-#: builtin/tag.c:469
+#: builtin/tag.c:470
 msgid "--column and -n are incompatible"
 msgstr "--column et -n sont incompatibles"
 
-#: builtin/tag.c:491
+#: builtin/tag.c:492
 msgid "-n option is only allowed in list mode"
 msgstr "l'option -n est autorisée seulement en mode de liste"
 
-#: builtin/tag.c:493
+#: builtin/tag.c:494
 msgid "--contains option is only allowed in list mode"
 msgstr "l'option --contains est autorisée seulement en mode de liste"
 
-#: builtin/tag.c:495
+#: builtin/tag.c:496
 msgid "--no-contains option is only allowed in list mode"
 msgstr "l'option --contains est autorisée seulement en mode liste"
 
-#: builtin/tag.c:497
+#: builtin/tag.c:498
 msgid "--points-at option is only allowed in list mode"
 msgstr "l'option --points-at est autorisée seulement en mode liste"
 
-#: builtin/tag.c:499
+#: builtin/tag.c:500
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr ""
 "les options --merged et --no-merged ne sont autorisées qu'en mode liste"
 
-#: builtin/tag.c:510
+#: builtin/tag.c:511
 msgid "only one -F or -m option is allowed."
 msgstr "une seule option -F ou -m est autorisée."
 
-#: builtin/tag.c:529
+#: builtin/tag.c:530
 msgid "too many params"
 msgstr "trop de paramètres"
 
-#: builtin/tag.c:535
+#: builtin/tag.c:536
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' n'est pas un nom d'étiquette valide."
 
-#: builtin/tag.c:540
+#: builtin/tag.c:541
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "l'étiquette '%s' existe déjà"
 
-#: builtin/tag.c:570
+#: builtin/tag.c:571
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n"
 
-#: builtin/unpack-objects.c:493
+#: builtin/unpack-objects.c:494
 msgid "Unpacking objects"
 msgstr "Dépaquetage des objets"
 
-#: builtin/update-index.c:79
+#: builtin/update-index.c:80
 #, c-format
 msgid "failed to create directory %s"
 msgstr "échec de la création du répertoire %s"
 
-#: builtin/update-index.c:85
+#: builtin/update-index.c:86
 #, c-format
 msgid "failed to stat %s"
 msgstr "échec du stat de %s"
 
-#: builtin/update-index.c:95
+#: builtin/update-index.c:96
 #, c-format
 msgid "failed to create file %s"
 msgstr "échec de la création du fichier %s"
 
-#: builtin/update-index.c:103
+#: builtin/update-index.c:104
 #, c-format
 msgid "failed to delete file %s"
 msgstr "échec de la suppression du fichier %s"
 
-#: builtin/update-index.c:110 builtin/update-index.c:216
+#: builtin/update-index.c:111 builtin/update-index.c:217
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "échec de la suppression du répertoire %s"
 
-#: builtin/update-index.c:135
+#: builtin/update-index.c:136
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Test du mtime dans '%s' "
 
-#: builtin/update-index.c:149
+#: builtin/update-index.c:150
 msgid "directory stat info does not change after adding a new file"
 msgstr ""
 "l'information de stat du répertoire ne change pas après ajout d'un fichier"
 
-#: builtin/update-index.c:162
+#: builtin/update-index.c:163
 msgid "directory stat info does not change after adding a new directory"
 msgstr ""
 "l'information de stat du répertoire ne change pas après ajout d'un répertoire"
 
-#: builtin/update-index.c:175
+#: builtin/update-index.c:176
 msgid "directory stat info changes after updating a file"
 msgstr ""
 "l'information de stat du répertoire change après mise à jour d'un fichier"
 
-#: builtin/update-index.c:186
+#: builtin/update-index.c:187
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 "l'information de stat du répertoire change après l'ajout d'un fichier dans "
 "un sous-répertoire"
 
-#: builtin/update-index.c:197
+#: builtin/update-index.c:198
 msgid "directory stat info does not change after deleting a file"
 msgstr ""
 "l'information de stat du répertoire ne change pas après la suppression d'un "
 "fichier<"
 
-#: builtin/update-index.c:210
+#: builtin/update-index.c:211
 msgid "directory stat info does not change after deleting a directory"
 msgstr ""
 "l'information de stat du répertoire ne change pas après la suppression d'un "
 "répertoire"
 
-#: builtin/update-index.c:217
+#: builtin/update-index.c:218
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:568
+#: builtin/update-index.c:569
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<options>] [--] [<fichier>...]"
 
-#: builtin/update-index.c:923
+#: builtin/update-index.c:924
 msgid "continue refresh even when index needs update"
 msgstr "continuer de rafraîchir même si l'index a besoin d'une mise à jour"
 
-#: builtin/update-index.c:926
+#: builtin/update-index.c:927
 msgid "refresh: ignore submodules"
 msgstr "rafraîchir : ignorer les sous-modules"
 
-#: builtin/update-index.c:929
+#: builtin/update-index.c:930
 msgid "do not ignore new files"
 msgstr "ne pas ignorer les nouveaux fichiers"
 
-#: builtin/update-index.c:931
+#: builtin/update-index.c:932
 msgid "let files replace directories and vice-versa"
 msgstr "laisser les fichiers remplacer des répertoires et vice-versa"
 
-#: builtin/update-index.c:933
+#: builtin/update-index.c:934
 msgid "notice files missing from worktree"
 msgstr "aviser des fichiers manquants dans la copie de travail"
 
-#: builtin/update-index.c:935
+#: builtin/update-index.c:936
 msgid "refresh even if index contains unmerged entries"
 msgstr "rafraîchir même si l'index contient des éléments non fusionnés"
 
-#: builtin/update-index.c:938
+#: builtin/update-index.c:939
 msgid "refresh stat information"
 msgstr "rafraîchir l'information de stat"
 
-#: builtin/update-index.c:942
+#: builtin/update-index.c:943
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "comme --refresh, mais en ignorant l'option assume-unchanged"
 
-#: builtin/update-index.c:946
+#: builtin/update-index.c:947
 msgid "<mode>,<object>,<path>"
 msgstr "<mode>, <objet>, <chemin>"
 
-#: builtin/update-index.c:947
+#: builtin/update-index.c:948
 msgid "add the specified entry to the index"
 msgstr "ajouter l'élément spécifié dans l'index"
 
-#: builtin/update-index.c:956
+#: builtin/update-index.c:957
 msgid "mark files as \"not changing\""
 msgstr "marquer les fichiers comme \"non changeants\""
 
-#: builtin/update-index.c:959
+#: builtin/update-index.c:960
 msgid "clear assumed-unchanged bit"
 msgstr "mettre à zéro le bit supposé-non-modifié"
 
-#: builtin/update-index.c:962
+#: builtin/update-index.c:963
 msgid "mark files as \"index-only\""
 msgstr "marquer les fichiers comme \"index seulement\""
 
-#: builtin/update-index.c:965
+#: builtin/update-index.c:966
 msgid "clear skip-worktree bit"
 msgstr "mettre à zéro le bit sauter-la-copie-de travail"
 
-#: builtin/update-index.c:968
+#: builtin/update-index.c:969
 msgid "add to index only; do not add content to object database"
 msgstr ""
 "ajouter seulement à l'index ; ne pas ajouter le contenu dans la base de "
 "données des objets"
 
-#: builtin/update-index.c:970
+#: builtin/update-index.c:971
 msgid "remove named paths even if present in worktree"
 msgstr ""
 "supprimer les chemins nommés même s'ils sont présents dans la copie de "
 "travail"
 
-#: builtin/update-index.c:972
+#: builtin/update-index.c:973
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "avec --stdin : les lignes en entrée sont terminées par des octets nuls"
 
-#: builtin/update-index.c:974
+#: builtin/update-index.c:975
 msgid "read list of paths to be updated from standard input"
 msgstr "lire la liste des chemins à mettre à jour depuis l'entrée standard"
 
-#: builtin/update-index.c:978
+#: builtin/update-index.c:979
 msgid "add entries from standard input to the index"
 msgstr "ajouter les éléments depuis l'entrée standard à l'index"
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:983
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "repeupler les étapes n°2 et n°3 pour les chemins listés"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:987
 msgid "only update entries that differ from HEAD"
 msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD"
 
-#: builtin/update-index.c:990
+#: builtin/update-index.c:991
 msgid "ignore files missing from worktree"
 msgstr "ignorer les fichiers manquants dans la copie de travail"
 
-#: builtin/update-index.c:993
+#: builtin/update-index.c:994
 msgid "report actions to standard output"
 msgstr "afficher les actions sur la sortie standard"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:996
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus"
 
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1000
 msgid "write index in this format"
 msgstr "écrire l'index dans ce format"
 
-#: builtin/update-index.c:1001
+#: builtin/update-index.c:1002
 msgid "enable or disable split index"
 msgstr "activer ou désactiver l'index divisé"
 
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1004
 msgid "enable/disable untracked cache"
 msgstr "activer ou désactiver le cache de non-suivis"
 
-#: builtin/update-index.c:1005
+#: builtin/update-index.c:1006
 msgid "test if the filesystem supports untracked cache"
 msgstr "tester si le système de fichier supporte le cache de non-suivis"
 
-#: builtin/update-index.c:1007
+#: builtin/update-index.c:1008
 msgid "enable untracked cache without testing the filesystem"
 msgstr "activer le cache de non-suivis sans tester le système de fichier"
 
-#: builtin/update-index.c:1107
+#: builtin/update-index.c:1108
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -13892,7 +14022,7 @@ msgstr ""
 "core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous "
 "souhaitez vraiment activer l'index coupé"
 
-#: builtin/update-index.c:1116
+#: builtin/update-index.c:1117
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -13900,7 +14030,7 @@ msgstr ""
 "core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous "
 "souhaitez vraiment désactiver l'index coupé"
 
-#: builtin/update-index.c:1127
+#: builtin/update-index.c:1128
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -13908,11 +14038,11 @@ msgstr ""
 "core.untrackedCache est réglé à true ; supprimez-le ou changez-le si vous "
 "souhaitez vraiment désactiver le cache des fichiers non-suivis"
 
-#: builtin/update-index.c:1131
+#: builtin/update-index.c:1132
 msgid "Untracked cache disabled"
 msgstr "Le cache non suivi est désactivé"
 
-#: builtin/update-index.c:1139
+#: builtin/update-index.c:1140
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -13920,246 +14050,246 @@ msgstr ""
 "core.untrackedCache est réglé à false ; supprimez-le ou changez-le si vous "
 "souhaitez vraiment activer le cache des fichiers non-suivis"
 
-#: builtin/update-index.c:1143
+#: builtin/update-index.c:1144
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Le cache non suivi est activé pour '%s'"
 
-#: builtin/update-ref.c:9
+#: builtin/update-ref.c:10
 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
 msgstr "git update-ref [<options>] -d <nom-référence> [<ancienne-valeur>]"
 
-#: builtin/update-ref.c:10
+#: builtin/update-ref.c:11
 msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
 msgstr ""
 "git update-ref [<options>]    <nom-référence> <nouvelle-valeur> [<ancienne-"
 "valeur>]"
 
-#: builtin/update-ref.c:11
+#: builtin/update-ref.c:12
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<options>] --stdin [-z]"
 
-#: builtin/update-ref.c:363
+#: builtin/update-ref.c:364
 msgid "delete the reference"
 msgstr "supprimer la référence"
 
-#: builtin/update-ref.c:365
+#: builtin/update-ref.c:366
 msgid "update <refname> not the one it points to"
 msgstr "mettre à jour <nomréférence> et non la référence pointée par lui"
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:367
 msgid "stdin has NUL-terminated arguments"
 msgstr "l'entrée standard a des arguments qui se terminent par NUL"
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:368
 msgid "read updates from stdin"
 msgstr "lire les mises à jour depuis l'entrée standard"
 
-#: builtin/update-server-info.c:6
+#: builtin/update-server-info.c:7
 msgid "git update-server-info [--force]"
 msgstr "git update-server-info [--force]"
 
-#: builtin/update-server-info.c:14
+#: builtin/update-server-info.c:15
 msgid "update the info files from scratch"
 msgstr "mettre à jour les fichiers d'information à partir de zéro"
 
-#: builtin/verify-commit.c:17
+#: builtin/verify-commit.c:18
 msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr "git verify-commit [-v | --verbose] <commit>..."
 
-#: builtin/verify-commit.c:72
+#: builtin/verify-commit.c:73
 msgid "print commit contents"
 msgstr "afficher le contenu du commit"
 
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:37
+#: builtin/verify-commit.c:74 builtin/verify-tag.c:38
 msgid "print raw gpg status output"
 msgstr "afficher les messages bruts de gpg"
 
-#: builtin/verify-pack.c:54
+#: builtin/verify-pack.c:55
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
 
-#: builtin/verify-pack.c:64
+#: builtin/verify-pack.c:65
 msgid "verbose"
 msgstr "verbeux"
 
-#: builtin/verify-pack.c:66
+#: builtin/verify-pack.c:67
 msgid "show statistics only"
 msgstr "afficher seulement les statistiques"
 
-#: builtin/verify-tag.c:18
+#: builtin/verify-tag.c:19
 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
 msgstr "git verify-tag [-v | --verbose] [--format=<format>] <étiquette>..."
 
-#: builtin/verify-tag.c:36
+#: builtin/verify-tag.c:37
 msgid "print tag contents"
 msgstr "afficher le contenu de l'étiquette"
 
-#: builtin/worktree.c:15
+#: builtin/worktree.c:16
 msgid "git worktree add [<options>] <path> [<branch>]"
 msgstr "git worktree add [<options>] <chemin> [<branche>]"
 
-#: builtin/worktree.c:16
+#: builtin/worktree.c:17
 msgid "git worktree list [<options>]"
 msgstr "git worktree prune [<options>]"
 
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<options>] <chemin>"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<options>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <chemin>"
 
-#: builtin/worktree.c:43
+#: builtin/worktree.c:44
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Suppression de worktrees/%s : répertoire invalide"
 
-#: builtin/worktree.c:49
+#: builtin/worktree.c:50
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas"
 
-#: builtin/worktree.c:54
+#: builtin/worktree.c:55
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr ""
 "Suppression de worktrees/%s : echec de la lecture du fichier gitdir (%s)"
 
-#: builtin/worktree.c:65
+#: builtin/worktree.c:66
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Suppression de worktrees/%s : fichier gitdir invalide"
 
-#: builtin/worktree.c:81
+#: builtin/worktree.c:82
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr ""
 "Suppression de worktrees/%s : le fichier gitdir point sur un endroit "
 "inexistant"
 
-#: builtin/worktree.c:128
+#: builtin/worktree.c:129
 msgid "report pruned working trees"
 msgstr "afficher les arbres de travail éliminés"
 
-#: builtin/worktree.c:130
+#: builtin/worktree.c:131
 msgid "expire working trees older than <time>"
 msgstr "faire expirer les arbres de travail plus vieux que <temps>"
 
-#: builtin/worktree.c:204
+#: builtin/worktree.c:205
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' existe déjà"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:236
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "impossible de créer le répertoire de '%s'"
 
-#: builtin/worktree.c:274
+#: builtin/worktree.c:275
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "Préparation de %s (identifiant %s)"
 
-#: builtin/worktree.c:328
+#: builtin/worktree.c:327
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 "extraire la <branche> même si elle est déjà extraite dans une autre copie de "
 "travail"
 
-#: builtin/worktree.c:330
+#: builtin/worktree.c:329
 msgid "create a new branch"
 msgstr "créer une nouvelle branche"
 
-#: builtin/worktree.c:332
+#: builtin/worktree.c:331
 msgid "create or reset a branch"
 msgstr "créer ou réinitialiser une branche"
 
-#: builtin/worktree.c:334
+#: builtin/worktree.c:333
 msgid "populate the new working tree"
 msgstr "remplissage de la nouvelle copie de travail"
 
-#: builtin/worktree.c:335
+#: builtin/worktree.c:334
 msgid "keep the new working tree locked"
 msgstr "conserver le verrou sur le nouvel arbre de travail"
 
-#: builtin/worktree.c:343
+#: builtin/worktree.c:342
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B et --detach sont mutuellement exclusifs"
 
-#: builtin/worktree.c:478
+#: builtin/worktree.c:479
 msgid "reason for locking"
-msgstr "raison du vérouillage"
+msgstr "raison du verrouillage"
 
-#: builtin/worktree.c:490 builtin/worktree.c:523
+#: builtin/worktree.c:491 builtin/worktree.c:524
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' n'est pas une copie de travail"
 
-#: builtin/worktree.c:492 builtin/worktree.c:525
+#: builtin/worktree.c:493 builtin/worktree.c:526
 msgid "The main working tree cannot be locked or unlocked"
 msgstr ""
-"La copie de travail principale ne peut pas être vérouillée ou dévérouillée"
+"La copie de travail principale ne peut pas être verrouillée ou déverrouillée"
 
-#: builtin/worktree.c:497
+#: builtin/worktree.c:498
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' est déjà verrouillé, car '%s'"
 
-#: builtin/worktree.c:499
+#: builtin/worktree.c:500
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' est déjà verrouillé"
 
-#: builtin/worktree.c:527
+#: builtin/worktree.c:528
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' n'est pas verrouillé"
 
-#: builtin/write-tree.c:13
+#: builtin/write-tree.c:14
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<préfixe>/]"
 
-#: builtin/write-tree.c:26
+#: builtin/write-tree.c:27
 msgid "<prefix>/"
 msgstr "<préfixe>/"
 
-#: builtin/write-tree.c:27
+#: builtin/write-tree.c:28
 msgid "write tree object for a subdirectory <prefix>"
 msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>"
 
-#: builtin/write-tree.c:30
+#: builtin/write-tree.c:31
 msgid "only useful for debugging"
 msgstr "seulement utile pour le débogage"
 
-#: upload-pack.c:22
+#: upload-pack.c:23
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<options>] <répertoire>"
 
-#: upload-pack.c:1040
+#: upload-pack.c:1041
 msgid "quit after a single request/response exchange"
 msgstr "quitter après un unique échange requête/réponse"
 
-#: upload-pack.c:1042
+#: upload-pack.c:1043
 msgid "exit immediately after initial ref advertisement"
 msgstr "Sortir immédiatement après l'annonce initiale des références"
 
-#: upload-pack.c:1044
+#: upload-pack.c:1045
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr ""
 "nes pas essayer <répertoire>/.git/ si <répertoire> n'est pas un répertoire "
 "Git"
 
-#: upload-pack.c:1046
+#: upload-pack.c:1047
 msgid "interrupt transfer after <n> seconds of inactivity"
-msgstr "interrompre le transfer après <n> secondes d'inactivité"
+msgstr "interrompre le transfert après <n> secondes d'inactivité"
 
-#: credential-cache--daemon.c:223
+#: credential-cache--daemon.c:224
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -14172,11 +14302,11 @@ msgstr ""
 "\n"
 "    chmod 0700 %s"
 
-#: credential-cache--daemon.c:271
+#: credential-cache--daemon.c:272
 msgid "print debugging messages to stderr"
 msgstr "afficher les messages de debug sur stderr"
 
-#: git.c:14
+#: git.c:15
 msgid ""
 "'git help -a' and 'git help -g' list available subcommands and some\n"
 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
@@ -14186,20 +14316,21 @@ msgstr ""
 "quelques concepts. Voir 'git help <commande>' ou 'git help <concept>'\n"
 "pour en lire plus à propos d'une commande spécifique ou d'un concept."
 
-#: http.c:336
+#: http.c:337
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
-msgstr "valeur négative pour http.postbuffer ; utilisation de la valeur par défaut %d"
+msgstr ""
+"valeur négative pour http.postbuffer ; utilisation de la valeur par défaut %d"
 
-#: http.c:357
+#: http.c:358
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "La délégation de commande n'est pas supporté avec cuRL < 7.22.0"
 
-#: http.c:366
+#: http.c:367
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.44.0"
 
-#: http.c:1766
+#: http.c:1764
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -14210,7 +14341,7 @@ msgstr ""
 "      demandé : %s\n"
 "  redirection : %s"
 
-#: remote-curl.c:323
+#: remote-curl.c:324
 #, c-format
 msgid "redirecting to %s"
 msgstr "redirection vers %s"
@@ -14316,7 +14447,7 @@ msgstr "Afficher différents types d'objets"
 
 #: common-cmds.h:36
 msgid "Show the working tree status"
-msgstr "Afficher le statut de la copie de travail"
+msgstr "Afficher l'état de la copie de travail"
 
 #: common-cmds.h:37
 msgid "Create, list, delete or verify a tag object signed with GPG"
@@ -14609,6 +14740,10 @@ msgstr ""
 msgid "Could not move back to $head_name"
 msgstr "Impossible de revenir à $head_name"
 
+#: git-rebase.sh:169
+msgid "Applied autostash."
+msgstr "Autoremisage appliqué."
+
 #: git-rebase.sh:172
 #, sh-format
 msgid "Cannot store $stash_sha1"
@@ -14729,39 +14864,39 @@ msgstr ""
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "$branch_name mise à jour en avance rapide sur $onto_name."
 
-#: git-stash.sh:53
+#: git-stash.sh:54
 msgid "git stash clear with parameters is unimplemented"
 msgstr "git stash clear avec des paramètres n'est pas implémenté"
 
-#: git-stash.sh:94
+#: git-stash.sh:95
 msgid "You do not have the initial commit yet"
 msgstr "Vous n'avez pas encore la validation initiale"
 
-#: git-stash.sh:109
+#: git-stash.sh:110
 msgid "Cannot save the current index state"
 msgstr "Impossible de sauver l'état courant de l'index"
 
-#: git-stash.sh:124
+#: git-stash.sh:125
 msgid "Cannot save the untracked files"
 msgstr "Impossible de sauver les fichiers non-suivis"
 
-#: git-stash.sh:144 git-stash.sh:157
+#: git-stash.sh:145 git-stash.sh:158
 msgid "Cannot save the current worktree state"
 msgstr "Impossible de sauver l'état courant de la copie de travail"
 
-#: git-stash.sh:161
+#: git-stash.sh:162
 msgid "No changes selected"
 msgstr "Aucun changement sélectionné"
 
-#: git-stash.sh:164
+#: git-stash.sh:165
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "Impossible de supprimer l'index temporaire (ne peut pas se produire)"
 
-#: git-stash.sh:177
+#: git-stash.sh:178
 msgid "Cannot record working tree state"
 msgstr "Impossible d'enregistrer l'état de la copie de travail"
 
-#: git-stash.sh:209
+#: git-stash.sh:210
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr "Impossible de mettre à jour $ref_stash avec $w_commit"
@@ -14776,7 +14911,7 @@ msgstr "Impossible de mettre à jour $ref_stash avec $w_commit"
 #. $ git stash save --blah-blah 2>&1 | head -n 2
 #. error: unknown option for 'stash save': --blah-blah
 #. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:265
+#: git-stash.sh:266
 #, sh-format
 msgid ""
 "error: unknown option for 'stash save': $option\n"
@@ -14785,108 +14920,110 @@ msgstr ""
 "erreur: option inconnue pour 'stash save': $option\n"
 "        Pour fournir un message, utilisez git stash save -- '$option'"
 
-#: git-stash.sh:278
+#: git-stash.sh:281
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr ""
 "Impossible d'utiliser --patch et --include-untracked ou --all en même temps"
 
-#: git-stash.sh:286
+#: git-stash.sh:289
 msgid "No local changes to save"
 msgstr "Pas de modifications locales à sauver"
 
-#: git-stash.sh:291
+#: git-stash.sh:294
 msgid "Cannot initialize stash"
 msgstr "Impossible d'initialiser le remisage"
 
-#: git-stash.sh:295
+#: git-stash.sh:298
 msgid "Cannot save the current status"
-msgstr "Impossible de sauver le statut courant"
+msgstr "Impossible de sauver l'état courant"
 
-#: git-stash.sh:296
+#: git-stash.sh:299
 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr "Copie de travail et état de l'index sauvegardés dans $stash_msg"
 
-#: git-stash.sh:323
+#: git-stash.sh:326
 msgid "Cannot remove worktree changes"
 msgstr "Impossible de supprimer les changements de la copie de travail"
 
-#: git-stash.sh:471
+#: git-stash.sh:474
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "option inconnue : $opt"
 
-#: git-stash.sh:484
-msgid "No stash found."
-msgstr "Pas de remisage trouvé."
+#: git-stash.sh:487
+msgid "No stash entries found."
+msgstr "Aucune entrée de remisage trouvée."
 
-#: git-stash.sh:491
+#: git-stash.sh:494
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "Trop de révisions spécifiées : $REV"
 
-#: git-stash.sh:506
+#: git-stash.sh:509
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference n'est pas une référence valide"
 
-#: git-stash.sh:534
+#: git-stash.sh:537
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "'$args' n'est pas une validation de type remisage"
 
-#: git-stash.sh:545
+#: git-stash.sh:548
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "'$args' n'est pas une référence de remisage"
 
-#: git-stash.sh:553
+#: git-stash.sh:556
 msgid "unable to refresh index"
 msgstr "impossible de rafraîchir l'index"
 
-#: git-stash.sh:557
+#: git-stash.sh:560
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "Impossible d'appliquer un remisage en cours de fusion"
 
-#: git-stash.sh:565
+#: git-stash.sh:568
 msgid "Conflicts in index. Try without --index."
 msgstr "Conflits dans l'index. Essayez sans --index."
 
-#: git-stash.sh:567
+#: git-stash.sh:570
 msgid "Could not save index tree"
 msgstr "Impossible de sauvegarder l'arbre d'index"
 
-#: git-stash.sh:576
-msgid "Could not restore untracked files from stash"
-msgstr "Impossible de restaurer les fichiers non-suivis depuis le remisage"
+#: git-stash.sh:579
+msgid "Could not restore untracked files from stash entry"
+msgstr ""
+"Impossible de restaurer les fichiers non-suivis depuis l'entrée de remisage"
 
-#: git-stash.sh:601
+#: git-stash.sh:604
 msgid "Cannot unstage modified files"
 msgstr "Impossible de désindexer les fichiers modifiés"
 
-#: git-stash.sh:616
+#: git-stash.sh:619
 msgid "Index was not unstashed."
 msgstr "L'index n'a pas été sorti de remise."
 
-#: git-stash.sh:630
-msgid "The stash is kept in case you need it again."
-msgstr "Le remisage est conservé au cas où vous en auriez encore besoin."
+#: git-stash.sh:633
+msgid "The stash entry is kept in case you need it again."
+msgstr ""
+"L'entrée de remisage est conservée au cas où vous en auriez encore besoin."
 
-#: git-stash.sh:639
+#: git-stash.sh:642
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "${REV} supprimé ($s)"
 
-#: git-stash.sh:640
+#: git-stash.sh:643
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: Impossible de supprimer l'élément de stash"
 
-#: git-stash.sh:648
+#: git-stash.sh:651
 msgid "No branch name specified"
 msgstr "Aucune branche spécifiée"
 
-#: git-stash.sh:727
+#: git-stash.sh:730
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Pour les restaurer tapez \"git stash apply\")"
 
@@ -14911,7 +15048,7 @@ msgstr "'$sm_path' existe déjà dans l'index"
 msgid "'$sm_path' already exists in the index and is not a submodule"
 msgstr "'$sm_path' existe déjà dans l'index et n'est pas un sous-module"
 
-#: git-submodule.sh:218
+#: git-submodule.sh:219
 #, sh-format
 msgid ""
 "The following path is ignored by one of your .gitignore files:\n"
@@ -14922,24 +15059,24 @@ msgstr ""
 "$sm_path\n"
 "Utilisez -f si vous voulez vraiment l'ajouter."
 
-#: git-submodule.sh:236
+#: git-submodule.sh:237
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "Ajout du dépôt existant à '$sm_path' dans l'index"
 
-#: git-submodule.sh:238
+#: git-submodule.sh:239
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "'$sm_path' existe déjà et n'est pas un dépôt git valide"
 
-#: git-submodule.sh:246
+#: git-submodule.sh:247
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr ""
 "Un répertoire git pour '$sm_name' est trouvé en local avec le(s) serveur(s) "
 "distant(s) :"
 
-#: git-submodule.sh:248
+#: git-submodule.sh:249
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -14956,48 +15093,48 @@ msgstr ""
 "correct\n"
 "ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'."
 
-#: git-submodule.sh:254
+#: git-submodule.sh:255
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr "Réactivation du répertoire git local pour le sous-module '$sm_name'."
 
-#: git-submodule.sh:266
+#: git-submodule.sh:267
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "Impossible d'extraire le sous-module '$sm_path'"
 
-#: git-submodule.sh:271
+#: git-submodule.sh:272
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "Échec d'ajout du sous-module '$sm_path'"
 
-#: git-submodule.sh:280
+#: git-submodule.sh:281
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "Échec d'enregistrement du sous-module '$sm_path'"
 
-#: git-submodule.sh:341
+#: git-submodule.sh:342
 #, sh-format
 msgid "Entering '$displaypath'"
 msgstr "Entrée dans '$displaypath'"
 
-#: git-submodule.sh:361
+#: git-submodule.sh:362
 #, sh-format
 msgid "Stopping at '$displaypath'; script returned non-zero status."
-msgstr "Arrêt sur '$displaypath' ; le script a retourné un statut non nul."
+msgstr "Arrêt sur '$displaypath' ; le script a retourné un état non nul."
 
-#: git-submodule.sh:432
+#: git-submodule.sh:433
 #, sh-format
 msgid "pathspec and --all are incompatible"
 msgstr "un spécificateur de chemin et --all sont incompatibles"
 
-#: git-submodule.sh:437
+#: git-submodule.sh:438
 #, sh-format
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr ""
 "Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules"
 
-#: git-submodule.sh:457
+#: git-submodule.sh:458
 #, sh-format
 msgid ""
 "Submodule work tree '$displaypath' contains a .git directory\n"
@@ -15008,7 +15145,7 @@ msgstr ""
 "(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son "
 "historique)"
 
-#: git-submodule.sh:465
+#: git-submodule.sh:466
 #, sh-format
 msgid ""
 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
@@ -15017,42 +15154,42 @@ msgstr ""
 "La copie de travail du sous-module '$displaypath' contient des modifications "
 "locales ; utilisez '-f' pour les annuler"
 
-#: git-submodule.sh:468
+#: git-submodule.sh:469
 #, sh-format
 msgid "Cleared directory '$displaypath'"
 msgstr "Répertoire '$displaypath' nettoyé"
 
-#: git-submodule.sh:469
+#: git-submodule.sh:470
 #, sh-format
 msgid "Could not remove submodule work tree '$displaypath'"
 msgstr ""
 "Impossible de supprimer la copie de travail du sous-module '$displaypath'"
 
-#: git-submodule.sh:472
+#: git-submodule.sh:473
 #, sh-format
 msgid "Could not create empty submodule directory '$displaypath'"
 msgstr "Impossible de créer le répertoire vide du sous-module '$displaypath'"
 
-#: git-submodule.sh:481
+#: git-submodule.sh:482
 #, sh-format
 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
 msgstr ""
 "Le sous-module '$name' ($url) n'est pas enregistré pour le chemin "
 "'$displaypath'"
 
-#: git-submodule.sh:637
+#: git-submodule.sh:638
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 "Impossible de trouver la révision courante dans le chemin de sous-module "
 "'$displaypath'"
 
-#: git-submodule.sh:647
+#: git-submodule.sh:648
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "Impossible de rapatrier dans le chemin de sous-module '$sm_path'"
 
-#: git-submodule.sh:652
+#: git-submodule.sh:653
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -15061,12 +15198,12 @@ msgstr ""
 "Impossible de trouver la révision courante ${remote_name}/${branch} dans le "
 "chemin de sous-module '$sm_path'"
 
-#: git-submodule.sh:670
+#: git-submodule.sh:671
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath'"
 
-#: git-submodule.sh:676
+#: git-submodule.sh:677
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -15075,88 +15212,88 @@ msgstr ""
 "Chemin de sous-module '$displaypath' récupéré, mais il ne contenait pas "
 "$sha1. La récupération directe de ce commit a échoué."
 
-#: git-submodule.sh:683
+#: git-submodule.sh:684
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'"
 
-#: git-submodule.sh:684
+#: git-submodule.sh:685
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait"
 
-#: git-submodule.sh:688
+#: git-submodule.sh:689
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'"
 
-#: git-submodule.sh:689
+#: git-submodule.sh:690
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'"
 
-#: git-submodule.sh:694
+#: git-submodule.sh:695
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'"
 
-#: git-submodule.sh:695
+#: git-submodule.sh:696
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'"
 
-#: git-submodule.sh:700
+#: git-submodule.sh:701
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 "L'exécution de '$command $sha1' a échoué dans le chemin de sous-module "
 "'$displaypath'"
 
-#: git-submodule.sh:701
+#: git-submodule.sh:702
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'"
 
-#: git-submodule.sh:732
+#: git-submodule.sh:733
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
 
-#: git-submodule.sh:840
+#: git-submodule.sh:841
 msgid "The --cached option cannot be used with the --files option"
 msgstr "L'option --cached ne peut pas être utilisée avec l'option --files"
 
-#: git-submodule.sh:892
+#: git-submodule.sh:893
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "mode $mod_dst inattendu"
 
-#: git-submodule.sh:912
+#: git-submodule.sh:913
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Attention : $display_name ne contient pas la validation $sha1_src"
 
-#: git-submodule.sh:915
+#: git-submodule.sh:916
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Attention : $display_name ne contient pas la validation $sha1_dst"
 
-#: git-submodule.sh:918
+#: git-submodule.sh:919
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr ""
 "  Attention : $display_name ne contient pas les validations $sha1_src et "
 "$sha1_dst"
 
-#: git-submodule.sh:1064
+#: git-submodule.sh:1065
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'"
 
-#: git-submodule.sh:1136
+#: git-submodule.sh:1137
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
@@ -15642,81 +15779,81 @@ msgid "Unable to determine absolute path of git directory"
 msgstr "Impossible de déterminer le chemin absolu du répertoire git"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:238
+#: git-add--interactive.perl:196
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %s12s %s"
 
-#: git-add--interactive.perl:239
+#: git-add--interactive.perl:197
 msgid "staged"
 msgstr "indexé"
 
-#: git-add--interactive.perl:239
+#: git-add--interactive.perl:197
 msgid "unstaged"
 msgstr "non-indexé"
 
-#: git-add--interactive.perl:288 git-add--interactive.perl:313
+#: git-add--interactive.perl:246 git-add--interactive.perl:271
 msgid "binary"
 msgstr "binaire"
 
-#: git-add--interactive.perl:297 git-add--interactive.perl:351
+#: git-add--interactive.perl:255 git-add--interactive.perl:309
 msgid "nothing"
 msgstr "rien"
 
-#: git-add--interactive.perl:333 git-add--interactive.perl:348
+#: git-add--interactive.perl:291 git-add--interactive.perl:306
 msgid "unchanged"
 msgstr "inchangé"
 
-#: git-add--interactive.perl:644
+#: git-add--interactive.perl:602
 #, perl-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
 msgstr[0] "%d chemin ajouté\n"
 msgstr[1] "%d chemins ajoutés\n"
 
-#: git-add--interactive.perl:647
+#: git-add--interactive.perl:605
 #, perl-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
 msgstr[0] "%d chemin mis à jour\n"
 msgstr[1] "%d chemins mis à jour\n"
 
-#: git-add--interactive.perl:650
+#: git-add--interactive.perl:608
 #, perl-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
 msgstr[0] "%d chemin inversé\n"
 msgstr[1] "%d chemins inversés\n"
 
-#: git-add--interactive.perl:653
+#: git-add--interactive.perl:611
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "%d chemin touché\n"
 msgstr[1] "%d chemins touchés\n"
 
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:620
 msgid "Update"
 msgstr "Mise à jour"
 
-#: git-add--interactive.perl:674
+#: git-add--interactive.perl:632
 msgid "Revert"
 msgstr "Inverser"
 
-#: git-add--interactive.perl:697
+#: git-add--interactive.perl:655
 #, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr "note : %s n'est plus suivi à présent.\n"
 
-#: git-add--interactive.perl:708
+#: git-add--interactive.perl:666
 msgid "Add untracked"
 msgstr "Ajouter un fichier non-suivi"
 
-#: git-add--interactive.perl:714
+#: git-add--interactive.perl:672
 msgid "No untracked files.\n"
 msgstr "Aucun Fichier non suivi.\n"
 
-#: git-add--interactive.perl:1030
+#: git-add--interactive.perl:985
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -15724,7 +15861,7 @@ msgstr ""
 "Si le patch s'applique proprement, la section éditée sera\n"
 "immédiatement marquée comme indexée."
 
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:988
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -15732,7 +15869,7 @@ msgstr ""
 "Si le patch s'applique proprement, la section éditée sera\n"
 "immédiatement marquée comme remisée."
 
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:991
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -15740,33 +15877,33 @@ msgstr ""
 "Si le patch s'applique proprement, la section éditée sera\n"
 "immédiatement marquée comme desindexée."
 
-#: git-add--interactive.perl:1039 git-add--interactive.perl:1048
+#: git-add--interactive.perl:994 git-add--interactive.perl:1003
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
 msgstr ""
 "Si le patch s'applique proprement, la section éditée sera\n"
-"immediatement marquée comme appliquée."
+"immédiatement marquée comme appliquée."
 
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1045
+#: git-add--interactive.perl:997 git-add--interactive.perl:1000
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
 msgstr ""
 "Si le patch s'applique proprement, la section éditée sera\n"
-"immediatement marquée comme éliminée."
+"immédiatement marquée comme éliminée."
 
-#: git-add--interactive.perl:1058
+#: git-add--interactive.perl:1013
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "impossible d'ouvrir le fichier d'édition de section en écriture : %s"
 
-#: git-add--interactive.perl:1059
+#: git-add--interactive.perl:1014
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr ""
 "Mode d'édition manuelle de section -- voir ci-dessous pour un guide rapide.\n"
 
-#: git-add--interactive.perl:1065
+#: git-add--interactive.perl:1020
 #, perl-format
 msgid ""
 "---\n"
@@ -15780,7 +15917,7 @@ msgstr ""
 "Les lignes commençant par %s seront éliminées.\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1073
+#: git-add--interactive.perl:1028
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
@@ -15790,7 +15927,7 @@ msgstr ""
 "l'éditer à nouveau. Si toutes les lignes de la section sont supprimées,\n"
 "alors l'édition sera abandonnée et la section conservée.\n"
 
-#: git-add--interactive.perl:1087
+#: git-add--interactive.perl:1042
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "échec de l'ouverture du fichier d'édition de section en lecture : %s"
@@ -15801,14 +15938,14 @@ msgstr "échec de l'ouverture du fichier d'édition de section en lecture : %s"
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: git-add--interactive.perl:1178
+#: git-add--interactive.perl:1134
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
 "Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" "
 "l'élimine !) [y|n] ? "
 
-#: git-add--interactive.perl:1187
+#: git-add--interactive.perl:1143
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -15822,7 +15959,7 @@ msgstr ""
 "a - indexer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas indexer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1193
+#: git-add--interactive.perl:1149
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -15836,7 +15973,7 @@ msgstr ""
 "a - remiser cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas remiser cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1199
+#: git-add--interactive.perl:1155
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -15850,7 +15987,7 @@ msgstr ""
 "a - désindexer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas désindexer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1205
+#: git-add--interactive.perl:1161
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -15864,7 +16001,7 @@ msgstr ""
 "a - appliquer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas appliquer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1211
+#: git-add--interactive.perl:1167
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -15878,7 +16015,7 @@ msgstr ""
 "a - supprimer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas supprimer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1217
+#: git-add--interactive.perl:1173
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -15892,7 +16029,7 @@ msgstr ""
 "a - éliminer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas éliminer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1223
+#: git-add--interactive.perl:1179
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -15906,7 +16043,7 @@ msgstr ""
 "a - appliquer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas appliquer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1232
+#: git-add--interactive.perl:1188
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -15928,203 +16065,203 @@ msgstr ""
 "e - éditer manuellement la section actuelle\n"
 "? - afficher l'aide\n"
 
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1219
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Les sections sélectionnées ne s'applique pas à l'index !\n"
 
-#: git-add--interactive.perl:1264
+#: git-add--interactive.perl:1220
 msgid "Apply them to the worktree anyway? "
 msgstr "Les appliquer quand même à l'arbre de travail ? "
 
-#: git-add--interactive.perl:1267
+#: git-add--interactive.perl:1223
 msgid "Nothing was applied.\n"
 msgstr "Rien n'a été appliqué.\n"
 
-#: git-add--interactive.perl:1278
+#: git-add--interactive.perl:1234
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "fichier non-fusionné ignoré : %s\n"
 
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1243
 msgid "Only binary files changed.\n"
 msgstr "Seuls des fichiers binaires ont changé.\n"
 
-#: git-add--interactive.perl:1289
+#: git-add--interactive.perl:1245
 msgid "No changes.\n"
 msgstr "Aucune modification.\n"
 
-#: git-add--interactive.perl:1297
+#: git-add--interactive.perl:1253
 msgid "Patch update"
 msgstr "Mise à jour par patch"
 
-#: git-add--interactive.perl:1349
+#: git-add--interactive.perl:1305
 #, perl-format
 msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
 msgstr "Indexer le changement de mode [y,n,q,a,d,/%s,?] ? "
 
-#: git-add--interactive.perl:1350
+#: git-add--interactive.perl:1306
 #, perl-format
 msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
 msgstr "Indexer la suppression [y,n,q,a,d,/%s,?] ? "
 
-#: git-add--interactive.perl:1351
+#: git-add--interactive.perl:1307
 #, perl-format
 msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
 msgstr "Indexer cette section [y,n,q,a,d,/%s,?] ? "
 
-#: git-add--interactive.perl:1354
+#: git-add--interactive.perl:1310
 #, perl-format
 msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
 msgstr "Remiser le changement de mode [y,n,q,a,d,/%s,?] ? "
 
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1311
 #, perl-format
 msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
 msgstr "Remiser la suppression [y,n,q,a,d,/%s,?] ? "
 
-#: git-add--interactive.perl:1356
+#: git-add--interactive.perl:1312
 #, perl-format
 msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
 msgstr "Remiser cette section [y,n,q,a,d,/%s,?] ? "
 
-#: git-add--interactive.perl:1359
+#: git-add--interactive.perl:1315
 #, perl-format
 msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
 msgstr "Désindexer le changement de mode [y,n,q,a,d,/%s,?] ? "
 
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1316
 #, perl-format
 msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
 msgstr "Désindexer la suppression [y,n,q,a,d,/%s,?] ? "
 
-#: git-add--interactive.perl:1361
+#: git-add--interactive.perl:1317
 #, perl-format
 msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
 msgstr "Désindexer cette section [y,n,q,a,d,/%s,?] ? "
 
-#: git-add--interactive.perl:1364
+#: git-add--interactive.perl:1320
 #, perl-format
 msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
 msgstr "Appliquer le changement de mode à l'index [y,n,q,a,d,/%s,?] ? "
 
-#: git-add--interactive.perl:1365
+#: git-add--interactive.perl:1321
 #, perl-format
 msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
 msgstr "Appliquer la suppression à l'index [y,n,q,a,d,/%s,?] ? "
 
-#: git-add--interactive.perl:1366
+#: git-add--interactive.perl:1322
 #, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
 msgstr "Appliquer cette section à l'index [y,n,q,a,d,/%s,?] ? "
 
-#: git-add--interactive.perl:1369
+#: git-add--interactive.perl:1325
 #, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
 msgstr "Abandonner le changement de mode dans l'arbre [y,n,q,a,d,/%s,?] ? "
 
-#: git-add--interactive.perl:1370
+#: git-add--interactive.perl:1326
 #, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
 msgstr "Abandonner la suppression dans l'arbre [y,n,q,a,d,/%s,?] ? "
 
-#: git-add--interactive.perl:1371
+#: git-add--interactive.perl:1327
 #, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
 msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d,/%s,?] ? "
 
-#: git-add--interactive.perl:1374
+#: git-add--interactive.perl:1330
 #, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr ""
 "Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d,/%s,?] ? "
 
-#: git-add--interactive.perl:1375
+#: git-add--interactive.perl:1331
 #, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr ""
 "Abandonner la suppression de l'index et de l'arbre [y,n,q,a,d,/%s,?] ? "
 
-#: git-add--interactive.perl:1376
+#: git-add--interactive.perl:1332
 #, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr ""
 "Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d,/%s,?] ? "
 
-#: git-add--interactive.perl:1379
+#: git-add--interactive.perl:1335
 #, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr ""
 "Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,"
 "d,/%s,?] ? "
 
-#: git-add--interactive.perl:1380
+#: git-add--interactive.perl:1336
 #, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr ""
 "Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,d,/"
 "%s,?] ? "
 
-#: git-add--interactive.perl:1381
+#: git-add--interactive.perl:1337
 #, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr ""
 "Appliquer la section à l'index et l'arbre de travail [y,n,q,a,d,/%s,?] ? "
 
-#: git-add--interactive.perl:1484
+#: git-add--interactive.perl:1440
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "aller à quelle section (<ret> pour voir plus) ? "
 
-#: git-add--interactive.perl:1486
+#: git-add--interactive.perl:1442
 msgid "go to which hunk? "
 msgstr "aller à quelle section ? "
 
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1451
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Nombre invalide : '%s'\n"
 
-#: git-add--interactive.perl:1500
+#: git-add--interactive.perl:1456
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Désolé, %d seule section disponible.\n"
 msgstr[1] "Désolé, Seulement %d sections disponibles.\n"
 
-#: git-add--interactive.perl:1526
+#: git-add--interactive.perl:1482
 msgid "search for regex? "
 msgstr "rechercher la regex ? "
 
-#: git-add--interactive.perl:1539
+#: git-add--interactive.perl:1495
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Regex de recherche malformée %s : %s\n"
 
-#: git-add--interactive.perl:1549
+#: git-add--interactive.perl:1505
 msgid "No hunk matches the given pattern\n"
 msgstr "Aucune section ne correspond au motif donné\n"
 
-#: git-add--interactive.perl:1561 git-add--interactive.perl:1583
+#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
 msgid "No previous hunk\n"
 msgstr "Pas de section précédente\n"
 
-#: git-add--interactive.perl:1570 git-add--interactive.perl:1589
+#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
 msgid "No next hunk\n"
 msgstr "Pas de section suivante\n"
 
-#: git-add--interactive.perl:1597
+#: git-add--interactive.perl:1553
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Découpée en %d section.\n"
 msgstr[1] "Découpée en %d sections.\n"
 
-#: git-add--interactive.perl:1649
+#: git-add--interactive.perl:1605
 msgid "Review diff"
 msgstr "Réviser la différence"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1668
+#: git-add--interactive.perl:1624
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -16142,87 +16279,88 @@ msgstr ""
 "diff          - visualiser les diff entre HEAD et l'index\n"
 "add untracked - ajouter les fichiers non-suivis aux modifications à indexer\n"
 
-#: git-add--interactive.perl:1685 git-add--interactive.perl:1690
-#: git-add--interactive.perl:1693 git-add--interactive.perl:1700
-#: git-add--interactive.perl:1704 git-add--interactive.perl:1710
+#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
+#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
+#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
 msgid "missing --"
 msgstr "-- manquant"
 
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1662
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "mode de --patch inconnu : %s"
 
-#: git-add--interactive.perl:1712 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "argument invalide %s, -- attendu"
 
-#: git-send-email.perl:121
+#: git-send-email.perl:126
 msgid "local zone differs from GMT by a non-minute interval\n"
-msgstr "la zone locale diffère du GMT par un interval supérieur à une minute\n"
+msgstr ""
+"la zone locale diffère du GMT par un intervalle supérieur à une minute\n"
 
-#: git-send-email.perl:128 git-send-email.perl:134
+#: git-send-email.perl:133 git-send-email.perl:139
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "le décalage de temps local est plus grand ou égal à 24 heures\n"
 
-#: git-send-email.perl:202 git-send-email.perl:208
+#: git-send-email.perl:208 git-send-email.perl:214
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "l'éditeur est sorti en erreur, abandon total"
 
-#: git-send-email.perl:282
+#: git-send-email.perl:291
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr ""
 "'%s' contient une version intermédiaire du courriel que vous composiez.\n"
 
-#: git-send-email.perl:287
+#: git-send-email.perl:296
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' contient le courriel composé.\n"
 
-#: git-send-email.perl:305
+#: git-send-email.perl:314
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases est incompatible avec d'autres options\n"
 
-#: git-send-email.perl:368 git-send-email.perl:623
+#: git-send-email.perl:379 git-send-email.perl:634
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "Lancement de git format-patch impossible à l'extérieur d'un dépôt\n"
 
-#: git-send-email.perl:437
+#: git-send-email.perl:448
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Champ de --suppress-cc inconnu : '%s'\n"
 
-#: git-send-email.perl:466
+#: git-send-email.perl:477
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Paramètre de --confirm inconnu : '%s'\n"
 
-#: git-send-email.perl:498
+#: git-send-email.perl:509
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr ""
 "attention : les guillemets ne sont pas supportés dans alias sendmail : %s\n"
 
-#: git-send-email.perl:500
+#: git-send-email.perl:511
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "attention : `:include:` n'est pas supporté : %s\n"
 
-#: git-send-email.perl:502
+#: git-send-email.perl:513
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr ""
 "attention : les redirections `/file` ou `|pipe` ne sont pas supportées : %s\n"
 
-#: git-send-email.perl:507
+#: git-send-email.perl:518
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "attention : ligne sendmail non reconnue : %s\n"
 
-#: git-send-email.perl:589
+#: git-send-email.perl:600
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -16237,12 +16375,12 @@ msgstr ""
 "    * en indiquant \"./%s\" si vous désignez un fichier, ou\n"
 "    * en fournissant l'option --format-patch pour une plage.\n"
 
-#: git-send-email.perl:610
+#: git-send-email.perl:621
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Échec à l'ouverture du répertoire %s : %s"
 
-#: git-send-email.perl:634
+#: git-send-email.perl:645
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
@@ -16251,7 +16389,7 @@ msgstr ""
 "fatal : %s : %s\n"
 "attention : aucun patch envoyé\n"
 
-#: git-send-email.perl:645
+#: git-send-email.perl:656
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -16261,17 +16399,17 @@ msgstr ""
 "Aucun fichier patch spécifié !\n"
 "\n"
 
-#: git-send-email.perl:658
+#: git-send-email.perl:669
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Ligne de sujet non trouvée dans %s ?"
 
-#: git-send-email.perl:668
+#: git-send-email.perl:679
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Impossible d'ouvrir %s en écriture : %s"
 
-#: git-send-email.perl:678
+#: git-send-email.perl:689
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -16285,32 +16423,32 @@ msgstr ""
 "\n"
 "Effacez le corps si vous ne souhaitez pas envoyer un résumé.\n"
 
-#: git-send-email.perl:701
+#: git-send-email.perl:712
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "Échec à l'ouverture de %s.final : %s"
 
-#: git-send-email.perl:704
+#: git-send-email.perl:715
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Échec à l'ouverture de %s : %s"
 
-#: git-send-email.perl:739
+#: git-send-email.perl:750
 msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
 msgstr ""
 "Les champs To/CC/Bcc ne sont pas encore interprétés, ils ont été ignorés\n"
 
-#: git-send-email.perl:748
+#: git-send-email.perl:759
 msgid "Summary email is empty, skipping it\n"
 msgstr "Le courriel de résumé etant vide, il a été ignoré\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:780
+#: git-send-email.perl:791
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "Êtes-vous sur de vouloir utiliser <%s> [y/N] ? "
 
-#: git-send-email.perl:809
+#: git-send-email.perl:820
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -16318,11 +16456,11 @@ msgstr ""
 "Les fichiers suivants sont 8bit mais ne déclarent pas de champs Content-"
 "Transfer-Encoding.\n"
 
-#: git-send-email.perl:814
+#: git-send-email.perl:825
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Quel encodage 8bit doit être déclaré [UTF8] ? "
 
-#: git-send-email.perl:822
+#: git-send-email.perl:833
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -16335,22 +16473,22 @@ msgstr ""
 "a un sujet modèle '*** SUBJECT HERE ***'. Passez --force is vous souhaitez "
 "vraiment envoyer.\n"
 
-#: git-send-email.perl:841
+#: git-send-email.perl:852
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "À qui les courriels doivent-ils être envoyés (s'il y en a) ?"
 
-#: git-send-email.perl:859
+#: git-send-email.perl:870
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "fatal : l'alias '%s' se développe en lui-même\n"
 
-#: git-send-email.perl:871
+#: git-send-email.perl:882
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
-"Message-ID à utiliser comme In-Reply-to pour le premier courriel (s'il y en "
+"Message-ID à utiliser comme In-Reply-To pour le premier courriel (s'il y en "
 "a) ? "
 
-#: git-send-email.perl:921 git-send-email.perl:929
+#: git-send-email.perl:932 git-send-email.perl:940
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n"
@@ -16358,16 +16496,16 @@ msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n"
 #. TRANSLATORS: Make sure to include [q] [d] [e] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:933
+#: git-send-email.perl:944
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "Que faire de cette adresse ? ([q]uitter|[d]élaisser|[e]diter): "
 
-#: git-send-email.perl:1234
+#: git-send-email.perl:1245
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "le chemin vers la CA \"%s\" n'existe pas"
 
-#: git-send-email.perl:1309
+#: git-send-email.perl:1320
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -16394,129 +16532,175 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1324
+#: git-send-email.perl:1335
 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
 msgstr "Envoyer ce courriel ? ([y]es|[n]o|[q]uit|[a]ll) : "
 
-#: git-send-email.perl:1327
+#: git-send-email.perl:1338
 msgid "Send this email reply required"
 msgstr "Une réponse est nécessaire"
 
-#: git-send-email.perl:1353
+#: git-send-email.perl:1364
 msgid "The required SMTP server is not properly defined."
 msgstr "Le serveur SMTP nécessaire n'est pas défini correctement."
 
-#: git-send-email.perl:1397
+#: git-send-email.perl:1411
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Le serveur ne supporte pas STARTTLS ! %s"
 
-#: git-send-email.perl:1403
+#: git-send-email.perl:1416 git-send-email.perl:1420
+#, perl-format
+msgid "STARTTLS failed! %s"
+msgstr "echec de STARTTLS ! %s"
+
+#: git-send-email.perl:1430
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "Impossible d'initialiser SMTP. Vérifiez la configuration et utilisez --smtp-"
 "debug."
 
-#: git-send-email.perl:1421
+#: git-send-email.perl:1448
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "échec de l'envoi de %s\n"
 
-#: git-send-email.perl:1424
+#: git-send-email.perl:1451
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Envoi simulé de %s\n"
 
-#: git-send-email.perl:1424
+#: git-send-email.perl:1451
 #, perl-format
 msgid "Sent %s\n"
 msgstr "%s envoyé\n"
 
-#: git-send-email.perl:1426
+#: git-send-email.perl:1453
 msgid "Dry-OK. Log says:\n"
 msgstr "Simulation OK. Le journal indique :\n"
 
-#: git-send-email.perl:1426
+#: git-send-email.perl:1453
 msgid "OK. Log says:\n"
 msgstr "OK. Le journal indique :\n"
 
-#: git-send-email.perl:1438
+#: git-send-email.perl:1465
 msgid "Result: "
 msgstr "Résultat : "
 
-#: git-send-email.perl:1441
+#: git-send-email.perl:1468
 msgid "Result: OK\n"
 msgstr "Résultat : OK\n"
 
-#: git-send-email.perl:1454
+#: git-send-email.perl:1481
 #, perl-format
 msgid "can't open file %s"
 msgstr "impossible d'ouvrir le fichier %s"
 
-#: git-send-email.perl:1501 git-send-email.perl:1521
+#: git-send-email.perl:1528 git-send-email.perl:1548
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Ajout de cc: %s depuis la ligne '%s'\n"
 
-#: git-send-email.perl:1507
+#: git-send-email.perl:1534
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Ajout de to: %s depuis la ligne '%s'\n"
 
-#: git-send-email.perl:1555
+#: git-send-email.perl:1582
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) Ajout de cc: %s depuis la ligne '%s'\n"
 
-#: git-send-email.perl:1578
+#: git-send-email.perl:1605
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(corps) Ajout de cc: %s depuis la ligne '%s'\n"
 
-#: git-send-email.perl:1676
+#: git-send-email.perl:1711
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Impossible d'exécuter '%s'"
 
-#: git-send-email.perl:1683
+#: git-send-email.perl:1718
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Ajout de %s : %s depuis : '%s'\n"
 
-#: git-send-email.perl:1687
+#: git-send-email.perl:1722
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) échec de la fermeture du pipe vers '%s'"
 
-#: git-send-email.perl:1714
+#: git-send-email.perl:1749
 msgid "cannot send message as 7bit"
 msgstr "impossible d'envoyer un message comme 7bit"
 
-#: git-send-email.perl:1722
+#: git-send-email.perl:1757
 msgid "invalid transfer encoding"
 msgstr "codage de transfert invalide"
 
-#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802
+#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "impossible d'ouvrir %s :%s\n"
 
-#: git-send-email.perl:1744
+#: git-send-email.perl:1798
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr "%s : le patch contient une ligne plus longue que 998 caractères"
 
-#: git-send-email.perl:1760
+#: git-send-email.perl:1814
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1764
+#: git-send-email.perl:1818
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
 
+#~ msgid "Could not open file '%s'"
+#~ msgstr "impossible d'ouvrir le fichier '%s'"
+
+#~ msgid "in %0.1f seconds automatically..."
+#~ msgstr "dans %0.1f secondes automatiquement..."
+
+#~ msgid "dup2(%d,%d) failed"
+#~ msgstr "échec de dup2(%d,%d)"
+
+#~ msgid "Initial commit on "
+#~ msgstr "Validation initiale sur "
+
+#~ msgid "Patch is empty. Was it split wrong?"
+#~ msgstr "Le patch est vide. Le découpage était-il bon ?"
+
+#~ msgid ""
+#~ "You still have unmerged paths in your index.\n"
+#~ "Did you forget to use 'git add'?"
+#~ msgstr ""
+#~ "Vous avez toujours des chemins non fusionnés dans votre index\n"
+#~ "Auriez-vous oublié de faire 'git add' ?"
+
+#~ msgid ""
+#~ "Cannot update paths and switch to branch '%s' at the same time.\n"
+#~ "Did you intend to checkout '%s' which can not be resolved as commit?"
+#~ msgstr ""
+#~ "Impossible de mettre à jour les chemins et de basculer sur la branche "
+#~ "'%s' en même temps.\n"
+#~ "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"
+
+#~ msgid "Explicit paths specified without -i or -o; assuming --only paths..."
+#~ msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."
+
+#~ msgid "default mode for recursion"
+#~ msgstr "mode par défaut pour la récursion"
+
+#~ msgid "submodule--helper subcommand must be called with a subcommand"
+#~ msgstr ""
+#~ "la sous-commande submodule--helper doit être appelée avec une sous-"
+#~ "commande"
+
 #~ msgid "could not stat '%s"
 #~ msgstr "stat impossible de '%s'"
 
@@ -17079,8 +17263,8 @@ msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
 #~ "Pour restaurer la branche d'origine et stopper le patchage, lancez "
 #~ "\"$cmdline --abort\"."
 
-#~ msgid "Patch does not have a valid e-mail address."
-#~ msgstr "Le patch n'a pas d'adresse e-mail valide."
+#~ msgid "Patch does not have a valid courriel address."
+#~ msgstr "Le patch n'a pas d'adresse courriel valide."
 
 #~ msgid "Applying: $FIRSTLINE"
 #~ msgstr "Application : $FIRSTLINE"
diff --git a/po/ko.po b/po/ko.po
index 0361597f53..6c7d896a87 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -58,8 +58,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-15 11:57+0800\n"
-"PO-Revision-Date: 2017-07-19 17:11+0900\n"
+"POT-Creation-Date: 2017-07-24 21:54+0800\n"
+"PO-Revision-Date: 2017-08-01 12:26+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Git Korean translation <http://github.com/changwoo/git-l10n-"
 "ko>\n"
@@ -1505,17 +1505,60 @@ msgstr "%s에서 LF는 CRLF로 바뀝니다."
 msgid "in the future"
 msgstr "미래에"
 
-#: date.c:122 date.c:129 date.c:136 date.c:143 date.c:149 date.c:156 date.c:167
-#: date.c:175 date.c:180
-msgid "%"
-msgid_plural "%"
-msgstr[0] "%"
+#: date.c:122
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "%<PRIuMAX>초 전"
+
+#: date.c:129
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "%<PRIuMAX>분 전"
+
+#: date.c:136
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "%<PRIuMAX>시간 전"
+
+#: date.c:143
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "%<PRIuMAX>일 전"
+
+#: date.c:149
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "%<PRIuMAX>주 전"
+
+#: date.c:156
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "%<PRIuMAX>달 전"
+
+#: date.c:167
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX>년"
 
 #. TRANSLATORS: "%s" is "<n> years"
 #: date.c:170
-msgid "%s, %"
-msgid_plural "%s, %"
-msgstr[0] "%s, %"
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "%s, %<PRIuMAX>달 전"
+
+#: date.c:175 date.c:180
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "%<PRIuMAX>년 전"
 
 #: diffcore-order.c:24
 #, c-format
@@ -1686,7 +1729,7 @@ msgstr "잘못된 커밋 %s"
 msgid "giving up"
 msgstr "포기함"
 
-#: fetch-pack.c:533 progress.c:235
+#: fetch-pack.c:533 progress.c:237
 msgid "done"
 msgstr "완료"
 
@@ -8363,7 +8406,7 @@ msgstr "최적 성능을 위해 자동으로 저장소의 묶음을 만듭니다
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "수동 관리 작업은 \"git help gc\" 내용을 참고하십시오.\n"
 
-#: builtin/gc.c:432
+#: builtin/gc.c:436
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8371,7 +8414,7 @@ msgstr ""
 "가비지컬렉터가 이미 '%s' 컴퓨터에서 %<PRIuMAX> PID로 실행 중입니다 (아니면 --"
 "force를 사용하십시오)"
 
-#: builtin/gc.c:476
+#: builtin/gc.c:480
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 0e3f1fd000..75ec68c340 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git Russian Localization Project\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-05-05 09:35+0800\n"
-"PO-Revision-Date: 2017-06-09 14:19+0000\n"
+"POT-Creation-Date: 2017-07-24 21:54+0800\n"
+"PO-Revision-Date: 2017-07-30 09:20+0000\n"
 "Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -20,59 +20,59 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: advice.c:55
+#: advice.c:58
 #, c-format
 msgid "hint: %.*s\n"
 msgstr "подсказка: %.*s\n"
 
-#: advice.c:83
+#: advice.c:86
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "Невозможно выполнить копирование коммита в текущую ветку, так как у вас имеются не слитые файлы."
 
-#: advice.c:85
+#: advice.c:88
 msgid "Committing is not possible because you have unmerged files."
 msgstr "Невозможно закоммитить, так как у вас имеются не слитые файлы."
 
-#: advice.c:87
+#: advice.c:90
 msgid "Merging is not possible because you have unmerged files."
 msgstr "Невозможно выполнить слияние, так как у вас имеются не слитые файлы."
 
-#: advice.c:89
+#: advice.c:92
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "Невозможно выполнить получение, так как у вас имеются не слитые файлы."
 
-#: advice.c:91
+#: advice.c:94
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "Невозможно обратить изменения, так как у вас имеются не слитые файлы."
 
-#: advice.c:93
+#: advice.c:96
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "Невозможно выполнить %s, так как у вас имеются не слитые файлы."
 
-#: advice.c:101
+#: advice.c:104
 msgid ""
 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 "as appropriate to mark resolution and make a commit."
 msgstr "Исправьте их в рабочем каталоге, затем запустите «git add/rm <файл>»,\nчтобы пометить исправление и сделайте коммит."
 
-#: advice.c:109
+#: advice.c:112
 msgid "Exiting because of an unresolved conflict."
 msgstr "Выход из-за неразрешенного конфликта."
 
-#: advice.c:114 builtin/merge.c:1185
+#: advice.c:117 builtin/merge.c:1184
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD)."
 
-#: advice.c:116
+#: advice.c:119
 msgid "Please, commit your changes before merging."
 msgstr "Перед слиянием, выполните коммит ваших изменений."
 
-#: advice.c:117
+#: advice.c:120
 msgid "Exiting because of unfinished merge."
 msgstr "Выход из-за незавершенного слияния."
 
-#: advice.c:123
+#: advice.c:126
 #, c-format
 msgid ""
 "Note: checking out '%s'.\n"
@@ -88,82 +88,92 @@ msgid ""
 "\n"
 msgstr "Примечание: переход на «%s».\n\nВы сейчас в состоянии «отделённого HEAD». Вы можете осмотреться, сделать\nэкспериментальные изменения и закоммитить их, также вы можете отменить\nизменения любых коммитов в этом состоянии не затрагивая любые ветки и\nне переходя на них.\n\nЕсли вы хотите создать новую ветку и сохранить свои коммиты, то вы\nможете сделать это (сейчас или позже) вызвав команду checkout снова,\nно с параметром -b. Например:\n\n  git checkout -b <имя-новой-ветки>\n\n"
 
-#: apply.c:57
+#: apply.c:58
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "неопознанная опция для пробелов «%s»"
 
-#: apply.c:73
+#: apply.c:74
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "неопознанная опция для игнорирования пробелов «%s»"
 
-#: apply.c:125
+#: apply.c:126
 msgid "--reject and --3way cannot be used together."
 msgstr "--reject и --3way нельзя использовать одновременно."
 
-#: apply.c:127
+#: apply.c:128
 msgid "--cached and --3way cannot be used together."
 msgstr "--cached и --3way нельзя использовать одновременно."
 
-#: apply.c:130
+#: apply.c:131
 msgid "--3way outside a repository"
 msgstr "--3way вне репозитория"
 
-#: apply.c:141
+#: apply.c:142
 msgid "--index outside a repository"
 msgstr "--index вне репозитория"
 
-#: apply.c:144
+#: apply.c:145
 msgid "--cached outside a repository"
 msgstr "--cached вне репозитория"
 
-#: apply.c:845
+#: apply.c:836
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "Не удалось подготовить регулярное выражение для метки времени %s"
 
-#: apply.c:854
+#: apply.c:845
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec возвратил %d для ввода: %s"
 
-#: apply.c:938
+#: apply.c:929
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "не удалось найти имя файла в строке патча %d"
 
-#: apply.c:977
+#: apply.c:967
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr "git apply: плохой git-diff — ожидалось /dev/null, получено %s на строке %d"
 
-#: apply.c:983
+#: apply.c:973
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr "git apply: плохой git-diff — не согласующееся новое имя файла на строке %d"
 
-#: apply.c:984
+#: apply.c:974
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr "git apply: плохой git-diff — не согласующееся старое имя файла на строке %d"
 
-#: apply.c:990
+#: apply.c:979
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: плохой git-diff  — ожидалось /dev/null на строке %d"
 
-#: apply.c:1488
+#: apply.c:1008
+#, c-format
+msgid "invalid mode on line %d: %s"
+msgstr "недопустимый режим %d: %s"
+
+#: apply.c:1326
+#, c-format
+msgid "inconsistent header lines %d and %d"
+msgstr "противоречивые строки заголовка %d и %d"
+
+#: apply.c:1498
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount: не ожидаемая строка: %.*s"
 
-#: apply.c:1557
+#: apply.c:1567
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "фрагмент изменений без заголовка на строке %d: %.*s"
 
-#: apply.c:1577
+#: apply.c:1587
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname"
@@ -176,70 +186,70 @@ msgstr[1] "заголовок git diff не нашел информацию об
 msgstr[2] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)"
 msgstr[3] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)"
 
-#: apply.c:1589
+#: apply.c:1600
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr "заголовок git diff не содержит информации об имени файла (строка %d)"
 
-#: apply.c:1759
+#: apply.c:1770
 msgid "new file depends on old contents"
 msgstr "новый файл зависит от старого содержимого"
 
-#: apply.c:1761
+#: apply.c:1772
 msgid "deleted file still has contents"
 msgstr "удаленный файл все еще имеет содержимое"
 
-#: apply.c:1795
+#: apply.c:1806
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "патч поврежден на строке %d"
 
-#: apply.c:1832
+#: apply.c:1843
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "новый файл %s зависит от старого содержимого"
 
-#: apply.c:1834
+#: apply.c:1845
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "удаленный файл %s все еще имеет содержимое"
 
-#: apply.c:1837
+#: apply.c:1848
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** предупреждение: файл %s становится пустым, но не удаляется"
 
-#: apply.c:1984
+#: apply.c:1995
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "поврежденный двоичный патч на строке %d: %.*s"
 
-#: apply.c:2021
+#: apply.c:2032
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "неопознанный двоичный патч на строке %d"
 
-#: apply.c:2182
+#: apply.c:2193
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "патч с мусором на строке %d"
 
-#: apply.c:2265
+#: apply.c:2276
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "не удалось прочитать символьную ссылку %s"
 
-#: apply.c:2269
+#: apply.c:2280
 #, c-format
 msgid "unable to open or read %s"
 msgstr "не удалось открыть или прочесть %s"
 
-#: apply.c:2922
+#: apply.c:2933
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "неправильное начало строки: «%c»"
 
-#: apply.c:3041
+#: apply.c:3052
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -248,257 +258,257 @@ msgstr[1] "Часть #%d успешно применена на %d (со сдв
 msgstr[2] "Часть #%d успешно применена на %d (со сдвигом в %d строк)."
 msgstr[3] "Часть #%d успешно применена на %d (со сдвигом в %d строк)."
 
-#: apply.c:3053
+#: apply.c:3064
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Контекст сужен до (%ld/%ld), чтобы применить фрагмент на %d строке"
 
-#: apply.c:3059
+#: apply.c:3070
 #, c-format
 msgid ""
 "while searching for:\n"
 "%.*s"
 msgstr "при поиске:\n%.*s"
 
-#: apply.c:3081
+#: apply.c:3092
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "пропущены данные двоичного патча для «%s»"
 
-#: apply.c:3089
+#: apply.c:3100
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr "невозможно выполнить reverse-apply для двоичного патча, без обращения изменений блока «%s»"
 
-#: apply.c:3135
+#: apply.c:3146
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr "невозможно применить двоичный патч «%s» без строки с указанной полной версией индекса"
 
-#: apply.c:3145
+#: apply.c:3156
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr "патч применятся к файлу «%s» (%s), но его текущее содержимое не соотвествует ожидаемому."
 
-#: apply.c:3153
+#: apply.c:3164
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "патч применяется к пустому файлу «%s», но файл не пустой"
 
-#: apply.c:3171
+#: apply.c:3182
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "не удалось прочитать необходимую посылку %s для «%s»"
 
-#: apply.c:3184
+#: apply.c:3195
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "не удалось применить двоичный патч к «%s»"
 
-#: apply.c:3190
+#: apply.c:3201
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr "после применения двоичного патча для «%s» был получен неправильный результат (ожидалось %s, получено %s)"
 
-#: apply.c:3211
+#: apply.c:3222
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "ошибка применения изменений: %s:%ld"
 
-#: apply.c:3333
+#: apply.c:3344
 #, c-format
 msgid "cannot checkout %s"
 msgstr "не удалось переключить состояние на %s"
 
-#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253
+#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
 #, c-format
 msgid "failed to read %s"
 msgstr "не удалось прочитать %s"
 
-#: apply.c:3389
+#: apply.c:3400
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "чтение из «%s» за символической ссылкой"
 
-#: apply.c:3418 apply.c:3658
+#: apply.c:3429 apply.c:3669
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "путь %s был переименован/удален"
 
-#: apply.c:3501 apply.c:3672
+#: apply.c:3512 apply.c:3683
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: нет в индексе"
 
-#: apply.c:3510 apply.c:3680
+#: apply.c:3521 apply.c:3691
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: не совпадает с индексом"
 
-#: apply.c:3545
+#: apply.c:3556
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr "в репозитории отсутствует необходимый двоичный объект для отката к трёхходовому слиянию."
 
-#: apply.c:3548
+#: apply.c:3559
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "Откат к трёхходовому слиянию…\n"
 
-#: apply.c:3564 apply.c:3568
+#: apply.c:3575 apply.c:3579
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "не удалось прочитать текущее содержимое «%s»"
 
-#: apply.c:3580
+#: apply.c:3591
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "Не удалось откатиться к трёхходовому слиянию…\n"
 
-#: apply.c:3594
+#: apply.c:3605
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Патч применен к «%s» с конфликтами.\n"
 
-#: apply.c:3599
+#: apply.c:3610
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Патч применен к «%s» без ошибок.\n"
 
-#: apply.c:3625
+#: apply.c:3636
 msgid "removal patch leaves file contents"
 msgstr "патч удаления не удалил содержимое файла"
 
-#: apply.c:3697
+#: apply.c:3708
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: неправильный тип"
 
-#: apply.c:3699
+#: apply.c:3710
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s имеет тип %o, а ожидался %o"
 
-#: apply.c:3850 apply.c:3852
+#: apply.c:3860 apply.c:3862
 #, c-format
 msgid "invalid path '%s'"
 msgstr "неправильный путь «%s»"
 
-#: apply.c:3908
+#: apply.c:3918
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: уже содержится в индексе"
 
-#: apply.c:3911
+#: apply.c:3921
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: уже содержится в рабочем каталоге"
 
-#: apply.c:3931
+#: apply.c:3941
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o)"
 
-#: apply.c:3936
+#: apply.c:3946
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o) для %s"
 
-#: apply.c:3956
+#: apply.c:3966
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "затронутый файл «%s» находится за символической ссылкой"
 
-#: apply.c:3960
+#: apply.c:3970
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: не удалось применить патч"
 
-#: apply.c:3975
+#: apply.c:3985
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Проверка патча %s…"
 
-#: apply.c:4066
+#: apply.c:4076
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "информация об sha1 отсутствует или бесполезна для подмодуля %s"
 
-#: apply.c:4073
+#: apply.c:4083
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "изменен режим для %s, который не находится в текущем HEAD"
 
-#: apply.c:4076
+#: apply.c:4086
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "информация об sha1 отсутствует или бесполезна (%s)."
 
-#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135
+#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "сбой make_cache_entry для пути «%s»"
 
-#: apply.c:4085
+#: apply.c:4095
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "не удалось добавить %s во временный индекс"
 
-#: apply.c:4095
+#: apply.c:4105
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "не удалось записать временный индкекс в %s"
 
-#: apply.c:4233
+#: apply.c:4243
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "не удалось удалить %s из индекса"
 
-#: apply.c:4268
+#: apply.c:4278
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "поврежденный патч для подмодуля %s"
 
-#: apply.c:4274
+#: apply.c:4284
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "не удалось выполнить stat для созданного файла «%s»"
 
-#: apply.c:4282
+#: apply.c:4292
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "не удалось создать вспомогательный файл для созданного файла %s"
 
-#: apply.c:4288 apply.c:4432
+#: apply.c:4298 apply.c:4442
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "не удалось создать запись в кэше для %s"
 
-#: apply.c:4329
+#: apply.c:4339
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "не удалось записать в «%s»"
 
-#: apply.c:4333
+#: apply.c:4343
 #, c-format
 msgid "closing file '%s'"
 msgstr "закрытие файла «%s»"
 
-#: apply.c:4403
+#: apply.c:4413
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "не удалось записать файл «%s» с режимом доступа %o"
 
-#: apply.c:4501
+#: apply.c:4511
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Патч %s применен без ошибок."
 
-#: apply.c:4509
+#: apply.c:4519
 msgid "internal error"
 msgstr "внутренняя ошибка"
 
-#: apply.c:4512
+#: apply.c:4522
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
@@ -507,45 +517,45 @@ msgstr[1] "Применение патча %%s с %d отказами…"
 msgstr[2] "Применение патча %%s с %d отказами…"
 msgstr[3] "Применение патча %%s с %d отказами…"
 
-#: apply.c:4523
+#: apply.c:4533
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "усечение имени .rej файла до %.*s.rej"
 
-#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988
+#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
 #, c-format
 msgid "cannot open %s"
 msgstr "не удалось открыть %s"
 
-#: apply.c:4545
+#: apply.c:4555
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Блок №%d применен без ошибок."
 
-#: apply.c:4549
+#: apply.c:4559
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Блок №%d отклонен."
 
-#: apply.c:4659
+#: apply.c:4669
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Патч «%s» пропущен."
 
-#: apply.c:4667
+#: apply.c:4677
 msgid "unrecognized input"
 msgstr "не распознанный ввод"
 
-#: apply.c:4686
+#: apply.c:4696
 msgid "unable to read index file"
 msgstr "не удалось прочитать файл индекса"
 
-#: apply.c:4823
+#: apply.c:4833
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "не удалось открыть патч «%s»: %s"
 
-#: apply.c:4850
+#: apply.c:4860
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
@@ -554,7 +564,7 @@ msgstr[1] "пропущено %d ошибки в пробельных симво
 msgstr[2] "пропущено %d ошибок в пробельных символах"
 msgstr[3] "пропущено %d ошибок в пробельных символах"
 
-#: apply.c:4856 apply.c:4871
+#: apply.c:4866 apply.c:4881
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
@@ -563,7 +573,7 @@ msgstr[1] "%d строки добавили ошибки в пробельных
 msgstr[2] "%d строк добавили ошибки в пробельных символах."
 msgstr[3] "%d строк добавили ошибки в пробельных символах."
 
-#: apply.c:4864
+#: apply.c:4874
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
@@ -572,304 +582,299 @@ msgstr[1] "%d строки добавлено после исправления
 msgstr[2] "%d строк добавлено после исправления ошибок в пробелах."
 msgstr[3] "%d строки добавлено после исправления ошибок в пробелах."
 
-#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
+#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
 msgid "Unable to write new index file"
 msgstr "Не удалось записать новый файл индекса"
 
-#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279
-#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180
+#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
+#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
 #: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
 #: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
 #: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
-#: git-add--interactive.perl:239
+#: git-add--interactive.perl:197
 msgid "path"
 msgstr "путь"
 
-#: apply.c:4912
+#: apply.c:4922
 msgid "don't apply changes matching the given path"
 msgstr "не применять изменения по указанному пути"
 
-#: apply.c:4915
+#: apply.c:4925
 msgid "apply changes matching the given path"
 msgstr "применять изменения по указанному пути"
 
-#: apply.c:4917 builtin/am.c:2285
+#: apply.c:4927 builtin/am.c:2266
 msgid "num"
 msgstr "количество"
 
-#: apply.c:4918
+#: apply.c:4928
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "удалить <количество> ведущих косых черт из традиционных путей списка изменений"
 
-#: apply.c:4921
+#: apply.c:4931
 msgid "ignore additions made by the patch"
 msgstr "игнорировать добавления, сделанные этим патчем"
 
-#: apply.c:4923
+#: apply.c:4933
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "вместо применения патча вывести статистику добавлений и удалений для ввода"
 
-#: apply.c:4927
+#: apply.c:4937
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "показать количество добавленных и удаленных строк в десятичном представлении"
 
-#: apply.c:4929
+#: apply.c:4939
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "вместо применения патча вывести статистику изменений для ввода"
 
-#: apply.c:4931
+#: apply.c:4941
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "вместо применения патча проверить подходит ли он"
 
-#: apply.c:4933
+#: apply.c:4943
 msgid "make sure the patch is applicable to the current index"
 msgstr "проверить, что патч применяется к текущему индексу"
 
-#: apply.c:4935
+#: apply.c:4945
 msgid "apply a patch without touching the working tree"
 msgstr "применить патч, не изменяя рабочий каталог"
 
-#: apply.c:4937
+#: apply.c:4947
 msgid "accept a patch that touches outside the working area"
 msgstr "принять патч, который затрагивает файлы за рабочим каталогом"
 
-#: apply.c:4939
+#: apply.c:4949
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "а также применить патч (используйте с --stat/--summary/--check)"
 
-#: apply.c:4941
+#: apply.c:4951
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "попытаться сделать трехходовое слияние, если патч не применяется"
 
-#: apply.c:4943
+#: apply.c:4953
 msgid "build a temporary index based on embedded index information"
 msgstr "построить временный индекс, основанный на встроенной информации об индексе"
 
-#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515
+#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
 msgid "paths are separated with NUL character"
 msgstr "пути, отделённые НУЛЕВЫМ символом"
 
-#: apply.c:4948
+#: apply.c:4958
 msgid "ensure at least <n> lines of context match"
 msgstr "удостовериться, что по крайней мере <n> строк контекста совпадают"
 
-#: apply.c:4949 builtin/am.c:2264
+#: apply.c:4959 builtin/am.c:2245
 msgid "action"
 msgstr "действие"
 
-#: apply.c:4950
+#: apply.c:4960
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "определять новые или модифицированные строки, у которых есть ошибки в пробельных символах"
 
-#: apply.c:4953 apply.c:4956
+#: apply.c:4963 apply.c:4966
 msgid "ignore changes in whitespace when finding context"
 msgstr "игнорировать изменения в пробельных символах при поиске контекста"
 
-#: apply.c:4959
+#: apply.c:4969
 msgid "apply the patch in reverse"
 msgstr "применить патч с обращением изменений"
 
-#: apply.c:4961
+#: apply.c:4971
 msgid "don't expect at least one line of context"
 msgstr "не ожидать как минимум одной строки контекста"
 
-#: apply.c:4963
+#: apply.c:4973
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "оставить отклоненные блоки изменений в соответствующих *.rej файлах"
 
-#: apply.c:4965
+#: apply.c:4975
 msgid "allow overlapping hunks"
 msgstr "разрешить перекрывающиеся блоки изменений"
 
-#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19
-#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651
-#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134
+#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
+#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
+#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
 msgid "be verbose"
 msgstr "быть многословнее"
 
-#: apply.c:4968
+#: apply.c:4978
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "разрешить некорректно определенные пропущенные пустые строки в конце файла"
 
-#: apply.c:4971
+#: apply.c:4981
 msgid "do not trust the line counts in the hunk headers"
 msgstr "не доверять количеству строк из заголовка блока изменений"
 
-#: apply.c:4973 builtin/am.c:2273
+#: apply.c:4983 builtin/am.c:2254
 msgid "root"
 msgstr "корень"
 
-#: apply.c:4974
+#: apply.c:4984
 msgid "prepend <root> to all filenames"
 msgstr "добавить <корень> спереди ко всем именам файлов"
 
-#: archive.c:12
+#: archive.c:13
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<опции>] <указатель-дерева> [<путь>…]"
 
-#: archive.c:13
+#: archive.c:14
 msgid "git archive --list"
 msgstr "git archive --list"
 
-#: archive.c:14
+#: archive.c:15
 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> "
 "[<path>...]"
 msgstr "git archive --remote <репозиторий> [--exec <команда>] [<опции>] <указатель-дерева> [<путь>…]"
 
-#: archive.c:15
+#: archive.c:16
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <репозиторий> [--exec <команда>] --list"
 
-#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
+#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "спецификатор пути «%s» не соответствует ни одному файлу"
 
-#: archive.c:417
+#: archive.c:418
 msgid "fmt"
 msgstr "формат"
 
-#: archive.c:417
+#: archive.c:418
 msgid "archive format"
 msgstr "формат архива"
 
-#: archive.c:418 builtin/log.c:1436
+#: archive.c:419 builtin/log.c:1446
 msgid "prefix"
 msgstr "префикс"
 
-#: archive.c:419
+#: archive.c:420
 msgid "prepend prefix to each pathname in the archive"
 msgstr "добавлять префикс перед каждым путем файла в архиве"
 
-#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60
-#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061
-#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129
+#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
+#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
+#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
+#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
 #: parse-options.h:153
 msgid "file"
 msgstr "файл"
 
-#: archive.c:421 builtin/archive.c:89
+#: archive.c:422 builtin/archive.c:89
 msgid "write the archive to this file"
 msgstr "запись архива в этот файл"
 
-#: archive.c:423
+#: archive.c:424
 msgid "read .gitattributes in working directory"
 msgstr "читать .gitattributes в рабочем каталоге"
 
-#: archive.c:424
+#: archive.c:425
 msgid "report archived files on stderr"
 msgstr "отчет об архивированных файлах в stderr"
 
-#: archive.c:425
+#: archive.c:426
 msgid "store only"
 msgstr "только хранение"
 
-#: archive.c:426
+#: archive.c:427
 msgid "compress faster"
 msgstr "сжимать быстрее"
 
-#: archive.c:434
+#: archive.c:435
 msgid "compress better"
 msgstr "сжимать лучше"
 
-#: archive.c:437
+#: archive.c:438
 msgid "list supported archive formats"
 msgstr "перечислить поддерживаемые форматы архивов"
 
-#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106
+#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
 #: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
 msgid "repo"
 msgstr "репозиторий"
 
-#: archive.c:440 builtin/archive.c:91
+#: archive.c:441 builtin/archive.c:91
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "получить архив из внешнего <репозитория>"
 
-#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485
+#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
 msgid "command"
 msgstr "команда"
 
-#: archive.c:442 builtin/archive.c:93
+#: archive.c:443 builtin/archive.c:93
 msgid "path to the remote git-upload-archive command"
 msgstr "путь к команде git-upload-archive на машине с внешним репозиторием"
 
-#: archive.c:449
+#: archive.c:450
 msgid "Unexpected option --remote"
 msgstr "Неожиданная опция --remote"
 
-#: archive.c:451
+#: archive.c:452
 msgid "Option --exec can only be used together with --remote"
 msgstr "Опция --exec может использоваться только вместе с --remote"
 
-#: archive.c:453
+#: archive.c:454
 msgid "Unexpected option --output"
 msgstr "Неожиданная опция --output"
 
-#: archive.c:475
+#: archive.c:476
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Неизвестный формат архива «%s»"
 
-#: archive.c:482
+#: archive.c:483
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Аргумент не поддерживается для формата «%s»: -%d"
 
-#: attr.c:212
+#: attr.c:214
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s не является допустимым именем атрибута"
 
-#: attr.c:408
+#: attr.c:410
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
 msgstr "Отрицающие шаблоны в атрибутах git игнорируются.\nИспользуйте «\\!» для буквального использования символа в значении «восклицательный знак»."
 
-#: bisect.c:444
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "Не удалось открыть файл «%s»"
-
-#: bisect.c:449
+#: bisect.c:447
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Плохое содержимое файла «%s»: %s"
 
-#: bisect.c:657
+#: bisect.c:655
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Невозможно продолжить бинарный поиск!\n"
 
-#: bisect.c:710
+#: bisect.c:708
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "Недопустимое имя коммита %s"
 
-#: bisect.c:734
+#: bisect.c:732
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
 "This means the bug has been fixed between %s and [%s].\n"
 msgstr "База слияния %s является плохим коммитом.\nЭто значит, что ошибка была исправлена где-то между %s и [%s].\n"
 
-#: bisect.c:739
+#: bisect.c:737
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
 "The property has changed between %s and [%s].\n"
 msgstr "База слияния %s является новой.\nСвойство было изменено где-то между %s и [%s].\n"
 
-#: bisect.c:744
+#: bisect.c:742
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
 "This means the first '%s' commit is between %s and [%s].\n"
 msgstr "База слияния %s является %s.\nЭто значит, что «%s» коммит находится где-то между %s и [%s].\n"
 
-#: bisect.c:752
+#: bisect.c:750
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -877,7 +882,7 @@ msgid ""
 "Maybe you mistook %s and %s revs?\n"
 msgstr "Несколько %s коммитов не являются предками %s коммита.\nВ этом случае git bisect не может работать правильно.\nВозможно, вы перепутали редакции %s и %s местами?\n"
 
-#: bisect.c:765
+#: bisect.c:763
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -885,43 +890,43 @@ msgid ""
 "We continue anyway."
 msgstr "База слияния между %s и [%s] должно быть пропущена.\nПоэтому мы не можем быть уверены, что первый %s коммит находится между %s и %s.\nНо все же продолжаем поиск."
 
-#: bisect.c:800
+#: bisect.c:798
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Бинарный поиск: база слияния должна быть проверена\n"
 
-#: bisect.c:851
+#: bisect.c:849
 #, c-format
 msgid "a %s revision is needed"
 msgstr "нужно указать %s редакцию"
 
-#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255
+#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
 #, c-format
 msgid "could not create file '%s'"
 msgstr "не удалось создать файл «%s»"
 
-#: bisect.c:919
+#: bisect.c:917
 #, c-format
 msgid "could not read file '%s'"
 msgstr "не удалось прочитать файл «%s»"
 
-#: bisect.c:949
+#: bisect.c:947
 msgid "reading bisect refs failed"
 msgstr "сбой при чтении ссылок двоичного поиска"
 
-#: bisect.c:969
+#: bisect.c:967
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s была одновременно и %s и %s\n"
 
-#: bisect.c:977
+#: bisect.c:975
 #, c-format
 msgid ""
 "No testable commit found.\n"
 "Maybe you started with bad path parameters?\n"
 msgstr "Тестируемый коммит не найден.\nВозможно, вы начали поиск с указанием неправильного параметра пути?\n"
 
-#: bisect.c:996
+#: bisect.c:994
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -930,8 +935,8 @@ msgstr[1] "(примерно %d шага)"
 msgstr[2] "(примерно %d шагов)"
 msgstr[3] "(примерно %d шагов)"
 
-#. TRANSLATORS: the last %s will be replaced with
-#. "(roughly %d steps)" translation
+#. TRANSLATORS: the last %s will be replaced with "(roughly %d
+#. steps)" translation.
 #: bisect.c:1000
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
@@ -941,6 +946,40 @@ msgstr[1] "Бинарный поиск: %d редакции осталось п
 msgstr[2] "Бинарный поиск: %d редакций осталось проверить после этой %s\n"
 msgstr[3] "Бинарный поиск: %d редакций осталось проверить после этой %s\n"
 
+#: blame.c:1757
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents и --reverse не очень сочетаются."
+
+#: blame.c:1768
+msgid "cannot use --contents with final commit object name"
+msgstr "нельзя использовать --contents с указанием финального имени объекта"
+
+#: blame.c:1788
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr "при --reverse и --first-parent вместе нужно указывать конкретный последний коммит"
+
+#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
+#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
+#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926
+#: builtin/merge.c:360 builtin/shortlog.c:177
+msgid "revision walk setup failed"
+msgstr "сбой инициализации прохода по редакциям"
+
+#: blame.c:1815
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr "при указании --reverse и --first-parent вместе, требуется также указать диапазон по цепочке первого родителя"
+
+#: blame.c:1826
+#, c-format
+msgid "no such path %s in %s"
+msgstr "нет такого пути %s в %s"
+
+#: blame.c:1837
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "невозможно прочитать объект %s для пути %s"
+
 #: branch.c:53
 #, c-format
 msgid ""
@@ -1061,7 +1100,7 @@ msgstr "Недопустимая точка ветки: «%s»."
 msgid "'%s' is already checked out at '%s'"
 msgstr "«%s» уже находится на «%s»"
 
-#: branch.c:364
+#: branch.c:366
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "HEAD рабочего каталога %s не обновлён"
@@ -1071,28 +1110,21 @@ msgstr "HEAD рабочего каталога %s не обновлён"
 msgid "'%s' does not look like a v2 bundle file"
 msgstr "«%s» не похож на файл пакета версии 2"
 
-#: bundle.c:61
+#: bundle.c:62
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "неопознанный заголовок: %s%s (%d)"
 
-#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777
+#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
 #, c-format
 msgid "could not open '%s'"
 msgstr "не удалось открыть «%s»"
 
-#: bundle.c:139
+#: bundle.c:140
 msgid "Repository lacks these prerequisite commits:"
 msgstr "В репозитории отсутствуют необходимые коммиты:"
 
-#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321
-#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353
-#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916
-#: builtin/merge.c:359 builtin/shortlog.c:176
-msgid "revision walk setup failed"
-msgstr "сбой инициализации прохода по редакциям"
-
-#: bundle.c:185
+#: bundle.c:186
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
@@ -1101,11 +1133,11 @@ msgstr[1] "Пакет содержит эти %d ссылки:"
 msgstr[2] "Пакет содержит эти %d ссылок:"
 msgstr[3] "Пакет содержит эти %d ссылок:"
 
-#: bundle.c:192
+#: bundle.c:193
 msgid "The bundle records a complete history."
 msgstr "Пакет содержит полную историю."
 
-#: bundle.c:194
+#: bundle.c:195
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
@@ -1114,53 +1146,53 @@ msgstr[1] "Пакет требует эти %d ссылки:"
 msgstr[2] "Пакет требует эти %d ссылок:"
 msgstr[3] "Пакет требует эти %d ссылок:"
 
-#: bundle.c:253
+#: bundle.c:254
 msgid "Could not spawn pack-objects"
 msgstr "Не удалось создать объекты пакета"
 
-#: bundle.c:264
+#: bundle.c:265
 msgid "pack-objects died"
 msgstr "критическая ошибка pack-objects"
 
-#: bundle.c:304
+#: bundle.c:307
 msgid "rev-list died"
 msgstr "критическая ошибка rev-list"
 
-#: bundle.c:353
+#: bundle.c:356
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "ссылка «%s» исключена в соответствии с опциями rev-list"
 
-#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281
+#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "неопознанный аргумент: %s"
 
-#: bundle.c:451
+#: bundle.c:454
 msgid "Refusing to create empty bundle."
 msgstr "Отклонение создания пустого пакета."
 
-#: bundle.c:463
+#: bundle.c:466
 #, c-format
 msgid "cannot create '%s'"
 msgstr "не удалось создать «%s»"
 
-#: bundle.c:491
+#: bundle.c:494
 msgid "index-pack died"
 msgstr "критическая ошибка index-pack"
 
-#: color.c:300
+#: color.c:301
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "недопустимое значение цвета: %.*s"
 
-#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455
-#: builtin/am.c:1489 builtin/am.c:2126
+#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
+#: builtin/am.c:1469 builtin/am.c:2107
 #, c-format
 msgid "could not parse %s"
 msgstr "не удалось разобрать %s"
 
-#: commit.c:42
+#: commit.c:43
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s не является коммитом!"
@@ -1176,161 +1208,161 @@ msgstr "Предупреждение: сообщение коммита не с
 msgid "memory exhausted"
 msgstr "память исчерпана"
 
-#: config.c:191
+#: config.c:186
 msgid "relative config include conditionals must come from files"
 msgstr "относительные условные включения конфигурации должны исходить из файлов"
 
-#: config.c:711
+#: config.c:720
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "ошибка в %d строке двоичного объекта %s"
 
-#: config.c:715
+#: config.c:724
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "ошибка в %d строке файла %s"
 
-#: config.c:719
+#: config.c:728
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "ошибка в %d строке стандартного ввода"
 
-#: config.c:723
+#: config.c:732
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "ошибка в %d строке двоичного объекта подмодуля %s"
 
-#: config.c:727
+#: config.c:736
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "ошибка в %d строке коммандной строки %s"
 
-#: config.c:731
+#: config.c:740
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "ошибка в %d строке в %s"
 
-#: config.c:859
+#: config.c:868
 msgid "out of range"
 msgstr "вне диапазона"
 
-#: config.c:859
+#: config.c:868
 msgid "invalid unit"
 msgstr "неправильное число"
 
-#: config.c:865
+#: config.c:874
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "неправильное числовое значение «%s» для «%s»: %s"
 
-#: config.c:870
+#: config.c:879
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "неправильное числовое значение «%s» для «%s» в двоичном объекте %s: %s"
 
-#: config.c:873
+#: config.c:882
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr "неправильное числовое значение «%s» для «%s» в файле %s: %s"
 
-#: config.c:876
+#: config.c:885
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr "неправильное числовое значение «%s» для «%s» на стандартном вводе: %s"
 
-#: config.c:879
+#: config.c:888
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr "неправильное числовое значение «%s» для «%s» в двоичном объекте подмодуля %s: %s"
 
-#: config.c:882
+#: config.c:891
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr "неправильное числовое значение «%s» для «%s» на коммандной строке %s: %s"
 
-#: config.c:885
+#: config.c:894
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "неправильное числовое значение «%s» для «%s» в %s: %s"
 
-#: config.c:980
+#: config.c:989
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "сбой разворачивания пути каталога пользователя: «%s»"
 
-#: config.c:1075 config.c:1086
+#: config.c:1084 config.c:1095
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "неправильный уровень сжатия zlib %d"
 
-#: config.c:1203
+#: config.c:1212
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "недопустимый режим создания объекта: %s"
 
-#: config.c:1359
+#: config.c:1368
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "неправильный уровень сжатия пакета %d"
 
-#: config.c:1557
+#: config.c:1564
 msgid "unable to parse command-line config"
 msgstr "не удалось разобрать конфигурацию из командной строки"
 
-#: config.c:1611
+#: config.c:1894
 msgid "unknown error occurred while reading the configuration files"
 msgstr "произошла неизвестная ошибка при чтении файлов конфигурации"
 
-#: config.c:1970
+#: config.c:2064
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "Недействительный %s: «%s»"
 
-#: config.c:1991
+#: config.c:2085
 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr "неизвестное значение «%s» для core.untrackedCache; использую стандартное значение «keep»"
 
-#: config.c:2017
+#: config.c:2111
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "значение «%d» для splitIndex.maxPercentChange должно быть от 0 до 100"
 
-#: config.c:2028
+#: config.c:2122
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "не удалось разобрать «%s» в конфигурации из командной строки"
 
-#: config.c:2030
+#: config.c:2124
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "неправильная переменная конфигурации «%s» в файле «%s» на строке %d"
 
-#: config.c:2089
+#: config.c:2183
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s имеет несколько значений"
 
-#: config.c:2423 config.c:2648
+#: config.c:2517 config.c:2745
 #, c-format
 msgid "fstat on %s failed"
 msgstr "сбой при выполнении fstat на файле %s"
 
-#: config.c:2541
+#: config.c:2635
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "не удалось установить «%s» в «%s»"
 
-#: config.c:2543 builtin/remote.c:774
+#: config.c:2637 builtin/remote.c:775
 #, c-format
 msgid "could not unset '%s'"
 msgstr "не удалось сбросить значение для «%s»"
 
-#: connect.c:49
+#: connect.c:50
 msgid "The remote end hung up upon initial contact"
 msgstr "Внешний сервер отсоединился до начала сеанса связи"
 
-#: connect.c:51
+#: connect.c:52
 msgid ""
 "Could not read from remote repository.\n"
 "\n"
@@ -1338,7 +1370,7 @@ msgid ""
 "and the repository exists."
 msgstr "Не удалось прочитать из внешнего репозитория.\n\nУдостоверьтесь, что у вас есть необходимые права доступа\nи репозиторий существует."
 
-#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140
+#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
 msgid "Checking connectivity"
 msgstr "Проверка соединения"
 
@@ -1354,115 +1386,115 @@ msgstr "сбой записи в rev-list"
 msgid "failed to close rev-list's stdin"
 msgstr "сбой закрытия стандартного ввода у rev-list"
 
-#: convert.c:201
+#: convert.c:205
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
 "The file will have its original line endings in your working directory."
 msgstr "CRLF будет заменен на LF в %s.\nФайл будет иметь свои оригинальные концы строк в рашей рабочей копии."
 
-#: convert.c:205
+#: convert.c:209
 #, c-format
 msgid "CRLF would be replaced by LF in %s."
 msgstr "CRLF будет заменен на LF в %s."
 
-#: convert.c:211
+#: convert.c:215
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
 "The file will have its original line endings in your working directory."
 msgstr "LF будет заменен на CRLF в %s.\nФайл будет иметь свои оригинальные концы строк в рашей рабочей копии."
 
-#: convert.c:215
+#: convert.c:219
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr "LF будет заменен на CRLF в %s"
 
-#: date.c:97
+#: date.c:116
 msgid "in the future"
 msgstr "в будущем"
 
-#: date.c:103
-#, c-format
-msgid "%lu second ago"
-msgid_plural "%lu seconds ago"
-msgstr[0] "%lu секунду назад"
-msgstr[1] "%lu секунды назад"
-msgstr[2] "%lu секунд назад"
-msgstr[3] "%lu секунд назад"
-
-#: date.c:110
-#, c-format
-msgid "%lu minute ago"
-msgid_plural "%lu minutes ago"
-msgstr[0] "%lu минуту назад"
-msgstr[1] "%lu минуты назад"
-msgstr[2] "%lu минут назад"
-msgstr[3] "%lu минут назад"
-
-#: date.c:117
-#, c-format
-msgid "%lu hour ago"
-msgid_plural "%lu hours ago"
-msgstr[0] "%lu час назад"
-msgstr[1] "%lu часа назад"
-msgstr[2] "%lu часов назад"
-msgstr[3] "%lu часов назад"
-
-#: date.c:124
-#, c-format
-msgid "%lu day ago"
-msgid_plural "%lu days ago"
-msgstr[0] "%lu день назад"
-msgstr[1] "%lu дня назад"
-msgstr[2] "%lu дней назад"
-msgstr[3] "%lu дней назад"
-
-#: date.c:130
-#, c-format
-msgid "%lu week ago"
-msgid_plural "%lu weeks ago"
-msgstr[0] "%lu неделю назад"
-msgstr[1] "%lu недели назад"
-msgstr[2] "%lu недель назад"
-msgstr[3] "%lu недель назад"
-
-#: date.c:137
-#, c-format
-msgid "%lu month ago"
-msgid_plural "%lu months ago"
-msgstr[0] "%lu месяц назад"
-msgstr[1] "%lu месяца назад"
-msgstr[2] "%lu месяцев назад"
-msgstr[3] "%lu месяцев назад"
-
-#: date.c:148
-#, c-format
-msgid "%lu year"
-msgid_plural "%lu years"
-msgstr[0] "%lu год"
-msgstr[1] "%lu года"
-msgstr[2] "%lu лет"
-msgstr[3] "%lu лет"
+#: date.c:122
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "%<PRIuMAX> секунда назад"
+msgstr[1] "%<PRIuMAX> секунды назад"
+msgstr[2] "%<PRIuMAX> секунд назад"
+msgstr[3] "%<PRIuMAX> секунды назад"
+
+#: date.c:129
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "%<PRIuMAX> минута назад"
+msgstr[1] "%<PRIuMAX> минуты назад"
+msgstr[2] "%<PRIuMAX> минут назад"
+msgstr[3] "%<PRIuMAX> минуты назад"
+
+#: date.c:136
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "%<PRIuMAX> час назад"
+msgstr[1] "%<PRIuMAX> часа назад"
+msgstr[2] "%<PRIuMAX> часов назад"
+msgstr[3] "%<PRIuMAX> часа назад"
+
+#: date.c:143
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "%<PRIuMAX> день назад"
+msgstr[1] "%<PRIuMAX> дня назад"
+msgstr[2] "%<PRIuMAX> дней назад"
+msgstr[3] "%<PRIuMAX> дня назад"
+
+#: date.c:149
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "%<PRIuMAX> неделю назад"
+msgstr[1] "%<PRIuMAX> недели назад"
+msgstr[2] "%<PRIuMAX> недель назад"
+msgstr[3] "%<PRIuMAX> недели назад"
+
+#: date.c:156
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "%<PRIuMAX> месяц назад"
+msgstr[1] "%<PRIuMAX> месяца назад"
+msgstr[2] "%<PRIuMAX> месяцев назад"
+msgstr[3] "%<PRIuMAX> месяца назад"
+
+#: date.c:167
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> год"
+msgstr[1] "%<PRIuMAX> года"
+msgstr[2] "%<PRIuMAX> лет"
+msgstr[3] "%<PRIuMAX> года"
 
 #. TRANSLATORS: "%s" is "<n> years"
-#: date.c:151
+#: date.c:170
 #, c-format
-msgid "%s, %lu month ago"
-msgid_plural "%s, %lu months ago"
-msgstr[0] "%s и %lu месяц назад"
-msgstr[1] "%s и %lu месяца назад"
-msgstr[2] "%s и %lu месяцев назад"
-msgstr[3] "%s и %lu месяцев назад"
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "%s, %<PRIuMAX> месяц назад"
+msgstr[1] "%s, %<PRIuMAX> месяца назад"
+msgstr[2] "%s, %<PRIuMAX> месяцев назад"
+msgstr[3] "%s, %<PRIuMAX> месяца назад"
 
-#: date.c:156 date.c:161
+#: date.c:175 date.c:180
 #, c-format
-msgid "%lu year ago"
-msgid_plural "%lu years ago"
-msgstr[0] "%lu год назад"
-msgstr[1] "%lu года назад"
-msgstr[2] "%lu лет назад"
-msgstr[3] "%lu лет назад"
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "%<PRIuMAX> год назад"
+msgstr[1] "%<PRIuMAX> года назад"
+msgstr[2] "%<PRIuMAX> лет назад"
+msgstr[3] "%<PRIuMAX> года назад"
 
 #: diffcore-order.c:24
 #, c-format
@@ -1473,352 +1505,376 @@ msgstr "сбой чтения orderfile «%s»"
 msgid "Performing inexact rename detection"
 msgstr "Выполняется неточное определение переименования"
 
-#: diff.c:62
+#: diff.c:63
 #, c-format
 msgid "option '%s' requires a value"
 msgstr "параметр «%s» требует указания значения"
 
-#: diff.c:124
+#: diff.c:125
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  Сбой разбора величины среза (cut-off) у dirstat «%s»\n"
 
-#: diff.c:129
+#: diff.c:130
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "Неизвестный параметр dirstat: «%s»\n"
 
-#: diff.c:281
+#: diff.c:282
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "Неизвестное значения для переменной «diff.submodule»: «%s»"
 
-#: diff.c:344
+#: diff.c:342
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
 "%s"
 msgstr "Найдены ошибки в переменной «diff.dirstat»:\n%s"
 
-#: diff.c:3102
+#: diff.c:3101
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "критическая ошибка при внешнем сравнении, останов на %s"
 
-#: diff.c:3428
+#: diff.c:3427
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only, --name-status, --check и -s нельзя использовать одновременно"
 
-#: diff.c:3518
+#: diff.c:3517
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow требует ровно одного спецификатора пути"
 
-#: diff.c:3681
+#: diff.c:3680
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
 "%s"
 msgstr "Сбой разбора параметра опции --dirstat/-X :\n%s"
 
-#: diff.c:3695
+#: diff.c:3694
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "Сбой разбора параметра опции --submodule: «%s»"
 
-#: diff.c:4719
+#: diff.c:4716
 msgid "inexact rename detection was skipped due to too many files."
 msgstr "неточное определение переименования было пропущено из-за слишком большого количества файлов."
 
-#: diff.c:4722
+#: diff.c:4719
 msgid "only found copies from modified paths due to too many files."
 msgstr "найдены только копии из измененных путей из-за слишком большого количества файлов."
 
-#: diff.c:4725
+#: diff.c:4722
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr "возможно вы захотите установить переменную %s в как минимум значение %d и повторить вызов команды."
 
-#: dir.c:1899
+#: dir.c:1948
 msgid "failed to get kernel name and information"
 msgstr "не удалось получить имя ядра и информацию"
 
-#: dir.c:2018
+#: dir.c:2067
 msgid "Untracked cache is disabled on this system or location."
 msgstr "Кэш неотслеживаемых файлов отключен на этой системе или в этом месте."
 
-#: dir.c:2776 dir.c:2781
+#: dir.c:2846 dir.c:2851
 #, c-format
 msgid "could not create directories for %s"
 msgstr "не удалось создать каталоги для %s"
 
-#: dir.c:2806
+#: dir.c:2876
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "не удалось переместить каталог git с «%s» в «%s»"
 
-#: entry.c:280
+#: entry.c:281
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "не удалось выполнить stat для файла «%s»"
 
-#: fetch-pack.c:249
+#: fetch-pack.c:251
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: ожидается передача списка для получение части"
 
-#: fetch-pack.c:261
+#: fetch-pack.c:263
 msgid "git fetch-pack: expected ACK/NAK, got EOF"
 msgstr "git fetch-pack: ожидается ACK/NAK, а получено EOF"
 
-#: fetch-pack.c:280 builtin/archive.c:63
+#: fetch-pack.c:282 builtin/archive.c:63
 #, c-format
 msgid "remote error: %s"
 msgstr "ошибка внешнего репозитория: %s"
 
-#: fetch-pack.c:281
+#: fetch-pack.c:283
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: ожидается ACK/NAK, а получено «%s»"
 
-#: fetch-pack.c:333
+#: fetch-pack.c:335
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc требует multi_ack_detailed"
 
-#: fetch-pack.c:419
+#: fetch-pack.c:421
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "неправильная строка частичного получения: %s"
 
-#: fetch-pack.c:425
+#: fetch-pack.c:427
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "неправильная строка полного получения: %s"
 
-#: fetch-pack.c:427
+#: fetch-pack.c:429
 #, c-format
 msgid "object not found: %s"
 msgstr "объект не найден: %s"
 
-#: fetch-pack.c:430
+#: fetch-pack.c:432
 #, c-format
 msgid "error in object: %s"
 msgstr "ошибка в объекте: %s"
 
-#: fetch-pack.c:432
+#: fetch-pack.c:434
 #, c-format
 msgid "no shallow found: %s"
 msgstr "частичный клон не найден: %s"
 
-#: fetch-pack.c:435
+#: fetch-pack.c:437
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "ожидалось shallow/unshallow, а получено %s"
 
-#: fetch-pack.c:474
+#: fetch-pack.c:476
 #, c-format
 msgid "got %s %d %s"
 msgstr "получено %s %d %s"
 
-#: fetch-pack.c:488
+#: fetch-pack.c:490
 #, c-format
 msgid "invalid commit %s"
 msgstr "недопустимый коммит %s"
 
-#: fetch-pack.c:521
+#: fetch-pack.c:523
 msgid "giving up"
 msgstr "останавливаю дальнейшие попытки"
 
-#: fetch-pack.c:531 progress.c:235
+#: fetch-pack.c:533 progress.c:237
 msgid "done"
 msgstr "готово"
 
-#: fetch-pack.c:543
+#: fetch-pack.c:545
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "получено %s (%d) %s"
 
-#: fetch-pack.c:589
+#: fetch-pack.c:591
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Помечаю %s как завершенный"
 
-#: fetch-pack.c:737
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr "уже есть %s (%s)"
 
-#: fetch-pack.c:775
+#: fetch-pack.c:813
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: не удалось запустить программу разбора данных"
 
-#: fetch-pack.c:783
+#: fetch-pack.c:821
 msgid "protocol error: bad pack header"
 msgstr "ошибка протокола: неправильный заголовок потока"
 
-#: fetch-pack.c:839
+#: fetch-pack.c:877
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: не удалось запустить программу %s"
 
-#: fetch-pack.c:855
+#: fetch-pack.c:893
 #, c-format
 msgid "%s failed"
 msgstr "%s завершен с ошибкой"
 
-#: fetch-pack.c:857
+#: fetch-pack.c:895
 msgid "error in sideband demultiplexer"
 msgstr "произошла  ошибка в  программе разбора данных"
 
-#: fetch-pack.c:884
+#: fetch-pack.c:922
 msgid "Server does not support shallow clients"
 msgstr "Сервер не поддерживает клиентов с частичным клонированием"
 
-#: fetch-pack.c:888
+#: fetch-pack.c:926
 msgid "Server supports multi_ack_detailed"
 msgstr "Сервер поддерживает multi_ack_detailed"
 
-#: fetch-pack.c:891
+#: fetch-pack.c:929
 msgid "Server supports no-done"
 msgstr "Сервер поддерживает no-done"
 
-#: fetch-pack.c:897
+#: fetch-pack.c:935
 msgid "Server supports multi_ack"
 msgstr "Сервер поддерживает multi_ack"
 
-#: fetch-pack.c:901
+#: fetch-pack.c:939
 msgid "Server supports side-band-64k"
 msgstr "Сервер поддерживает side-band-64k"
 
-#: fetch-pack.c:905
+#: fetch-pack.c:943
 msgid "Server supports side-band"
 msgstr "Сервер поддерживает side-band"
 
-#: fetch-pack.c:909
+#: fetch-pack.c:947
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "Сервер поддерживает allow-tip-sha1-in-want"
 
-#: fetch-pack.c:913
+#: fetch-pack.c:951
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "Сервер поддерживает allow-reachable-sha1-in-want"
 
-#: fetch-pack.c:923
+#: fetch-pack.c:961
 msgid "Server supports ofs-delta"
 msgstr "Сервер поддерживает ofs-delta"
 
-#: fetch-pack.c:930
+#: fetch-pack.c:968
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Версия сервера %.*s"
 
-#: fetch-pack.c:936
+#: fetch-pack.c:974
 msgid "Server does not support --shallow-since"
 msgstr "Сервер не поддерживает --shallow-since"
 
-#: fetch-pack.c:940
+#: fetch-pack.c:978
 msgid "Server does not support --shallow-exclude"
 msgstr "Сервер не поддерживает --shallow-exclude"
 
-#: fetch-pack.c:942
+#: fetch-pack.c:980
 msgid "Server does not support --deepen"
 msgstr "Сервер не поддерживает --deepen"
 
-#: fetch-pack.c:953
+#: fetch-pack.c:991
 msgid "no common commits"
 msgstr "не общих коммитов"
 
-#: fetch-pack.c:965
+#: fetch-pack.c:1003
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: ошибка при получении данных."
 
-#: fetch-pack.c:1127
+#: fetch-pack.c:1165
 msgid "no matching remote head"
 msgstr "нет соотвествующего внешнего указателя на ветку"
 
-#: fetch-pack.c:1149
+#: fetch-pack.c:1187
 #, c-format
 msgid "no such remote ref %s"
 msgstr "нет такой внешней ссылки %s"
 
-#: fetch-pack.c:1152
+#: fetch-pack.c:1190
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "Сервер не поддерживает запрос необъявленного объекта %s"
 
-#: gpg-interface.c:185
+#: gpg-interface.c:181
 msgid "gpg failed to sign the data"
 msgstr "gpg не удалось подписать данные"
 
-#: gpg-interface.c:215
+#: gpg-interface.c:211
 msgid "could not create temporary file"
 msgstr "не удалось создать временный файл"
 
-#: gpg-interface.c:217
+#: gpg-interface.c:213
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "сбой записи отсоединенной подписи в «%s»"
 
-#: graph.c:96
+#: graph.c:97
 #, c-format
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "игнорирую недопустимый цвет «%.*s» в log.graphColors"
 
-#: grep.c:1796
+#: grep.c:1981
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "«%s»: не удалось прочесть %s"
 
-#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133
+#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "не удалось выполнить stat «%s»"
 
-#: grep.c:1824
+#: grep.c:2009
 #, c-format
 msgid "'%s': short read"
 msgstr "«%s»: слишком мало данных прочитано"
 
-#: help.c:218
+#: help.c:179
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "доступные команды git в «%s»"
 
-#: help.c:225
+#: help.c:186
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "команды git, доступные в других местах вашего $PATH"
 
-#: help.c:256
+#: help.c:217
 msgid "These are common Git commands used in various situations:"
 msgstr "Стандартные команды Git используемые в различных ситуациях:"
 
-#: help.c:321
+#: help.c:281
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
 "able to execute it. Maybe git-%s is broken?"
 msgstr "«%s» похоже на команду git, но нам не удалось ее запустить. Возможно, git-%s  не работает?"
 
-#: help.c:376
+#: help.c:336
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "Ой-ёй! Ваша система не сообщает ни о каких командах Git вообще."
 
-#: help.c:398
+#: help.c:358
 #, c-format
-msgid ""
-"WARNING: You called a Git command named '%s', which does not exist.\n"
-"Continuing under the assumption that you meant '%s'"
-msgstr "ВНИМАНИЕ: Вы вызвали команду Git «%s», но такой не существует.\nПродолжаем с предположением, что вы имели в виду «%s»"
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr "Внимание: Вы запустили не существующую команду Git «%s»."
+
+#: help.c:363
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "Продолжаю, предполагая, что вы имели в виду «%s»."
 
-#: help.c:403
+#: help.c:368
 #, c-format
-msgid "in %0.1f seconds automatically..."
-msgstr "через %0.1f секунд автоматически…"
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr "Продолжу через %0.1f секунд, предполагая, что вы имели в виду «%s»."
 
-#: help.c:410
+#: help.c:376
 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr "git: «%s» не является командой git. Смотрите «git --help»."
 
-#: help.c:414 help.c:480
+#: help.c:380
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] "\nСамые похожие команды:"
+msgstr[1] "\nСамые похожие команды:"
+msgstr[2] "\nСамые похожие команды:"
+msgstr[3] "\nСамые похожие команды:"
+
+#: help.c:395
+msgid "git version [<options>]"
+msgstr "git version [<options>]"
+
+#: help.c:456
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s — %s"
+
+#: help.c:460
 msgid ""
 "\n"
 "Did you mean this?"
@@ -1830,12 +1886,7 @@ msgstr[1] "\nВозможно, вы имели в виду что-то из эт
 msgstr[2] "\nВозможно, вы имели в виду что-то из этого?"
 msgstr[3] "\nВозможно, вы имели в виду что-то из этого?"
 
-#: help.c:476
-#, c-format
-msgid "%s: %s - %s"
-msgstr "%s: %s — %s"
-
-#: ident.c:343
+#: ident.c:342
 msgid ""
 "\n"
 "*** Please tell me who you are.\n"
@@ -1850,35 +1901,35 @@ msgid ""
 "\n"
 msgstr "\n*** Пожалуйста, скажите мне кто вы есть.\n\nЗапустите\n\n  git config --global user.email \"you@example.com\"\n  git config --global user.name \"Ваше Имя\"\n\nдля указания идентификационных данных аккаунта по умолчанию.\nПропустите параметр --global для указания данных только для этого репозитория.\n\n"
 
-#: ident.c:367
+#: ident.c:366
 msgid "no email was given and auto-detection is disabled"
 msgstr "адрес электронной почты не указан и автоопределение отключено"
 
-#: ident.c:372
+#: ident.c:371
 #, c-format
 msgid "unable to auto-detect email address (got '%s')"
 msgstr "не удалось выполнить автоопределение адреса электронной почты (получено «%s»)"
 
-#: ident.c:382
+#: ident.c:381
 msgid "no name was given and auto-detection is disabled"
 msgstr "имя не указано и автоопределение отключено"
 
-#: ident.c:388
+#: ident.c:387
 #, c-format
 msgid "unable to auto-detect name (got '%s')"
 msgstr "не удалось выполнить автоопределение имени (получено «%s»)"
 
-#: ident.c:396
+#: ident.c:395
 #, c-format
 msgid "empty ident name (for <%s>) not allowed"
 msgstr "пустое имя идентификатора (для <%s>) не разрешено"
 
-#: ident.c:402
+#: ident.c:401
 #, c-format
 msgid "name consists only of disallowed characters: %s"
 msgstr "имя состоит только из неразрешенных симоволов: %s"
 
-#: ident.c:417 builtin/commit.c:611
+#: ident.c:416 builtin/commit.c:612
 #, c-format
 msgid "invalid date format: %s"
 msgstr "неправильный формат даты: %s"
@@ -1904,237 +1955,237 @@ msgstr "Не удалось создать «%s.lock»: %s"
 msgid "failed to read the cache"
 msgstr "сбой чтения кэша"
 
-#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393
-#: builtin/checkout.c:607 builtin/clone.c:749
+#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
+#: builtin/checkout.c:591 builtin/clone.c:753
 msgid "unable to write new index file"
 msgstr "не удалось записать новый файл индекса"
 
-#: merge-recursive.c:209
+#: merge-recursive.c:210
 msgid "(bad commit)\n"
 msgstr "(плохой коммит)\n"
 
-#: merge-recursive.c:231 merge-recursive.c:239
+#: merge-recursive.c:232 merge-recursive.c:240
 #, c-format
 msgid "addinfo_cache failed for path '%s'"
 msgstr "сбой addinfo_cache для пути «%s»"
 
-#: merge-recursive.c:303
+#: merge-recursive.c:304
 msgid "error building trees"
 msgstr "ошибка при построении деревьев"
 
-#: merge-recursive.c:727
+#: merge-recursive.c:728
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "не удалось создать путь «%s»%s"
 
-#: merge-recursive.c:738
+#: merge-recursive.c:739
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Удаление %s, чтобы освободить место для подкаталогов\n"
 
-#: merge-recursive.c:752 merge-recursive.c:771
+#: merge-recursive.c:753 merge-recursive.c:772
 msgid ": perhaps a D/F conflict?"
 msgstr ": возможно, конфликт каталогов/файлов?"
 
-#: merge-recursive.c:761
+#: merge-recursive.c:762
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "отказ потери неотслеживаемого файла в «%s»"
 
-#: merge-recursive.c:803 builtin/cat-file.c:34
+#: merge-recursive.c:804 builtin/cat-file.c:36
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "невозможно прочитать объект %s «%s»"
 
-#: merge-recursive.c:805
+#: merge-recursive.c:806
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "ожидается двоичный объект для %s «%s»"
 
-#: merge-recursive.c:829
+#: merge-recursive.c:830
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "не удалось открыть «%s»: %s"
 
-#: merge-recursive.c:840
+#: merge-recursive.c:841
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "не удалось создать символьную ссылку «%s»: %s"
 
-#: merge-recursive.c:845
+#: merge-recursive.c:846
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "не понятно, что делать с %06o %s «%s»"
 
-#: merge-recursive.c:985
+#: merge-recursive.c:986
 msgid "Failed to execute internal merge"
 msgstr "Не удалось запустить внутреннее слияние"
 
-#: merge-recursive.c:989
+#: merge-recursive.c:990
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "Не удалось добавить %s в базу данных"
 
-#: merge-recursive.c:1092
+#: merge-recursive.c:1093
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 "in tree."
 msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена в дереве."
 
-#: merge-recursive.c:1097
+#: merge-recursive.c:1098
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
 "left in tree."
 msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. Версия %s из %s оставлена в дереве."
 
-#: merge-recursive.c:1104
+#: merge-recursive.c:1105
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 "in tree at %s."
 msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена в дереве на %s."
 
-#: merge-recursive.c:1109
+#: merge-recursive.c:1110
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
 "left in tree at %s."
 msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. Версия %s из %s оставлена в дереве на %s."
 
-#: merge-recursive.c:1143
+#: merge-recursive.c:1144
 msgid "rename"
 msgstr "переименование"
 
-#: merge-recursive.c:1143
+#: merge-recursive.c:1144
 msgid "renamed"
 msgstr "переименовано"
 
-#: merge-recursive.c:1200
+#: merge-recursive.c:1201
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s — это каталог в %s, добавляем как %s вместо этого"
 
-#: merge-recursive.c:1225
+#: merge-recursive.c:1226
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
 "\"%s\"->\"%s\" in \"%s\"%s"
 msgstr "КОНФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»%s"
 
-#: merge-recursive.c:1230
+#: merge-recursive.c:1231
 msgid " (left unresolved)"
 msgstr " (оставлено неразрешенным)"
 
-#: merge-recursive.c:1292
+#: merge-recursive.c:1293
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr "КОНФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»"
 
-#: merge-recursive.c:1325
+#: merge-recursive.c:1326
 #, c-format
 msgid "Renaming %s to %s and %s to %s instead"
 msgstr "Переименовываю %s в %s и %s в %s вместо этого"
 
-#: merge-recursive.c:1528
+#: merge-recursive.c:1529
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 msgstr "КОНФЛИКТ (переименование/добавление): Переименование «%s»→«%s» в ветке «%s» и добавление «%s» в ветке «%s»"
 
-#: merge-recursive.c:1543
+#: merge-recursive.c:1544
 #, c-format
 msgid "Adding merged %s"
 msgstr "Добавление слитого %s"
 
-#: merge-recursive.c:1550 merge-recursive.c:1780
+#: merge-recursive.c:1551 merge-recursive.c:1781
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Добавление вместо этого как %s"
 
-#: merge-recursive.c:1607
+#: merge-recursive.c:1608
 #, c-format
 msgid "cannot read object %s"
 msgstr "невозможно прочитать объект «%s»"
 
-#: merge-recursive.c:1610
+#: merge-recursive.c:1611
 #, c-format
 msgid "object %s is not a blob"
 msgstr "объект %s не является двоичным объектом"
 
-#: merge-recursive.c:1679
+#: merge-recursive.c:1680
 msgid "modify"
 msgstr "изменение"
 
-#: merge-recursive.c:1679
+#: merge-recursive.c:1680
 msgid "modified"
 msgstr "изменено"
 
-#: merge-recursive.c:1689
+#: merge-recursive.c:1690
 msgid "content"
 msgstr "содержимое"
 
-#: merge-recursive.c:1696
+#: merge-recursive.c:1697
 msgid "add/add"
 msgstr "добавление/добавление"
 
-#: merge-recursive.c:1732
+#: merge-recursive.c:1733
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "Пропуск %s (слиты одинаковые изменения как существующие)"
 
-#: merge-recursive.c:1746
+#: merge-recursive.c:1747
 #, c-format
 msgid "Auto-merging %s"
 msgstr "Автослияние %s"
 
-#: merge-recursive.c:1750 git-submodule.sh:944
+#: merge-recursive.c:1751 git-submodule.sh:945
 msgid "submodule"
 msgstr "подмодуль"
 
-#: merge-recursive.c:1751
+#: merge-recursive.c:1752
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "КОНФЛИКТ (%s): Конфликт слияния в %s"
 
-#: merge-recursive.c:1845
+#: merge-recursive.c:1846
 #, c-format
 msgid "Removing %s"
 msgstr "Удаление %s"
 
-#: merge-recursive.c:1871
+#: merge-recursive.c:1872
 msgid "file/directory"
 msgstr "файл/каталог"
 
-#: merge-recursive.c:1877
+#: merge-recursive.c:1878
 msgid "directory/file"
 msgstr "каталог/файл"
 
-#: merge-recursive.c:1883
+#: merge-recursive.c:1884
 #, c-format
 msgid ""
 "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr "КОНФЛИКТ (%s): Уже существует каталог с именем «%s» в «%s». Добавление «%s» как «%s»"
 
-#: merge-recursive.c:1892
+#: merge-recursive.c:1893
 #, c-format
 msgid "Adding %s"
 msgstr "Добавление %s"
 
-#: merge-recursive.c:1929
+#: merge-recursive.c:1930
 msgid "Already up-to-date!"
 msgstr "Уже обновлено!"
 
-#: merge-recursive.c:1938
+#: merge-recursive.c:1939
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "сбой слияния деревьев «%s» и «%s»"
 
-#: merge-recursive.c:2021
+#: merge-recursive.c:2022
 msgid "Merging:"
 msgstr "Слияние:"
 
-#: merge-recursive.c:2034
+#: merge-recursive.c:2035
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
@@ -2143,16 +2194,16 @@ msgstr[1] "найдено %u общих предка:"
 msgstr[2] "найдено %u общих предков:"
 msgstr[3] "найдено %u общих предков:"
 
-#: merge-recursive.c:2073
+#: merge-recursive.c:2074
 msgid "merge returned no commit"
 msgstr "слияние не вернуло коммит"
 
-#: merge-recursive.c:2136
+#: merge-recursive.c:2137
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Не удалось разобрать объект «%s»"
 
-#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792
+#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
 msgid "Unable to write index."
 msgstr "Не удается записать индекс."
 
@@ -2168,23 +2219,24 @@ msgstr "Вы не закончили предыдущее слияние зам
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr "Вы не закончили предыдущее слияние заметок (%s существует)."
 
-#: notes-utils.c:41
+#: notes-utils.c:42
 msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr "Нельзя закоммитить неинициализированное или не имеющее ссылок дерево заметок"
 
-#: notes-utils.c:100
+#: notes-utils.c:101
 #, c-format
 msgid "Bad notes.rewriteMode value: '%s'"
 msgstr "Неправильное значение notes.rewriteMode: «%s»"
 
-#: notes-utils.c:110
+#: notes-utils.c:111
 #, c-format
 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr "Отказ в перезаписи заметок в %s (за пределами refs/notes/)"
 
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: notes-utils.c:137
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#: notes-utils.c:141
 #, c-format
 msgid "Bad %s value: '%s'"
 msgstr "Неправильное значение переменной %s: «%s»"
@@ -2194,28 +2246,28 @@ msgstr "Неправильное значение переменной %s: «%s
 msgid "unable to parse object: %s"
 msgstr "не удалось разобрать объект: %s"
 
-#: parse-options.c:572
+#: parse-options.c:573
 msgid "..."
 msgstr "…"
 
-#: parse-options.c:590
+#: parse-options.c:591
 #, c-format
 msgid "usage: %s"
 msgstr "использование: %s"
 
 #. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation
-#: parse-options.c:594
+#. one in "usage: %s" translation.
+#: parse-options.c:597
 #, c-format
 msgid "   or: %s"
 msgstr "          или: %s"
 
-#: parse-options.c:597
+#: parse-options.c:600
 #, c-format
 msgid "    %s"
 msgstr "            %s"
 
-#: parse-options.c:631
+#: parse-options.c:634
 msgid "-NUM"
 msgstr "-КОЛИЧЕСТВО"
 
@@ -2224,151 +2276,151 @@ msgstr "-КОЛИЧЕСТВО"
 msgid "malformed object name '%s'"
 msgstr "Неправильное имя объекта «%s»"
 
-#: path.c:810
+#: path.c:890
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Не удалось предоставить доступ к %s на запись"
 
-#: pathspec.c:125
+#: pathspec.c:129
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr "Управляющий символ «\\» не разрешен как последний символ в значении attr"
 
-#: pathspec.c:143
+#: pathspec.c:147
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Разрешен только один спецификатор «attr:»."
 
-#: pathspec.c:146
+#: pathspec.c:150
 msgid "attr spec must not be empty"
 msgstr "спецификатор attr не должен быть пустой"
 
-#: pathspec.c:189
+#: pathspec.c:193
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "недопустимое имя атрибута %s"
 
-#: pathspec.c:254
+#: pathspec.c:258
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr "глобальные опции спецификаторов пути «glob» и «noglob» нельзя использовать одновременно"
 
-#: pathspec.c:261
+#: pathspec.c:265
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
 msgstr "глобальная опция спецификатора пути «literal» не совместима с другими глобальными спецификаторами доступа"
 
-#: pathspec.c:301
+#: pathspec.c:305
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "неправильный параметр для магического слова «prefix» в спецификаторе пути "
 
-#: pathspec.c:322
+#: pathspec.c:326
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "неправильное магическое слово «%.*s» в спецификаторе пути «%s»"
 
-#: pathspec.c:327
+#: pathspec.c:331
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "Пропущено «)» в конце магического слова спецификатора пути «%s»"
 
-#: pathspec.c:365
+#: pathspec.c:369
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "Нереализованное магическое слово «%c» спецификатора пути «%s»"
 
-#: pathspec.c:421 pathspec.c:443
-#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "Спецификатор пути «%s» в подмодуле «%.*s»"
-
-#: pathspec.c:483
+#: pathspec.c:428
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: «literal» и «glob» не совместимы"
 
-#: pathspec.c:496
+#: pathspec.c:441
 #, c-format
 msgid "%s: '%s' is outside repository"
 msgstr "%s: «%s» вне репозитория"
 
-#: pathspec.c:584
+#: pathspec.c:515
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "«%s» (мнемоника: «%c»)"
 
-#: pathspec.c:594
+#: pathspec.c:525
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s: магические слова в спецификаторе пути не поддерживаются командой: %s"
 
-#: pathspec.c:644
+#: pathspec.c:575
 msgid ""
 "empty strings as pathspecs will be made invalid in upcoming releases. please"
 " use . instead if you meant to match all paths"
 msgstr "пустые строки как спецификаторы пути будут сделаны недопустимыми в следующих версиях. используйте вместо них «.», что значит соотвествие всем путям"
 
-#: pathspec.c:668
+#: pathspec.c:599
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "спецификатор пути «%s» находится за символической ссылкой"
 
-#: pretty.c:982
+#: pretty.c:963
 msgid "unable to parse --pretty format"
 msgstr "не удалось разобрать формат для --pretty"
 
-#: read-cache.c:1442
+#: read-cache.c:1443
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
 "Using version %i"
 msgstr "index.version указан, но значение недействительное.\nИспользую версию %i"
 
-#: read-cache.c:1452
+#: read-cache.c:1453
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
 "Using version %i"
 msgstr "GIT_INDEX_VERSION указан, но значение недействительное.\nИспользую версию %i"
 
-#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048
+#: read-cache.c:2308 builtin/merge.c:1019
+#, c-format
+msgid "could not close '%s'"
+msgstr "не удалось закрыть «%s»"
+
+#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
 #, c-format
 msgid "could not stat '%s'"
 msgstr "не удалось выполнить stat для «%s»"
 
-#: read-cache.c:2388
+#: read-cache.c:2396
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "не удалось открыть каталог git: %s"
 
-#: read-cache.c:2400
+#: read-cache.c:2408
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "не удалось отсоединить: %s"
 
-#: refs.c:620 builtin/merge.c:844
+#: refs.c:622
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "Не удалось открыть «%s» для записи"
 
-#: refs.c:1667
+#: refs.c:1769
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "обновление ссылок запрещено в изолированном окружении"
 
-#: refs/files-backend.c:1631
+#: refs/files-backend.c:1664
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "не удалось удалить ссылку %s: %s"
 
-#: refs/files-backend.c:1634
+#: refs/files-backend.c:1667
 #, c-format
 msgid "could not delete references: %s"
 msgstr "не удалось удалить ссылки: %s"
 
-#: refs/files-backend.c:1643
+#: refs/files-backend.c:1676
 #, c-format
 msgid "could not remove reference %s"
 msgstr "не удалось удалить ссылки %s"
 
-#: ref-filter.c:35 wt-status.c:1780
+#: ref-filter.c:35 wt-status.c:1811
 msgid "gone"
 msgstr "исчез"
 
@@ -2387,290 +2439,290 @@ msgstr "позади %d"
 msgid "ahead %d, behind %d"
 msgstr "впереди %d, позади %d"
 
-#: ref-filter.c:104
+#: ref-filter.c:105
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "ожидаемый формат: %%(color:<color>)"
 
-#: ref-filter.c:106
+#: ref-filter.c:107
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "неопознанный цвет: %%(color:%s)"
 
-#: ref-filter.c:120
+#: ref-filter.c:121
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Ожидается целочисленное значение refname:lstrip=%s"
 
-#: ref-filter.c:124
+#: ref-filter.c:125
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Ожидается целочисленное значение refname:rstrip=%s"
 
-#: ref-filter.c:126
+#: ref-filter.c:127
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "неопознанный аргумент %%(%s): %s"
 
-#: ref-filter.c:166
+#: ref-filter.c:167
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "параметр %%(body) не принимает аргументы"
 
-#: ref-filter.c:173
+#: ref-filter.c:174
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "параметр %%(subject) не принимает аргументы"
 
-#: ref-filter.c:180
+#: ref-filter.c:181
 #, c-format
 msgid "%%(trailers) does not take arguments"
 msgstr "параметр %%(trailers) не принимает аргументы"
 
-#: ref-filter.c:199
+#: ref-filter.c:200
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "положительное значение ожидает contents:lines=%s"
 
-#: ref-filter.c:201
+#: ref-filter.c:202
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "неопознанный аргумент %%(contents): %s"
 
-#: ref-filter.c:214
+#: ref-filter.c:215
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "ожидается положительное значение objectname:short=%s"
 
-#: ref-filter.c:218
+#: ref-filter.c:219
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "неопознанный аргумент %%(objectname): %s"
 
-#: ref-filter.c:245
+#: ref-filter.c:246
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "ожидаемый формат: %%(align:<width>,<position>)"
 
-#: ref-filter.c:257
+#: ref-filter.c:258
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "неопознанная позиция:%s"
 
-#: ref-filter.c:261
+#: ref-filter.c:262
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "неопознанная ширина:%s"
 
-#: ref-filter.c:267
+#: ref-filter.c:268
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "неопознанный аргумент %%(align): %s"
 
-#: ref-filter.c:271
+#: ref-filter.c:272
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "ожидается положительная ширина с указанием частицы %%(align)"
 
-#: ref-filter.c:286
+#: ref-filter.c:287
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "неопознанный аргумент %%(if): %s"
 
-#: ref-filter.c:371
+#: ref-filter.c:378
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "неправильное имя поля: %.*s"
 
-#: ref-filter.c:397
+#: ref-filter.c:404
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "неизвестное имя поля: %.*s"
 
-#: ref-filter.c:501
+#: ref-filter.c:508
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "формат: частица %%(if) использована без частицы %%(then)"
 
-#: ref-filter.c:561
+#: ref-filter.c:568
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "формат: частица %%(then) использована без частицы %%(if)"
 
-#: ref-filter.c:563
+#: ref-filter.c:570
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "формат: частица %%(then) использована более одного раза"
 
-#: ref-filter.c:565
+#: ref-filter.c:572
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "формат: частица %%(then) использована после %%(else)"
 
-#: ref-filter.c:591
+#: ref-filter.c:598
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "формат: частица %%(else) использована без частицы %%(if)"
 
-#: ref-filter.c:593
+#: ref-filter.c:600
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "формат: частица %%(else) использована без частицы %%(then)"
 
-#: ref-filter.c:595
+#: ref-filter.c:602
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "формат: частица %%(else) использована более одного раза"
 
-#: ref-filter.c:608
+#: ref-filter.c:615
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "формат: частица %%(end) использована без соответствующей частицы"
 
-#: ref-filter.c:663
+#: ref-filter.c:670
 #, c-format
 msgid "malformed format string %s"
 msgstr "неправильная строка формата %s"
 
-#: ref-filter.c:1247
+#: ref-filter.c:1254
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(нет ветки, перемещение %s)"
 
-#: ref-filter.c:1250
+#: ref-filter.c:1257
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(нет ветки, двоичный поиск начат на %s)"
 
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached at " in wt-status.c
-#: ref-filter.c:1256
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached at " in wt-status.c
+#: ref-filter.c:1265
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD отделён на %s)"
 
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached from " in wt-status.c
-#: ref-filter.c:1261
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached from " in wt-status.c
+#: ref-filter.c:1272
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD отделён начиная с %s)"
 
-#: ref-filter.c:1265
+#: ref-filter.c:1276
 msgid "(no branch)"
 msgstr "(нет ветки)"
 
-#: ref-filter.c:1420 ref-filter.c:1451
+#: ref-filter.c:1426 ref-filter.c:1457
 #, c-format
 msgid "missing object %s for %s"
 msgstr "не найден объект %s для %s"
 
-#: ref-filter.c:1423 ref-filter.c:1454
+#: ref-filter.c:1429 ref-filter.c:1460
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "сбой при выполнении parse_object_buffer на %s для %s"
 
-#: ref-filter.c:1692
+#: ref-filter.c:1760
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "Повреждённый объект «%s»"
 
-#: ref-filter.c:1759
+#: ref-filter.c:1827
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "игнорирую ссылку с неправильным именем %s"
 
-#: ref-filter.c:1764
+#: ref-filter.c:1832
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "игнорирую неправильную ссылку %s"
 
-#: ref-filter.c:2028
+#: ref-filter.c:2095
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "format: пропущена частица %%(end)"
 
-#: ref-filter.c:2109
+#: ref-filter.c:2176
 #, c-format
 msgid "malformed object name %s"
 msgstr "неправильное имя объекта %s"
 
-#: remote.c:754
+#: remote.c:747
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "Нельзя извлечь одновременно %s и %s в %s"
 
-#: remote.c:758
+#: remote.c:751
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s обычно отслеживает %s, а не %s"
 
-#: remote.c:762
+#: remote.c:755
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s отслеживает и %s и %s"
 
-#: remote.c:770
+#: remote.c:763
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
-#: remote.c:1685 remote.c:1787
+#: remote.c:1680 remote.c:1782
 msgid "HEAD does not point to a branch"
 msgstr "HEAD не указывает на ветку"
 
-#: remote.c:1694
+#: remote.c:1689
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "нет такой ветки: «%s»"
 
-#: remote.c:1697
+#: remote.c:1692
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "вышестоящая ветка не настроена для ветки «%s»"
 
-#: remote.c:1703
+#: remote.c:1698
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "вышестоящая ветка «%s» не сохранена как отслеживаемая ветка"
 
-#: remote.c:1718
+#: remote.c:1713
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr "назначение для отправки «%s» на внешнем сервере «%s» не имеет локальной отслеживаемой ветки"
 
-#: remote.c:1730
+#: remote.c:1725
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "ветка «%s» не имеет внешнего сервера для отправки"
 
-#: remote.c:1741
+#: remote.c:1736
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "спецификаторы пути для отправки «%s» не включают в себя «%s»"
 
-#: remote.c:1754
+#: remote.c:1749
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "отправка не имеет точки назначения (push.default выставлен в «nothing»)"
 
-#: remote.c:1776
+#: remote.c:1771
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "не удалось выполнить «simple» отправку в единственную точку назначения"
 
-#: remote.c:2081
+#: remote.c:2076
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Ваша ветка базируется на «%s», но вышестоящий репозиторий исчез.\n"
 
-#: remote.c:2085
+#: remote.c:2080
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "(для исправления запустите «git branch --unset-upstream»)\n"
 
-#: remote.c:2088
+#: remote.c:2083
 #, c-format
 msgid "Your branch is up-to-date with '%s'.\n"
 msgstr "Ваша ветка обновлена в соответствии с «%s».\n"
 
-#: remote.c:2092
+#: remote.c:2087
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
@@ -2679,11 +2731,11 @@ msgstr[1] "Ваша ветка опережает «%s» на %d коммита.
 msgstr[2] "Ваша ветка опережает «%s» на %d коммитов.\n"
 msgstr[3] "Ваша ветка опережает «%s» на %d коммитов.\n"
 
-#: remote.c:2098
+#: remote.c:2093
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (используйте «git push», чтобы опубликовать ваши локальные коммиты)\n"
 
-#: remote.c:2101
+#: remote.c:2096
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -2693,11 +2745,11 @@ msgstr[1] "Ваша ветка отстает от «%s» на %d коммита
 msgstr[2] "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n"
 msgstr[3] "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n"
 
-#: remote.c:2109
+#: remote.c:2104
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (используйте «git pull», чтобы обновить вашу локальную ветку)\n"
 
-#: remote.c:2112
+#: remote.c:2107
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -2710,150 +2762,145 @@ msgstr[1] "Ваша ветка и «%s» разделились\nи теперь
 msgstr[2] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммитов в каждой соответственно.\n"
 msgstr[3] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммитов в каждой соответственно.\n"
 
-#: remote.c:2122
+#: remote.c:2117
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  (используйте «git pull», чтобы слить внешнюю ветку в вашу)\n"
 
-#: revision.c:2158
+#: revision.c:2187
 msgid "your current branch appears to be broken"
 msgstr "похоже, ваша текущая ветка повреждена"
 
-#: revision.c:2161
+#: revision.c:2190
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "ваша текущая ветка «%s» еще не содержит ни одного коммита"
 
-#: revision.c:2355
+#: revision.c:2384
 msgid "--first-parent is incompatible with --bisect"
 msgstr "опцию --first-parent нельзя использовать одновременно с --bisect"
 
-#: run-command.c:125
+#: run-command.c:644
 msgid "open /dev/null failed"
 msgstr "сбой открытия /dev/null"
 
-#: run-command.c:127
-#, c-format
-msgid "dup2(%d,%d) failed"
-msgstr "dup2(%d,%d) сбой"
-
-#: send-pack.c:150
+#: send-pack.c:151
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "не удалось разобрать статус внешней распаковки: %s"
 
-#: send-pack.c:152
+#: send-pack.c:153
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "сбой при внешней распаковке %s"
 
-#: send-pack.c:315
+#: send-pack.c:316
 msgid "failed to sign the push certificate"
 msgstr "сбой подписания сертификата отправки"
 
-#: send-pack.c:428
+#: send-pack.c:429
 msgid "the receiving end does not support --signed push"
 msgstr "принимающая сторона не поддерживает отправку с опцией --signed"
 
-#: send-pack.c:430
+#: send-pack.c:431
 msgid ""
 "not sending a push certificate since the receiving end does not support "
 "--signed push"
 msgstr "не отправляем сертификат для отправки, так как принимающая сторона не поддерживает отправку с опцией --signed"
 
-#: send-pack.c:442
+#: send-pack.c:443
 msgid "the receiving end does not support --atomic push"
 msgstr "принимающая сторона не поддерживает отправку с опцией --atomic"
 
-#: send-pack.c:447
+#: send-pack.c:448
 msgid "the receiving end does not support push options"
 msgstr "принимающая сторона не поддерживает отправку с опциями"
 
-#: sequencer.c:215
+#: sequencer.c:216
 msgid "revert"
 msgstr "обратить изменения"
 
-#: sequencer.c:217
+#: sequencer.c:218
 msgid "cherry-pick"
 msgstr "копировать коммит"
 
-#: sequencer.c:219
+#: sequencer.c:220
 msgid "rebase -i"
 msgstr "rebase -i"
 
-#: sequencer.c:221
+#: sequencer.c:222
 #, c-format
 msgid "Unknown action: %d"
 msgstr "Неизвестное действие: %d"
 
-#: sequencer.c:278
+#: sequencer.c:279
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
 msgstr "после разрешения конфликтов, пометьте исправленные пути\nс помощью «git add <пути>» или «git rm <пути>»"
 
-#: sequencer.c:281
+#: sequencer.c:282
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
 "and commit the result with 'git commit'"
 msgstr "после разрешения конфликтов, пометьте исправленные пути\nс помощью «git add <пути>» или «git rm <пути>»\nи сделайте коммит с помощью «git commit»"
 
-#: sequencer.c:294 sequencer.c:1682
+#: sequencer.c:295 sequencer.c:1685
 #, c-format
 msgid "could not lock '%s'"
 msgstr "не удалось заблокировать «%s»"
 
-#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701
+#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
 #, c-format
 msgid "could not write to '%s'"
 msgstr "не удалось записать в «%s»"
 
-#: sequencer.c:301
+#: sequencer.c:302
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "не удалось записать eol в «%s»"
 
-#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689
+#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
 #, c-format
 msgid "failed to finalize '%s'."
 msgstr "не удалось завершить «%s»."
 
-#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257
-#: builtin/commit.c:749 builtin/merge.c:1018
+#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
+#: builtin/commit.c:750 builtin/merge.c:1017
 #, c-format
 msgid "could not read '%s'"
 msgstr "не удалось прочитать «%s»"
 
-#: sequencer.c:355
+#: sequencer.c:356
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "ваши локальные изменения будут перезаписаны %s."
 
-#: sequencer.c:359
+#: sequencer.c:360
 msgid "commit your changes or stash them to proceed."
 msgstr "для продолжения закоммитьте ваши изменения или спрячьте их."
 
-#: sequencer.c:388
+#: sequencer.c:389
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: перемотка вперед"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. * "rebase -i".
-#: sequencer.c:470
+#. "rebase -i".
+#: sequencer.c:472
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Не удалось записать файл индекса"
 
-#: sequencer.c:489
+#: sequencer.c:491
 msgid "could not resolve HEAD commit\n"
 msgstr "не удалось распознать HEAD коммит\n"
 
-#: sequencer.c:509
+#: sequencer.c:511
 msgid "unable to update cache tree\n"
 msgstr "не удалось обновить дерево кэша\n"
 
-#: sequencer.c:592
+#: sequencer.c:595
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -2870,17 +2917,17 @@ msgid ""
 "  git rebase --continue\n"
 msgstr "у вас имеются проиндексированные изменения в рабочем каталоге. Если эти изменения должны быть объеденены с предыдущим коммитом, то запустите:\n\n  git commit --amend %s\n\nЕсли же они должны быть помещены в новый коммит, то запустите:\n\n  git commit %s\n\nВ любом случае, после того как вы закончите, продолжить перемещение можно выполнив:\n\n  git rebase --continue\n"
 
-#: sequencer.c:694
+#: sequencer.c:697
 #, c-format
 msgid "could not parse commit %s\n"
 msgstr "не удалось разобрать коммит %s\n"
 
-#: sequencer.c:699
+#: sequencer.c:702
 #, c-format
 msgid "could not parse parent commit %s\n"
 msgstr "не удалось разобрать родительский коммит %s\n"
 
-#: sequencer.c:821
+#: sequencer.c:824
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
@@ -2888,7 +2935,7 @@ msgid ""
 "\t%.*s"
 msgstr "неожиданная первая строка сообщения уплотнения:\n\n\t%.*s"
 
-#: sequencer.c:827
+#: sequencer.c:830
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
@@ -2896,229 +2943,229 @@ msgid ""
 "\t%.*s"
 msgstr "недопустимая первая строка сообщения уплотнения:\n\n\t%.*s"
 
-#: sequencer.c:833 sequencer.c:858
+#: sequencer.c:836 sequencer.c:861
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Это объединение %d коммитов."
 
-#: sequencer.c:842
+#: sequencer.c:845
 msgid "need a HEAD to fixup"
 msgstr "нужен HEAD для исправления"
 
-#: sequencer.c:844
+#: sequencer.c:847
 msgid "could not read HEAD"
 msgstr "не удалось прочитать HEAD"
 
-#: sequencer.c:846
+#: sequencer.c:849
 msgid "could not read HEAD's commit message"
 msgstr "не удалось прочитать сообщение коммита текущего HEAD"
 
-#: sequencer.c:852
+#: sequencer.c:855
 #, c-format
 msgid "cannot write '%s'"
 msgstr "не удалось записать «%s»"
 
-#: sequencer.c:861 git-rebase--interactive.sh:445
+#: sequencer.c:864 git-rebase--interactive.sh:445
 msgid "This is the 1st commit message:"
 msgstr "Это 1-е сообщение коммита:"
 
-#: sequencer.c:869
+#: sequencer.c:872
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "не удалось прочитать сообщение коммита для %s"
 
-#: sequencer.c:876
+#: sequencer.c:879
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Это сообщение коммита номер #%d:"
 
-#: sequencer.c:881
+#: sequencer.c:884
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Сообщение коммита номер #%d будет пропущено:"
 
-#: sequencer.c:886
+#: sequencer.c:889
 #, c-format
 msgid "unknown command: %d"
 msgstr "неизвестная команда: %d"
 
-#: sequencer.c:952
+#: sequencer.c:955
 msgid "your index file is unmerged."
 msgstr "ваш индекс не слит."
 
-#: sequencer.c:970
+#: sequencer.c:973
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "коммит %s — это коммит-слияние, но опция -m не указана."
 
-#: sequencer.c:978
+#: sequencer.c:981
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "у коммита %s нет предка %d"
 
-#: sequencer.c:982
+#: sequencer.c:985
 #, c-format
 msgid "mainline was specified but commit %s is not a merge."
 msgstr "основная ветка указана, но коммит %s не является слиянием."
 
-#: sequencer.c:988
+#: sequencer.c:991
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "не удалось получить сообщение коммита для %s"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1009
+#: sequencer.c:1012
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: не удалось разобрать родительский коммит для %s"
 
-#: sequencer.c:1071 sequencer.c:1827
+#: sequencer.c:1075 sequencer.c:1830
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "не удалось переименовать «%s» в «%s»"
 
-#: sequencer.c:1122
+#: sequencer.c:1126
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "не удалось обратить изменения коммита %s… %s"
 
-#: sequencer.c:1123
+#: sequencer.c:1127
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "не удалось применить коммит %s… %s"
 
-#: sequencer.c:1165
+#: sequencer.c:1169
 msgid "empty commit set passed"
 msgstr "передан пустой набор коммитов"
 
-#: sequencer.c:1175
+#: sequencer.c:1179
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: сбой чтения индекса"
 
-#: sequencer.c:1182
+#: sequencer.c:1186
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: сбой обновления индекса"
 
-#: sequencer.c:1303
+#: sequencer.c:1306
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "неправильная строка %d: %.*s"
 
-#: sequencer.c:1311
+#: sequencer.c:1314
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "нельзя выполнить «%s» без указания предыдущего коммита"
 
-#: sequencer.c:1344
+#: sequencer.c:1347
 #, c-format
 msgid "could not read '%s'."
 msgstr "не удалось прочитать «%s»."
 
-#: sequencer.c:1356
+#: sequencer.c:1359
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "пожалуйста исправьте это с помощью «git rebase --edit-todo»."
 
-#: sequencer.c:1358
+#: sequencer.c:1361
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "непригодная для использования карта с инструкциями: «%s»"
 
-#: sequencer.c:1363
+#: sequencer.c:1366
 msgid "no commits parsed."
 msgstr "коммиты не разобраны."
 
-#: sequencer.c:1374
+#: sequencer.c:1377
 msgid "cannot cherry-pick during a revert."
 msgstr "нельзя скопировать коммит во время процесса обращения коммита."
 
-#: sequencer.c:1376
+#: sequencer.c:1379
 msgid "cannot revert during a cherry-pick."
 msgstr "нельзя обратить изменения коммита во время копирования коммита."
 
-#: sequencer.c:1439
+#: sequencer.c:1442
 #, c-format
 msgid "invalid key: %s"
 msgstr "недействительный ключ: %s"
 
-#: sequencer.c:1442
+#: sequencer.c:1445
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "неправильное значение %s: %s"
 
-#: sequencer.c:1499
+#: sequencer.c:1502
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "испорченная карта с опциями: «%s»"
 
-#: sequencer.c:1537
+#: sequencer.c:1540
 msgid "a cherry-pick or revert is already in progress"
 msgstr "копирование или обращение изменений коммита уже выполняются"
 
-#: sequencer.c:1538
+#: sequencer.c:1541
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "попробуйте «git cherry-pick (--continue | --quit | --abort)»"
 
-#: sequencer.c:1541
+#: sequencer.c:1544
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "не удалось создать каталог для указателя следования коммитов «%s»"
 
-#: sequencer.c:1555
+#: sequencer.c:1558
 msgid "could not lock HEAD"
 msgstr "не удалось заблокировать HEAD"
 
-#: sequencer.c:1611 sequencer.c:2181
+#: sequencer.c:1614 sequencer.c:2188
 msgid "no cherry-pick or revert in progress"
 msgstr "копирование или обращение изменений коммита уже выполняются"
 
-#: sequencer.c:1613
+#: sequencer.c:1616
 msgid "cannot resolve HEAD"
 msgstr "не удалось определить HEAD"
 
-#: sequencer.c:1615 sequencer.c:1649
+#: sequencer.c:1618 sequencer.c:1652
 msgid "cannot abort from a branch yet to be born"
 msgstr "нельзя отменить изменения с ветки, которая еще не создана"
 
-#: sequencer.c:1635 builtin/grep.c:910
+#: sequencer.c:1638 builtin/grep.c:929
 #, c-format
 msgid "cannot open '%s'"
 msgstr "не удалось открыть «%s»"
 
-#: sequencer.c:1637
+#: sequencer.c:1640
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "не удалось прочитать «%s»: %s"
 
-#: sequencer.c:1638
+#: sequencer.c:1641
 msgid "unexpected end of file"
 msgstr "неожиданный конец файла"
 
-#: sequencer.c:1644
+#: sequencer.c:1647
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "сохраненный файл с HEAD перед копированием коммита «%s» поврежден"
 
-#: sequencer.c:1655
+#: sequencer.c:1658
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr "Похоже, что вы переместили HEAD. Перемотка не выполняется, проверьте свой указатель HEAD!"
 
-#: sequencer.c:1792 sequencer.c:2080
+#: sequencer.c:1795 sequencer.c:2086
 msgid "cannot read HEAD"
 msgstr "не удалось прочитать HEAD"
 
-#: sequencer.c:1832 builtin/difftool.c:616
+#: sequencer.c:1835 builtin/difftool.c:633
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "не удалось скопировать «%s» в «%s»"
 
-#: sequencer.c:1848
+#: sequencer.c:1851
 msgid "could not read index"
 msgstr "не удалось прочитать индекс"
 
-#: sequencer.c:1853
+#: sequencer.c:1856
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3128,11 +3175,11 @@ msgid ""
 "\n"
 msgstr "ошибка выполнения: %s\n%sВы можете исправить ошибку, а затем запустить\n\n  git rebase --continue\n\n"
 
-#: sequencer.c:1859
+#: sequencer.c:1862
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "и были сделаны изменения в индексе и/или в рабочем каталоге\n"
 
-#: sequencer.c:1865
+#: sequencer.c:1868
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3143,107 +3190,107 @@ msgid ""
 "\n"
 msgstr "успешное выполнение: %s\nно остались изменения в индексе и/или в рабочем каталоге\nСделайте коммит или спрячьте ваши изменения, а затем выполните\n\n  git rebase --continue\n\n"
 
-#: sequencer.c:1920 git-rebase.sh:169
+#: sequencer.c:1925
 #, c-format
-msgid "Applied autostash."
-msgstr "Применено автоматическое прятанье."
+msgid "Applied autostash.\n"
+msgstr "Применены автоматически спрятанные изменения.\n"
 
-#: sequencer.c:1932
+#: sequencer.c:1937
 #, c-format
 msgid "cannot store %s"
 msgstr "не удалось сохранить %s"
 
-#: sequencer.c:1934 git-rebase.sh:173
+#: sequencer.c:1940 git-rebase.sh:173
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
 "Your changes are safe in the stash.\n"
 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
-msgstr "Применение автоматического прятанья вызвало конфликты.\nВаши изменения спрятаны и в безопасности.\nВы можете выполнить «git stash pop» или «git stash drop» в любой момент.\n"
+msgstr "Применение автоматически спрятанных изменений вызвало конфликты.\nВаши изменения спрятаны и в безопасности.\nВы можете выполнить «git stash pop» или «git stash drop» в любой момент.\n"
 
-#: sequencer.c:2016
+#: sequencer.c:2022
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Остановлено на %s …  %.*s\n"
 
-#: sequencer.c:2058
+#: sequencer.c:2064
 #, c-format
 msgid "unknown command %d"
 msgstr "неизвестная команда %d"
 
-#: sequencer.c:2088
+#: sequencer.c:2094
 msgid "could not read orig-head"
 msgstr "не удалось прочитать orig-head"
 
-#: sequencer.c:2092
+#: sequencer.c:2099
 msgid "could not read 'onto'"
 msgstr "не удалось прочитать «onto»"
 
-#: sequencer.c:2099
+#: sequencer.c:2106
 #, c-format
 msgid "could not update %s"
 msgstr "не удалось обновить %s"
 
-#: sequencer.c:2106
+#: sequencer.c:2113
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "не удалось обновить HEAD на %s"
 
-#: sequencer.c:2190
+#: sequencer.c:2197
 msgid "cannot rebase: You have unstaged changes."
 msgstr "не удалось выполнить перемещение коммитов: У вас есть непроиндексированные изменения."
 
-#: sequencer.c:2195
+#: sequencer.c:2202
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "не удалось удалить CHERRY_PICK_HEAD"
 
-#: sequencer.c:2204
+#: sequencer.c:2211
 msgid "cannot amend non-existing commit"
 msgstr "не удалось исправить несуществующий коммит"
 
-#: sequencer.c:2206
+#: sequencer.c:2213
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "недопустимый файл: «%s»"
 
-#: sequencer.c:2208
+#: sequencer.c:2215
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "недопустимое содержимое: «%s»"
 
-#: sequencer.c:2211
+#: sequencer.c:2218
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
 "first and then run 'git rebase --continue' again."
 msgstr "\nУ вас имеются незакоммиченные изменения в рабочем каталоге. Сделайте коммит, а затем запустите «git rebase --continue» снова."
 
-#: sequencer.c:2221
+#: sequencer.c:2228
 msgid "could not commit staged changes."
 msgstr "не удалось закоммитить проиндексированные изменения."
 
-#: sequencer.c:2301
+#: sequencer.c:2308
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: не удалось скопировать коммит %s"
 
-#: sequencer.c:2305
+#: sequencer.c:2312
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: плохая редакция"
 
-#: sequencer.c:2338
+#: sequencer.c:2345
 msgid "can't revert as initial commit"
 msgstr "нельзя возвратить изначальный коммит"
 
-#: setup.c:165
+#: setup.c:171
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
 "Use 'git <command> -- <path>...' to specify paths that do not exist locally."
 msgstr "%s: нет такого пути в рабочем каталоге.\nИспользуйте «git <команда> -- <путь>…» для указания путей, которые не существуют локально."
 
-#: setup.c:178
+#: setup.c:184
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -3251,7 +3298,7 @@ msgid ""
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr "неоднозначный аргумент «%s»: неизвестная редакция или не путь в рабочем каталоге.\nИспользуйте «--» для отделения путей от редакций, вот так:\n«git <команда> [<редакция>…] -- [<файл>…]»"
 
-#: setup.c:228
+#: setup.c:252
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -3259,68 +3306,68 @@ msgid ""
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr "неоднозначный аргумент «%s»: является одновременно и редакцией и именем файла.\nИспользуйте «--» для отделения путей от редакций, вот так:\n«git <команда> [<редакция>…] -- [<файл>…]»"
 
-#: setup.c:475
+#: setup.c:504
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Ожидаемая версия git репозитория <= %d, а обнаружена %d"
 
-#: setup.c:483
+#: setup.c:512
 msgid "unknown repository extensions found:"
 msgstr "обнаружены неизвестные расширения репозитория:"
 
-#: setup.c:776
+#: setup.c:810
 #, c-format
 msgid "Not a git repository (or any of the parent directories): %s"
 msgstr "Не найден git репозитоий (или один из его каталогов): %s"
 
-#: setup.c:778 builtin/index-pack.c:1646
+#: setup.c:812 builtin/index-pack.c:1652
 msgid "Cannot come back to cwd"
 msgstr "Не удалось вернуться в текущий рабочий каталог"
 
-#: setup.c:1010
+#: setup.c:1050
 msgid "Unable to read current working directory"
 msgstr "Не удалось прочитать текущий рабочий каталог"
 
-#: setup.c:1022 setup.c:1028
+#: setup.c:1062 setup.c:1068
 #, c-format
 msgid "Cannot change to '%s'"
 msgstr "Не удалось изменить на «%s»"
 
-#: setup.c:1041
+#: setup.c:1081
 #, c-format
 msgid ""
 "Not a git repository (or any parent up to mount point %s)\n"
 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
 msgstr "Не найден git репозитоий (или один из его каталогов вплоть до точки монтирования %s)\nОстанавливаю поиск на границе файловой системы (так как GIT_DISCOVERY_ACROSS_FILESYSTEM не установлен)."
 
-#: setup.c:1106
+#: setup.c:1173
 #, c-format
 msgid ""
 "Problem with core.sharedRepository filemode value (0%.3o).\n"
 "The owner of files must always have read and write permissions."
 msgstr "Проблема со значением режима доступа к файлу core.sharedRepository (0%.3o).\nВладелец файлов должен всегда иметь права на чтение и на запись."
 
-#: sha1_file.c:559
+#: sha1_file.c:560
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "путь «%s» не существует"
 
-#: sha1_file.c:585
+#: sha1_file.c:586
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "ссылаемый репозиторий «%s» как связанное состояние, пока не поддерживается."
 
-#: sha1_file.c:591
+#: sha1_file.c:592
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "ссылаемый репозиторий «%s» не является локальным."
 
-#: sha1_file.c:597
+#: sha1_file.c:598
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "ссылаемый репозиторий «%s» является частичным"
 
-#: sha1_file.c:605
+#: sha1_file.c:606
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "ссылаемый репозиторий «%s» является сращенным"
@@ -3329,26 +3376,26 @@ msgstr "ссылаемый репозиторий «%s» является сра
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "сдвиг до конца файла пакета (возможно, повреждён файл .idx?)"
 
-#: sha1_file.c:2721
+#: sha1_file.c:2729
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "сдвиг до начала индекса пакета для %s (повреждён индекс?)"
 
-#: sha1_file.c:2725
+#: sha1_file.c:2733
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr "сдвиг за пределами индекса пакета для %s (обрезан индекс?)"
 
-#: sha1_name.c:409
+#: sha1_name.c:419
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "сокращённый SHA1 идентификатор %s неоднозначен"
 
-#: sha1_name.c:420
+#: sha1_name.c:430
 msgid "The candidates are:"
 msgstr "Возможно, вы имели в виду:"
 
-#: sha1_name.c:580
+#: sha1_name.c:589
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -3361,71 +3408,81 @@ msgid ""
 "running \"git config advice.objectNameWarning false\""
 msgstr "Обычно Git не создает ссылки, оканчивающиеся на 40 шестнадцатеричных\nсимволов, потому, что они будут игнорироваться, когда вы просто\nукажете это 40-символьное шестнадцатеричное число. Такие ссылки\nмогли быть созданы по ошибке. Например, с помощью:\n\n  git checkout -b $br $(git rev-parse …)\n\n, если «$br» оказался пустым, то ссылка с 40-символьным\nшестнадцатеричным числом будет создана. Пожалуйста, просмотрите эти\nссылки и, возможно, удалите их. Вы можете отключить это сообщение\nзапустив «git config advice.objectNameWarning false»"
 
-#: submodule.c:67 submodule.c:101
+#: submodule.c:70 submodule.c:104
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr "Не удалось изменить не слитый .gitmodules, сначала разрешите конфликты"
 
-#: submodule.c:71 submodule.c:105
+#: submodule.c:74 submodule.c:108
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "Не удалось найти раздел в .gitmodules, где путь равен %s"
 
-#: submodule.c:79
+#: submodule.c:82
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr " Не удалось обновить .gitmodules запись %s"
 
-#: submodule.c:112
+#: submodule.c:115
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "Не удалось удалить запись в .gitmodules для %s"
 
-#: submodule.c:123
+#: submodule.c:126
 msgid "staging updated .gitmodules failed"
 msgstr "сбой индексирования обновленного .gitmodules"
 
-#: submodule.c:161
+#: submodule.c:165
 msgid "negative values not allowed for submodule.fetchJobs"
 msgstr "нельзя использовать отприцательные значения для submodule.fetchJobs"
 
-#: submodule.c:1194
+#: submodule.c:376
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "в пустом подмодуле «%s»"
+
+#: submodule.c:407
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Спецификатор пути «%s» в подмодуле «%.*s»"
+
+#: submodule.c:1337
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "«%s» не распознан как репозиторий git"
 
-#: submodule.c:1332
+#: submodule.c:1475
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "не удалось запустить «git status» в подмодуле «%s»"
 
-#: submodule.c:1345
+#: submodule.c:1488
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "не удалось запустить «git status» в подмодуле «%s»"
 
-#: submodule.c:1421
+#: submodule.c:1581
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "подмодуль «%s» имеет изменённый индекс"
 
-#: submodule.c:1678
+#: submodule.c:1845
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr "relocate_gitdir для подмодуля «%s» с указанием более одного рабочего дерева не поддерживается"
 
-#: submodule.c:1690 submodule.c:1746
+#: submodule.c:1857 submodule.c:1913
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "не удалось запросить имя подмодуля «%s»"
 
-#: submodule.c:1694 builtin/submodule--helper.c:678
+#: submodule.c:1861 builtin/submodule--helper.c:678
 #: builtin/submodule--helper.c:688
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "не удалось создать каталог «%s»"
 
-#: submodule.c:1697
+#: submodule.c:1864
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3433,101 +3490,101 @@ msgid ""
 "'%s'\n"
 msgstr "Перемещение каталога git для «%s%s» из\n«%s» в\n«%s»\n"
 
-#: submodule.c:1781
+#: submodule.c:1948
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "не удалось рекурсивно зайти в подмодуль «%s»"
 
-#: submodule.c:1825
+#: submodule.c:1992
 msgid "could not start ls-files in .."
 msgstr "не удалось выполнить stat ls-files в .."
 
-#: submodule.c:1845
+#: submodule.c:2012
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr "ОШИБКА: возвращенная строка не соответсвует cwd?"
 
-#: submodule.c:1864
+#: submodule.c:2031
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree вернул неожиданный код %d"
 
-#: submodule-config.c:380
+#: submodule-config.c:420
 #, c-format
 msgid "invalid value for %s"
 msgstr "неправильное значение %s"
 
-#: trailer.c:240
+#: trailer.c:241
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "сбой при запуске команды завершителя «%s»"
 
-#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539
-#: trailer.c:543
+#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
+#: trailer.c:544
 #, c-format
 msgid "unknown value '%s' for key '%s'"
 msgstr "неизвестное значение «%s» для ключа «%s»"
 
-#: trailer.c:525 trailer.c:530 builtin/remote.c:289
+#: trailer.c:526 trailer.c:531 builtin/remote.c:290
 #, c-format
 msgid "more than one %s"
 msgstr "больше одного %s"
 
-#: trailer.c:702
+#: trailer.c:703
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "пустая последняя лексема в завершителе «%.*s»"
 
-#: trailer.c:722
+#: trailer.c:723
 #, c-format
 msgid "could not read input file '%s'"
 msgstr "не удалось прочитать входной файл «%s»"
 
-#: trailer.c:725
+#: trailer.c:726
 msgid "could not read from stdin"
 msgstr "не удалось прочитать из стандартного ввода"
 
-#: trailer.c:949 builtin/am.c:44
+#: trailer.c:950 builtin/am.c:45
 #, c-format
 msgid "could not stat %s"
 msgstr "не удалось выполнить stat для %s"
 
-#: trailer.c:951
+#: trailer.c:952
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "файл %s не является обычным файлом"
 
-#: trailer.c:953
+#: trailer.c:954
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "файл %s не доступен на запись пользователю"
 
-#: trailer.c:965
+#: trailer.c:966
 msgid "could not open temporary file"
 msgstr "не удалось создать временный файл"
 
-#: trailer.c:1001
+#: trailer.c:1002
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "не удалось переименовать временный файл в %s"
 
-#: transport.c:62
+#: transport.c:63
 #, c-format
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "Будет установлен вышестоящий репозиторий для «%s» на «%s» с «%s»\n"
 
-#: transport.c:151
+#: transport.c:152
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "транспорт: неправильный параметр глубины «%s»"
 
-#: transport.c:889
+#: transport.c:890
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
 "not be found on any remote:\n"
 msgstr "Подмодули по указанным путям содержат изменения, которые не найдены ни на одном из внешних репозиториев:\n"
 
-#: transport.c:893
+#: transport.c:894
 #, c-format
 msgid ""
 "\n"
@@ -3543,11 +3600,11 @@ msgid ""
 "\n"
 msgstr "\nПопробуйте выполнить\n\n\tgit push --recurse-submodules=on-demand\n\nили перейти в каталог с помощью команды cd и выполнить\n\n\tgit push\n\nдля их отправки на внешний репозиторий.\n"
 
-#: transport.c:901
+#: transport.c:902
 msgid "Aborting."
 msgstr "Прерываю."
 
-#: transport-helper.c:1080
+#: transport-helper.c:1071
 #, c-format
 msgid "Could not read ref %s"
 msgstr "Не удалось прочитать ссылку %s"
@@ -3568,183 +3625,183 @@ msgstr "пустое имя файла в записи дерева"
 msgid "too-short tree file"
 msgstr "слишком  короткий файл дерева"
 
-#: unpack-trees.c:104
+#: unpack-trees.c:105
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%sPlease commit your changes or stash them before you switch branches."
 msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при переключении на состояние:\n%%sСделайте коммит или спрячьте ваши изменения перед переключением веток."
 
-#: unpack-trees.c:106
+#: unpack-trees.c:107
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%s"
 msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при переключении на состояние:\n%%s"
 
-#: unpack-trees.c:109
+#: unpack-trees.c:110
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%sPlease commit your changes or stash them before you merge."
 msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\n%%sСделайте коммит или спрячьте ваши изменения перед слиянием веток."
 
-#: unpack-trees.c:111
+#: unpack-trees.c:112
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%s"
 msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\n%%s"
 
-#: unpack-trees.c:114
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 "%%sPlease commit your changes or stash them before you %s."
 msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при %s:\n%%sСделайте коммит или спрячьте ваши изменения перед %s."
 
-#: unpack-trees.c:116
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 "%%s"
 msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при %s:\n%%s"
 
-#: unpack-trees.c:121
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
 "%s"
 msgstr "Обновление указанных каталогов приведет к потере неотслеживаемых файлов в них:\n%s"
 
-#: unpack-trees.c:125
+#: unpack-trees.c:126
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%sPlease move or remove them before you switch branches."
 msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при переключении на состояние:\n%%sПереместите эти файлы или удалите их перед переключением веток."
 
-#: unpack-trees.c:127
+#: unpack-trees.c:128
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%s"
 msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при переключении на состояние:\n%%s"
 
-#: unpack-trees.c:130
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%sPlease move or remove them before you merge."
 msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при слиянии:\n%%sПереместите эти файлы или удалите их перед переключением веток."
 
-#: unpack-trees.c:132
+#: unpack-trees.c:133
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%s"
 msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при слиянии:\n%%s"
 
-#: unpack-trees.c:135
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 "%%sPlease move or remove them before you %s."
 msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n%%sПереместите эти файлы или удалите их перед %s."
 
-#: unpack-trees.c:137
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 "%%s"
 msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n%%s"
 
-#: unpack-trees.c:142
+#: unpack-trees.c:143
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by checkout:\n"
 "%%sPlease move or remove them before you switch branches."
 msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при переключении на состояние:\n%%sПереместите эти файлы или удалите их перед переключением веток."
 
-#: unpack-trees.c:144
+#: unpack-trees.c:145
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by checkout:\n"
 "%%s"
 msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при переключении на состояние:\n%%s"
 
-#: unpack-trees.c:147
+#: unpack-trees.c:148
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%sPlease move or remove them before you merge."
 msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при слиянии:\n%%sПереместите эти файлы или удалите их перед переключением веток."
 
-#: unpack-trees.c:149
+#: unpack-trees.c:150
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%s"
 msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при слиянии:\n%%s"
 
-#: unpack-trees.c:152
+#: unpack-trees.c:153
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%sPlease move or remove them before you %s."
 msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при %s:\n%%sПереместите эти файлы или удалите их перед %s."
 
-#: unpack-trees.c:154
+#: unpack-trees.c:155
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%s"
 msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при %s:\n%%s"
 
-#: unpack-trees.c:161
+#: unpack-trees.c:162
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Запись «%s» частично совпадает с «%s».  Не удалось назначить соответствие."
 
-#: unpack-trees.c:164
+#: unpack-trees.c:165
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up-to-date:\n"
 "%s"
 msgstr "Не удалось обновить частичное состояние: следующие элементы не последней версии:\n%s"
 
-#: unpack-trees.c:166
+#: unpack-trees.c:167
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout update:\n"
 "%s"
 msgstr "Указанные файлы из рабочего каталога будут перезаписаны при обновлении частичного состояния:\n%s"
 
-#: unpack-trees.c:168
+#: unpack-trees.c:169
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout update:\n"
 "%s"
 msgstr "Указанные файлы из рабочего каталога будут удалены при обновлении частичного состояния:\n%s"
 
-#: unpack-trees.c:170
+#: unpack-trees.c:171
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
 "%s"
 msgstr "Не удолось обновить подмодуль:\n%s"
 
-#: unpack-trees.c:247
+#: unpack-trees.c:248
 #, c-format
 msgid "Aborting\n"
 msgstr "Прерываю\n"
 
-#: unpack-trees.c:272
+#: unpack-trees.c:277
 #, c-format
 msgid "submodule update strategy not supported for submodule '%s'"
 msgstr "стратегия обновления подмодуля не поддерживается подмодулем «%s»"
 
-#: unpack-trees.c:340
+#: unpack-trees.c:346
 msgid "Checking out files"
 msgstr "Распаковка файлов"
 
@@ -3777,238 +3834,246 @@ msgstr "неправильный номер порта"
 msgid "invalid '..' path segment"
 msgstr "неправильная часть пути «..»"
 
-#: worktree.c:285
+#: worktree.c:245
 #, c-format
 msgid "failed to read '%s'"
 msgstr "не удалось прочитать «%s»"
 
-#: wrapper.c:222 wrapper.c:392
+#: wrapper.c:223 wrapper.c:393
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "не удалось открыть «%s» для чтения и записи"
 
-#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
+#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "не удалось открыть «%s» для записи"
 
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757
-#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015
-#: builtin/pull.c:341
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
+#: builtin/am.c:849 builtin/merge.c:1014
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "не удалось открыть «%s» для чтения"
 
-#: wrapper.c:581 wrapper.c:602
+#: wrapper.c:424 wrapper.c:624
 #, c-format
 msgid "unable to access '%s'"
 msgstr "«%s» недоступно"
 
-#: wrapper.c:610
+#: wrapper.c:632
 msgid "unable to get current working directory"
 msgstr "не удалось получить текущий рабочий каталог"
 
-#: wrapper.c:634
+#: wrapper.c:656
 #, c-format
 msgid "could not write to %s"
 msgstr "не удалось записать в %s"
 
-#: wrapper.c:636
+#: wrapper.c:658
 #, c-format
 msgid "could not close %s"
 msgstr "не удалось закрыть %s"
 
-#: wt-status.c:151
+#: wt-status.c:152
 msgid "Unmerged paths:"
 msgstr "Не слитые пути:"
 
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  (используйте «git reset %s <файл>…», чтобы убрать из индекса)"
 
-#: wt-status.c:180 wt-status.c:207
+#: wt-status.c:181 wt-status.c:208
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  (используйте «git rm --cached <файл>…», чтобы убрать из индекса)"
 
-#: wt-status.c:184
+#: wt-status.c:185
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (используйте «git add <файл>…», чтобы пометить разрешение конфликта)"
 
-#: wt-status.c:186 wt-status.c:190
+#: wt-status.c:187 wt-status.c:191
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr "  (используйте «git add/rm <файл>…», чтобы пометить выбранное разрешение конфликта)"
 
-#: wt-status.c:188
+#: wt-status.c:189
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (используйте «git rm <файл>…», чтобы пометить разрешение конфликта)"
 
-#: wt-status.c:199 wt-status.c:958
+#: wt-status.c:200 wt-status.c:981
 msgid "Changes to be committed:"
 msgstr "Изменения, которые будут включены в коммит:"
 
-#: wt-status.c:217 wt-status.c:967
+#: wt-status.c:218 wt-status.c:990
 msgid "Changes not staged for commit:"
 msgstr "Изменения, которые не в индексе для коммита:"
 
-#: wt-status.c:221
+#: wt-status.c:222
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr "  (используйте «git add <файл>…», чтобы добавить файл в индекс)"
 
-#: wt-status.c:223
+#: wt-status.c:224
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr "  (используйте «git add/rm <файл>…», чтобы добавить или удалить файл из индекса)"
 
-#: wt-status.c:224
+#: wt-status.c:225
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working "
 "directory)"
 msgstr "  (используйте «git checkout -- <файл>…», чтобы отменить изменения\n   в рабочем каталоге)"
 
-#: wt-status.c:226
+#: wt-status.c:227
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr "  (сделайте коммит или отмените изменения в неотслеживаемом или измененном содержимом в подмодулях)"
 
-#: wt-status.c:238
+#: wt-status.c:239
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr "  (используйте «git %s <файл>…», чтобы добавить в то, что будет включено в коммит)"
 
-#: wt-status.c:253
+#: wt-status.c:254
 msgid "both deleted:"
 msgstr "оба удалены:"
 
-#: wt-status.c:255
+#: wt-status.c:256
 msgid "added by us:"
 msgstr "добавлено нами:"
 
-#: wt-status.c:257
+#: wt-status.c:258
 msgid "deleted by them:"
 msgstr "удалено ими:"
 
-#: wt-status.c:259
+#: wt-status.c:260
 msgid "added by them:"
 msgstr "добавлено ими:"
 
-#: wt-status.c:261
+#: wt-status.c:262
 msgid "deleted by us:"
 msgstr "удалено нами:"
 
-#: wt-status.c:263
+#: wt-status.c:264
 msgid "both added:"
 msgstr "оба добавлены:"
 
-#: wt-status.c:265
+#: wt-status.c:266
 msgid "both modified:"
 msgstr "оба изменены:"
 
-#: wt-status.c:275
+#: wt-status.c:276
 msgid "new file:"
 msgstr "новый файл:"
 
-#: wt-status.c:277
+#: wt-status.c:278
 msgid "copied:"
 msgstr "скопировано:"
 
-#: wt-status.c:279
+#: wt-status.c:280
 msgid "deleted:"
 msgstr "удалено:"
 
-#: wt-status.c:281
+#: wt-status.c:282
 msgid "modified:"
 msgstr "изменено:"
 
-#: wt-status.c:283
+#: wt-status.c:284
 msgid "renamed:"
 msgstr "переименовано:"
 
-#: wt-status.c:285
+#: wt-status.c:286
 msgid "typechange:"
 msgstr "изменен тип:"
 
-#: wt-status.c:287
+#: wt-status.c:288
 msgid "unknown:"
 msgstr "неизвестно:"
 
-#: wt-status.c:289
+#: wt-status.c:290
 msgid "unmerged:"
 msgstr "не слитые:"
 
-#: wt-status.c:371
+#: wt-status.c:372
 msgid "new commits, "
 msgstr "новые коммиты, "
 
-#: wt-status.c:373
+#: wt-status.c:374
 msgid "modified content, "
 msgstr "изменено содержимое, "
 
-#: wt-status.c:375
+#: wt-status.c:376
 msgid "untracked content, "
 msgstr "неотслеживаемое содержимое, "
 
-#: wt-status.c:831
+#: wt-status.c:821
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "У вас сейчас спрятана %d запись"
+msgstr[1] "У вас сейчас спрятаны %d записи"
+msgstr[2] "У вас сейчас спрятано %d записей"
+msgstr[3] "У вас сейчас спрятаны %d записи"
+
+#: wt-status.c:853
 msgid "Submodules changed but not updated:"
 msgstr "Измененные, но не обновленные подмодули:"
 
-#: wt-status.c:833
+#: wt-status.c:855
 msgid "Submodule changes to be committed:"
 msgstr "Изменения в подмодулях, которые будут закоммичены:"
 
-#: wt-status.c:914
+#: wt-status.c:937
 msgid ""
 "Do not touch the line above.\n"
 "Everything below will be removed."
 msgstr "Не трогайте строку выше этой.\nВсё, что ниже — будет удалено."
 
-#: wt-status.c:1026
+#: wt-status.c:1049
 msgid "You have unmerged paths."
 msgstr "У вас есть не слитые пути."
 
-#: wt-status.c:1029
+#: wt-status.c:1052
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (разрешите конфликты, затем запустите «git commit»)"
 
-#: wt-status.c:1031
+#: wt-status.c:1054
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (используйте «git merge --abort», чтобы остановить операцию слияния)"
 
-#: wt-status.c:1036
+#: wt-status.c:1059
 msgid "All conflicts fixed but you are still merging."
 msgstr "Все конфликты исправлены, но вы все еще в процессе слияния."
 
-#: wt-status.c:1039
+#: wt-status.c:1062
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (используйте «git commit», чтобы завершить слияние)"
 
-#: wt-status.c:1049
+#: wt-status.c:1072
 msgid "You are in the middle of an am session."
 msgstr "Вы в процессе сессии am."
 
-#: wt-status.c:1052
+#: wt-status.c:1075
 msgid "The current patch is empty."
 msgstr "Текущий патч пустой."
 
-#: wt-status.c:1056
+#: wt-status.c:1079
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (разрешите конфликты, затем запустите «git am --continue»)"
 
-#: wt-status.c:1058
+#: wt-status.c:1081
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (используйте «git am --skip», чтобы пропустить этот патч)"
 
-#: wt-status.c:1060
+#: wt-status.c:1083
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (используйте «git am --abort», чтобы восстановить оригинальную ветку)"
 
-#: wt-status.c:1189
+#: wt-status.c:1214
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo отсутствует."
 
-#: wt-status.c:1191
+#: wt-status.c:1216
 msgid "No commands done."
 msgstr "Команды не выполнены."
 
-#: wt-status.c:1194
+#: wt-status.c:1219
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
@@ -4017,16 +4082,16 @@ msgstr[1] "Последняя команда выполнена (%d команд
 msgstr[2] "Последняя команда выполнена (%d команд выполнено):"
 msgstr[3] "Последняя команда выполнена (%d команд выполнено):"
 
-#: wt-status.c:1205
+#: wt-status.c:1230
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (смотрите дополнительно в файле %s)"
 
-#: wt-status.c:1210
+#: wt-status.c:1235
 msgid "No commands remaining."
 msgstr "Команд больше не осталось."
 
-#: wt-status.c:1213
+#: wt-status.c:1238
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
@@ -4035,150 +4100,154 @@ msgstr[1] "Следующая команда для выполнения (%d к
 msgstr[2] "Следующая команда для выполнения (%d команд осталось):"
 msgstr[3] "Следующая команда для выполнения (%d команд осталось):"
 
-#: wt-status.c:1221
+#: wt-status.c:1246
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (используйте «git rebase --edit-todo», чтобы просмотреть и изменить)"
 
-#: wt-status.c:1234
+#: wt-status.c:1259
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "Вы сейчас перемещаете ветку «%s» над «%s»."
 
-#: wt-status.c:1239
+#: wt-status.c:1264
 msgid "You are currently rebasing."
 msgstr "Вы сейчас перемещаете ветку."
 
-#: wt-status.c:1253
+#: wt-status.c:1278
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (разрешите конфликты, затем запустите «git rebase --continue»)"
 
-#: wt-status.c:1255
+#: wt-status.c:1280
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (используйте «git rebase --skip», чтобы пропустить этот патч)"
 
-#: wt-status.c:1257
+#: wt-status.c:1282
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  (используйте «git rebase --abort», чтобы перейти на оригинальную ветку)"
 
-#: wt-status.c:1263
+#: wt-status.c:1288
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (все конфликты разрешены: запустите «git rebase --continue»)"
 
-#: wt-status.c:1267
+#: wt-status.c:1292
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr "Вы сейчас разделяете коммит при перемещении ветки  «%s» над «%s»."
 
-#: wt-status.c:1272
+#: wt-status.c:1297
 msgid "You are currently splitting a commit during a rebase."
 msgstr "Вы сейчас разделяете коммит при перемещении ветки."
 
-#: wt-status.c:1275
+#: wt-status.c:1300
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr "(Как только ваш рабочий каталог будет чистый, запустите «git rebase --continue»)"
 
-#: wt-status.c:1279
+#: wt-status.c:1304
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr "Вы сейчас редактируете коммит при перемещении ветки  «%s» над «%s»."
 
-#: wt-status.c:1284
+#: wt-status.c:1309
 msgid "You are currently editing a commit during a rebase."
 msgstr "Вы сейчас редактируете коммит при перемещении ветки."
 
-#: wt-status.c:1287
+#: wt-status.c:1312
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  (используйте «git commit --amend», чтобы исправить текущий коммит)"
 
-#: wt-status.c:1289
+#: wt-status.c:1314
 msgid "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr "  (используйте «git rebase --continue», когда будете довольны изменениями)"
 
-#: wt-status.c:1299
+#: wt-status.c:1324
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Вы копируете коммит %s."
 
-#: wt-status.c:1304
+#: wt-status.c:1329
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (разрешите конфликты, затем запустите «git cherry-pick --continue»)"
 
-#: wt-status.c:1307
+#: wt-status.c:1332
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr "  (все конфликты разрешены: запустите «git cherry-pick --continue»)"
 
-#: wt-status.c:1309
+#: wt-status.c:1334
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr "  (используйте «git cherry-pick --abort», чтобы отменить копирования коммита)"
 
-#: wt-status.c:1318
+#: wt-status.c:1343
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Вы сейчас обращаете изменения коммита %s."
 
-#: wt-status.c:1323
+#: wt-status.c:1348
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (разрешите конфликты, затем запустите «git revert --continue»)"
 
-#: wt-status.c:1326
+#: wt-status.c:1351
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (все конфликты разрешены: запустите «git revert --continue»)"
 
-#: wt-status.c:1328
+#: wt-status.c:1353
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (используйте «git revert --abort», чтобы отменить операцию обращения изменений коммита)"
 
-#: wt-status.c:1339
+#: wt-status.c:1364
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Вы сейчас в процессе двоичного поиска, начатого с ветки «%s»."
 
-#: wt-status.c:1343
+#: wt-status.c:1368
 msgid "You are currently bisecting."
 msgstr "Вы сейчас в процессе двоичного поиска."
 
-#: wt-status.c:1346
+#: wt-status.c:1371
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (используйте «git bisect reset», чтобы вернуться на исходную ветку)"
 
-#: wt-status.c:1543
+#: wt-status.c:1568
 msgid "On branch "
 msgstr "На ветке "
 
-#: wt-status.c:1549
+#: wt-status.c:1574
 msgid "interactive rebase in progress; onto "
 msgstr "интерактивное перемещение в процессе; над "
 
-#: wt-status.c:1551
+#: wt-status.c:1576
 msgid "rebase in progress; onto "
 msgstr "перемещение в процессе; над "
 
-#: wt-status.c:1556
+#: wt-status.c:1581
 msgid "HEAD detached at "
 msgstr "HEAD отделён на "
 
-#: wt-status.c:1558
+#: wt-status.c:1583
 msgid "HEAD detached from "
 msgstr "HEAD отделён начиная с "
 
-#: wt-status.c:1561
+#: wt-status.c:1586
 msgid "Not currently on any branch."
 msgstr "Сейчас ни на одной из веток"
 
-#: wt-status.c:1579
+#: wt-status.c:1606
 msgid "Initial commit"
 msgstr "Начальный коммит"
 
-#: wt-status.c:1593
+#: wt-status.c:1607
+msgid "No commits yet"
+msgstr "Еще нет коммитов"
+
+#: wt-status.c:1621
 msgid "Untracked files"
 msgstr "Неотслеживаемые файлы"
 
-#: wt-status.c:1595
+#: wt-status.c:1623
 msgid "Ignored files"
 msgstr "Игнорируемые файлы"
 
-#: wt-status.c:1599
+#: wt-status.c:1627
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4186,252 +4255,279 @@ msgid ""
 "new files yourself (see 'git help status')."
 msgstr "%.2f секунды занял вывод списка неотслеживаемых файлов. «status -uno» возможно может ускорить это, но будьте внимательны, и не забудьте добавить новые файлы вручную (смотрите «git help status» для подробностей)."
 
-#: wt-status.c:1605
+#: wt-status.c:1633
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Неотслеживаемые файлы не показаны%s"
 
-#: wt-status.c:1607
+#: wt-status.c:1635
 msgid " (use -u option to show untracked files)"
 msgstr "(используйте опцию «-u», чтобы показать неотслеживаемые файлы)"
 
-#: wt-status.c:1613
+#: wt-status.c:1641
 msgid "No changes"
 msgstr "Нет изменений"
 
-#: wt-status.c:1618
+#: wt-status.c:1646
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr "нет изменений добавленных для коммита\n(используйте «git add» и/или «git commit -a»)\n"
 
-#: wt-status.c:1621
+#: wt-status.c:1649
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "нет изменений добавленных для коммита\n"
 
-#: wt-status.c:1624
+#: wt-status.c:1652
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы (используйте «git add», чтобы отслеживать их)\n"
 
-#: wt-status.c:1627
+#: wt-status.c:1655
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы\n"
 
-#: wt-status.c:1630
+#: wt-status.c:1658
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr "нечего коммитить (создайте/скопируйте файлы, затем запустите «git add», чтобы отслеживать их)\n"
 
-#: wt-status.c:1633 wt-status.c:1638
+#: wt-status.c:1661 wt-status.c:1666
 #, c-format
 msgid "nothing to commit\n"
 msgstr "нечего коммитить\n"
 
-#: wt-status.c:1636
+#: wt-status.c:1664
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "нечего коммитить (используйте опцию «-u», чтобы показать неотслеживаемые файлы)\n"
 
-#: wt-status.c:1640
+#: wt-status.c:1668
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "нечего коммитить, нет изменений в рабочем каталоге\n"
 
-#: wt-status.c:1749
-msgid "Initial commit on "
-msgstr "Начальный коммит на "
+#: wt-status.c:1780
+msgid "No commits yet on "
+msgstr "Еще нет коммитов в"
 
-#: wt-status.c:1753
+#: wt-status.c:1784
 msgid "HEAD (no branch)"
 msgstr "HEAD (нет ветки)"
 
-#: wt-status.c:1782 wt-status.c:1790
+#: wt-status.c:1813 wt-status.c:1821
 msgid "behind "
 msgstr "позади"
 
-#: wt-status.c:1785 wt-status.c:1788
+#: wt-status.c:1816 wt-status.c:1819
 msgid "ahead "
 msgstr "впереди "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2280
+#: wt-status.c:2311
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "не удалось выполнить %s: У вас есть непроиндексированные изменения."
 
-#: wt-status.c:2286
+#: wt-status.c:2317
 msgid "additionally, your index contains uncommitted changes."
 msgstr "к тому же, в вашем индексе есть незакоммиченные изменения."
 
-#: wt-status.c:2288
+#: wt-status.c:2319
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "не удалось выполнить %s: В вашем индексе есть незакоммиченные изменения."
 
-#: compat/precompose_utf8.c:57 builtin/clone.c:432
+#: compat/precompose_utf8.c:58 builtin/clone.c:436
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "сбой отсоединения «%s»"
 
-#: builtin/add.c:22
+#: builtin/add.c:24
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<опции>] [--] <спецификатор-пути>…"
 
-#: builtin/add.c:80
+#: builtin/add.c:82
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "неожиданный статус различий %c"
 
-#: builtin/add.c:85 builtin/commit.c:291
+#: builtin/add.c:87 builtin/commit.c:292
 msgid "updating files failed"
 msgstr "сбой при обновлении файлов"
 
-#: builtin/add.c:95
+#: builtin/add.c:97
 #, c-format
 msgid "remove '%s'\n"
 msgstr "удалить «%s»\n"
 
-#: builtin/add.c:149
+#: builtin/add.c:151
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Непроиндексированные изменения после обновления индекса:"
 
-#: builtin/add.c:209 builtin/rev-parse.c:872
+#: builtin/add.c:211 builtin/rev-parse.c:873
 msgid "Could not read the index"
 msgstr "Не удалось прочитать индекс"
 
-#: builtin/add.c:220
+#: builtin/add.c:222
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "Не удалось открыть «%s» для записи."
 
-#: builtin/add.c:224
+#: builtin/add.c:226
 msgid "Could not write patch"
 msgstr "Не удалось записать патч"
 
-#: builtin/add.c:227
+#: builtin/add.c:229
 msgid "editing patch failed"
 msgstr "сбой при редактировании патча"
 
-#: builtin/add.c:230
+#: builtin/add.c:232
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Не удалось выполнить stat для «%s»"
 
-#: builtin/add.c:232
+#: builtin/add.c:234
 msgid "Empty patch. Aborted."
 msgstr "Пустой патч. Операция прервана."
 
-#: builtin/add.c:237
+#: builtin/add.c:239
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Не удалось применить «%s»"
 
-#: builtin/add.c:247
+#: builtin/add.c:249
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "Следующие пути игнорируются одним из ваших файлов .gitignore:\n"
 
-#: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123
-#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524
-#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163
+#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
+#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
+#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
 msgstr "пробный запуск"
 
-#: builtin/add.c:269
+#: builtin/add.c:272
 msgid "interactive picking"
 msgstr "интерактивный выбор"
 
-#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286
+#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
 msgid "select hunks interactively"
 msgstr "интерактивный выбор блоков"
 
-#: builtin/add.c:271
+#: builtin/add.c:274
 msgid "edit current diff and apply"
 msgstr "отредактировать текущий файл различий и применить его"
 
-#: builtin/add.c:272
+#: builtin/add.c:275
 msgid "allow adding otherwise ignored files"
 msgstr "разрешить добавление игнорируемых иначе файлов"
 
-#: builtin/add.c:273
+#: builtin/add.c:276
 msgid "update tracked files"
 msgstr "обновить отслеживаемые файлы"
 
-#: builtin/add.c:274
+#: builtin/add.c:277
 msgid "record only the fact that the path will be added later"
 msgstr "записать только факт, что путь будет добавлен позже"
 
-#: builtin/add.c:275
+#: builtin/add.c:278
 msgid "add changes from all tracked and untracked files"
 msgstr "добавить изменения из всех отслеживаемых и неотслеживаемых файлов"
 
-#: builtin/add.c:278
+#: builtin/add.c:281
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "игнорировать пути удаленные из рабочего каталога (тоже, что и --no-all)"
 
-#: builtin/add.c:280
+#: builtin/add.c:283
 msgid "don't add, only refresh the index"
 msgstr "не добавлять, только обновить индекс"
 
-#: builtin/add.c:281
+#: builtin/add.c:284
 msgid "just skip files which cannot be added because of errors"
 msgstr "пропускать файлы, которые не могут быть добавлены из-за ошибок"
 
-#: builtin/add.c:282
+#: builtin/add.c:285
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "удостовериться, что даже недостающие файлы будут проигнорированы при  пробном запуске"
 
-#: builtin/add.c:283 builtin/update-index.c:951
+#: builtin/add.c:286 builtin/update-index.c:952
 msgid "(+/-)x"
 msgstr "(+/-)x"
 
-#: builtin/add.c:283 builtin/update-index.c:952
+#: builtin/add.c:286 builtin/update-index.c:953
 msgid "override the executable bit of the listed files"
 msgstr "переопределить бит выполнения на указанных файлах"
 
-#: builtin/add.c:305
+#: builtin/add.c:288
+msgid "warn when adding an embedded repository"
+msgstr "предупреждать при добавлении встроенного git репозитория"
+
+#: builtin/add.c:303
+#, c-format
+msgid ""
+"You've added another git repository inside your current repository.\n"
+"Clones of the outer repository will not contain the contents of\n"
+"the embedded repository and will not know how to obtain it.\n"
+"If you meant to add a submodule, use:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"If you added this path by mistake, you can remove it from the\n"
+"index with:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"See \"git help submodule\" for more information."
+msgstr "Вы добавили другой репозиторий git внутри текущего репозитория\nКлоны внешнего репозитория не будут содержать внутренний\nрепозиторий и не будут знать как его получить.\nЕсли вы хотели добавить подмодуль, то запустите:\n\n\tgit submodule add <url> %s\n\nЕсли бы добавили этот путь по ошибке, то вы можете удалить его\nиз индекса с помощью:\n\n\tgit rm --cached %s\n\nДля дополнительной информации смотрите «git help submodule»."
+
+#: builtin/add.c:331
+#, c-format
+msgid "adding embedded git repository: %s"
+msgstr "добавление встроенного git репозитория: %s"
+
+#: builtin/add.c:349
 #, c-format
 msgid "Use -f if you really want to add them.\n"
 msgstr "Используйте -f, если вы действительно хотите добавить их.\n"
 
-#: builtin/add.c:312
+#: builtin/add.c:357
 msgid "adding files failed"
 msgstr "ошибка при добавлении файлов"
 
-#: builtin/add.c:348
+#: builtin/add.c:394
 msgid "-A and -u are mutually incompatible"
 msgstr "-A и -u нельзя использовать одновременно"
 
-#: builtin/add.c:355
+#: builtin/add.c:401
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr "Опция --ignore-missing может использоваться только вместе с --dry-run"
 
-#: builtin/add.c:359
+#: builtin/add.c:405
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "параметр --chmod «%s» должен быть -x или +x"
 
-#: builtin/add.c:374
+#: builtin/add.c:420
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Ничего не указано, ничего не добавлено.\n"
 
-#: builtin/add.c:375
+#: builtin/add.c:421
 #, c-format
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "Возможно, вы имели в виду «git add .»?\n"
 
-#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298
-#: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350
-#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271
+#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
+#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
+#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
 #: builtin/submodule--helper.c:244
 msgid "index file corrupt"
 msgstr "файл индекса поврежден"
 
-#: builtin/am.c:412
+#: builtin/am.c:413
 msgid "could not parse author script"
 msgstr "не удалось разобрать сценарий авторства"
 
@@ -4479,7 +4575,7 @@ msgstr "недопустимое смещение часового пояса"
 msgid "Patch format detection failed."
 msgstr "Сбой определения формата патча."
 
-#: builtin/am.c:991 builtin/clone.c:397
+#: builtin/am.c:991 builtin/clone.c:401
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "не удалось создать каталог «%s»"
@@ -4488,296 +4584,298 @@ msgstr "не удалось создать каталог «%s»"
 msgid "Failed to split patches."
 msgstr "Не удалось разделить патчи на части."
 
-#: builtin/am.c:1127 builtin/commit.c:376
+#: builtin/am.c:1120 builtin/commit.c:377
 msgid "unable to write index file"
 msgstr "не удалось записать индекс"
 
-#: builtin/am.c:1178
+#: builtin/am.c:1171
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Когда вы устраните эту проблему, запустите «%s --continue»."
 
-#: builtin/am.c:1179
+#: builtin/am.c:1172
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "Если вы хотите пропустить этот патч, то запустите «%s --skip»."
 
-#: builtin/am.c:1180
+#: builtin/am.c:1173
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr "Чтобы вернуться на предыдущую ветку и остановить применение изменений, запустите «%s --abort»."
 
-#: builtin/am.c:1315
-msgid "Patch is empty. Was it split wrong?"
-msgstr "Патч пуст. Возможно, он был неправильно разделён?"
+#: builtin/am.c:1304
+msgid "Patch is empty."
+msgstr "Патч пустой."
 
-#: builtin/am.c:1386 builtin/log.c:1557
+#: builtin/am.c:1370
 #, c-format
-msgid "invalid ident line: %s"
-msgstr "неправильная строка идентификации: %s"
+msgid "invalid ident line: %.*s"
+msgstr "неправильная строка идентификации: %.*s"
 
-#: builtin/am.c:1413
+#: builtin/am.c:1392
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "не удалось разобрать коммит %s"
 
-#: builtin/am.c:1606
+#: builtin/am.c:1586
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr "В репозитории отсутствуют двоичные объекты, необходимые для отката к трехходовому слиянию."
 
-#: builtin/am.c:1608
+#: builtin/am.c:1588
 msgid "Using index info to reconstruct a base tree..."
 msgstr "Использую индекс для реконструкции базового дерева…"
 
-#: builtin/am.c:1627
+#: builtin/am.c:1607
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
 msgstr "Вы вручную изменяли патч?\nОн не накладывается без ошибок на двоичные объекты, записанные в его заголовке."
 
-#: builtin/am.c:1633
+#: builtin/am.c:1613
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Откат к применению изменений к базовому коммиту с помощью трехходового слияния…"
 
-#: builtin/am.c:1658
+#: builtin/am.c:1638
 msgid "Failed to merge in the changes."
 msgstr "Не удалось слить изменения."
 
-#: builtin/am.c:1682 builtin/merge.c:631
+#: builtin/am.c:1662 builtin/merge.c:632
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree не удалось записать дерево"
 
-#: builtin/am.c:1689
+#: builtin/am.c:1669
 msgid "applying to an empty history"
 msgstr "применение к пустой истории"
 
-#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802
-#: builtin/merge.c:827
+#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
+#: builtin/merge.c:828
 msgid "failed to write commit object"
 msgstr "сбой записи объекта коммита"
 
-#: builtin/am.c:1735 builtin/am.c:1739
+#: builtin/am.c:1715 builtin/am.c:1719
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "нельзя продолжнить: %s не существует "
 
-#: builtin/am.c:1755
+#: builtin/am.c:1735
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr "не удалось использовать интерактивное поведение, без stdin подключенного к терминалу."
 
-#: builtin/am.c:1760
+#: builtin/am.c:1740
 msgid "Commit Body is:"
 msgstr "Тело коммита:"
 
 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
 #. in your translation. The program will only accept English
 #. input at this point.
-#: builtin/am.c:1770
+#: builtin/am.c:1750
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "Применить? [y] - да/[n] - нет/[e] - редактировать/[v] - просмотреть патч/[a] - применить всё: "
 
-#: builtin/am.c:1820
+#: builtin/am.c:1800
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Индекс не пустой: нельзя применять патчи (в индексе: %s)"
 
-#: builtin/am.c:1860 builtin/am.c:1932
+#: builtin/am.c:1840 builtin/am.c:1912
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Применение: %.*s"
 
-#: builtin/am.c:1876
+#: builtin/am.c:1856
 msgid "No changes -- Patch already applied."
 msgstr "Нет изменений — Патч уже применен."
 
-#: builtin/am.c:1884
+#: builtin/am.c:1864
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Ошибка применения изменений на %s %.*s"
 
-#: builtin/am.c:1890
+#: builtin/am.c:1870
 #, c-format
 msgid "The copy of the patch that failed is found in: %s"
 msgstr "Копию изменений, которые не удалось применить, вы можете найти в: %s"
 
-#: builtin/am.c:1935
+#: builtin/am.c:1915
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
 "already introduced the same changes; you might want to skip this patch."
 msgstr "Нет изменений — возможно, вы забыли вызвать «git add»?\nЕсли ничего не осталось для индексации, то, скорее всего, что-то другое уже сделало те же изменения; возможно, вам следует пропустить этот патч."
 
-#: builtin/am.c:1942
+#: builtin/am.c:1922
 msgid ""
 "You still have unmerged paths in your index.\n"
-"Did you forget to use 'git add'?"
-msgstr "У вас все еще имеются не слитые пути в индексе.\nВозможно, вы забыли вызвать «git add»?"
+"You should 'git add' each file with resolved conflicts to mark them as such.\n"
+"You might run `git rm` on a file to accept \"deleted by them\" for it."
+msgstr "У вас есть не слитые пути в индексе.\nВы должны выполнить «git add» для каждого файла с разрешенными конфликтами, чтобы пометить их таковыми.\nВы можете запустить «git rm» с именем файла, чтобы пометить его как «удалено ими»."
 
-#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308
-#: builtin/reset.c:316
+#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
+#: builtin/reset.c:331
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Не удалось разобрать объект «%s»."
 
-#: builtin/am.c:2102
+#: builtin/am.c:2083
 msgid "failed to clean index"
 msgstr "не удалось очистить индекс"
 
-#: builtin/am.c:2136
+#: builtin/am.c:2117
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr "Похоже, что вы переместили HEAD с момента последней ошибки выполнения «am».\nПеремотка на ORIG_HEAD не выполняется"
 
-#: builtin/am.c:2199
+#: builtin/am.c:2180
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Неправильное значение для --patch-format: %s"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2213
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<опции>] [(<mbox> | <Maildir>)…]"
 
-#: builtin/am.c:2233
+#: builtin/am.c:2214
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<опции>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2220
 msgid "run interactively"
 msgstr "запустить в интерактивном режиме"
 
-#: builtin/am.c:2241
+#: builtin/am.c:2222
 msgid "historical option -- no-op"
 msgstr "историческая опция — ничего не делает"
 
-#: builtin/am.c:2243
+#: builtin/am.c:2224
 msgid "allow fall back on 3way merging if needed"
 msgstr "разрешить откатиться к трехходовому слиянию, если нужно"
 
-#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57
-#: builtin/repack.c:178
+#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/repack.c:180
 msgid "be quiet"
 msgstr "тихий режим"
 
-#: builtin/am.c:2246
+#: builtin/am.c:2227
 msgid "add a Signed-off-by line to the commit message"
 msgstr "добавить строку Signed-off-by к сообщению коммита"
 
-#: builtin/am.c:2249
+#: builtin/am.c:2230
 msgid "recode into utf8 (default)"
 msgstr "перекодировать в utf8 (по умолчанию)"
 
-#: builtin/am.c:2251
+#: builtin/am.c:2232
 msgid "pass -k flag to git-mailinfo"
 msgstr "передать флаг -k в git-mailinfo"
 
-#: builtin/am.c:2253
+#: builtin/am.c:2234
 msgid "pass -b flag to git-mailinfo"
 msgstr "передать флаг -b в git-mailinfo"
 
-#: builtin/am.c:2255
+#: builtin/am.c:2236
 msgid "pass -m flag to git-mailinfo"
 msgstr "передать флаг -m в git-mailinfo"
 
-#: builtin/am.c:2257
+#: builtin/am.c:2238
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "передать флаг --keep-cr в git-mailsplit для формата mbox"
 
-#: builtin/am.c:2260
+#: builtin/am.c:2241
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr "не передавать --keep-cr флаг в git-mailsplit вне зависимости от am.keepcr"
 
-#: builtin/am.c:2263
+#: builtin/am.c:2244
 msgid "strip everything before a scissors line"
 msgstr "обрезать все до строки обрезки"
 
-#: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274
-#: builtin/am.c:2277 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286
-#: builtin/am.c:2292
+#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2273
 msgid "pass it through git-apply"
 msgstr "передать его в git-apply"
 
-#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
-#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135
-#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191
-#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398
-#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
+#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
+#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193
+#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169
+#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134
+#: parse-options.h:245
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37
-#: builtin/replace.c:443 builtin/tag.c:433 builtin/verify-tag.c:38
+#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
+#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
 msgid "format"
 msgstr "формат"
 
-#: builtin/am.c:2289
+#: builtin/am.c:2270
 msgid "format the patch(es) are in"
 msgstr "формат, в котором находятся патчи"
 
-#: builtin/am.c:2295
+#: builtin/am.c:2276
 msgid "override error message when patch failure occurs"
 msgstr "переопределить сообщение об ошибке, если не удалось наложить изменения"
 
-#: builtin/am.c:2297
+#: builtin/am.c:2278
 msgid "continue applying patches after resolving a conflict"
 msgstr "продолжить применение изменений после разрешения конфиликта"
 
-#: builtin/am.c:2300
+#: builtin/am.c:2281
 msgid "synonyms for --continue"
 msgstr "синоним для --continue"
 
-#: builtin/am.c:2303
+#: builtin/am.c:2284
 msgid "skip the current patch"
 msgstr "пропустить текущий патч"
 
-#: builtin/am.c:2306
+#: builtin/am.c:2287
 msgid "restore the original branch and abort the patching operation."
 msgstr "восстановить оригинальную ветку и отменить операцию применения изменений."
 
-#: builtin/am.c:2310
+#: builtin/am.c:2291
 msgid "lie about committer date"
 msgstr "соврать о дате коммитера"
 
-#: builtin/am.c:2312
+#: builtin/am.c:2293
 msgid "use current timestamp for author date"
 msgstr "использовать текущее время как время авторства"
 
-#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232
-#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
+#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
+#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
 msgid "key-id"
 msgstr "key-id"
 
-#: builtin/am.c:2315
+#: builtin/am.c:2296
 msgid "GPG-sign commits"
 msgstr "подписать коммиты с помощью GPG"
 
-#: builtin/am.c:2318
+#: builtin/am.c:2299
 msgid "(internal use for git-rebase)"
 msgstr "(внутреннее использование для git-rebase)"
 
-#: builtin/am.c:2333
+#: builtin/am.c:2317
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
 msgstr "Опция -b/--binary уже долгое время ничего не делает и будет удалена с следующих версиях Git. Пожалуйста, не используйте ее."
 
-#: builtin/am.c:2340
+#: builtin/am.c:2324
 msgid "failed to read the index"
 msgstr "сбой чтения индекса"
 
-#: builtin/am.c:2355
+#: builtin/am.c:2339
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "предыдущий каталог перемещения %s еще существует, но передан mbox."
 
-#: builtin/am.c:2379
+#: builtin/am.c:2363
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
 "Use \"git am --abort\" to remove it."
 msgstr "Найден забытый каталог %s.\nИспользуйте «git am --abort», чтобы удалить его."
 
-#: builtin/am.c:2385
+#: builtin/am.c:2369
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Операция разрешения конфликтов не в процессе выполнения, не продолжаем."
 
@@ -4827,160 +4925,130 @@ msgstr "выполнить «git bisect next»"
 msgid "update BISECT_HEAD instead of checking out the current commit"
 msgstr "обновить BISECT_HEAD вместо перехода на текущий коммит"
 
-#: builtin/blame.c:33
+#: builtin/blame.c:27
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<опции>] [<опции-редакции>] [<редакция>] [--] <файл>"
 
-#: builtin/blame.c:38
+#: builtin/blame.c:32
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<опции-rev-list> документированы в git-rev-list(1)"
 
-#: builtin/blame.c:1777
-msgid "Blaming lines"
-msgstr "Просмотр авторов строк"
-
-#: builtin/blame.c:2573
+#: builtin/blame.c:668
 msgid "Show blame entries as we find them, incrementally"
 msgstr "Показать записи авторства постепенно, в процессе нахождения"
 
-#: builtin/blame.c:2574
+#: builtin/blame.c:669
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr "Не показывать SHA-1 для коммитов, не входящих в границы запроса (По умолчанию: отключено)"
 
-#: builtin/blame.c:2575
+#: builtin/blame.c:670
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr "Не воспринимать корневые коммиты как граничные (По умолчанию: отключено)"
 
-#: builtin/blame.c:2576
+#: builtin/blame.c:671
 msgid "Show work cost statistics"
 msgstr "Показать статистику расходов на выполнение запроса"
 
-#: builtin/blame.c:2577
+#: builtin/blame.c:672
 msgid "Force progress reporting"
 msgstr "Принудительно выводить прогресс выполнения"
 
-#: builtin/blame.c:2578
+#: builtin/blame.c:673
 msgid "Show output score for blame entries"
 msgstr "Показать оценку для записей авторства"
 
-#: builtin/blame.c:2579
+#: builtin/blame.c:674
 msgid "Show original filename (Default: auto)"
 msgstr "Показать оригинальное имя файла (По умолчанию: автоматически)"
 
-#: builtin/blame.c:2580
+#: builtin/blame.c:675
 msgid "Show original linenumber (Default: off)"
 msgstr "Показать оригинальные номера строк (По умолчанию: отключено)"
 
-#: builtin/blame.c:2581
+#: builtin/blame.c:676
 msgid "Show in a format designed for machine consumption"
 msgstr "Показать в формате для программного разбора"
 
-#: builtin/blame.c:2582
+#: builtin/blame.c:677
 msgid "Show porcelain format with per-line commit information"
 msgstr "Показать в машиночитаемом формате, с построчной информацией о коммите"
 
-#: builtin/blame.c:2583
+#: builtin/blame.c:678
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr "Использовать такой же формат вывода, как и git-annotate (По умолчанию: отключено)"
 
-#: builtin/blame.c:2584
+#: builtin/blame.c:679
 msgid "Show raw timestamp (Default: off)"
 msgstr "Показать необработанные временные метки (По умолчанию: отключено)"
 
-#: builtin/blame.c:2585
+#: builtin/blame.c:680
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Показать длинный SHA1 идентификатор коммита (По умолчанию: отключено)"
 
-#: builtin/blame.c:2586
+#: builtin/blame.c:681
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "Не показывать имя автора и временные метки (По умолчанию: отключено)"
 
-#: builtin/blame.c:2587
+#: builtin/blame.c:682
 msgid "Show author email instead of name (Default: off)"
 msgstr "Показать почту автора вместо имени (По умолчанию: отключено)"
 
-#: builtin/blame.c:2588
+#: builtin/blame.c:683
 msgid "Ignore whitespace differences"
 msgstr "Игнорировать различия в пробелах"
 
-#: builtin/blame.c:2595
+#: builtin/blame.c:690
 msgid "Use an experimental heuristic to improve diffs"
 msgstr "Использовать эксперементальную эвристику, чтобы улучшить файлы различий"
 
-#: builtin/blame.c:2597
+#: builtin/blame.c:692
 msgid "Spend extra cycles to find better match"
 msgstr "Потратить больше времени, для нахождения лучших совпадений"
 
-#: builtin/blame.c:2598
+#: builtin/blame.c:693
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "Использовать редакции из <файла> вместо вызова git-rev-list"
 
-#: builtin/blame.c:2599
+#: builtin/blame.c:694
 msgid "Use <file>'s contents as the final image"
 msgstr "Использовать содержимое <файла> как финальный снимок"
 
-#: builtin/blame.c:2600 builtin/blame.c:2601
+#: builtin/blame.c:695 builtin/blame.c:696
 msgid "score"
 msgstr "мин-длина"
 
-#: builtin/blame.c:2600
+#: builtin/blame.c:695
 msgid "Find line copies within and across files"
 msgstr "Найти копирование строк в пределах и между файлами"
 
-#: builtin/blame.c:2601
+#: builtin/blame.c:696
 msgid "Find line movements within and across files"
 msgstr "Найти перемещения строк в пределах и между файлами"
 
-#: builtin/blame.c:2602
+#: builtin/blame.c:697
 msgid "n,m"
 msgstr "начало,конец"
 
-#: builtin/blame.c:2602
+#: builtin/blame.c:697
 msgid "Process only line range n,m, counting from 1"
 msgstr "Обработать только строки в диапазоне начало,конец, начиная с 1"
 
-#: builtin/blame.c:2649
+#: builtin/blame.c:744
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr "--progress нельзя использовать одновременно с --incremental или машиночитаемым (porcelain) форматом"
 
-#. TRANSLATORS: This string is used to tell us the maximum
-#. display width for a relative timestamp in "git blame"
-#. output.  For C locale, "4 years, 11 months ago", which
-#. takes 22 places, is the longest among various forms of
-#. relative timestamps, but your language may need more or
-#. fewer display columns.
-#: builtin/blame.c:2697
+#. TRANSLATORS: This string is used to tell us the
+#. maximum display width for a relative timestamp in
+#. "git blame" output.  For C locale, "4 years, 11
+#. months ago", which takes 22 places, is the longest
+#. among various forms of relative timestamps, but
+#. your language may need more or fewer display
+#. columns.
+#: builtin/blame.c:795
 msgid "4 years, 11 months ago"
 msgstr "4 года и 11 месяцев назад"
 
-#: builtin/blame.c:2777
-msgid "--contents and --reverse do not blend well."
-msgstr "--contents и --reverse не очень сочетаются."
-
-#: builtin/blame.c:2797
-msgid "cannot use --contents with final commit object name"
-msgstr "нельзя использовать --contents с указанием финального имени объекта"
-
-#: builtin/blame.c:2802
-msgid "--reverse and --first-parent together require specified latest commit"
-msgstr "при --reverse и --first-parent вместе нужно указывать конкретный последний коммит"
-
-#: builtin/blame.c:2829
-msgid ""
-"--reverse --first-parent together require range along first-parent chain"
-msgstr "при указании --reverse и --first-parent вместе, требуется также указать диапазон по цепочке первого родителя"
-
-#: builtin/blame.c:2840
-#, c-format
-msgid "no such path %s in %s"
-msgstr "нет такого пути %s в %s"
-
-#: builtin/blame.c:2851
-#, c-format
-msgid "cannot read blob %s for path %s"
-msgstr "невозможно прочитать объект %s для пути %s"
-
-#: builtin/blame.c:2870
+#: builtin/blame.c:882
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
@@ -4989,141 +5057,145 @@ msgstr[1] "файл %s содержит только %lu строки"
 msgstr[2] "файл %s содержит только %lu строк"
 msgstr[3] "файл %s содержит только %lu строки"
 
-#: builtin/branch.c:26
+#: builtin/blame.c:928
+msgid "Blaming lines"
+msgstr "Просмотр авторов строк"
+
+#: builtin/branch.c:27
 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
 msgstr "git branch [<опции>] [-r | -a] [--merged | --no-merged]"
 
-#: builtin/branch.c:27
+#: builtin/branch.c:28
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
 msgstr "git branch [<опции>] [-l] [-f] <имя-ветки> [<точка-начала>]"
 
-#: builtin/branch.c:28
+#: builtin/branch.c:29
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<опции>] [-r] (-d | -D) <имя-ветки>…"
 
-#: builtin/branch.c:29
+#: builtin/branch.c:30
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<опции>] (-m | -M) [<старая-ветка>] <новая-ветка>"
 
-#: builtin/branch.c:30
+#: builtin/branch.c:31
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<опции>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:31
+#: builtin/branch.c:32
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<опции>] [-r | -a] [--format]"
 
-#: builtin/branch.c:144
+#: builtin/branch.c:145
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
 "         '%s', but not yet merged to HEAD."
 msgstr "удаление ветки «%s», которая была слита с\n         «%s», но не слита с HEAD."
 
-#: builtin/branch.c:148
+#: builtin/branch.c:149
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
 "         '%s', even though it is merged to HEAD."
 msgstr "не удаление ветки «%s», которая еще не слита с\n         «%s», хотя уже слита с HEAD."
 
-#: builtin/branch.c:162
+#: builtin/branch.c:163
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Не удалось найти объект коммита для «%s»"
 
-#: builtin/branch.c:166
+#: builtin/branch.c:167
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
 "If you are sure you want to delete it, run 'git branch -D %s'."
 msgstr "Ветка «%s» не слита полностью.\nЕсли вы уверены, что хотите ее удалить, запустите «git branch -D %s»."
 
-#: builtin/branch.c:179
+#: builtin/branch.c:180
 msgid "Update of config-file failed"
 msgstr "Не удалось обновить файл конфигурации"
 
-#: builtin/branch.c:210
+#: builtin/branch.c:211
 msgid "cannot use -a with -d"
 msgstr "нельзя использовать одновременно ключи -a и -d"
 
-#: builtin/branch.c:216
+#: builtin/branch.c:217
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Не удалось найти объект коммита для HEAD"
 
-#: builtin/branch.c:230
+#: builtin/branch.c:231
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "Нельзя удалить ветку «%s» т.к. она активна на «%s»"
 
-#: builtin/branch.c:245
+#: builtin/branch.c:246
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "внешняя отслеживаемая ветка «%s» не найдена."
 
-#: builtin/branch.c:246
+#: builtin/branch.c:247
 #, c-format
 msgid "branch '%s' not found."
 msgstr "ветка «%s» не найдена."
 
-#: builtin/branch.c:261
+#: builtin/branch.c:262
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr "Ошибка удаления внешней отслеживаемой ветки «%s»"
 
-#: builtin/branch.c:262
+#: builtin/branch.c:263
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "Ошибка удаления ветки «%s»"
 
-#: builtin/branch.c:269
+#: builtin/branch.c:270
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Внешняя отслеживаемая ветка %s удалена (была %s).\n"
 
-#: builtin/branch.c:270
+#: builtin/branch.c:271
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Ветка %s удалена (была %s).\n"
 
-#: builtin/branch.c:441
+#: builtin/branch.c:445
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Производится перемещение ветки %s на %s"
 
-#: builtin/branch.c:445
+#: builtin/branch.c:449
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Производится двоичный поиск в ветке %s на %s"
 
-#: builtin/branch.c:460
+#: builtin/branch.c:464
 msgid "cannot rename the current branch while not on any."
 msgstr "невозможно переименовать текущую ветку, если вы не находитесь ни на одной из них."
 
-#: builtin/branch.c:470
+#: builtin/branch.c:474
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Недействительное имя ветки: «%s»"
 
-#: builtin/branch.c:487
+#: builtin/branch.c:491
 msgid "Branch rename failed"
 msgstr "Сбой переименования ветки"
 
-#: builtin/branch.c:490
+#: builtin/branch.c:494
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Переименована неправильно названная ветка «%s»"
 
-#: builtin/branch.c:493
+#: builtin/branch.c:497
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "Ветка переименована в %s, но HEAD не обновлен!"
 
-#: builtin/branch.c:502
+#: builtin/branch.c:506
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "Ветка переименована, но произошел сбой обновления файла конфигурации"
 
-#: builtin/branch.c:518
+#: builtin/branch.c:522
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -5131,220 +5203,220 @@ msgid ""
 "Lines starting with '%c' will be stripped.\n"
 msgstr "Измените описание для ветки:\n  %s\nСтроки, начинающиеся с «%c» будут вырезаны.\n"
 
-#: builtin/branch.c:551
+#: builtin/branch.c:555
 msgid "Generic options"
 msgstr "Общие параметры"
 
-#: builtin/branch.c:553
+#: builtin/branch.c:557
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "показывать хэш-сумму и тему, укажите дважды для вышестоящей ветки"
 
-#: builtin/branch.c:554
+#: builtin/branch.c:558
 msgid "suppress informational messages"
 msgstr "не выводить информационные сообщения"
 
-#: builtin/branch.c:555
+#: builtin/branch.c:559
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "установить режим отслеживания вышестоящей ветки (см. git-pull(1))"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:561
 msgid "change upstream info"
 msgstr "изменить информацию о вышестоящей ветке"
 
-#: builtin/branch.c:559
+#: builtin/branch.c:563
 msgid "upstream"
 msgstr "вышестоящая"
 
-#: builtin/branch.c:559
+#: builtin/branch.c:563
 msgid "change the upstream info"
 msgstr "изменить информацию о вышестоящей ветке"
 
-#: builtin/branch.c:560
+#: builtin/branch.c:564
 msgid "Unset the upstream info"
 msgstr "Убрать информацию о вышестоящей ветке"
 
-#: builtin/branch.c:561
+#: builtin/branch.c:565
 msgid "use colored output"
 msgstr "использовать цветной вывод"
 
-#: builtin/branch.c:562
+#: builtin/branch.c:566
 msgid "act on remote-tracking branches"
 msgstr "выполнить действия на отслеживаемых внешних ветках"
 
-#: builtin/branch.c:564 builtin/branch.c:566
+#: builtin/branch.c:568 builtin/branch.c:570
 msgid "print only branches that contain the commit"
 msgstr "вывод только веток, которые содержат коммит"
 
-#: builtin/branch.c:565 builtin/branch.c:567
+#: builtin/branch.c:569 builtin/branch.c:571
 msgid "print only branches that don't contain the commit"
 msgstr "вывод только веток, которые не содержат коммит"
 
-#: builtin/branch.c:570
+#: builtin/branch.c:574
 msgid "Specific git-branch actions:"
 msgstr "Специфичные для git-branch действия:"
 
-#: builtin/branch.c:571
+#: builtin/branch.c:575
 msgid "list both remote-tracking and local branches"
 msgstr "показать список и отслеживаемых и локальных веток"
 
-#: builtin/branch.c:573
+#: builtin/branch.c:577
 msgid "delete fully merged branch"
 msgstr "удалить полностью слитую ветку"
 
-#: builtin/branch.c:574
+#: builtin/branch.c:578
 msgid "delete branch (even if not merged)"
 msgstr "удалить ветку (даже никуда не слитую)"
 
-#: builtin/branch.c:575
+#: builtin/branch.c:579
 msgid "move/rename a branch and its reflog"
 msgstr "переместить/переименовать ветки и ее журнал ссылок"
 
-#: builtin/branch.c:576
+#: builtin/branch.c:580
 msgid "move/rename a branch, even if target exists"
 msgstr "переместить/переименовать ветку, даже если целевое имя уже существует"
 
-#: builtin/branch.c:577
+#: builtin/branch.c:581
 msgid "list branch names"
 msgstr "показать список имен веток"
 
-#: builtin/branch.c:578
+#: builtin/branch.c:582
 msgid "create the branch's reflog"
 msgstr "создать журнал ссылок ветки"
 
-#: builtin/branch.c:580
+#: builtin/branch.c:584
 msgid "edit the description for the branch"
 msgstr "изменить описание ветки"
 
-#: builtin/branch.c:581
+#: builtin/branch.c:585
 msgid "force creation, move/rename, deletion"
 msgstr "принудительное создание, перемещение или удаление ветки"
 
-#: builtin/branch.c:582
+#: builtin/branch.c:586
 msgid "print only branches that are merged"
 msgstr "вывод только слитых веток"
 
-#: builtin/branch.c:583
+#: builtin/branch.c:587
 msgid "print only branches that are not merged"
 msgstr "вывод только не слитых веток"
 
-#: builtin/branch.c:584
+#: builtin/branch.c:588
 msgid "list branches in columns"
 msgstr "показать список веток по столбцам"
 
-#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426
+#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
 msgid "key"
 msgstr "ключ"
 
-#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
 msgid "field name to sort on"
 msgstr "имя поля, по которому выполнить сортировку"
 
-#: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404
-#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
-#: builtin/tag.c:429
+#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
+#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
+#: builtin/tag.c:430
 msgid "object"
 msgstr "объект"
 
-#: builtin/branch.c:589
+#: builtin/branch.c:593
 msgid "print only branches of the object"
 msgstr "вывод только веток, определенного объекта"
 
-#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434
+#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
 msgid "sorting and filtering are case insensitive"
 msgstr "сортировка и фильтрация не зависят от регистра"
 
-#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433
-#: builtin/verify-tag.c:38
+#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr "использовать формат для вывода"
 
-#: builtin/branch.c:611
+#: builtin/branch.c:615
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Не удалось определить HEAD как действительную ссылку."
 
-#: builtin/branch.c:615 builtin/clone.c:724
+#: builtin/branch.c:619 builtin/clone.c:728
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD не найден в refs/heads!"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:642
 msgid "--column and --verbose are incompatible"
 msgstr "--column и --verbose нельзя использовать одновременно"
 
-#: builtin/branch.c:649 builtin/branch.c:701
+#: builtin/branch.c:653 builtin/branch.c:705
 msgid "branch name required"
 msgstr "требуется имя ветки"
 
-#: builtin/branch.c:677
+#: builtin/branch.c:681
 msgid "Cannot give description to detached HEAD"
 msgstr "Нельзя дать описание отделённому HEAD"
 
-#: builtin/branch.c:682
+#: builtin/branch.c:686
 msgid "cannot edit description of more than one branch"
 msgstr "нельзя изменить описание более одной ветки за раз"
 
-#: builtin/branch.c:689
+#: builtin/branch.c:693
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Еще нет коммита на ветке «%s»."
 
-#: builtin/branch.c:692
+#: builtin/branch.c:696
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Нет ветки с именем «%s»."
 
-#: builtin/branch.c:707
+#: builtin/branch.c:711
 msgid "too many branches for a rename operation"
 msgstr "слишком много веток для операции переименования"
 
-#: builtin/branch.c:712
+#: builtin/branch.c:716
 msgid "too many branches to set new upstream"
 msgstr "слишком много веток для указания новых вышестоящих"
 
-#: builtin/branch.c:716
+#: builtin/branch.c:720
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr "невозможно установить вышестоящий репозиторий для HEAD на %s, так как он не указывает ни на одну ветку."
 
-#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762
+#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
 #, c-format
 msgid "no such branch '%s'"
 msgstr "нет такой ветки «%s»"
 
-#: builtin/branch.c:723
+#: builtin/branch.c:727
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "ветка «%s» не существует"
 
-#: builtin/branch.c:735
+#: builtin/branch.c:739
 msgid "too many branches to unset upstream"
 msgstr "слишком много веток для убирания вышестоящих"
 
-#: builtin/branch.c:739
+#: builtin/branch.c:743
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr "невозможно убрать вышестоящий репозиторий для HEAD, так как он не указывает ни на одну ветку."
 
-#: builtin/branch.c:745
+#: builtin/branch.c:749
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Ветка «%s» не имеет информации о вышестоящей ветке"
 
-#: builtin/branch.c:759
+#: builtin/branch.c:763
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr "не имеет смысла создавать «HEAD» вручную"
 
-#: builtin/branch.c:765
+#: builtin/branch.c:769
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr "параметры -a и -r для «git branch» не имеют смысла с указанием имени ветки"
 
-#: builtin/branch.c:768
+#: builtin/branch.c:772
 #, c-format
 msgid ""
 "The --set-upstream flag is deprecated and will be removed. Consider using "
 "--track or --set-upstream-to\n"
 msgstr "Флаг --set-upstream устарел и будет удален в будущем. Вместо него используйте --track или --set-upstream-to\n"
 
-#: builtin/branch.c:785
+#: builtin/branch.c:789
 #, c-format
 msgid ""
 "\n"
@@ -5365,313 +5437,313 @@ msgstr "Требуется репозиторий для создания пак
 msgid "Need a repository to unbundle."
 msgstr "Требуется репозиторий для распаковки."
 
-#: builtin/cat-file.c:513
+#: builtin/cat-file.c:519
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | "
 "-p | <type> | --textconv | --filters) [--path=<path>] <object>"
 msgstr "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <тип> | --textconv | --filters) [--path=<путь>] <объект>"
 
-#: builtin/cat-file.c:514
+#: builtin/cat-file.c:520
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | "
 "--filters]"
 msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]"
 
-#: builtin/cat-file.c:551
+#: builtin/cat-file.c:557
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<тип> может быть одним из: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:552
+#: builtin/cat-file.c:558
 msgid "show object type"
 msgstr "показать тип объекта"
 
-#: builtin/cat-file.c:553
+#: builtin/cat-file.c:559
 msgid "show object size"
 msgstr "показать размер объекта"
 
-#: builtin/cat-file.c:555
+#: builtin/cat-file.c:561
 msgid "exit with zero when there's no error"
 msgstr "выйти с нулевым кодом возврата, если нет ошибки"
 
-#: builtin/cat-file.c:556
+#: builtin/cat-file.c:562
 msgid "pretty-print object's content"
 msgstr "структурированный вывод содержимого объекта"
 
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:564
 msgid "for blob objects, run textconv on object's content"
 msgstr "запустить texconv на содержимом двоичных объектов "
 
-#: builtin/cat-file.c:560
+#: builtin/cat-file.c:566
 msgid "for blob objects, run filters on object's content"
 msgstr "запуск фильтров на содержимом двоичных объектов "
 
-#: builtin/cat-file.c:561 git-submodule.sh:943
+#: builtin/cat-file.c:567 git-submodule.sh:944
 msgid "blob"
 msgstr "двоичный объект"
 
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:568
 msgid "use a specific path for --textconv/--filters"
 msgstr "использовать определенный путь для --textconv/--filters"
 
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:570
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "разрешить -s и -t работать с повреждёнными объектами"
 
-#: builtin/cat-file.c:565
+#: builtin/cat-file.c:571
 msgid "buffer --batch output"
 msgstr "буфферировать вывод --batch"
 
-#: builtin/cat-file.c:567
+#: builtin/cat-file.c:573
 msgid "show info and content of objects fed from the standard input"
 msgstr "показать информацию и содержимое объектов, переданных из стандартного ввода"
 
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:576
 msgid "show info about objects fed from the standard input"
 msgstr "показать информацию об объектах, переданных из стандартного ввода"
 
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:579
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr "переходить по символьным ссылкам внутри дерева (используется с опциями --batch и --batch-check)"
 
-#: builtin/cat-file.c:575
+#: builtin/cat-file.c:581
 msgid "show all objects with --batch or --batch-check"
 msgstr "показать все объекты с опциями --batch или --batch-check"
 
-#: builtin/check-attr.c:11
+#: builtin/check-attr.c:12
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
 msgstr "git check-attr [-a | --all | <атрибут>…] [--] <путь>…"
 
-#: builtin/check-attr.c:12
+#: builtin/check-attr.c:13
 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 msgstr "git check-attr --stdin [-z] [-a | --all | <атрибут>…]"
 
-#: builtin/check-attr.c:19
+#: builtin/check-attr.c:20
 msgid "report all attributes set on file"
 msgstr "вывести все атрибуты установленные для файла"
 
-#: builtin/check-attr.c:20
+#: builtin/check-attr.c:21
 msgid "use .gitattributes only from the index"
 msgstr "использовать только .gitattributes из индекса"
 
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
 msgid "read file names from stdin"
 msgstr "прочитать имена файлов из стандартного ввода"
 
-#: builtin/check-attr.c:23 builtin/check-ignore.c:24
+#: builtin/check-attr.c:24 builtin/check-ignore.c:26
 msgid "terminate input and output records by a NUL character"
 msgstr "окончание ввода и вывода записей по НУЛЕВОМУ символу"
 
-#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356
+#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
 msgid "suppress progress reporting"
 msgstr "не выводить прогресс выполнения"
 
-#: builtin/check-ignore.c:26
+#: builtin/check-ignore.c:28
 msgid "show non-matching input paths"
 msgstr "показать не совпадающие введенные пути"
 
-#: builtin/check-ignore.c:28
+#: builtin/check-ignore.c:30
 msgid "ignore index when checking"
 msgstr "игнорировать индекс при проверке"
 
-#: builtin/check-ignore.c:154
+#: builtin/check-ignore.c:158
 msgid "cannot specify pathnames with --stdin"
 msgstr "нельзя указывать пути вместе с параметром --stdin"
 
-#: builtin/check-ignore.c:157
+#: builtin/check-ignore.c:161
 msgid "-z only makes sense with --stdin"
 msgstr "-z имеет смысл только вместе с параметром --stdin"
 
-#: builtin/check-ignore.c:159
+#: builtin/check-ignore.c:163
 msgid "no path specified"
 msgstr "не указан путь"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:167
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet можно использовать только при указании одного пути"
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:169
 msgid "cannot have both --quiet and --verbose"
 msgstr "нельзя использовать одновременно --quiet и --verbose"
 
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c:172
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching можно использовать только вместе с --verbose"
 
-#: builtin/check-mailmap.c:8
+#: builtin/check-mailmap.c:9
 msgid "git check-mailmap [<options>] <contact>..."
 msgstr "git check-mailmap [<опции>] <контакт>…"
 
-#: builtin/check-mailmap.c:13
+#: builtin/check-mailmap.c:14
 msgid "also read contacts from stdin"
 msgstr "также читать контакты из стандартного ввода"
 
-#: builtin/check-mailmap.c:24
+#: builtin/check-mailmap.c:25
 #, c-format
 msgid "unable to parse contact: %s"
 msgstr "не удалось разобрать контакт: %s"
 
-#: builtin/check-mailmap.c:47
+#: builtin/check-mailmap.c:48
 msgid "no contacts specified"
 msgstr "не указаны контакты"
 
-#: builtin/checkout-index.c:127
+#: builtin/checkout-index.c:128
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<опции>] [--] [<файл>…]"
 
-#: builtin/checkout-index.c:144
+#: builtin/checkout-index.c:145
 msgid "stage should be between 1 and 3 or all"
 msgstr "индекс должен быть между 1 и 3 или all"
 
-#: builtin/checkout-index.c:160
+#: builtin/checkout-index.c:161
 msgid "check out all files in the index"
 msgstr "переключиться на состояние всех файлов из индекса"
 
-#: builtin/checkout-index.c:161
+#: builtin/checkout-index.c:162
 msgid "force overwrite of existing files"
 msgstr "принудительная перезапись существующих файлов"
 
-#: builtin/checkout-index.c:163
+#: builtin/checkout-index.c:164
 msgid "no warning for existing files and files not in index"
 msgstr "не выводить предупреждения для существующих и непроиндексированных файлов"
 
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:166
 msgid "don't checkout new files"
 msgstr "не создавать новые файлы"
 
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:168
 msgid "update stat information in the index file"
 msgstr "обновить статистику доступа в файле индекса"
 
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:172
 msgid "read list of paths from the standard input"
 msgstr "прочитать список путей из стандартного ввода"
 
-#: builtin/checkout-index.c:173
+#: builtin/checkout-index.c:174
 msgid "write the content to temporary files"
 msgstr "записать содержимое во временные файлы"
 
-#: builtin/checkout-index.c:174 builtin/column.c:30
+#: builtin/checkout-index.c:175 builtin/column.c:31
 #: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
 #: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:477
+#: builtin/worktree.c:478
 msgid "string"
 msgstr "строка"
 
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:176
 msgid "when creating files, prepend <string>"
 msgstr "добавить спереди <строку> при создании файлов"
 
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:178
 msgid "copy out the files from named stage"
 msgstr "копировать файлы из указанного индекса"
 
-#: builtin/checkout.c:27
+#: builtin/checkout.c:26
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<опции>] <ветка>"
 
-#: builtin/checkout.c:28
+#: builtin/checkout.c:27
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<опции>] [<ветка>] -- <файл>…"
 
-#: builtin/checkout.c:153 builtin/checkout.c:186
+#: builtin/checkout.c:135 builtin/checkout.c:168
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "путь «%s» не имеет нашей версии"
 
-#: builtin/checkout.c:155 builtin/checkout.c:188
+#: builtin/checkout.c:137 builtin/checkout.c:170
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "путь «%s» не имеет их версии"
 
-#: builtin/checkout.c:171
+#: builtin/checkout.c:153
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "путь «%s» не имеет всех необходимых версий"
 
-#: builtin/checkout.c:215
+#: builtin/checkout.c:197
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "путь «%s» не имеет необходимых версий"
 
-#: builtin/checkout.c:232
+#: builtin/checkout.c:214
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "путь «%s»: не удалось слить"
 
-#: builtin/checkout.c:249
+#: builtin/checkout.c:231
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Не удалось добавить результат слияния «%s»"
 
-#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275
-#: builtin/checkout.c:278
+#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
+#: builtin/checkout.c:262
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "«%s» нельзя использовать при обновлении путей"
 
-#: builtin/checkout.c:281 builtin/checkout.c:284
+#: builtin/checkout.c:265 builtin/checkout.c:268
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "«%s» нельзя использовать одновременно с %s"
 
-#: builtin/checkout.c:287
+#: builtin/checkout.c:271
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "Нельзя обновлять пути и переключаться на ветку «%s» одновременно."
 
-#: builtin/checkout.c:358 builtin/checkout.c:365
+#: builtin/checkout.c:342 builtin/checkout.c:349
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "путь «%s» не слит"
 
-#: builtin/checkout.c:513
+#: builtin/checkout.c:497
 msgid "you need to resolve your current index first"
 msgstr "сначала нужно разрешить конфликты в вашем текущем индексе"
 
-#: builtin/checkout.c:644
+#: builtin/checkout.c:628
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Не удалось создать журнал ссылок для «%s»: %s\n"
 
-#: builtin/checkout.c:685
+#: builtin/checkout.c:669
 msgid "HEAD is now at"
 msgstr "HEAD сейчас на"
 
-#: builtin/checkout.c:689 builtin/clone.c:678
+#: builtin/checkout.c:673 builtin/clone.c:682
 msgid "unable to update HEAD"
 msgstr "не удалось обновить HEAD"
 
-#: builtin/checkout.c:693
+#: builtin/checkout.c:677
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Сброс ветки «%s»\n"
 
-#: builtin/checkout.c:696
+#: builtin/checkout.c:680
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Уже на «%s»\n"
 
-#: builtin/checkout.c:700
+#: builtin/checkout.c:684
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Переключение и сброс ветки «%s»\n"
 
-#: builtin/checkout.c:702 builtin/checkout.c:1090
+#: builtin/checkout.c:686 builtin/checkout.c:1075
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Переключено на новую ветку «%s»\n"
 
-#: builtin/checkout.c:704
+#: builtin/checkout.c:688
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Переключено на ветку «%s»\n"
 
-#: builtin/checkout.c:755
+#: builtin/checkout.c:739
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " … и еще %d.\n"
 
-#: builtin/checkout.c:761
+#: builtin/checkout.c:745
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -5688,7 +5760,7 @@ msgstr[1] "Предупреждение: вы оставляете позади
 msgstr[2] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n"
 msgstr[3] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n"
 
-#: builtin/checkout.c:780
+#: builtin/checkout.c:764
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -5707,198 +5779,196 @@ msgstr[1] "Если вы хотите сохранить их с помощью
 msgstr[2] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n"
 msgstr[3] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n"
 
-#: builtin/checkout.c:816
+#: builtin/checkout.c:800
 msgid "internal error in revision walk"
 msgstr "внутренняя ошибка при хождении по редакциям"
 
-#: builtin/checkout.c:820
+#: builtin/checkout.c:804
 msgid "Previous HEAD position was"
 msgstr "Предыдущая позиция HEAD была"
 
-#: builtin/checkout.c:847 builtin/checkout.c:1085
+#: builtin/checkout.c:832 builtin/checkout.c:1070
 msgid "You are on a branch yet to be born"
 msgstr "Вы находитесь на еще не созданной ветке"
 
-#: builtin/checkout.c:991
+#: builtin/checkout.c:976
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "ожидается только одна ссылка, а передано %d."
 
-#: builtin/checkout.c:1031 builtin/worktree.c:214
+#: builtin/checkout.c:1016 builtin/worktree.c:215
 #, c-format
 msgid "invalid reference: %s"
 msgstr "неправильная ссылка: %s"
 
-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1045
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "в дереве нет такой ссылки: %s"
 
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1084
 msgid "paths cannot be used with switching branches"
 msgstr "нельзя использовать пути при переключении веток"
 
-#: builtin/checkout.c:1102 builtin/checkout.c:1106
+#: builtin/checkout.c:1087 builtin/checkout.c:1091
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "нельзя использовать «%s» при переключении веток"
 
-#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118
-#: builtin/checkout.c:1121
+#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
+#: builtin/checkout.c:1106
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "«%s» нельзя использовать одновременно с «%s»"
 
-#: builtin/checkout.c:1126
+#: builtin/checkout.c:1111
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Нельзя переключить ветку на не коммит «%s»"
 
-#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:329
-#: builtin/worktree.c:331
+#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
+#: builtin/worktree.c:330
 msgid "branch"
 msgstr "ветка"
 
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1145
 msgid "create and checkout a new branch"
 msgstr "создать и переключиться на новую ветку"
 
-#: builtin/checkout.c:1162
+#: builtin/checkout.c:1147
 msgid "create/reset and checkout a branch"
 msgstr "создать/сбросить и перключиться на новую ветку"
 
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1148
 msgid "create reflog for new branch"
 msgstr "создать журнал ссылок для новой ветки"
 
-#: builtin/checkout.c:1164 builtin/worktree.c:333
+#: builtin/checkout.c:1149 builtin/worktree.c:332
 msgid "detach HEAD at named commit"
 msgstr "отсоединить HEAD на указанном коммите"
 
-#: builtin/checkout.c:1165
+#: builtin/checkout.c:1150
 msgid "set upstream info for new branch"
 msgstr "установить информацию о вышестоящей ветке для новой ветки"
 
-#: builtin/checkout.c:1167
+#: builtin/checkout.c:1152
 msgid "new-branch"
 msgstr "новая-ветка"
 
-#: builtin/checkout.c:1167
+#: builtin/checkout.c:1152
 msgid "new unparented branch"
 msgstr "новая ветка без родителей"
 
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1153
 msgid "checkout our version for unmerged files"
 msgstr "переключиться на нашу версию для не слитых файлов"
 
-#: builtin/checkout.c:1170
+#: builtin/checkout.c:1155
 msgid "checkout their version for unmerged files"
 msgstr "переключиться на их версию для не слитых файлов"
 
-#: builtin/checkout.c:1172
+#: builtin/checkout.c:1157
 msgid "force checkout (throw away local modifications)"
 msgstr "принудительное переключение на состояние (отбрасывает все локальные изменения)"
 
-#: builtin/checkout.c:1173
+#: builtin/checkout.c:1158
 msgid "perform a 3-way merge with the new branch"
 msgstr "выполнить трехходовое слияние с новой веткой"
 
-#: builtin/checkout.c:1174 builtin/merge.c:234
+#: builtin/checkout.c:1159 builtin/merge.c:235
 msgid "update ignored files (default)"
 msgstr "обновить игнорируемые файлы (по умолчанию)"
 
-#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251
+#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
 msgid "style"
 msgstr "стиль"
 
-#: builtin/checkout.c:1176
+#: builtin/checkout.c:1161
 msgid "conflict style (merge or diff3)"
 msgstr "стиль конфликтов слияния (merge или diff3)"
 
-#: builtin/checkout.c:1179
+#: builtin/checkout.c:1164
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "не ограничивать спецификаторы пути только частичными записями"
 
-#: builtin/checkout.c:1181
+#: builtin/checkout.c:1166
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "пересмотр «git checkout <нет-такой-ветки>»"
 
-#: builtin/checkout.c:1183
+#: builtin/checkout.c:1168
 msgid "do not check if another worktree is holding the given ref"
 msgstr "не проверять, что другое дерево уже содержит указанную ссылку"
 
-#: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119
-#: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539
-#: builtin/send-pack.c:172
+#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
+#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: builtin/send-pack.c:173
 msgid "force progress reporting"
 msgstr "принудительно выводить прогресс"
 
-#: builtin/checkout.c:1224
+#: builtin/checkout.c:1203
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b, -B и --orphan нельзя использовать одновременно"
 
-#: builtin/checkout.c:1241
+#: builtin/checkout.c:1220
 msgid "--track needs a branch name"
 msgstr "--track требует имя ветки"
 
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1225
 msgid "Missing branch name; try -b"
 msgstr "Пропущено имя ветки; попробуйте -b"
 
-#: builtin/checkout.c:1282
+#: builtin/checkout.c:1261
 msgid "invalid path specification"
 msgstr "недопустимый спецификатор пути"
 
-#: builtin/checkout.c:1289
+#: builtin/checkout.c:1268
 #, c-format
-msgid ""
-"Cannot update paths and switch to branch '%s' at the same time.\n"
-"Did you intend to checkout '%s' which can not be resolved as commit?"
-msgstr "Нельзя обновить пути и одновременно переключиться на ветку «%s».\nВы хотели переключиться на «%s», что не может быть определено как коммит?"
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgstr "«%s» не является коммитом, поэтому невозможно создать из него ветку «%s»"
 
-#: builtin/checkout.c:1294
+#: builtin/checkout.c:1272
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach не принимает путь «%s» как аргумент"
 
-#: builtin/checkout.c:1298
+#: builtin/checkout.c:1276
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
 msgstr "git checkout: --ours/--theirs, --force and --merge нельзя использовать одновременно при применении состояния индекса."
 
-#: builtin/clean.c:25
+#: builtin/clean.c:26
 msgid ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
 msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e <шаблон>] [-x | -X] [--] <пути>…"
 
-#: builtin/clean.c:29
+#: builtin/clean.c:30
 #, c-format
 msgid "Removing %s\n"
 msgstr "Удаление %s\n"
 
-#: builtin/clean.c:30
+#: builtin/clean.c:31
 #, c-format
 msgid "Would remove %s\n"
 msgstr "Будет удалено %s\n"
 
-#: builtin/clean.c:31
+#: builtin/clean.c:32
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "Пропуск репозитория %s\n"
 
-#: builtin/clean.c:32
+#: builtin/clean.c:33
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "Будет пропущен репозиторий %s\n"
 
-#: builtin/clean.c:33
+#: builtin/clean.c:34
 #, c-format
 msgid "failed to remove %s"
 msgstr "сбой удаления %s"
 
-#: builtin/clean.c:297 git-add--interactive.perl:614
+#: builtin/clean.c:298 git-add--interactive.perl:572
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -5907,7 +5977,7 @@ msgid ""
 "           - (empty) select nothing\n"
 msgstr "Справка по выделению:\n1          - выбрать указанный элемент\nfoo        - выбрать элемент с указанным префиксом\n           - (пусто) не выбирать ничего\n"
 
-#: builtin/clean.c:301 git-add--interactive.perl:623
+#: builtin/clean.c:302 git-add--interactive.perl:581
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -5920,38 +5990,38 @@ msgid ""
 "           - (empty) finish selecting\n"
 msgstr "Справка по выделению:\n1          - выбрать один элемент\n3-5        - выбрать диапазон элементов\n2-3,6-9    - выбрать несколько диапазонов\nfoo        - выбрать элемент с указанным префиксом\n-…       - убрать выделение с указанных элементов\n*          - выбрать все элементы\n           - (пусто) завершить выделение\n"
 
-#: builtin/clean.c:517 git-add--interactive.perl:589
-#: git-add--interactive.perl:594
+#: builtin/clean.c:518 git-add--interactive.perl:547
+#: git-add--interactive.perl:552
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Хм (%s)?\n"
 
-#: builtin/clean.c:659
+#: builtin/clean.c:660
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Шаблоны игнорирования ввода>> "
 
-#: builtin/clean.c:696
+#: builtin/clean.c:697
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: Не удалось найти элементы соответствующие: %s"
 
-#: builtin/clean.c:717
+#: builtin/clean.c:718
 msgid "Select items to delete"
 msgstr "Укажите элементы для удаления"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:758
+#: builtin/clean.c:759
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Удалить %s [y - да/N - нет]? "
 
-#: builtin/clean.c:783 git-add--interactive.perl:1660
+#: builtin/clean.c:784 git-add--interactive.perl:1616
 #, c-format
 msgid "Bye.\n"
 msgstr "До свидания.\n"
 
-#: builtin/clean.c:791
+#: builtin/clean.c:792
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -5962,15 +6032,15 @@ msgid ""
 "?                   - help for prompt selection"
 msgstr "clean               - начать очистку\nfilter by pattern   - исключить удаление элементов\nselect by numbers   - исключить удаление элементов по номерам\nask each            - запрашивать подтверждение на удаление каждого элемента (как «rm -i»)\nquit                - прекратить очистку\nhelp                - этот экран\n?                   - справка по выделению"
 
-#: builtin/clean.c:818 git-add--interactive.perl:1736
+#: builtin/clean.c:819 git-add--interactive.perl:1692
 msgid "*** Commands ***"
 msgstr "*** Команды ***"
 
-#: builtin/clean.c:819 git-add--interactive.perl:1733
+#: builtin/clean.c:820 git-add--interactive.perl:1689
 msgid "What now"
 msgstr "Что теперь"
 
-#: builtin/clean.c:827
+#: builtin/clean.c:828
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Удалить следующие элементы:"
@@ -5982,408 +6052,412 @@ msgstr[3] "Удалить следующие элементы:"
 msgid "No more files to clean, exiting."
 msgstr "Больше нет файлов для очистки, выходим."
 
-#: builtin/clean.c:875
+#: builtin/clean.c:906
 msgid "do not print names of files removed"
 msgstr "не выводить имена удаляемых файлов"
 
-#: builtin/clean.c:877
+#: builtin/clean.c:908
 msgid "force"
 msgstr "принудительно"
 
-#: builtin/clean.c:878
+#: builtin/clean.c:909
 msgid "interactive cleaning"
 msgstr "интерактивная очистка"
 
-#: builtin/clean.c:880
+#: builtin/clean.c:911
 msgid "remove whole directories"
 msgstr "удалить каталоги полностью"
 
-#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451
-#: builtin/grep.c:1063 builtin/ls-files.c:546 builtin/name-rev.c:348
-#: builtin/name-rev.c:350 builtin/show-ref.c:176
+#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
+#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
+#: builtin/name-rev.c:399 builtin/show-ref.c:176
 msgid "pattern"
 msgstr "шаблон"
 
-#: builtin/clean.c:882
+#: builtin/clean.c:913
 msgid "add <pattern> to ignore rules"
 msgstr "добавить <шаблон> в правила игнорирования"
 
-#: builtin/clean.c:883
+#: builtin/clean.c:914
 msgid "remove ignored files, too"
 msgstr "также удалить игнорируемые файлы"
 
-#: builtin/clean.c:885
+#: builtin/clean.c:916
 msgid "remove only ignored files"
 msgstr "удалить только игнорируемые файлы"
 
-#: builtin/clean.c:903
+#: builtin/clean.c:934
 msgid "-x and -X cannot be used together"
 msgstr "нельзя использовать одновременно -x и -X"
 
-#: builtin/clean.c:907
+#: builtin/clean.c:938
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to"
 " clean"
 msgstr "clean.requireForce установлен как true и ни одна из опций -i, -n или -f не указана; отказ очистки"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:941
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
 msgstr "clean.requireForce установлен по умолчанию как true и ни одна из опций -i, -n или -f не указана; отказ очистки"
 
-#: builtin/clone.c:37
+#: builtin/clone.c:38
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<опции>] [--] <репозиторий> [<каталог>]"
 
-#: builtin/clone.c:80
+#: builtin/clone.c:82
 msgid "don't create a checkout"
 msgstr "не переключать рабочую копию на HEAD"
 
-#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478
+#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
 msgid "create a bare repository"
 msgstr "создать голый репозиторий"
 
-#: builtin/clone.c:85
+#: builtin/clone.c:87
 msgid "create a mirror repository (implies bare)"
 msgstr "создать зеркало репозитория (включает в себя и параметр bare)"
 
-#: builtin/clone.c:87
+#: builtin/clone.c:89
 msgid "to clone from a local repository"
 msgstr "для клонирования из локального репозитория"
 
-#: builtin/clone.c:89
+#: builtin/clone.c:91
 msgid "don't use local hardlinks, always copy"
 msgstr "не использовать жесткие ссылки, всегда копировать файлы"
 
-#: builtin/clone.c:91
+#: builtin/clone.c:93
 msgid "setup as shared repository"
 msgstr "настроить как общедоступный репозиторий"
 
-#: builtin/clone.c:93 builtin/clone.c:97
+#: builtin/clone.c:95 builtin/clone.c:99
 msgid "pathspec"
 msgstr "спецификатор-пути"
 
-#: builtin/clone.c:93 builtin/clone.c:97
+#: builtin/clone.c:95 builtin/clone.c:99
 msgid "initialize submodules in the clone"
 msgstr "инициализировать подмодули в клоне"
 
-#: builtin/clone.c:100
+#: builtin/clone.c:102
 msgid "number of submodules cloned in parallel"
 msgstr "количество подмодулей, которые будут клонированы парралельно"
 
-#: builtin/clone.c:101 builtin/init-db.c:475
+#: builtin/clone.c:103 builtin/init-db.c:476
 msgid "template-directory"
 msgstr "каталог-шаблонов"
 
-#: builtin/clone.c:102 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:477
 msgid "directory from which templates will be used"
 msgstr "каталог, шаблоны из которого будут использованы"
 
-#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642
+#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
 #: builtin/submodule--helper.c:983
 msgid "reference repository"
 msgstr "ссылаемый репозиторий"
 
-#: builtin/clone.c:108
+#: builtin/clone.c:110
 msgid "use --reference only while cloning"
 msgstr "используйте --reference только при клонировании"
 
-#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43
+#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
 msgid "name"
 msgstr "имя"
 
-#: builtin/clone.c:110
+#: builtin/clone.c:112
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "использовать <имя> вместо «origin» для отслеживания вышестоящего репозитория"
 
-#: builtin/clone.c:112
+#: builtin/clone.c:114
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "переключиться на <ветку>, вместо HEAD внешнего репозитория"
 
-#: builtin/clone.c:114
+#: builtin/clone.c:116
 msgid "path to git-upload-pack on the remote"
 msgstr "путь к git-upload-pack на внешнем репозитории"
 
-#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006
-#: builtin/pull.c:202
+#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
+#: builtin/pull.c:205
 msgid "depth"
 msgstr "глубина"
 
-#: builtin/clone.c:116
+#: builtin/clone.c:118
 msgid "create a shallow clone of that depth"
 msgstr "сделать частичный клон указанной глубины"
 
-#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918
+#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
 #: parse-options.h:142
 msgid "time"
 msgstr "время"
 
-#: builtin/clone.c:118
+#: builtin/clone.c:120
 msgid "create a shallow clone since a specific time"
 msgstr "сделать частичный клон до определенного времени"
 
-#: builtin/clone.c:119 builtin/fetch.c:124
+#: builtin/clone.c:121 builtin/fetch.c:119
 msgid "revision"
 msgstr "редакция"
 
-#: builtin/clone.c:120 builtin/fetch.c:125
+#: builtin/clone.c:122 builtin/fetch.c:120
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "углубить историю частичного клона исключая редакцию"
 
-#: builtin/clone.c:122
+#: builtin/clone.c:124
 msgid "clone only one branch, HEAD or --branch"
 msgstr "клонировать только одну ветку, HEAD или --branch"
 
-#: builtin/clone.c:124
+#: builtin/clone.c:126
+msgid "don't clone any tags, and make later fetches not to follow them"
+msgstr "не клонировать метки, а также настроить, чтобы не клонировались и в дальнейшем"
+
+#: builtin/clone.c:128
 msgid "any cloned submodules will be shallow"
 msgstr "все склонированные подмодули будут частичными клонами"
 
-#: builtin/clone.c:125 builtin/init-db.c:484
+#: builtin/clone.c:129 builtin/init-db.c:485
 msgid "gitdir"
 msgstr "каталог-git"
 
-#: builtin/clone.c:126 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:486
 msgid "separate git dir from working tree"
 msgstr "разместить каталог git отдельно от рабочей копии"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:131
 msgid "key=value"
 msgstr "ключ=значение"
 
-#: builtin/clone.c:128
+#: builtin/clone.c:132
 msgid "set config inside the new repository"
 msgstr "установить параметры внутри нового репозитория"
 
-#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550
+#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
 msgid "use IPv4 addresses only"
 msgstr "использовать только IPv4 адреса"
 
-#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552
+#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
 msgid "use IPv6 addresses only"
 msgstr "использовать только IPv6 адреса"
 
-#: builtin/clone.c:268
+#: builtin/clone.c:272
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
 msgstr "Имя каталога не может быть угадано.\nУкажите имя каталога с помощью параметра командной строки"
 
-#: builtin/clone.c:321
+#: builtin/clone.c:325
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "информация: Не удалось добавить альтернативу для «%s»: %s\n"
 
-#: builtin/clone.c:393
+#: builtin/clone.c:397
 #, c-format
 msgid "failed to open '%s'"
 msgstr "не удалось открыть «%s»"
 
-#: builtin/clone.c:401
+#: builtin/clone.c:405
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s уже существует и не является каталогом"
 
-#: builtin/clone.c:415
+#: builtin/clone.c:419
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "не удалось выполнить stat %s\n"
 
-#: builtin/clone.c:437
+#: builtin/clone.c:441
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "не удалось создать ссылку «%s»"
 
-#: builtin/clone.c:441
+#: builtin/clone.c:445
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "не удалось копировать файл в «%s»"
 
-#: builtin/clone.c:466
+#: builtin/clone.c:470
 #, c-format
 msgid "done.\n"
 msgstr "готово.\n"
 
-#: builtin/clone.c:478
+#: builtin/clone.c:482
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
 "and retry the checkout with 'git checkout -f HEAD'\n"
 msgstr "Клонирование прошло успешно, но во время переключения состояния произошла ошибка.\nС помощь команды «git status» вы можете просмотреть, какие файлы были обновлены, а повторить попытку переключения на ветку с помощью «git checkout -f HEAD»\n"
 
-#: builtin/clone.c:555
+#: builtin/clone.c:559
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Не удалось найти внешнюю ветку %s для клонирования."
 
-#: builtin/clone.c:650
+#: builtin/clone.c:654
 msgid "remote did not send all necessary objects"
 msgstr "внешний репозиторий прислал не все необходимые объекты"
 
-#: builtin/clone.c:666
+#: builtin/clone.c:670
 #, c-format
 msgid "unable to update %s"
 msgstr "не удалось обновить %s"
 
-#: builtin/clone.c:715
+#: builtin/clone.c:719
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr "внешний HEAD ссылается на несуществующую ссылку, нельзя переключиться на такую версию.\n"
 
-#: builtin/clone.c:746
+#: builtin/clone.c:750
 msgid "unable to checkout working tree"
 msgstr "не удалось переключиться на версию в рабочем каталоге"
 
-#: builtin/clone.c:786
+#: builtin/clone.c:792
 msgid "unable to write parameters to config file"
 msgstr "не удалось записать параметры в файл конфигурации"
 
-#: builtin/clone.c:849
+#: builtin/clone.c:855
 msgid "cannot repack to clean up"
 msgstr "не удалось выполнить перепаковку для очистки"
 
-#: builtin/clone.c:851
+#: builtin/clone.c:857
 msgid "cannot unlink temporary alternates file"
 msgstr "не удалось отсоединить временные альтернативные файлы"
 
-#: builtin/clone.c:884 builtin/receive-pack.c:1900
+#: builtin/clone.c:890 builtin/receive-pack.c:1945
 msgid "Too many arguments."
 msgstr "Слишком много аргументов."
 
-#: builtin/clone.c:888
+#: builtin/clone.c:894
 msgid "You must specify a repository to clone."
 msgstr "Вы должны указать репозиторий для клонирования."
 
-#: builtin/clone.c:901
+#: builtin/clone.c:907
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "--bare и --origin %s нельзя использовать одновременно."
 
-#: builtin/clone.c:904
+#: builtin/clone.c:910
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare и --separate-git-dir нельзя использовать одновременно."
 
-#: builtin/clone.c:917
+#: builtin/clone.c:923
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "репозиторий «%s» не существует"
 
-#: builtin/clone.c:923 builtin/fetch.c:1337
+#: builtin/clone.c:929 builtin/fetch.c:1337
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "глубина %s не является положительным числом"
 
-#: builtin/clone.c:933
+#: builtin/clone.c:939
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "целевой путь «%s» уже существует и не является пустым каталогом."
 
-#: builtin/clone.c:943
+#: builtin/clone.c:949
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "рабочий каталог «%s» уже существует."
 
-#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
-#: builtin/worktree.c:221 builtin/worktree.c:251
+#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
+#: builtin/worktree.c:222 builtin/worktree.c:252
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "не удалось создать родительские каталоги для «%s»"
 
-#: builtin/clone.c:961
+#: builtin/clone.c:967
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "не удалось создать рабочий каталог «%s»"
 
-#: builtin/clone.c:973
+#: builtin/clone.c:979
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Клонирование в голый репозиторий «%s»…\n"
 
-#: builtin/clone.c:975
+#: builtin/clone.c:981
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Клонирование в «%s»…\n"
 
-#: builtin/clone.c:999
+#: builtin/clone.c:1005
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-"
 "if-able"
 msgstr "клонирование с параметром --recursive нельзя использовать одновременно ни с --reference, ни с --reference-if-able"
 
-#: builtin/clone.c:1055
+#: builtin/clone.c:1067
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth игнорируется на локальных клонах; вместо этого используйте file://."
 
-#: builtin/clone.c:1057
+#: builtin/clone.c:1069
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "--shallow-since игнорируется на локальных клонах; используйте file:// вместо этого."
 
-#: builtin/clone.c:1059
+#: builtin/clone.c:1071
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr "--shallow-exclude игнорируется на локальных клонах; используйте file:// вместо этого."
 
-#: builtin/clone.c:1062
+#: builtin/clone.c:1074
 msgid "source repository is shallow, ignoring --local"
 msgstr "исходный репозиторий является частичным, --local игнорируется"
 
-#: builtin/clone.c:1067
+#: builtin/clone.c:1079
 msgid "--local is ignored"
 msgstr "--local игнорируется"
 
-#: builtin/clone.c:1071
+#: builtin/clone.c:1083
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr "Не знаю как клонировать %s"
 
-#: builtin/clone.c:1126 builtin/clone.c:1134
+#: builtin/clone.c:1138 builtin/clone.c:1146
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Внешняя ветка %s не найдена в вышестоящем репозитории %s"
 
-#: builtin/clone.c:1137
+#: builtin/clone.c:1149
 msgid "You appear to have cloned an empty repository."
 msgstr "Похоже, что вы клонировали пустой репозиторий."
 
-#: builtin/column.c:9
+#: builtin/column.c:10
 msgid "git column [<options>]"
 msgstr "git column [<опции>]"
 
-#: builtin/column.c:26
+#: builtin/column.c:27
 msgid "lookup config vars"
 msgstr "запросить переменные конфигурации"
 
-#: builtin/column.c:27 builtin/column.c:28
+#: builtin/column.c:28 builtin/column.c:29
 msgid "layout to use"
 msgstr "использовать схему расположения"
 
-#: builtin/column.c:29
+#: builtin/column.c:30
 msgid "Maximum width"
 msgstr "Максимальная ширина"
 
-#: builtin/column.c:30
+#: builtin/column.c:31
 msgid "Padding space on left border"
 msgstr "Расстояние отступа слева"
 
-#: builtin/column.c:31
+#: builtin/column.c:32
 msgid "Padding space on right border"
 msgstr "Расстояние отступа справа"
 
-#: builtin/column.c:32
+#: builtin/column.c:33
 msgid "Padding space between columns"
 msgstr "Расстояние отступа между колонками"
 
-#: builtin/column.c:51
+#: builtin/column.c:52
 msgid "--command must be the first argument"
 msgstr "параметр --command должен быть первым"
 
-#: builtin/commit.c:38
+#: builtin/commit.c:39
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<опции>] [--] <спецификатор-пути>…"
 
-#: builtin/commit.c:43
+#: builtin/commit.c:44
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<опции>] [--] <спецификатор-пути>…"
 
-#: builtin/commit.c:48
+#: builtin/commit.c:49
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -6398,7 +6472,7 @@ msgid ""
 "    git commit --amend --reset-author\n"
 msgstr "Ваше имя или электронная почта настроены автоматически на основании вашего\nимени пользователя и имени машины. Пожалуйста, проверьте, что они \nопределены правильно.\nВы можете отключить это уведомление установив их напрямую. Запустите следующую\nкоманду и следуйте инструкциям вашего текстового редактора, для\nредактирования вашего файла конфигурации:\n\n    git config --global --edit\n\nПосле этого, изменить авторство этой коммита можно будет с помощью команды:\n\n    git commit --amend --reset-author\n"
 
-#: builtin/commit.c:61
+#: builtin/commit.c:62
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -6412,14 +6486,14 @@ msgid ""
 "    git commit --amend --reset-author\n"
 msgstr "Ваше имя или электронная почта настроены автоматически на основании вашего\nимени пользователя и имени машины. Пожалуйста, проверьте, что они \nопределены правильно.\nВы можете отключить это уведомление установив их напрямую:\n\n    git config --global user.name \"Ваше Имя\"\n    git config --global user.email you@example.com\n\nПосле этого, изменить авторство этой коммита можно будет с помощью команды:\n\n    git commit --amend --reset-author\n"
 
-#: builtin/commit.c:73
+#: builtin/commit.c:74
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
 "remove the commit entirely with \"git reset HEAD^\".\n"
 msgstr "Вы попросили исправить последний коммит, но делая это вы сделаете\nпустой коммит. Вы можете повторить эту команду с опцией --allow-empty\nили вы можете удалить коммит полностью с помощью команды \n«git reset HEAD^».\n"
 
-#: builtin/commit.c:78
+#: builtin/commit.c:79
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -6428,11 +6502,11 @@ msgid ""
 "\n"
 msgstr "Копируемый коммит теперь пуст, возможно после разрешения конфликтов.\nЕсли вы все равно хотите сделать пустой коммит, используйте:\n\n    git commit --allow-empty\n\n"
 
-#: builtin/commit.c:85
+#: builtin/commit.c:86
 msgid "Otherwise, please use 'git reset'\n"
 msgstr "В противном случае, используйте «git reset»\n"
 
-#: builtin/commit.c:88
+#: builtin/commit.c:89
 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"
@@ -6442,98 +6516,98 @@ msgid ""
 "the remaining commits.\n"
 msgstr "Если вы хотите пропустит этот коммит, используйте команду:\n\n    git reset\n\nПосле этого «git cherry-pick --continue» продолжит копирование оставшихся коммитов.\n"
 
-#: builtin/commit.c:318
+#: builtin/commit.c:319
 msgid "failed to unpack HEAD tree object"
 msgstr "сбой распаковки объекта дерева HEAD"
 
-#: builtin/commit.c:359
+#: builtin/commit.c:360
 msgid "unable to create temporary index"
 msgstr "не удалось создать временный индекс"
 
-#: builtin/commit.c:365
+#: builtin/commit.c:366
 msgid "interactive add failed"
 msgstr "сбой интерактивного добавления"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:379
 msgid "unable to update temporary index"
 msgstr "не удалось обновить временный индекс"
 
-#: builtin/commit.c:380
+#: builtin/commit.c:381
 msgid "Failed to update main cache tree"
 msgstr "Сбой при обновлении основного кэша дерева"
 
-#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
+#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
 msgid "unable to write new_index file"
 msgstr "не удалось записать файл new_index"
 
-#: builtin/commit.c:458
+#: builtin/commit.c:459
 msgid "cannot do a partial commit during a merge."
 msgstr "нельзя создать частичный коммит во время слияния."
 
-#: builtin/commit.c:460
+#: builtin/commit.c:461
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "нельзя создать частичный коммит во время копирования коммита."
 
-#: builtin/commit.c:469
+#: builtin/commit.c:470
 msgid "cannot read the index"
 msgstr "не удалось прочитать индекс"
 
-#: builtin/commit.c:488
+#: builtin/commit.c:489
 msgid "unable to write temporary index file"
 msgstr "не удалось записать временный файл индекса"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:583
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "у коммита «%s» отсутствует автор в заголовке"
 
-#: builtin/commit.c:584
+#: builtin/commit.c:585
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "у коммита «%s» строка автора в неправильном формате"
 
-#: builtin/commit.c:603
+#: builtin/commit.c:604
 msgid "malformed --author parameter"
 msgstr "параметр --author в неправильном формате"
 
-#: builtin/commit.c:655
+#: builtin/commit.c:656
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr "нельзя выбрать символ комментария, который\nне используется в текущем сообщении коммита"
 
-#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
+#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "не удалось запросить коммит %s"
 
-#: builtin/commit.c:704 builtin/shortlog.c:294
+#: builtin/commit.c:705 builtin/shortlog.c:295
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(чтение файла журнала из стандартного ввода)\n"
 
-#: builtin/commit.c:706
+#: builtin/commit.c:707
 msgid "could not read log from standard input"
 msgstr "не удалось прочитать файл журнала из стандартного ввода"
 
-#: builtin/commit.c:710
+#: builtin/commit.c:711
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "не удалось прочитать файл журнала «%s»"
 
-#: builtin/commit.c:737 builtin/commit.c:745
+#: builtin/commit.c:738 builtin/commit.c:746
 msgid "could not read SQUASH_MSG"
 msgstr "не удалось прочитать SQUASH_MSG"
 
-#: builtin/commit.c:742
+#: builtin/commit.c:743
 msgid "could not read MERGE_MSG"
 msgstr "не удалось прочитать MERGE_MSG"
 
-#: builtin/commit.c:796
+#: builtin/commit.c:797
 msgid "could not write commit template"
 msgstr "не удалось записать шаблон описания коммита"
 
-#: builtin/commit.c:814
+#: builtin/commit.c:815
 #, c-format
 msgid ""
 "\n"
@@ -6543,7 +6617,7 @@ msgid ""
 "and try again.\n"
 msgstr "\nПохоже, что вы пытаетесь закоммитить слияние.\nЕсли это ошибка, пожалуйста удалите файл\n\t%s\nи попробуйте снова.\n"
 
-#: builtin/commit.c:819
+#: builtin/commit.c:820
 #, c-format
 msgid ""
 "\n"
@@ -6553,14 +6627,14 @@ msgid ""
 "and try again.\n"
 msgstr "\nПохоже, что вы пытаетесь закоммитить при копировании коммита.\nЕсли это не так, то удалите файл\n\t%s\nи попробуйте снова.\n"
 
-#: builtin/commit.c:832
+#: builtin/commit.c:833
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
 "with '%c' will be ignored, and an empty message aborts the commit.\n"
 msgstr "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут проигнорированы, а пустое сообщение\nотменяет процесс коммита.\n"
 
-#: builtin/commit.c:839
+#: builtin/commit.c:840
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -6568,484 +6642,484 @@ msgid ""
 "An empty message aborts the commit.\n"
 msgstr "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут оставлены; вы можете удалить их вручную,\nесли хотите. Пустое сообщение отменяет процесс коммита.\n"
 
-#: builtin/commit.c:859
+#: builtin/commit.c:857
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sАвтор:     %.*s <%.*s>"
 
-#: builtin/commit.c:867
+#: builtin/commit.c:865
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sДата:      %s"
 
-#: builtin/commit.c:874
+#: builtin/commit.c:872
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sКоммитер:  %.*s <%.*s>"
 
-#: builtin/commit.c:892
+#: builtin/commit.c:889
 msgid "Cannot read index"
 msgstr "Не удалось прочитать индекс"
 
-#: builtin/commit.c:954
+#: builtin/commit.c:951
 msgid "Error building trees"
 msgstr "Ошибка при построении деревьев"
 
-#: builtin/commit.c:968 builtin/tag.c:273
+#: builtin/commit.c:965 builtin/tag.c:274
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Пожалуйста, укажите сообщение, при указании опций -m или -F.\n"
 
-#: builtin/commit.c:1071
+#: builtin/commit.c:1068
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr "--author «%s» не в формате «Имя <почта>» и не совпадает с существующим автором"
 
-#: builtin/commit.c:1086 builtin/commit.c:1325
+#: builtin/commit.c:1083 builtin/commit.c:1328
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Неправильный режим неотслеживаемых файлов «%s»"
 
-#: builtin/commit.c:1124
+#: builtin/commit.c:1121
 msgid "--long and -z are incompatible"
 msgstr "--long и -z нельзя использовать одновременно"
 
-#: builtin/commit.c:1154
+#: builtin/commit.c:1151
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Указание одновременно опций --reset-author и --author не имеет смысла"
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1160
 msgid "You have nothing to amend."
 msgstr "Нечего исправлять."
 
-#: builtin/commit.c:1166
+#: builtin/commit.c:1163
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Вы в процессе слияния —  сейчас нельзя исправлять."
 
-#: builtin/commit.c:1168
+#: builtin/commit.c:1165
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Вы в процессе копирования коммита —  сейчас нельзя исправлять."
 
-#: builtin/commit.c:1171
+#: builtin/commit.c:1168
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Опции --squash и --fixup не могут использоваться одновременно"
 
-#: builtin/commit.c:1181
+#: builtin/commit.c:1178
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Может использоваться только одна из опций -c/-C/-F/--fixup."
 
-#: builtin/commit.c:1183
+#: builtin/commit.c:1180
 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
 msgstr "Опция -m не может использоваться с -c/-C/-F/--fixup."
 
-#: builtin/commit.c:1191
+#: builtin/commit.c:1188
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author может использоваться только одновременно с опциями -C, -c или --amend."
 
-#: builtin/commit.c:1208
+#: builtin/commit.c:1205
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr "Может использоваться только одна из опций --include/--only/--all/--interactive/--patch."
 
-#: builtin/commit.c:1210
+#: builtin/commit.c:1207
 msgid "No paths with --include/--only does not make sense."
 msgstr "Указание путей каталогов с опциями --include/--only не имеет смысла."
 
-#: builtin/commit.c:1212
-msgid "Explicit paths specified without -i or -o; assuming --only paths..."
-msgstr "Пути явно указаны пути без опций -i или -o; предполагаю опцию --only…"
-
-#: builtin/commit.c:1224 builtin/tag.c:551
+#: builtin/commit.c:1219 builtin/tag.c:552
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Неправильное значение режима очистки %s"
 
-#: builtin/commit.c:1229
+#: builtin/commit.c:1224
 msgid "Paths with -a does not make sense."
 msgstr "С опцией -a указание пути не имеет смысла."
 
-#: builtin/commit.c:1339 builtin/commit.c:1612
+#: builtin/commit.c:1342 builtin/commit.c:1617
 msgid "show status concisely"
 msgstr "кратко показать статус"
 
-#: builtin/commit.c:1341 builtin/commit.c:1614
+#: builtin/commit.c:1344 builtin/commit.c:1619
 msgid "show branch information"
 msgstr "показать информацию о версии"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1346
+msgid "show stash information"
+msgstr "показать информацию о спрятанном"
+
+#: builtin/commit.c:1348
 msgid "version"
 msgstr "версия"
 
-#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
-#: builtin/worktree.c:448
+#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
+#: builtin/worktree.c:449
 msgid "machine-readable output"
 msgstr "машиночитаемый вывод"
 
-#: builtin/commit.c:1346 builtin/commit.c:1618
+#: builtin/commit.c:1351 builtin/commit.c:1623
 msgid "show status in long format (default)"
 msgstr "показать статус в длинном формате (по умолчанию)"
 
-#: builtin/commit.c:1349 builtin/commit.c:1621
+#: builtin/commit.c:1354 builtin/commit.c:1626
 msgid "terminate entries with NUL"
 msgstr "завершать записи НУЛЕВЫМ байтом"
 
-#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:411
+#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
+#: builtin/fast-export.c:986 builtin/tag.c:412
 msgid "mode"
 msgstr "режим"
 
-#: builtin/commit.c:1352 builtin/commit.c:1624
+#: builtin/commit.c:1357 builtin/commit.c:1629
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr "показать неотслеживаемые файлы, опциональные режимы: all (все), normal (как обычно), no (нет). (По умолчанию: all)"
 
-#: builtin/commit.c:1355
+#: builtin/commit.c:1360
 msgid "show ignored files"
 msgstr "показать игнорируемые файлы"
 
-#: builtin/commit.c:1356 parse-options.h:155
+#: builtin/commit.c:1361 parse-options.h:155
 msgid "when"
 msgstr "когда"
 
-#: builtin/commit.c:1357
+#: builtin/commit.c:1362
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr "игнорировать изменения в подмодулях, опционально когда: all (всегда), dirty (измененные), untracked (неотслеживаемые). (По умолчанию: all)"
 
-#: builtin/commit.c:1359
+#: builtin/commit.c:1364
 msgid "list untracked files in columns"
 msgstr "показать неотслеживаемые файлы по столбцам"
 
-#: builtin/commit.c:1435
+#: builtin/commit.c:1440
 msgid "couldn't look up newly created commit"
 msgstr "нельзя запросить новосозданный коммит"
 
-#: builtin/commit.c:1437
+#: builtin/commit.c:1442
 msgid "could not parse newly created commit"
 msgstr "нельзя разобрать новосозданный коммит"
 
-#: builtin/commit.c:1482
+#: builtin/commit.c:1487
 msgid "detached HEAD"
 msgstr "отделённый HEAD"
 
-#: builtin/commit.c:1485
+#: builtin/commit.c:1490
 msgid " (root-commit)"
 msgstr " (корневой коммит)"
 
-#: builtin/commit.c:1582
+#: builtin/commit.c:1587
 msgid "suppress summary after successful commit"
 msgstr "не выводить сводку после успешного коммита"
 
-#: builtin/commit.c:1583
+#: builtin/commit.c:1588
 msgid "show diff in commit message template"
 msgstr "добавить список изменений в шаблон сообщения коммита"
 
-#: builtin/commit.c:1585
+#: builtin/commit.c:1590
 msgid "Commit message options"
 msgstr "Опции сообщения коммита"
 
-#: builtin/commit.c:1586 builtin/tag.c:409
+#: builtin/commit.c:1591 builtin/tag.c:410
 msgid "read message from file"
 msgstr "прочитать сообщение из файла"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1592
 msgid "author"
 msgstr "автор"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1592
 msgid "override author for commit"
 msgstr "подменить автора коммита"
 
-#: builtin/commit.c:1588 builtin/gc.c:357
+#: builtin/commit.c:1593 builtin/gc.c:358
 msgid "date"
 msgstr "дата"
 
-#: builtin/commit.c:1588
+#: builtin/commit.c:1593
 msgid "override date for commit"
 msgstr "подменить дату коммита"
 
-#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/tag.c:407
+#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
+#: builtin/notes.c:564 builtin/tag.c:408
 msgid "message"
 msgstr "сообщение"
 
-#: builtin/commit.c:1589
+#: builtin/commit.c:1594
 msgid "commit message"
 msgstr "сообщение коммита"
 
-#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592
-#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
+#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
 msgid "commit"
 msgstr "коммит"
 
-#: builtin/commit.c:1590
+#: builtin/commit.c:1595
 msgid "reuse and edit message from specified commit"
 msgstr "использовать и отредактировать сообщение от указанного коммита"
 
-#: builtin/commit.c:1591
+#: builtin/commit.c:1596
 msgid "reuse message from specified commit"
 msgstr "использовать сообщение указанного коммита"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1597
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr "использовать форматированное сообщение автоуплотнения для исправления указанного коммита"
 
-#: builtin/commit.c:1593
+#: builtin/commit.c:1598
 msgid "use autosquash formatted message to squash specified commit"
 msgstr "использовать форматированное сообщение автоуплотнения для уплотнения указанного коммита"
 
-#: builtin/commit.c:1594
+#: builtin/commit.c:1599
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "коммит теперь за моим авторством (используется с -C/-c/--amend)"
 
-#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104
+#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr "добавить Signed-off-by:"
 
-#: builtin/commit.c:1596
+#: builtin/commit.c:1601
 msgid "use specified template file"
 msgstr "использовать указанный файл шаблона"
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1602
 msgid "force edit of commit"
 msgstr "принудительно редактировать коммит"
 
-#: builtin/commit.c:1598
+#: builtin/commit.c:1603
 msgid "default"
 msgstr "по-умолчанию"
 
-#: builtin/commit.c:1598 builtin/tag.c:412
+#: builtin/commit.c:1603 builtin/tag.c:413
 msgid "how to strip spaces and #comments from message"
 msgstr "как удалять пробелы и #комментарии из сообщения коммита"
 
-#: builtin/commit.c:1599
+#: builtin/commit.c:1604
 msgid "include status in commit message template"
 msgstr "включить статус файлов в шаблон сообщения коммита"
 
-#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166
-#: builtin/revert.c:112
+#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr "подписать коммит с помощью GPG"
 
-#: builtin/commit.c:1604
+#: builtin/commit.c:1609
 msgid "Commit contents options"
 msgstr "Опции содержимого коммита"
 
-#: builtin/commit.c:1605
+#: builtin/commit.c:1610
 msgid "commit all changed files"
 msgstr "закоммитить все измененные файлы"
 
-#: builtin/commit.c:1606
+#: builtin/commit.c:1611
 msgid "add specified files to index for commit"
 msgstr "добавить указанные файлы в индекс для коммита"
 
-#: builtin/commit.c:1607
+#: builtin/commit.c:1612
 msgid "interactively add files"
 msgstr "интерактивное добавление файлов"
 
-#: builtin/commit.c:1608
+#: builtin/commit.c:1613
 msgid "interactively add changes"
 msgstr "интерактивное добавление изменений"
 
-#: builtin/commit.c:1609
+#: builtin/commit.c:1614
 msgid "commit only specified files"
 msgstr "закоммитить только указанные файлы"
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1615
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "пропустить перехватчик pre-commit и commit-msg"
 
-#: builtin/commit.c:1611
+#: builtin/commit.c:1616
 msgid "show what would be committed"
 msgstr "показать, что будет закоммичено"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c:1627
 msgid "amend previous commit"
 msgstr "исправить предыдущий коммит"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1628
 msgid "bypass post-rewrite hook"
 msgstr "пропустить перехватчик post-rewrite"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1633
 msgid "ok to record an empty change"
 msgstr "разрешить запись пустого коммита"
 
-#: builtin/commit.c:1630
+#: builtin/commit.c:1635
 msgid "ok to record a change with an empty message"
 msgstr "разрешить запись изменений с пустым сообщением"
 
-#: builtin/commit.c:1659
+#: builtin/commit.c:1665
 msgid "could not parse HEAD commit"
 msgstr "не удалось разобрать HEAD коммит"
 
-#: builtin/commit.c:1707
+#: builtin/commit.c:1710
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Файл MERGE_HEAD поврежден (%s)"
 
-#: builtin/commit.c:1714
+#: builtin/commit.c:1717
 msgid "could not read MERGE_MODE"
 msgstr "не удалось прочитать MERGE_MODE"
 
-#: builtin/commit.c:1733
+#: builtin/commit.c:1736
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "не удалось открыть сообщение коммита: %s"
 
-#: builtin/commit.c:1744
+#: builtin/commit.c:1747
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Отмена коммита; вы не изменили сообщение.\n"
 
-#: builtin/commit.c:1749
+#: builtin/commit.c:1752
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Отмена коммита из-за пустого сообщения коммита.\n"
 
-#: builtin/commit.c:1797
+#: builtin/commit.c:1800
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
 "not exceeded, and then \"git reset HEAD\" to recover."
 msgstr "Репозиторий был обновлен, но не удалось записать файл new_index. Удостоверьтесь, что на диске есть свободное место и квота не исчерпана, а после этого запустите «git reset HEAD» для восстановления."
 
-#: builtin/config.c:9
+#: builtin/config.c:10
 msgid "git config [<options>]"
 msgstr "git config [<опции>]"
 
-#: builtin/config.c:56
+#: builtin/config.c:57
 msgid "Config file location"
 msgstr "Размещение файла конфигурации"
 
-#: builtin/config.c:57
+#: builtin/config.c:58
 msgid "use global config file"
 msgstr "использовать глобальный файл конфигурации"
 
-#: builtin/config.c:58
+#: builtin/config.c:59
 msgid "use system config file"
 msgstr "использовать системный файл конфигурации"
 
-#: builtin/config.c:59
+#: builtin/config.c:60
 msgid "use repository config file"
 msgstr "использовать файл конфигурации репозитория"
 
-#: builtin/config.c:60
+#: builtin/config.c:61
 msgid "use given config file"
 msgstr "использовать указанный файл конфигурации"
 
-#: builtin/config.c:61
+#: builtin/config.c:62
 msgid "blob-id"
 msgstr "идент-двоичн-объекта"
 
-#: builtin/config.c:61
+#: builtin/config.c:62
 msgid "read config from given blob object"
 msgstr "прочитать настройки из указанного двоичного объекта"
 
-#: builtin/config.c:62
+#: builtin/config.c:63
 msgid "Action"
 msgstr "Действие"
 
-#: builtin/config.c:63
+#: builtin/config.c:64
 msgid "get value: name [value-regex]"
 msgstr "получить значение: имя [шаблон-значений]"
 
-#: builtin/config.c:64
+#: builtin/config.c:65
 msgid "get all values: key [value-regex]"
 msgstr "получить все значения: ключ [шаблон-значений]"
 
-#: builtin/config.c:65
+#: builtin/config.c:66
 msgid "get values for regexp: name-regex [value-regex]"
 msgstr "получить значения по шаблону: шаблон-имен [шаблон-значений]"
 
-#: builtin/config.c:66
+#: builtin/config.c:67
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "получить значение, специфичное для URL: раздел[.переменная] URL"
 
-#: builtin/config.c:67
+#: builtin/config.c:68
 msgid "replace all matching variables: name value [value_regex]"
 msgstr "заменить все соответствующие переменные: имя значение [шаблон-значений]"
 
-#: builtin/config.c:68
+#: builtin/config.c:69
 msgid "add a new variable: name value"
 msgstr "добавить новую переменную: имя значение"
 
-#: builtin/config.c:69
+#: builtin/config.c:70
 msgid "remove a variable: name [value-regex]"
 msgstr "удалить переменную: имя [шаблон-значений]"
 
-#: builtin/config.c:70
+#: builtin/config.c:71
 msgid "remove all matches: name [value-regex]"
 msgstr "удалить все совпадающие: имя [шаблон-значений]"
 
-#: builtin/config.c:71
+#: builtin/config.c:72
 msgid "rename section: old-name new-name"
 msgstr "переименовать раздел: старое-имя новое-имя"
 
-#: builtin/config.c:72
+#: builtin/config.c:73
 msgid "remove a section: name"
 msgstr "удалить раздел: имя"
 
-#: builtin/config.c:73
+#: builtin/config.c:74
 msgid "list all"
 msgstr "показать весь список"
 
-#: builtin/config.c:74
+#: builtin/config.c:75
 msgid "open an editor"
 msgstr "открыть в редакторе"
 
-#: builtin/config.c:75
+#: builtin/config.c:76
 msgid "find the color configured: slot [default]"
 msgstr "найти настроенный цвет: раздел [по-умолчанию]"
 
-#: builtin/config.c:76
+#: builtin/config.c:77
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "проверить, существует ли настроенный цвет: раздел [stdout-есть-tty]"
 
-#: builtin/config.c:77
+#: builtin/config.c:78
 msgid "Type"
 msgstr "Тип"
 
-#: builtin/config.c:78
+#: builtin/config.c:79
 msgid "value is \"true\" or \"false\""
 msgstr "значение — это «true» (правда) или «false» (ложь)"
 
-#: builtin/config.c:79
+#: builtin/config.c:80
 msgid "value is decimal number"
 msgstr "значение — это десятичное число"
 
-#: builtin/config.c:80
+#: builtin/config.c:81
 msgid "value is --bool or --int"
 msgstr "значение — это --bool или --int"
 
-#: builtin/config.c:81
+#: builtin/config.c:82
 msgid "value is a path (file or directory name)"
 msgstr "значение — это путь (к файлу или каталогу)"
 
-#: builtin/config.c:82
+#: builtin/config.c:83
 msgid "Other"
 msgstr "Другое"
 
-#: builtin/config.c:83
+#: builtin/config.c:84
 msgid "terminate values with NUL byte"
 msgstr "завершать значения НУЛЕВЫМ байтом"
 
-#: builtin/config.c:84
+#: builtin/config.c:85
 msgid "show variable names only"
 msgstr "показывать только имена переменных"
 
-#: builtin/config.c:85
+#: builtin/config.c:86
 msgid "respect include directives on lookup"
 msgstr "учитывать директивы include (включения файлов) при запросе"
 
-#: builtin/config.c:86
+#: builtin/config.c:87
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr "показать источник настройки (файл, стандартный ввод, двоичный объект, командная строка)"
 
-#: builtin/config.c:328
+#: builtin/config.c:327
 msgid "unable to parse default color value"
 msgstr "не удалось разобрать значение цвета по умолчанию"
 
-#: builtin/config.c:472
+#: builtin/config.c:471
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -7055,181 +7129,185 @@ msgid ""
 "#\temail = %s\n"
 msgstr "# Это файл конфигурации пользователя Git.\n[user]\n# Пожалуйста, адаптируйте и раскомментируйте следующие строки:\n#\tuser = %s\n#\temail = %s\n"
 
-#: builtin/config.c:615
+#: builtin/config.c:499
+msgid "--local can only be used inside a git repository"
+msgstr "--local можно использовать только внутри git репозитория"
+
+#: builtin/config.c:621
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "не удалось создать файл конфигурации %s"
 
-#: builtin/config.c:627
+#: builtin/config.c:633
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
 "       Use a regexp, --add or --replace-all to change %s."
 msgstr "нельзя перезаписать несколько значений одним\n       Используйте регулярные выражения, параметры --add или --replace-all, чтобы изменить %s."
 
-#: builtin/count-objects.c:86
+#: builtin/count-objects.c:87
 msgid "git count-objects [-v] [-H | --human-readable]"
 msgstr "git count-objects [-v] [-H | --human-readable]"
 
-#: builtin/count-objects.c:96
+#: builtin/count-objects.c:97
 msgid "print sizes in human readable format"
 msgstr "вывод размеров в удобочитаемом для человека виде"
 
-#: builtin/describe.c:18
+#: builtin/describe.c:19
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<опции>] [<указатель-коммита>…]"
 
-#: builtin/describe.c:19
+#: builtin/describe.c:20
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<опции>] --dirty"
 
-#: builtin/describe.c:53
+#: builtin/describe.c:54
 msgid "head"
 msgstr "указатель на ветку"
 
-#: builtin/describe.c:53
+#: builtin/describe.c:54
 msgid "lightweight"
 msgstr "легковесный"
 
-#: builtin/describe.c:53
+#: builtin/describe.c:54
 msgid "annotated"
 msgstr "аннотированный"
 
-#: builtin/describe.c:250
+#: builtin/describe.c:253
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "аннотированная метка %s не доступна"
 
-#: builtin/describe.c:254
+#: builtin/describe.c:257
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "аннотированная метка %s не содержит встроенного названия"
 
-#: builtin/describe.c:256
+#: builtin/describe.c:259
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "метка «%s» уже здесь «%s»"
 
-#: builtin/describe.c:283 builtin/log.c:487
+#: builtin/describe.c:286 builtin/log.c:489
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "Недопустимое имя объекта %s"
 
-#: builtin/describe.c:286
+#: builtin/describe.c:289
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s не является действительным объектом «%s»"
 
-#: builtin/describe.c:303
+#: builtin/describe.c:306
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "нет меток, точно соответствующих «%s»"
 
-#: builtin/describe.c:305
+#: builtin/describe.c:308
 #, c-format
 msgid "searching to describe %s\n"
 msgstr "поиск описания для %s\n"
 
-#: builtin/describe.c:352
+#: builtin/describe.c:355
 #, c-format
 msgid "finished search at %s\n"
 msgstr "поиск окончен на %s\n"
 
-#: builtin/describe.c:379
+#: builtin/describe.c:382
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
 "However, there were unannotated tags: try --tags."
 msgstr "Нет аннотированных меток, которые могут описать «%s».\nНо имеются неаннотированные метки: попробуйте добавить параметр --tags."
 
-#: builtin/describe.c:383
+#: builtin/describe.c:386
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
 "Try --always, or create some tags."
 msgstr "Нет меток, которые могут описать «%s….\nПопробуйте добавить параметр --always или создать какие-нибудь метки."
 
-#: builtin/describe.c:413
+#: builtin/describe.c:416
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "посещено %lu коммитов\n"
 
-#: builtin/describe.c:416
+#: builtin/describe.c:419
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
 "gave up search at %s\n"
 msgstr "более %i меток найдено; показано последние %i\nостановлен поиск после %s\n"
 
-#: builtin/describe.c:438
+#: builtin/describe.c:441
 msgid "find the tag that comes after the commit"
 msgstr "поиск метки, которая идет после коммита"
 
-#: builtin/describe.c:439
+#: builtin/describe.c:442
 msgid "debug search strategy on stderr"
 msgstr "вывод отладочной информации стратегии поиска на стандартный вывод"
 
-#: builtin/describe.c:440
+#: builtin/describe.c:443
 msgid "use any ref"
 msgstr "использовать любую ссылку"
 
-#: builtin/describe.c:441
+#: builtin/describe.c:444
 msgid "use any tag, even unannotated"
 msgstr "использовать любую метку, даже неаннотированную"
 
-#: builtin/describe.c:442
+#: builtin/describe.c:445
 msgid "always use long format"
 msgstr "всегда использовать длинный формат вывода"
 
-#: builtin/describe.c:443
+#: builtin/describe.c:446
 msgid "only follow first parent"
 msgstr "следовать только за первым родителем"
 
-#: builtin/describe.c:446
+#: builtin/describe.c:449
 msgid "only output exact matches"
 msgstr "выводить только точные совпадения"
 
-#: builtin/describe.c:448
+#: builtin/describe.c:451
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "рассматривать последние <n> меток (по умолчанию: 10)"
 
-#: builtin/describe.c:450
+#: builtin/describe.c:453
 msgid "only consider tags matching <pattern>"
 msgstr "рассматривать только метки по <шаблону>"
 
-#: builtin/describe.c:452
+#: builtin/describe.c:455
 msgid "do not consider tags matching <pattern>"
 msgstr "не учитывать метки, которые соответствуют <шаблону>"
 
-#: builtin/describe.c:454 builtin/name-rev.c:357
+#: builtin/describe.c:457 builtin/name-rev.c:406
 msgid "show abbreviated commit object as fallback"
 msgstr "если не найдено, показать сокращенный номер редакции коммита"
 
-#: builtin/describe.c:455 builtin/describe.c:458
+#: builtin/describe.c:458 builtin/describe.c:461
 msgid "mark"
 msgstr "пометка"
 
-#: builtin/describe.c:456
+#: builtin/describe.c:459
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "добавить <пометку> при измененном рабочем каталоге (по умолчанию: «-dirty»)"
 
-#: builtin/describe.c:459
+#: builtin/describe.c:462
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "добавить <пометку> на повреждённое рабочее дерево (по умолчанию: «-broken»)"
 
-#: builtin/describe.c:477
+#: builtin/describe.c:480
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long несовместимо с --abbrev=0"
 
-#: builtin/describe.c:506
+#: builtin/describe.c:509
 msgid "No names found, cannot describe anything."
 msgstr "Имена не найдены, не могу ничего описать."
 
-#: builtin/describe.c:549
+#: builtin/describe.c:552
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty несовместимо с указанием указателей коммитов"
 
-#: builtin/describe.c:551
+#: builtin/describe.c:554
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken несовместимо с указанием указателей коммитов"
 
@@ -7238,345 +7316,347 @@ msgstr "--broken несовместимо с указанием указател
 msgid "'%s': not a regular file or symlink"
 msgstr "«%s»: не является обычным файлом или символьной ссылкой"
 
-#: builtin/diff.c:234
+#: builtin/diff.c:235
 #, c-format
 msgid "invalid option: %s"
 msgstr "неправильный параметр: %s"
 
-#: builtin/diff.c:358
+#: builtin/diff.c:359
 msgid "Not a git repository"
 msgstr "Не найден git репозитоий"
 
-#: builtin/diff.c:401
+#: builtin/diff.c:402
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "передан неправильный объект «%s»."
 
-#: builtin/diff.c:410
+#: builtin/diff.c:411
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "передано больше двух двоичных объектов: «%s»"
 
-#: builtin/diff.c:417
+#: builtin/diff.c:416
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "передан необработанный объект «%s»."
 
-#: builtin/difftool.c:28
+#: builtin/difftool.c:29
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<опции>] [<коммит> [<коммит>]] [--] [<путь>…]"
 
-#: builtin/difftool.c:241
+#: builtin/difftool.c:249
 #, c-format
 msgid "failed: %d"
 msgstr "сбой: %d"
 
-#: builtin/difftool.c:283
+#: builtin/difftool.c:291
 #, c-format
 msgid "could not read symlink %s"
 msgstr "не удалось прочитать символьную ссылку %s"
 
-#: builtin/difftool.c:285
+#: builtin/difftool.c:293
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "не удалось прочитать файл символьной ссылки %s"
 
-#: builtin/difftool.c:293
+#: builtin/difftool.c:301
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "не удалось прочитать объект %s для символьной ссылки %s"
 
-#: builtin/difftool.c:395
+#: builtin/difftool.c:403
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
 msgstr "комбинированные форматы различий файлов(«-c» и «--cc») не поддерживаются в режиме сравнения каталогов(«-d» и «--dir-diff»)."
 
-#: builtin/difftool.c:609
+#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "оба файла изменены: «%s» и «%s»."
 
-#: builtin/difftool.c:611
+#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "рабочий каталог был покинут."
 
-#: builtin/difftool.c:622
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "временные файлы уже находятся в «%s»."
 
-#: builtin/difftool.c:623
+#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "возможно вы хотите их удалить или восстановить."
 
-#: builtin/difftool.c:669
+#: builtin/difftool.c:689
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "использовать «diff.guitool» вместо «diff.tool»"
 
-#: builtin/difftool.c:671
+#: builtin/difftool.c:691
 msgid "perform a full-directory diff"
 msgstr "выполнить пофайловое сравнение всего каталога"
 
-#: builtin/difftool.c:673
+#: builtin/difftool.c:693
 msgid "do not prompt before launching a diff tool"
 msgstr "не спрашивать перед запуском утилиты сравнения"
 
-#: builtin/difftool.c:679
+#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "использовать символьные ссылки в режиме сравнения каталога"
 
-#: builtin/difftool.c:680
+#: builtin/difftool.c:700
 msgid "<tool>"
 msgstr "<утилита>"
 
-#: builtin/difftool.c:681
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "использовать указанную утилиту сравнения"
 
-#: builtin/difftool.c:683
+#: builtin/difftool.c:703
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr "вывести список утилит, которые можно использовать с параметром «--tool»"
 
-#: builtin/difftool.c:686
+#: builtin/difftool.c:706
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit"
 " code"
 msgstr "выходить из «git-difftool», если вызванная утилита сравнения вернула не нулевой код возврата"
 
-#: builtin/difftool.c:688
+#: builtin/difftool.c:708
 msgid "<command>"
 msgstr "<команда>"
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr "использовать особую команду для просмотра различий"
 
-#: builtin/difftool.c:713
+#: builtin/difftool.c:733
 msgid "no <tool> given for --tool=<tool>"
 msgstr "не передана <утилита> для --tool=<утилита>"
 
-#: builtin/difftool.c:720
+#: builtin/difftool.c:740
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "не передана <команда> для --extcmd=<команда>"
 
-#: builtin/fast-export.c:25
+#: builtin/fast-export.c:26
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [опции-rev-list]"
 
-#: builtin/fast-export.c:980
+#: builtin/fast-export.c:982
 msgid "show progress after <n> objects"
 msgstr "показать прогресс после <n> объектов"
 
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:984
 msgid "select handling of signed tags"
 msgstr "выбор обработки подписанных меток"
 
-#: builtin/fast-export.c:985
+#: builtin/fast-export.c:987
 msgid "select handling of tags that tag filtered objects"
 msgstr "выбор обработки меток, которыми помечены отфильтрованные объекты"
 
-#: builtin/fast-export.c:988
+#: builtin/fast-export.c:990
 msgid "Dump marks to this file"
 msgstr "Записать пометки в этот файл"
 
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:992
 msgid "Import marks from this file"
 msgstr "Импортировать пометки из этого файла"
 
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:994
 msgid "Fake a tagger when tags lack one"
 msgstr "Подделать автора метки, если у метки он отсутствует"
 
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:996
 msgid "Output full tree for each commit"
 msgstr "Вывести полное дерево для каждого коммита"
 
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:998
 msgid "Use the done feature to terminate the stream"
 msgstr "Использовать пометку завершения в конце потока"
 
-#: builtin/fast-export.c:997
+#: builtin/fast-export.c:999
 msgid "Skip output of blob data"
 msgstr "Пропустить вывод данных двоичных объектов"
 
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1000
 msgid "refspec"
 msgstr "спецификатор ссылки"
 
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1001
 msgid "Apply refspec to exported refs"
 msgstr "Применить спецификатор ссылки к экспортируемым ссылкам"
 
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1002
 msgid "anonymize output"
 msgstr "сделать вывод анонимным"
 
-#: builtin/fetch.c:21
+#: builtin/fetch.c:22
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<опции>] [<репозиторий> [<спецификатор-ссылки>…]]"
 
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<опции>] <группа>"
 
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<опции>] [(<репозиторий> | <группа>)…]"
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<опции>]"
 
-#: builtin/fetch.c:95 builtin/pull.c:175
+#: builtin/fetch.c:90 builtin/pull.c:182
 msgid "fetch from all remotes"
 msgstr "извлечь со всех внешних репозиториев"
 
-#: builtin/fetch.c:97 builtin/pull.c:178
+#: builtin/fetch.c:92 builtin/pull.c:185
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "дописать к .git/FETCH_HEAD вместо перезаписи"
 
-#: builtin/fetch.c:99 builtin/pull.c:181
+#: builtin/fetch.c:94 builtin/pull.c:188
 msgid "path to upload pack on remote end"
 msgstr "путь к программе упаковки пакета на машине с внешним репозиторием"
 
-#: builtin/fetch.c:100 builtin/pull.c:183
+#: builtin/fetch.c:95 builtin/pull.c:190
 msgid "force overwrite of local branch"
 msgstr "принудительная перезапись локальной ветки"
 
-#: builtin/fetch.c:102
+#: builtin/fetch.c:97
 msgid "fetch from multiple remotes"
 msgstr "извлечь с нескольких внешних репозиториев"
 
-#: builtin/fetch.c:104 builtin/pull.c:185
+#: builtin/fetch.c:99 builtin/pull.c:192
 msgid "fetch all tags and associated objects"
 msgstr "извлечь все метки и связанные объекты"
 
-#: builtin/fetch.c:106
+#: builtin/fetch.c:101
 msgid "do not fetch all tags (--no-tags)"
 msgstr "не извлекать все метки (--no-tags)"
 
-#: builtin/fetch.c:108
+#: builtin/fetch.c:103
 msgid "number of submodules fetched in parallel"
 msgstr "количество подмодулей, которые будут скачаны парралельно"
 
-#: builtin/fetch.c:110 builtin/pull.c:188
+#: builtin/fetch.c:105 builtin/pull.c:195
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "почистить отслеживаемые внешние ветки, которых уже нет на внешнем репозитории"
 
-#: builtin/fetch.c:111 builtin/pull.c:191
+#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
 msgid "on-demand"
 msgstr "по требованию"
 
-#: builtin/fetch.c:112 builtin/pull.c:192
+#: builtin/fetch.c:107
 msgid "control recursive fetching of submodules"
 msgstr "управление рекурсивным извлечением подмодулей"
 
-#: builtin/fetch.c:116 builtin/pull.c:200
+#: builtin/fetch.c:111 builtin/pull.c:203
 msgid "keep downloaded pack"
 msgstr "оставить загруженный пакет данных"
 
-#: builtin/fetch.c:118
+#: builtin/fetch.c:113
 msgid "allow updating of HEAD ref"
 msgstr "разрешить обновление ссылки HEAD"
 
-#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
+#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
 msgid "deepen history of shallow clone"
 msgstr "улугубить историю частичного клона"
 
-#: builtin/fetch.c:123
+#: builtin/fetch.c:118
 msgid "deepen history of shallow repository based on time"
 msgstr "углубить историю частичного клона основываясь на времени"
 
-#: builtin/fetch.c:129 builtin/pull.c:206
+#: builtin/fetch.c:124 builtin/pull.c:209
 msgid "convert to a complete repository"
 msgstr "преобразовать в полный репозиторий"
 
-#: builtin/fetch.c:131 builtin/log.c:1440
+#: builtin/fetch.c:126 builtin/log.c:1450
 msgid "dir"
 msgstr "каталог"
 
-#: builtin/fetch.c:132
+#: builtin/fetch.c:127
 msgid "prepend this to submodule path output"
 msgstr "присоединять это спереди к выводу путей подмодуля"
 
-#: builtin/fetch.c:135
-msgid "default mode for recursion"
-msgstr "режим по умолчанию для рекурсии"
+#: builtin/fetch.c:130
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr "настроить по умолчанию рекурсивное извлечение подмодулей (более низкий приоритет, чем файлы конфигурации)"
 
-#: builtin/fetch.c:137 builtin/pull.c:209
+#: builtin/fetch.c:134 builtin/pull.c:212
 msgid "accept refs that update .git/shallow"
 msgstr "принимать ссылки, которые обновляют .git/shallow"
 
-#: builtin/fetch.c:138 builtin/pull.c:211
+#: builtin/fetch.c:135 builtin/pull.c:214
 msgid "refmap"
 msgstr "соответствие-ссылок"
 
-#: builtin/fetch.c:139 builtin/pull.c:212
+#: builtin/fetch.c:136 builtin/pull.c:215
 msgid "specify fetch refmap"
 msgstr "указать соответствие ссылок при извлечении"
 
-#: builtin/fetch.c:395
+#: builtin/fetch.c:394
 msgid "Couldn't find remote ref HEAD"
 msgstr "Не удалось найти ссылку HEAD на внешнем репозитории"
 
-#: builtin/fetch.c:513
+#: builtin/fetch.c:512
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "опция fetch.output содержит неправильное значение для %s"
 
-#: builtin/fetch.c:606
+#: builtin/fetch.c:605
 #, c-format
 msgid "object %s not found"
 msgstr "объект %s не найден"
 
-#: builtin/fetch.c:610
+#: builtin/fetch.c:609
 msgid "[up to date]"
 msgstr "[актуально]"
 
-#: builtin/fetch.c:623 builtin/fetch.c:703
+#: builtin/fetch.c:622 builtin/fetch.c:702
 msgid "[rejected]"
 msgstr "[отклонено]"
 
-#: builtin/fetch.c:624
+#: builtin/fetch.c:623
 msgid "can't fetch in current branch"
 msgstr "нельзя извлечь текущую ветку"
 
-#: builtin/fetch.c:633
+#: builtin/fetch.c:632
 msgid "[tag update]"
 msgstr "[обновление метки]"
 
-#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683
-#: builtin/fetch.c:698
+#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
+#: builtin/fetch.c:697
 msgid "unable to update local ref"
 msgstr "не удалось обновить локальную ссылку"
 
-#: builtin/fetch.c:653
+#: builtin/fetch.c:652
 msgid "[new tag]"
 msgstr "[новая метка]"
 
-#: builtin/fetch.c:656
+#: builtin/fetch.c:655
 msgid "[new branch]"
 msgstr "[новая ветка]"
 
-#: builtin/fetch.c:659
+#: builtin/fetch.c:658
 msgid "[new ref]"
 msgstr "[новая ссылка]"
 
-#: builtin/fetch.c:698
+#: builtin/fetch.c:697
 msgid "forced update"
 msgstr "принудительное обновление"
 
-#: builtin/fetch.c:703
+#: builtin/fetch.c:702
 msgid "non-fast-forward"
 msgstr "без перемотки вперед"
 
-#: builtin/fetch.c:748
+#: builtin/fetch.c:747
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s не отправил все необходимые объекты\n"
 
-#: builtin/fetch.c:768
+#: builtin/fetch.c:767
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr "%s отклонено из-за того, что частичные корни не разрешено обновлять"
@@ -7607,7 +7687,7 @@ msgstr "   (%s стала висящей веткой)"
 msgid "[deleted]"
 msgstr "[удалено]"
 
-#: builtin/fetch.c:955 builtin/remote.c:1022
+#: builtin/fetch.c:955 builtin/remote.c:1023
 msgid "(none)"
 msgstr "(нет)"
 
@@ -7636,7 +7716,7 @@ msgstr "Не знаю как извлечь с %s"
 msgid "Fetching %s\n"
 msgstr "Извлечение из %s\n"
 
-#: builtin/fetch.c:1238 builtin/remote.c:96
+#: builtin/fetch.c:1238 builtin/remote.c:97
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Не удалось извлечь %s"
@@ -7667,101 +7747,101 @@ msgstr "нельзя использовать одновременно --depth 
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow не имеет смысла на полном репозитории"
 
-#: builtin/fetch.c:1352
+#: builtin/fetch.c:1349
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all не принимает имя репозитория как аргумент"
 
-#: builtin/fetch.c:1354
+#: builtin/fetch.c:1351
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all не имеет смысла при указании спецификаторов ссылок"
 
-#: builtin/fetch.c:1365
+#: builtin/fetch.c:1362
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "Нет такого внешнего репозитория или группы: %s"
 
-#: builtin/fetch.c:1373
+#: builtin/fetch.c:1370
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "Получение группы и указание спецификаций ссылок не имеет смысла"
 
-#: builtin/fmt-merge-msg.c:14
+#: builtin/fmt-merge-msg.c:15
 msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr "git fmt-merge-msg [-m <сообщение>] [--log[=<n>] | --no-log] [--file <файл>]"
 
-#: builtin/fmt-merge-msg.c:663
+#: builtin/fmt-merge-msg.c:664
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "отправить в журнал <n> записей из короткого журнала"
 
-#: builtin/fmt-merge-msg.c:666
+#: builtin/fmt-merge-msg.c:667
 msgid "alias for --log (deprecated)"
 msgstr "сокращение для --log (устаревшее)"
 
-#: builtin/fmt-merge-msg.c:669
+#: builtin/fmt-merge-msg.c:670
 msgid "text"
 msgstr "текст"
 
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:671
 msgid "use <text> as start of message"
 msgstr "использовать <текст> как начальное сообщение"
 
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
 msgid "file to read from"
 msgstr "файл для чтения"
 
-#: builtin/for-each-ref.c:9
+#: builtin/for-each-ref.c:10
 msgid "git for-each-ref [<options>] [<pattern>]"
 msgstr "git for-each-ref [<опции>] [<шаблон>]"
 
-#: builtin/for-each-ref.c:10
+#: builtin/for-each-ref.c:11
 msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <объект>]"
 
-#: builtin/for-each-ref.c:11
+#: builtin/for-each-ref.c:12
 msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
 msgstr "git for-each-ref [(--merged | --no-merged) [<коммит>]]"
 
-#: builtin/for-each-ref.c:12
+#: builtin/for-each-ref.c:13
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr "git for-each-ref [--contains [<коммит>]] [--no-contains [<коммит>]]"
 
-#: builtin/for-each-ref.c:27
+#: builtin/for-each-ref.c:28
 msgid "quote placeholders suitably for shells"
 msgstr "выводить указатели места заполнения в подходящем формате для командного процессора"
 
-#: builtin/for-each-ref.c:29
+#: builtin/for-each-ref.c:30
 msgid "quote placeholders suitably for perl"
 msgstr "выводить указатели места заполнения в подходящем формате для perl"
 
-#: builtin/for-each-ref.c:31
+#: builtin/for-each-ref.c:32
 msgid "quote placeholders suitably for python"
 msgstr "выводить указатели места заполнения в подходящем формате для python"
 
-#: builtin/for-each-ref.c:33
+#: builtin/for-each-ref.c:34
 msgid "quote placeholders suitably for Tcl"
 msgstr "выводить указатели места заполнения в подходящем формате для Tcl"
 
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
 msgid "show only <n> matched refs"
 msgstr "показать только <n> совпадающих ссылок"
 
-#: builtin/for-each-ref.c:41
+#: builtin/for-each-ref.c:42
 msgid "print only refs which points at the given object"
 msgstr "вывод только ссылок, которые указывают на переданный объект"
 
-#: builtin/for-each-ref.c:43
+#: builtin/for-each-ref.c:44
 msgid "print only refs that are merged"
 msgstr "вывод только слитых ссылок"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 msgid "print only refs that are not merged"
 msgstr "вывод только не слитых ссылок"
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
 msgid "print only refs which contain the commit"
 msgstr "вывод только ссылок, которые содержат коммит"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
 msgid "print only refs which don't contain the commit"
 msgstr "вывод только ссылок, которые не содержат коммит"
 
@@ -7825,21 +7905,21 @@ msgstr "показать подробные имена для недоступн
 msgid "Checking objects"
 msgstr "Проверка объектов"
 
-#: builtin/gc.c:25
+#: builtin/gc.c:26
 msgid "git gc [<options>]"
 msgstr "git gc [<опции>]"
 
-#: builtin/gc.c:78
+#: builtin/gc.c:79
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "Не удалось выполнить fstat %s: %s"
 
-#: builtin/gc.c:310
+#: builtin/gc.c:311
 #, c-format
 msgid "Can't stat %s"
 msgstr "Не удалось выполнить stat для %s"
 
-#: builtin/gc.c:319
+#: builtin/gc.c:320
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -7849,489 +7929,501 @@ msgid ""
 "%s"
 msgstr "Последний запуск gc сообщил следующее. Пожалуйста, исправьте ошибку и удалите %s.\nАвтоматическая очистка репозитория не будет производиться, пока этот файл не удалён.\n\n%s"
 
-#: builtin/gc.c:358
+#: builtin/gc.c:359
 msgid "prune unreferenced objects"
 msgstr "почистить объекты, на которые нет ссылок"
 
-#: builtin/gc.c:360
+#: builtin/gc.c:361
 msgid "be more thorough (increased runtime)"
 msgstr "проверять более внимательно (занимает больше времени)"
 
-#: builtin/gc.c:361
+#: builtin/gc.c:362
 msgid "enable auto-gc mode"
 msgstr "включить режим auto-gc"
 
-#: builtin/gc.c:362
+#: builtin/gc.c:363
 msgid "force running gc even if there may be another gc running"
 msgstr "принудительно запустить gc, даже есть другая копия gc уже запущена"
 
-#: builtin/gc.c:379
+#: builtin/gc.c:380
 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr "Не удалось разобрать значение %s для gc.logexpiry"
 
-#: builtin/gc.c:407
+#: builtin/gc.c:408
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr "Автоматическая упаковка репозитория в фоне, для оптимальной производительности.\n"
 
-#: builtin/gc.c:409
+#: builtin/gc.c:410
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "Автоматическая упаковка репозитория, для оптимальной производительности.\n"
 
-#: builtin/gc.c:410
+#: builtin/gc.c:411
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Смотрите «git help gc» руководства по ручной очистке.\n"
 
-#: builtin/gc.c:431
+#: builtin/gc.c:436
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 msgstr "gc уже запущен на этом компьютере «%s» pid %<PRIuMAX> (если нет, используйте --force)"
 
-#: builtin/gc.c:475
+#: builtin/gc.c:480
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove "
 "them."
 msgstr "Имеется слишком много объектов, на которые нет ссылок; запустите «git prune» для их удаления."
 
-#: builtin/grep.c:25
+#: builtin/grep.c:27
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<опции>] [-e] <шаблон> [<редакция>…] [[--] <путь>…]"
 
-#: builtin/grep.c:232
+#: builtin/grep.c:235
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: сбой создания потока: %s"
 
-#: builtin/grep.c:290
+#: builtin/grep.c:293
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "указано недопустимое количество потоков (%d) для %s"
 
-#: builtin/grep.c:769 builtin/grep.c:810
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#, c-format
+msgid "no threads support, ignoring %s"
+msgstr "нет поддержки потоков, игнорирование %s"
+
+#: builtin/grep.c:788 builtin/grep.c:829
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "не удалось прочитать дерево (%s)"
 
-#: builtin/grep.c:829
+#: builtin/grep.c:848
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "не удалось выполнить grep из объекта типа %s"
 
-#: builtin/grep.c:893
+#: builtin/grep.c:912
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "параметр «%c» ожидает числовое значение"
 
-#: builtin/grep.c:980
+#: builtin/grep.c:999
 msgid "search in index instead of in the work tree"
 msgstr "искать в индексе, а не в рабочем каталоге"
 
-#: builtin/grep.c:982
+#: builtin/grep.c:1001
 msgid "find in contents not managed by git"
 msgstr "искать в содержимом не управляемым git"
 
-#: builtin/grep.c:984
+#: builtin/grep.c:1003
 msgid "search in both tracked and untracked files"
 msgstr "искать и в отслеживаемых, и в неотслеживаемых файлах"
 
-#: builtin/grep.c:986
+#: builtin/grep.c:1005
 msgid "ignore files specified via '.gitignore'"
 msgstr "игнорировать файлы указанные в «.gitignore»"
 
-#: builtin/grep.c:988
+#: builtin/grep.c:1007
 msgid "recursively search in each submodule"
 msgstr "рекурсивный поиск по всем подмодулям"
 
-#: builtin/grep.c:990
+#: builtin/grep.c:1009
 msgid "basename"
 msgstr "базовое имя"
 
-#: builtin/grep.c:991
+#: builtin/grep.c:1010
 msgid "prepend parent project's basename to output"
 msgstr "добавить базовое имя проекта спереди ко всему выводимому"
 
-#: builtin/grep.c:994
+#: builtin/grep.c:1013
 msgid "show non-matching lines"
 msgstr "искать в несовпадающих строках"
 
-#: builtin/grep.c:996
+#: builtin/grep.c:1015
 msgid "case insensitive matching"
 msgstr "без учета регистра"
 
-#: builtin/grep.c:998
+#: builtin/grep.c:1017
 msgid "match patterns only at word boundaries"
 msgstr "искать совпадения шаблона только на границах слов"
 
-#: builtin/grep.c:1000
+#: builtin/grep.c:1019
 msgid "process binary files as text"
 msgstr "обработка двоичных файлов как текста"
 
-#: builtin/grep.c:1002
+#: builtin/grep.c:1021
 msgid "don't match patterns in binary files"
 msgstr "не искать совпадения шаблона в двоичных файлах"
 
-#: builtin/grep.c:1005
+#: builtin/grep.c:1024
 msgid "process binary files with textconv filters"
 msgstr "обрабатываться двоичные файлы с помощью фильтров textconv"
 
-#: builtin/grep.c:1007
+#: builtin/grep.c:1026
 msgid "descend at most <depth> levels"
 msgstr "на глубине максиму <глубина> уровней"
 
-#: builtin/grep.c:1011
+#: builtin/grep.c:1030
 msgid "use extended POSIX regular expressions"
 msgstr "использовать расширенные регулярные выражения POSIX"
 
-#: builtin/grep.c:1014
+#: builtin/grep.c:1033
 msgid "use basic POSIX regular expressions (default)"
 msgstr "использовать базовые регулярные выражения POSIX (по умолчанию)"
 
-#: builtin/grep.c:1017
+#: builtin/grep.c:1036
 msgid "interpret patterns as fixed strings"
 msgstr "интерпретировать шаблоны как фиксированные строки"
 
-#: builtin/grep.c:1020
+#: builtin/grep.c:1039
 msgid "use Perl-compatible regular expressions"
 msgstr "использовать Perl-совместимые регулярные выражения"
 
-#: builtin/grep.c:1023
+#: builtin/grep.c:1042
 msgid "show line numbers"
 msgstr "вывести номера строк"
 
-#: builtin/grep.c:1024
+#: builtin/grep.c:1043
 msgid "don't show filenames"
 msgstr "не выводить имена файлов"
 
-#: builtin/grep.c:1025
+#: builtin/grep.c:1044
 msgid "show filenames"
 msgstr "выводить имена файлов"
 
-#: builtin/grep.c:1027
+#: builtin/grep.c:1046
 msgid "show filenames relative to top directory"
 msgstr "выводить имена файлов относительно каталога репозитория"
 
-#: builtin/grep.c:1029
+#: builtin/grep.c:1048
 msgid "show only filenames instead of matching lines"
 msgstr "выводить только имена файлов, а не совпадающие строки"
 
-#: builtin/grep.c:1031
+#: builtin/grep.c:1050
 msgid "synonym for --files-with-matches"
 msgstr "синоним для --files-with-matches"
 
-#: builtin/grep.c:1034
+#: builtin/grep.c:1053
 msgid "show only the names of files without match"
 msgstr "выводить только несовпадающие имена файлов"
 
-#: builtin/grep.c:1036
+#: builtin/grep.c:1055
 msgid "print NUL after filenames"
 msgstr "выводить двоичный НОЛЬ после списка имен файлов"
 
-#: builtin/grep.c:1038
+#: builtin/grep.c:1057
 msgid "show the number of matches instead of matching lines"
 msgstr "выводить количество совпадений, а не совпадающие строки"
 
-#: builtin/grep.c:1039
+#: builtin/grep.c:1058
 msgid "highlight matches"
 msgstr "подсвечивать совпадения"
 
-#: builtin/grep.c:1041
+#: builtin/grep.c:1060
 msgid "print empty line between matches from different files"
 msgstr "выводить пустую строку после совпадений из разных файлов"
 
-#: builtin/grep.c:1043
+#: builtin/grep.c:1062
 msgid "show filename only once above matches from same file"
 msgstr "выводить имя файла только раз на несколько совпадений в одном файле"
 
-#: builtin/grep.c:1046
+#: builtin/grep.c:1065
 msgid "show <n> context lines before and after matches"
 msgstr "показать <n> строк контекста перед и после совпадения"
 
-#: builtin/grep.c:1049
+#: builtin/grep.c:1068
 msgid "show <n> context lines before matches"
 msgstr "показать <n> строк контекста перед совпадением"
 
-#: builtin/grep.c:1051
+#: builtin/grep.c:1070
 msgid "show <n> context lines after matches"
 msgstr "показать <n> строк контекста после совпадения"
 
-#: builtin/grep.c:1053
+#: builtin/grep.c:1072
 msgid "use <n> worker threads"
 msgstr "использовать <кол> рабочих потоков"
 
-#: builtin/grep.c:1054
+#: builtin/grep.c:1073
 msgid "shortcut for -C NUM"
 msgstr "тоже, что и -C КОЛИЧЕСТВО"
 
-#: builtin/grep.c:1057
+#: builtin/grep.c:1076
 msgid "show a line with the function name before matches"
 msgstr "показать строку с именем функции перед совпадением"
 
-#: builtin/grep.c:1059
+#: builtin/grep.c:1078
 msgid "show the surrounding function"
 msgstr "показать окружающую функцию"
 
-#: builtin/grep.c:1062
+#: builtin/grep.c:1081
 msgid "read patterns from file"
 msgstr "прочитать шаблоны из файла"
 
-#: builtin/grep.c:1064
+#: builtin/grep.c:1083
 msgid "match <pattern>"
 msgstr "поиск соответствий с <шаблоном>"
 
-#: builtin/grep.c:1066
+#: builtin/grep.c:1085
 msgid "combine patterns specified with -e"
 msgstr "объединить шаблоны указанные с помощью -e"
 
-#: builtin/grep.c:1078
+#: builtin/grep.c:1097
 msgid "indicate hit with exit status without output"
 msgstr "ничего не выводить, указать на совпадение с помощью кода выхода"
 
-#: builtin/grep.c:1080
+#: builtin/grep.c:1099
 msgid "show only matches from files that match all patterns"
 msgstr "показать только совпадения из файлов в которых совпадают все шаблоны"
 
-#: builtin/grep.c:1082
+#: builtin/grep.c:1101
 msgid "show parse tree for grep expression"
 msgstr "показать дерево разбора для выражения поиска"
 
-#: builtin/grep.c:1086
+#: builtin/grep.c:1105
 msgid "pager"
 msgstr "пейджер"
 
-#: builtin/grep.c:1086
+#: builtin/grep.c:1105
 msgid "show matching files in the pager"
 msgstr "показать совпадающие файлы с помощью программы-пейджера"
 
-#: builtin/grep.c:1089
+#: builtin/grep.c:1108
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "разрешить вызов grep(1) (игнорируется в этой сборке)"
 
-#: builtin/grep.c:1153
+#: builtin/grep.c:1172
 msgid "no pattern given."
 msgstr "не задан шаблон."
 
-#: builtin/grep.c:1189
+#: builtin/grep.c:1204
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index или --untracked нельзя использовать одновременно с указанием ревизии"
 
-#: builtin/grep.c:1195
+#: builtin/grep.c:1211
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "не удалось определить редакцию: %s"
 
-#: builtin/grep.c:1228 builtin/index-pack.c:1485
+#: builtin/grep.c:1245 builtin/index-pack.c:1490
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "указано неправильное количество потоков (%d)"
 
-#: builtin/grep.c:1251
+#: builtin/grep.c:1250
+msgid "no threads support, ignoring --threads"
+msgstr "нет поддержки потоков, игнорирование --threads"
+
+#: builtin/grep.c:1281
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager работает только в рабочем каталоге"
 
-#: builtin/grep.c:1274
+#: builtin/grep.c:1304
 msgid "option not supported with --recurse-submodules."
 msgstr "опция не поддерживается одновременно с --recurse-submodules."
 
-#: builtin/grep.c:1280
+#: builtin/grep.c:1310
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr "--cached или --untracked нельзя использовать одновременно с --no-index."
 
-#: builtin/grep.c:1286
+#: builtin/grep.c:1316
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr "--[no-]exclude-standard не может использоваться для отслеживаемого содержимого."
 
-#: builtin/grep.c:1294
+#: builtin/grep.c:1324
 msgid "both --cached and trees are given."
 msgstr "указано одновременно --cached и дерево."
 
-#: builtin/hash-object.c:81
+#: builtin/hash-object.c:82
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
 msgstr "git hash-object [-t <тип>] [-w] [--path=<файл> | --no-filters] [--stdin] [--] <файл>…"
 
-#: builtin/hash-object.c:82
+#: builtin/hash-object.c:83
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
 msgid "type"
 msgstr "тип"
 
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
 msgid "object type"
 msgstr "тип объекта"
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "write the object into the object database"
 msgstr "запись объекта в базу данных объектов"
 
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98
 msgid "read the object from stdin"
 msgstr "прочитать объект из стандартного ввода"
 
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:100
 msgid "store file as is without filters"
 msgstr "сохранить файл без использования фильтров"
 
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr "хэшировать любой мусор и создавать поврежденные объекты для отладки Git"
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:102
 msgid "process file as it were from this path"
 msgstr "обработать файл так, будто он находится по указанному пути"
 
-#: builtin/help.c:42
+#: builtin/help.c:43
 msgid "print all available commands"
 msgstr "вывести список всех доступных команд"
 
-#: builtin/help.c:43
+#: builtin/help.c:44
 msgid "exclude guides"
 msgstr "исключить руководства"
 
-#: builtin/help.c:44
+#: builtin/help.c:45
 msgid "print list of useful guides"
 msgstr "вывести список полезных руководств"
 
-#: builtin/help.c:45
+#: builtin/help.c:46
 msgid "show man page"
 msgstr "открыть руководство в формате man"
 
-#: builtin/help.c:46
+#: builtin/help.c:47
 msgid "show manual in web browser"
 msgstr "открыть руководство в веб-браузере"
 
-#: builtin/help.c:48
+#: builtin/help.c:49
 msgid "show info page"
 msgstr "открыть руководство в формате info"
 
-#: builtin/help.c:54
+#: builtin/help.c:55
 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
 msgstr "git help [--all] [--guides] [--man | --web | --info] [<команда>]"
 
-#: builtin/help.c:66
+#: builtin/help.c:67
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "неопознанный формат руководства «%s»"
 
-#: builtin/help.c:93
+#: builtin/help.c:94
 msgid "Failed to start emacsclient."
 msgstr "Сбой при запуске emacsclient."
 
-#: builtin/help.c:106
+#: builtin/help.c:107
 msgid "Failed to parse emacsclient version."
 msgstr "Сбой при определении версии emacsclient."
 
-#: builtin/help.c:114
+#: builtin/help.c:115
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "версия emacsclient «%d» слишком старая (< 22)."
 
-#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
+#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "сбой при запуске «%s»"
 
-#: builtin/help.c:207
+#: builtin/help.c:208
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
 "Please consider using 'man.<tool>.cmd' instead."
 msgstr "«%s»: путь для неподдерживаемой программы просмотра man.\nВместо этого используйте «man.<программа>.cmd»."
 
-#: builtin/help.c:219
+#: builtin/help.c:220
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
 "Please consider using 'man.<tool>.path' instead."
 msgstr "«%s»: команда для неподдерживаемой программы просмотра man.\nВместо этого используйте «man.<программа>.path»."
 
-#: builtin/help.c:336
+#: builtin/help.c:337
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "«%s»: неизвестная программа просмотра man."
 
-#: builtin/help.c:353
+#: builtin/help.c:354
 msgid "no man viewer handled the request"
 msgstr "программа просмотра man не обработала запрос"
 
-#: builtin/help.c:361
+#: builtin/help.c:362
 msgid "no info viewer handled the request"
 msgstr "программа просмотра info не обработала запрос"
 
-#: builtin/help.c:403
+#: builtin/help.c:404
 msgid "Defining attributes per path"
 msgstr "Определение атрибутов для путей файлов или каталогов"
 
-#: builtin/help.c:404
+#: builtin/help.c:405
 msgid "Everyday Git With 20 Commands Or So"
 msgstr "Повседневный Git с 20 командами или около того"
 
-#: builtin/help.c:405
+#: builtin/help.c:406
 msgid "A Git glossary"
 msgstr "Глоссарий Git"
 
-#: builtin/help.c:406
+#: builtin/help.c:407
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Указание специально игнорируемых файлов"
 
-#: builtin/help.c:407
+#: builtin/help.c:408
 msgid "Defining submodule properties"
 msgstr "Определение свойств подмодулей"
 
-#: builtin/help.c:408
+#: builtin/help.c:409
 msgid "Specifying revisions and ranges for Git"
 msgstr "Указание редакций и диапазонов для Git"
 
-#: builtin/help.c:409
+#: builtin/help.c:410
 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
 msgstr "Учебное введение в Git (для версии 1.5.1 или новее)"
 
-#: builtin/help.c:410
+#: builtin/help.c:411
 msgid "An overview of recommended workflows with Git"
 msgstr "Обзор рекомендуемых последовательностей выполняемых действий с Git"
 
-#: builtin/help.c:422
+#: builtin/help.c:423
 msgid "The common Git guides are:\n"
 msgstr "Основные руководства Git:\n"
 
-#: builtin/help.c:440
+#: builtin/help.c:441
 #, c-format
 msgid "`git %s' is aliased to `%s'"
 msgstr "«git %s» — это сокращение для «%s»"
 
-#: builtin/help.c:462 builtin/help.c:479
+#: builtin/help.c:463 builtin/help.c:480
 #, c-format
 msgid "usage: %s%s"
 msgstr "использование: %s%s"
 
-#: builtin/index-pack.c:154
+#: builtin/index-pack.c:155
 #, c-format
 msgid "unable to open %s"
 msgstr "не удалось открыть %s"
 
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "несоответствие типа объекта на %s"
 
-#: builtin/index-pack.c:224
+#: builtin/index-pack.c:225
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "ожидаемый объект не получен на %s"
 
-#: builtin/index-pack.c:227
+#: builtin/index-pack.c:228
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "объект %s: ожидаемый тип %s, получен %s"
 
-#: builtin/index-pack.c:269
+#: builtin/index-pack.c:270
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
@@ -8340,46 +8432,46 @@ msgstr[1] "не удалось заполнить %d байта"
 msgstr[2] "не удалось заполнить %d байтов"
 msgstr[3] "не удалось заполнить %d байтов"
 
-#: builtin/index-pack.c:279
+#: builtin/index-pack.c:280
 msgid "early EOF"
 msgstr "неожиданный конец файла"
 
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
 msgid "read error on input"
 msgstr "ошибка чтения ввода"
 
-#: builtin/index-pack.c:292
+#: builtin/index-pack.c:293
 msgid "used more bytes than were available"
 msgstr "использовано больше байт, чем было доступно"
 
-#: builtin/index-pack.c:299
+#: builtin/index-pack.c:300
 msgid "pack too large for current definition of off_t"
 msgstr "пакет слишком большой для текущего определения off_t"
 
-#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
+#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
 msgid "pack exceeds maximum allowed size"
 msgstr "размер пакета превышает максимальный допустимый"
 
-#: builtin/index-pack.c:317
+#: builtin/index-pack.c:318
 #, c-format
 msgid "unable to create '%s'"
 msgstr "не удалось создать «%s»"
 
-#: builtin/index-pack.c:323
+#: builtin/index-pack.c:324
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "не удалось открыть файл пакета «%s»"
 
-#: builtin/index-pack.c:337
+#: builtin/index-pack.c:338
 msgid "pack signature mismatch"
 msgstr "несоответствие подписи пакета"
 
-#: builtin/index-pack.c:339
+#: builtin/index-pack.c:340
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "версия пакета %<PRIu32> не поддерживается"
 
-#: builtin/index-pack.c:357
+#: builtin/index-pack.c:358
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "пакет содержит плохой объект по смещению %<PRIuMAX>: %s"
@@ -8419,14 +8511,14 @@ msgstr[3] "преждевременное окончание файла паке
 msgid "serious inflate inconsistency"
 msgstr "серьезное несоответствие при распаковке"
 
-#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
 #: builtin/index-pack.c:816 builtin/index-pack.c:825
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "НАЙДЕНА КОЛЛИЗИЯ SHA1 С %s !"
 
-#: builtin/index-pack.c:752 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:257
+#: builtin/index-pack.c:751 builtin/pack-objects.c:167
+#: builtin/pack-objects.c:261
 #, c-format
 msgid "unable to read %s"
 msgstr "не удалось прочитать %s"
@@ -8446,62 +8538,62 @@ msgstr "не удалось прочитать существующий объе
 msgid "invalid blob object %s"
 msgstr "неправильный файл двоичного объекта %s"
 
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:851
 #, c-format
 msgid "invalid %s"
 msgstr "неправильный %s"
 
-#: builtin/index-pack.c:853
+#: builtin/index-pack.c:854
 msgid "Error in object"
 msgstr "Ошибка в объекте"
 
-#: builtin/index-pack.c:855
+#: builtin/index-pack.c:856
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Не все дочерние объекты %s достижимы"
 
-#: builtin/index-pack.c:927 builtin/index-pack.c:958
+#: builtin/index-pack.c:928 builtin/index-pack.c:959
 msgid "failed to apply delta"
 msgstr "сбой при применении дельты"
 
-#: builtin/index-pack.c:1128
+#: builtin/index-pack.c:1130
 msgid "Receiving objects"
 msgstr "Получение объектов"
 
-#: builtin/index-pack.c:1128
+#: builtin/index-pack.c:1130
 msgid "Indexing objects"
 msgstr "Индексирование объектов"
 
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1164
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "пакет поврежден (несоответствие SHA1)"
 
-#: builtin/index-pack.c:1165
+#: builtin/index-pack.c:1169
 msgid "cannot fstat packfile"
 msgstr "не удалось выполнить fstat для файла пакета"
 
-#: builtin/index-pack.c:1168
+#: builtin/index-pack.c:1172
 msgid "pack has junk at the end"
 msgstr "файл пакета содержит мусор в конце"
 
-#: builtin/index-pack.c:1179
+#: builtin/index-pack.c:1184
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "безумная путаница в parse_pack_objects()"
 
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1207
 msgid "Resolving deltas"
 msgstr "Определение изменений"
 
-#: builtin/index-pack.c:1213
+#: builtin/index-pack.c:1218
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "не удалось создать поток: %s"
 
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1260
 msgid "confusion beyond insanity"
 msgstr "безумная путаница"
 
-#: builtin/index-pack.c:1261
+#: builtin/index-pack.c:1266
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
@@ -8510,12 +8602,12 @@ msgstr[1] "завершено с %d локальными объектами"
 msgstr[2] "завершено с %d локальными объектами"
 msgstr[3] "завершено с %d локальными объектами"
 
-#: builtin/index-pack.c:1273
+#: builtin/index-pack.c:1278
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Неожиданная контрольная сумма в конце %s (диск поврежден?)"
 
-#: builtin/index-pack.c:1277
+#: builtin/index-pack.c:1282
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
@@ -8524,59 +8616,54 @@ msgstr[1] "пакет содержит %d неразрешенные дельт
 msgstr[2] "пакет содержит %d неразрешенных дельт"
 msgstr[3] "пакет содержит %d неразрешенных дельт"
 
-#: builtin/index-pack.c:1301
+#: builtin/index-pack.c:1306
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "нельзя сжать присоединенный объект (%d)"
 
-#: builtin/index-pack.c:1377
+#: builtin/index-pack.c:1382
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "локальный объект %s поврежден"
 
-#: builtin/index-pack.c:1403
+#: builtin/index-pack.c:1408
 msgid "error while closing pack file"
 msgstr "ошибка при закрытии файла пакета"
 
-#: builtin/index-pack.c:1415
+#: builtin/index-pack.c:1420
 #, c-format
 msgid "cannot write keep file '%s'"
 msgstr "не удалось записать файл удержания «%s»"
 
-#: builtin/index-pack.c:1423
+#: builtin/index-pack.c:1428
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr "не удалось закрыть записанный файл удержания «%s»"
 
-#: builtin/index-pack.c:1433
+#: builtin/index-pack.c:1438
 msgid "cannot store pack file"
 msgstr "не удалось сохранить файл пакета"
 
-#: builtin/index-pack.c:1441
+#: builtin/index-pack.c:1446
 msgid "cannot store index file"
 msgstr "не удалось сохранить файл индекса"
 
-#: builtin/index-pack.c:1479
+#: builtin/index-pack.c:1484
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "плохой pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1489 builtin/index-pack.c:1686
-#, c-format
-msgid "no threads support, ignoring %s"
-msgstr "нет поддержки потоков, игнорирование %s"
-
-#: builtin/index-pack.c:1547
+#: builtin/index-pack.c:1552
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Не удалось открыть существующий файл пакета «%s»"
 
-#: builtin/index-pack.c:1549
+#: builtin/index-pack.c:1554
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Не удалось открыть существующий файл индекса для «%s»"
 
-#: builtin/index-pack.c:1596
+#: builtin/index-pack.c:1602
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
@@ -8585,7 +8672,7 @@ msgstr[1] "не дельты: %d объекта"
 msgstr[2] "не дельты: %d объектов"
 msgstr[3] "не дельты: %d объектов"
 
-#: builtin/index-pack.c:1603
+#: builtin/index-pack.c:1609
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
@@ -8594,141 +8681,141 @@ msgstr[1] "длина цепочки = %d: %lu объекта"
 msgstr[2] "длина цепочки = %d: %lu объектов"
 msgstr[3] "длина цепочки = %d: %lu объектов"
 
-#: builtin/index-pack.c:1616
+#: builtin/index-pack.c:1622
 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr "имя пакета «%s» не оканчивается на «.pack»"
 
-#: builtin/index-pack.c:1698 builtin/index-pack.c:1701
-#: builtin/index-pack.c:1717 builtin/index-pack.c:1721
+#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
+#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
 #, c-format
 msgid "bad %s"
 msgstr "плохой %s"
 
-#: builtin/index-pack.c:1737
+#: builtin/index-pack.c:1743
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin нельзя использовать без --stdin"
 
-#: builtin/index-pack.c:1739
+#: builtin/index-pack.c:1745
 msgid "--stdin requires a git repository"
 msgstr "опция --stdin требует наличия репозитория git"
 
-#: builtin/index-pack.c:1747
+#: builtin/index-pack.c:1753
 msgid "--verify with no packfile name given"
 msgstr "--verify без указания имени файла пакета"
 
-#: builtin/init-db.c:54
+#: builtin/init-db.c:55
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "не удалось выполнить stat для «%s»"
 
-#: builtin/init-db.c:60
+#: builtin/init-db.c:61
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "не удалось выполнить stat для шаблона «%s»"
 
-#: builtin/init-db.c:65
+#: builtin/init-db.c:66
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "не удалось выполнить opendir для «%s»"
 
-#: builtin/init-db.c:76
+#: builtin/init-db.c:77
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "не удалось выполнить readlink для «%s»"
 
-#: builtin/init-db.c:78
+#: builtin/init-db.c:79
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "не удалось создать символьную ссылку «%s» на «%s»"
 
-#: builtin/init-db.c:84
+#: builtin/init-db.c:85
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "не удалось скопировать файл «%s» в «%s»"
 
-#: builtin/init-db.c:88
+#: builtin/init-db.c:89
 #, c-format
 msgid "ignoring template %s"
 msgstr "игнорирование шаблона %s"
 
-#: builtin/init-db.c:119
+#: builtin/init-db.c:120
 #, c-format
 msgid "templates not found %s"
 msgstr "шаблоны не найдены %s"
 
-#: builtin/init-db.c:134
+#: builtin/init-db.c:135
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "не копирую шаблоны из «%s»: %s"
 
-#: builtin/init-db.c:327
+#: builtin/init-db.c:328
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "не удается обработать файл типа %d"
 
-#: builtin/init-db.c:330
+#: builtin/init-db.c:331
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "не удается переместить файл %s в %s"
 
-#: builtin/init-db.c:347 builtin/init-db.c:350
+#: builtin/init-db.c:348 builtin/init-db.c:351
 #, c-format
 msgid "%s already exists"
 msgstr "%s уже существует"
 
-#: builtin/init-db.c:403
+#: builtin/init-db.c:404
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "Переинициализирован существующий общий репозиторий Git в %s%s\n"
 
-#: builtin/init-db.c:404
+#: builtin/init-db.c:405
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "Переинициализирован существующий репозиторий Git в %s%s\n"
 
-#: builtin/init-db.c:408
+#: builtin/init-db.c:409
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "Инициализирован пустой общий репозиторий Git в %s%s\n"
 
-#: builtin/init-db.c:409
+#: builtin/init-db.c:410
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "Инициализирован пустой репозиторий Git в %s%s\n"
 
-#: builtin/init-db.c:457
+#: builtin/init-db.c:458
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] "
 "[--shared[=<permissions>]] [<directory>]"
 msgstr "git init [-q | --quiet] [--bare] [--template=<каталог-шаблонов>] [--shared[=<права-доступа>]] [<каталог>]"
 
-#: builtin/init-db.c:480
+#: builtin/init-db.c:481
 msgid "permissions"
 msgstr "права-доступа"
 
-#: builtin/init-db.c:481
+#: builtin/init-db.c:482
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "укажите, если репозиторий git будет использоваться несколькими пользователями"
 
-#: builtin/init-db.c:515 builtin/init-db.c:520
+#: builtin/init-db.c:516 builtin/init-db.c:521
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "не удалось выполнить mkdir %s"
 
-#: builtin/init-db.c:524
+#: builtin/init-db.c:525
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "не удалось выполнить chdir в %s"
 
-#: builtin/init-db.c:545
+#: builtin/init-db.c:546
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
 "dir=<directory>)"
 msgstr "%s (или --work-tree=<каталог>) нельзя использовать без указания %s (или --git-dir=<каталог>)"
 
-#: builtin/init-db.c:573
+#: builtin/init-db.c:574
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Не удалось получить доступ к рабочему каталогу «%s»"
@@ -8759,325 +8846,330 @@ msgstr "завершители для добавления"
 msgid "no input file given for in-place editing"
 msgstr "ничего не передано, для редактирования файлов на месте"
 
-#: builtin/log.c:44
+#: builtin/log.c:45
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<опции>] [<диапазон-редакций>] [[--] <путь>…]"
 
-#: builtin/log.c:45
+#: builtin/log.c:46
 msgid "git show [<options>] <object>..."
 msgstr "git show [<опции>] <объект>…"
 
-#: builtin/log.c:89
+#: builtin/log.c:90
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "неправильный параметр для --decorate: %s"
 
-#: builtin/log.c:144
+#: builtin/log.c:147
 msgid "suppress diff output"
 msgstr "не выводить различия"
 
-#: builtin/log.c:145
+#: builtin/log.c:148
 msgid "show source"
 msgstr "показать источник"
 
-#: builtin/log.c:146
+#: builtin/log.c:149
 msgid "Use mail map file"
 msgstr "Использовать файл соответствия почтовых адресов"
 
-#: builtin/log.c:147
+#: builtin/log.c:150
 msgid "decorate options"
 msgstr "опции формата вывода ссылок"
 
-#: builtin/log.c:150
+#: builtin/log.c:153
 msgid "Process line range n,m in file, counting from 1"
 msgstr "Обработать диапазон строк n,m из файла, начиная с 1"
 
-#: builtin/log.c:246
+#: builtin/log.c:249
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Финальный вывод: %d %s\n"
 
-#: builtin/log.c:493
+#: builtin/log.c:497
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: плохой файл"
 
-#: builtin/log.c:507 builtin/log.c:601
+#: builtin/log.c:512 builtin/log.c:606
 #, c-format
 msgid "Could not read object %s"
 msgstr "Не удалось прочитать объект %s"
 
-#: builtin/log.c:625
+#: builtin/log.c:630
 #, c-format
 msgid "Unknown type: %d"
 msgstr "Неизвестный тип объекта: %d"
 
-#: builtin/log.c:746
+#: builtin/log.c:751
 msgid "format.headers without value"
 msgstr "в format.headers не указано значение"
 
-#: builtin/log.c:846
+#: builtin/log.c:852
 msgid "name of output directory is too long"
 msgstr "слишком длинное имя выходного каталога"
 
-#: builtin/log.c:861
+#: builtin/log.c:868
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "Ну удалось открыть файл изменений %s"
 
-#: builtin/log.c:875
+#: builtin/log.c:885
 msgid "Need exactly one range."
 msgstr "Нужен только один диапазон."
 
-#: builtin/log.c:885
+#: builtin/log.c:895
 msgid "Not a range."
 msgstr "Не является диапазоном."
 
-#: builtin/log.c:991
+#: builtin/log.c:1001
 msgid "Cover letter needs email format"
 msgstr "Сопроводительное письмо должно быть в формате электронной почты"
 
-#: builtin/log.c:1071
+#: builtin/log.c:1081
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "ошибка в поле in-reply-to: %s"
 
-#: builtin/log.c:1098
+#: builtin/log.c:1108
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<опции>] [<начиная-с> | <диапазон-редакций>]"
 
-#: builtin/log.c:1148
+#: builtin/log.c:1158
 msgid "Two output directories?"
 msgstr "Два выходных каталога?"
 
-#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912
+#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
 #, c-format
 msgid "Unknown commit %s"
 msgstr "Неизвестный коммит %s"
 
-#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532
+#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Не удалось разрешить «%s» как ссылку."
 
-#: builtin/log.c:1270
+#: builtin/log.c:1280
 msgid "Could not find exact merge base."
 msgstr "Не удалось найти точную базу слияния."
 
-#: builtin/log.c:1274
+#: builtin/log.c:1284
 msgid ""
 "Failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
 "Or you could specify base commit by --base=<base-commit-id> manually."
 msgstr "Не удалось получить вышестоящую ветку. Если вы хотите записать базовый коммит автомитически, то используйте git branch --set-upstream-to для отслеживания внешней ветки.\nИли же вы можете указать базовый коммит указанием --base=<идентификатор-базового-коммита> вручную."
 
-#: builtin/log.c:1294
+#: builtin/log.c:1304
 msgid "Failed to find exact merge base"
 msgstr "Не удалось найти точную базу слияния"
 
-#: builtin/log.c:1305
+#: builtin/log.c:1315
 msgid "base commit should be the ancestor of revision list"
 msgstr "базовый коммит должен быть предком списка редакций"
 
-#: builtin/log.c:1309
+#: builtin/log.c:1319
 msgid "base commit shouldn't be in revision list"
 msgstr "базовый коммит не должен быть в списке редакций"
 
-#: builtin/log.c:1358
+#: builtin/log.c:1368
 msgid "cannot get patch id"
 msgstr "не удалось получить идентификатор патча"
 
-#: builtin/log.c:1415
+#: builtin/log.c:1425
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "выводить [PATCH n/m] даже когда один патч"
 
-#: builtin/log.c:1418
+#: builtin/log.c:1428
 msgid "use [PATCH] even with multiple patches"
 msgstr "выводить [PATCH] даже когда несколько патчей"
 
-#: builtin/log.c:1422
+#: builtin/log.c:1432
 msgid "print patches to standard out"
 msgstr "выводить патчи на стандартный вывод"
 
-#: builtin/log.c:1424
+#: builtin/log.c:1434
 msgid "generate a cover letter"
 msgstr "генерировать сопроводительное письмо"
 
-#: builtin/log.c:1426
+#: builtin/log.c:1436
 msgid "use simple number sequence for output file names"
 msgstr "использовать простую последовательность чисел для имен выходных файлов"
 
-#: builtin/log.c:1427
+#: builtin/log.c:1437
 msgid "sfx"
 msgstr "суффикс"
 
-#: builtin/log.c:1428
+#: builtin/log.c:1438
 msgid "use <sfx> instead of '.patch'"
 msgstr "использовать суффикс <суффикс> вместо «.patch»"
 
-#: builtin/log.c:1430
+#: builtin/log.c:1440
 msgid "start numbering patches at <n> instead of 1"
 msgstr "начать нумерацию патчей с <n>, а не с 1"
 
-#: builtin/log.c:1432
+#: builtin/log.c:1442
 msgid "mark the series as Nth re-roll"
 msgstr "пометить серию как энную попытку"
 
-#: builtin/log.c:1434
+#: builtin/log.c:1444
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "Использовать [RFC PATCH] вместо [PATCH]"
 
-#: builtin/log.c:1437
+#: builtin/log.c:1447
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "Использовать [<префикс>] вместо [PATCH]"
 
-#: builtin/log.c:1440
+#: builtin/log.c:1450
 msgid "store resulting files in <dir>"
 msgstr "сохранить результирующие файлы в <каталог>"
 
-#: builtin/log.c:1443
+#: builtin/log.c:1453
 msgid "don't strip/add [PATCH]"
 msgstr "не обрезать/добавлять [PATCH]"
 
-#: builtin/log.c:1446
+#: builtin/log.c:1456
 msgid "don't output binary diffs"
 msgstr "не выводить двоичные различия"
 
-#: builtin/log.c:1448
+#: builtin/log.c:1458
 msgid "output all-zero hash in From header"
 msgstr "выводить нулевую хэш-сумму в заголовке From"
 
-#: builtin/log.c:1450
+#: builtin/log.c:1460
 msgid "don't include a patch matching a commit upstream"
 msgstr "не включать патч, если коммит уже есть в вышестоящей ветке"
 
-#: builtin/log.c:1452
+#: builtin/log.c:1462
 msgid "show patch format instead of default (patch + stat)"
 msgstr "выводить в формате патча, а не в стандартном (патч + статистика)"
 
-#: builtin/log.c:1454
+#: builtin/log.c:1464
 msgid "Messaging"
 msgstr "Передача сообщений"
 
-#: builtin/log.c:1455
+#: builtin/log.c:1465
 msgid "header"
 msgstr "заголовок"
 
-#: builtin/log.c:1456
+#: builtin/log.c:1466
 msgid "add email header"
 msgstr "добавить заголовок сообщения"
 
-#: builtin/log.c:1457 builtin/log.c:1459
+#: builtin/log.c:1467 builtin/log.c:1469
 msgid "email"
 msgstr "почта"
 
-#: builtin/log.c:1457
+#: builtin/log.c:1467
 msgid "add To: header"
 msgstr "добавить заголовок To:"
 
-#: builtin/log.c:1459
+#: builtin/log.c:1469
 msgid "add Cc: header"
 msgstr "добавить заголовок Cc:"
 
-#: builtin/log.c:1461
+#: builtin/log.c:1471
 msgid "ident"
 msgstr "идентификатор"
 
-#: builtin/log.c:1462
+#: builtin/log.c:1472
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr "установить адрес отправителя на <идентификатор> (или на идентификатор коммитера, если отсутствует)"
 
-#: builtin/log.c:1464
+#: builtin/log.c:1474
 msgid "message-id"
 msgstr "идентификатор-сообщения"
 
-#: builtin/log.c:1465
+#: builtin/log.c:1475
 msgid "make first mail a reply to <message-id>"
 msgstr "сделать первое письмо ответом на <идентификатор-сообщения>"
 
-#: builtin/log.c:1466 builtin/log.c:1469
+#: builtin/log.c:1476 builtin/log.c:1479
 msgid "boundary"
 msgstr "вложение"
 
-#: builtin/log.c:1467
+#: builtin/log.c:1477
 msgid "attach the patch"
 msgstr "приложить патч"
 
-#: builtin/log.c:1470
+#: builtin/log.c:1480
 msgid "inline the patch"
 msgstr "включить патч в текст письма"
 
-#: builtin/log.c:1474
+#: builtin/log.c:1484
 msgid "enable message threading, styles: shallow, deep"
 msgstr "включить в письмах иерархичность, стили: shallow (частичную), deep (глубокую)"
 
-#: builtin/log.c:1476
+#: builtin/log.c:1486
 msgid "signature"
 msgstr "подпись"
 
-#: builtin/log.c:1477
+#: builtin/log.c:1487
 msgid "add a signature"
 msgstr "добавить подпись"
 
-#: builtin/log.c:1478
+#: builtin/log.c:1488
 msgid "base-commit"
 msgstr "базовый коммит"
 
-#: builtin/log.c:1479
+#: builtin/log.c:1489
 msgid "add prerequisite tree info to the patch series"
 msgstr "добавить информацию о требовании дерева к серии патчей"
 
-#: builtin/log.c:1481
+#: builtin/log.c:1491
 msgid "add a signature from a file"
 msgstr "добавить подпись из файла"
 
-#: builtin/log.c:1482
+#: builtin/log.c:1492
 msgid "don't print the patch filenames"
 msgstr "не выводить имена файлов патчей"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1567
+#, c-format
+msgid "invalid ident line: %s"
+msgstr "неправильная строка идентификации: %s"
+
+#: builtin/log.c:1582
 msgid "-n and -k are mutually exclusive."
 msgstr "-n и -k нельзя использовать одновременно"
 
-#: builtin/log.c:1574
+#: builtin/log.c:1584
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr "--subject-prefix/--rfc и -k нельзя использовать одновременно."
 
-#: builtin/log.c:1582
+#: builtin/log.c:1592
 msgid "--name-only does not make sense"
 msgstr "--name-only не имеет смысла"
 
-#: builtin/log.c:1584
+#: builtin/log.c:1594
 msgid "--name-status does not make sense"
 msgstr "--name-status не имеет смысла"
 
-#: builtin/log.c:1586
+#: builtin/log.c:1596
 msgid "--check does not make sense"
 msgstr "--check не имеет смысла"
 
-#: builtin/log.c:1616
+#: builtin/log.c:1626
 msgid "standard output, or directory, which one?"
 msgstr "стандартный вывод или каталог?"
 
-#: builtin/log.c:1618
+#: builtin/log.c:1628
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "Не удалось создать каталог «%s»"
 
-#: builtin/log.c:1712
+#: builtin/log.c:1722
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "не удалось прочитать файл подписи «%s»"
 
-#: builtin/log.c:1784
+#: builtin/log.c:1794
 msgid "Failed to create output files"
 msgstr "Сбой при создании выходных файлов"
 
-#: builtin/log.c:1833
+#: builtin/log.c:1843
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<вышестоящая-ветка> [<голова> [<ограничение>]]]"
 
-#: builtin/log.c:1887
+#: builtin/log.c:1897
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> "
@@ -9227,212 +9319,217 @@ msgstr "выходить с кодом 2, если соответствующи
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "показать также внутреннюю ссылку в дополнение к объекту, на который она указывает"
 
-#: builtin/ls-tree.c:28
+#: builtin/ls-tree.c:29
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
 msgstr "git ls-tree [<опции>] <указатель-дерева> [<путь>…]"
 
-#: builtin/ls-tree.c:126
+#: builtin/ls-tree.c:127
 msgid "only show trees"
 msgstr "выводить только деревья"
 
-#: builtin/ls-tree.c:128
+#: builtin/ls-tree.c:129
 msgid "recurse into subtrees"
 msgstr "проходить рекурсивно в поддеревья"
 
-#: builtin/ls-tree.c:130
+#: builtin/ls-tree.c:131
 msgid "show trees when recursing"
 msgstr "выводить деревья при рекурсивном проходе"
 
-#: builtin/ls-tree.c:133
+#: builtin/ls-tree.c:134
 msgid "terminate entries with NUL byte"
 msgstr "разделять записи с помощью НУЛЕВОГО байта"
 
-#: builtin/ls-tree.c:134
+#: builtin/ls-tree.c:135
 msgid "include object size"
 msgstr "включить размер объекта"
 
-#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
+#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
 msgid "list only filenames"
 msgstr "выводить только имена файлов"
 
-#: builtin/ls-tree.c:141
+#: builtin/ls-tree.c:142
 msgid "use full path names"
 msgstr "использовать полные пути"
 
-#: builtin/ls-tree.c:143
+#: builtin/ls-tree.c:144
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr "вывести полное дерево; не только текущий каталог (включает в себя --full-name)"
 
-#: builtin/merge.c:46
+#: builtin/mailsplit.c:241
+#, c-format
+msgid "empty mbox: '%s'"
+msgstr "пустой mbox: «%s»"
+
+#: builtin/merge.c:47
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<опции>] [<коммит>…]"
 
-#: builtin/merge.c:47
+#: builtin/merge.c:48
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:48
+#: builtin/merge.c:49
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:103
+#: builtin/merge.c:104
 msgid "switch `m' requires a value"
 msgstr "при указании параметра «m» требуется указать значение"
 
-#: builtin/merge.c:140
+#: builtin/merge.c:141
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Не удалось найти стратегию слияния «%s».\n"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:142
 #, c-format
 msgid "Available strategies are:"
 msgstr "Доступные стратегии:"
 
-#: builtin/merge.c:146
+#: builtin/merge.c:147
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Доступные пользовательские стратегии:"
 
-#: builtin/merge.c:196 builtin/pull.c:127
+#: builtin/merge.c:197 builtin/pull.c:134
 msgid "do not show a diffstat at the end of the merge"
 msgstr "не выводить статистику изменений после окончания слияния"
 
-#: builtin/merge.c:199 builtin/pull.c:130
+#: builtin/merge.c:200 builtin/pull.c:137
 msgid "show a diffstat at the end of the merge"
 msgstr "вывести статистику изменений после окончания слияния"
 
-#: builtin/merge.c:200 builtin/pull.c:133
+#: builtin/merge.c:201 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(синоним для --stat)"
 
-#: builtin/merge.c:202 builtin/pull.c:136
+#: builtin/merge.c:203 builtin/pull.c:143
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr "добавить (максимум <n>) записей из короткого журнала в сообщение коммита у слияния"
 
-#: builtin/merge.c:205 builtin/pull.c:139
+#: builtin/merge.c:206 builtin/pull.c:146
 msgid "create a single commit instead of doing a merge"
 msgstr "создать один коммит, вместо выполнения слияния"
 
-#: builtin/merge.c:207 builtin/pull.c:142
+#: builtin/merge.c:208 builtin/pull.c:149
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "сделать коммит, если слияние прошло успешно (по умолчанию)"
 
-#: builtin/merge.c:209 builtin/pull.c:145
+#: builtin/merge.c:210 builtin/pull.c:152
 msgid "edit message before committing"
 msgstr "отредактировать сообщение перед выполнением коммита"
 
-#: builtin/merge.c:210
+#: builtin/merge.c:211
 msgid "allow fast-forward (default)"
 msgstr "разрешить перемотку вперед (по умолчанию)"
 
-#: builtin/merge.c:212 builtin/pull.c:151
+#: builtin/merge.c:213 builtin/pull.c:158
 msgid "abort if fast-forward is not possible"
 msgstr "отменить выполнение слияния, если перемотка вперед невозможна"
 
-#: builtin/merge.c:216 builtin/pull.c:154
+#: builtin/merge.c:217 builtin/pull.c:161
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "проверить, что указанный коммит имеет верную электронную подпись GPG"
 
-#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158
-#: builtin/revert.c:108
+#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/revert.c:109
 msgid "strategy"
 msgstr "стратегия"
 
-#: builtin/merge.c:218 builtin/pull.c:159
+#: builtin/merge.c:219 builtin/pull.c:166
 msgid "merge strategy to use"
 msgstr "используемая стратегия слияния"
 
-#: builtin/merge.c:219 builtin/pull.c:162
+#: builtin/merge.c:220 builtin/pull.c:169
 msgid "option=value"
 msgstr "опция=значение"
 
-#: builtin/merge.c:220 builtin/pull.c:163
+#: builtin/merge.c:221 builtin/pull.c:170
 msgid "option for selected merge strategy"
 msgstr "опции для выбранной стратегии слияния"
 
-#: builtin/merge.c:222
+#: builtin/merge.c:223
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "сообщение коммита для слияния (для слияния без перемотки вперед)"
 
-#: builtin/merge.c:226
+#: builtin/merge.c:227
 msgid "abort the current in-progress merge"
 msgstr "отменить выполнение происходящего слияния"
 
-#: builtin/merge.c:228
+#: builtin/merge.c:229
 msgid "continue the current in-progress merge"
 msgstr "продолжить выполнение происходящего слияния"
 
-#: builtin/merge.c:230 builtin/pull.c:170
+#: builtin/merge.c:231 builtin/pull.c:177
 msgid "allow merging unrelated histories"
 msgstr "разрешить слияние несвязанных историй изменений"
 
-#: builtin/merge.c:258
+#: builtin/merge.c:259
 msgid "could not run stash."
 msgstr "не удалось выполнить stash."
 
-#: builtin/merge.c:263
+#: builtin/merge.c:264
 msgid "stash failed"
 msgstr "сбой при выполнении stash"
 
-#: builtin/merge.c:268
+#: builtin/merge.c:269
 #, c-format
 msgid "not a valid object: %s"
 msgstr "неправильный объект: %s"
 
-#: builtin/merge.c:287 builtin/merge.c:304
+#: builtin/merge.c:288 builtin/merge.c:305
 msgid "read-tree failed"
 msgstr "сбой при выполнении read-tree"
 
-#: builtin/merge.c:334
+#: builtin/merge.c:335
 msgid " (nothing to squash)"
 msgstr " (нечего уплотнять)"
 
-#: builtin/merge.c:345
+#: builtin/merge.c:346
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Уплотнение коммита — не обновляя HEAD\n"
 
-#: builtin/merge.c:395
+#: builtin/merge.c:396
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Нет сообщения слияния — не обновляем HEAD\n"
 
-#: builtin/merge.c:446
+#: builtin/merge.c:447
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "«%s» не указывает на коммит"
 
-#: builtin/merge.c:536
+#: builtin/merge.c:537
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Неправильная строка branch.%s.mergeoptions: %s"
 
-#: builtin/merge.c:656
+#: builtin/merge.c:657
 msgid "Not handling anything other than two heads merge."
 msgstr "Не обрабатываю ничего, кроме слияния двух указателей на ветки."
 
-#: builtin/merge.c:670
+#: builtin/merge.c:671
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Неизвестный параметр merge-recursive: -X%s"
 
-#: builtin/merge.c:685
+#: builtin/merge.c:686
 #, c-format
 msgid "unable to write %s"
 msgstr "не удалось записать %s"
 
-#: builtin/merge.c:737
+#: builtin/merge.c:738
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Не удалось прочесть из «%s»"
 
-#: builtin/merge.c:746
+#: builtin/merge.c:747
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr "Не выполняю коммит слияния; используйте «git commit» для завершения слияния.\n"
 
-#: builtin/merge.c:752
+#: builtin/merge.c:753
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -9442,269 +9539,264 @@ msgid ""
 "the commit.\n"
 msgstr "Пожалуйста, введите сообщение коммита, для объяснения, зачем нужно\nэто слияние, особенно, если это слияние обновленной вышестоящей\nветки в тематическую ветку.\n\nСтроки, начинающиеся с «%c» будут проигнорированы, а пустое\nсообщение отменяет процесс коммита.\n"
 
-#: builtin/merge.c:776
+#: builtin/merge.c:777
 msgid "Empty commit message."
 msgstr "Пустое сообщение коммита."
 
-#: builtin/merge.c:796
+#: builtin/merge.c:797
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Прекрасно.\n"
 
-#: builtin/merge.c:851
+#: builtin/merge.c:850
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr "Не удалось провести автоматическое слияние; исправьте конфликты и сделайте коммит результата.\n"
 
-#: builtin/merge.c:890
+#: builtin/merge.c:889
 msgid "No current branch."
 msgstr "Нет текущей ветки."
 
-#: builtin/merge.c:892
+#: builtin/merge.c:891
 msgid "No remote for the current branch."
 msgstr "У текущей ветки нет внешнего репозитория."
 
-#: builtin/merge.c:894
+#: builtin/merge.c:893
 msgid "No default upstream defined for the current branch."
 msgstr "Для текущей ветки не указана вышестоящая ветка по умолчанию."
 
-#: builtin/merge.c:899
+#: builtin/merge.c:898
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Не указана внешняя отслеживаемая ветка для %s на %s"
 
-#: builtin/merge.c:946
+#: builtin/merge.c:945
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Плохое значение «%s» в переменной окружения «%s»"
 
-#: builtin/merge.c:1020
-#, c-format
-msgid "could not close '%s'"
-msgstr "не удалось закрыть «%s»"
-
-#: builtin/merge.c:1047
+#: builtin/merge.c:1046
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "не является тем, что можно слить в %s: %s"
 
-#: builtin/merge.c:1081
+#: builtin/merge.c:1080
 msgid "not something we can merge"
 msgstr "не является тем, что можно слить"
 
-#: builtin/merge.c:1146
+#: builtin/merge.c:1145
 msgid "--abort expects no arguments"
 msgstr "опция --abort не принимает аргументы"
 
-#: builtin/merge.c:1150
+#: builtin/merge.c:1149
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Нет слияния, которое можно отменить (отсутствует файл MERGE_HEAD)."
 
-#: builtin/merge.c:1162
+#: builtin/merge.c:1161
 msgid "--continue expects no arguments"
 msgstr "опция --continue не принимает аргументы"
 
-#: builtin/merge.c:1166
+#: builtin/merge.c:1165
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Сейчас не происходит слияние (отсутствует файл MERGE_HEAD)."
 
-#: builtin/merge.c:1182
+#: builtin/merge.c:1181
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD).\nВыполните коммит ваших изменений, перед слиянием."
 
-#: builtin/merge.c:1189
+#: builtin/merge.c:1188
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr "Вы не завершили копирование коммита (присутствует файл CHERRY_PICK_HEAD).\nПожалуйста, закоммитьте ваши изменения, перед слиянием."
 
-#: builtin/merge.c:1192
+#: builtin/merge.c:1191
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "Вы не завершили копирование коммита (присутствует файл CHERRY_PICK_HEAD)."
 
-#: builtin/merge.c:1201
+#: builtin/merge.c:1200
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Нельзя использовать одновременно --squash и --no-ff."
 
-#: builtin/merge.c:1209
+#: builtin/merge.c:1208
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Коммит не указан и параметр merge.defaultToUpstream не установлен."
 
-#: builtin/merge.c:1226
+#: builtin/merge.c:1225
 msgid "Squash commit into empty head not supported yet"
 msgstr "Уплотнение коммита в пустую ветку еще не поддерживается"
 
-#: builtin/merge.c:1228
+#: builtin/merge.c:1227
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "Коммит, не являющийся перемоткой вперед, нет смысла делать в пустую ветку."
 
-#: builtin/merge.c:1233
+#: builtin/merge.c:1232
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s не является тем, что можно слить"
 
-#: builtin/merge.c:1235
+#: builtin/merge.c:1234
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Можно только один коммит в пустую ветку."
 
-#: builtin/merge.c:1269
+#: builtin/merge.c:1268
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "Коммит %s содержит не доверенную GPG подпись, предположительно от %s."
 
-#: builtin/merge.c:1272
+#: builtin/merge.c:1271
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "Коммит %s содержит плохую GPG подпись, предположительно от %s."
 
-#: builtin/merge.c:1275
+#: builtin/merge.c:1274
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Коммит %s не содержит GPG подпись."
 
-#: builtin/merge.c:1278
+#: builtin/merge.c:1277
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "Коммит %s содержит действительную GPG подпись, от %s.\n"
 
-#: builtin/merge.c:1340
+#: builtin/merge.c:1339
 msgid "refusing to merge unrelated histories"
 msgstr "отказ слияния несвязанных историй изменений"
 
-#: builtin/merge.c:1349
+#: builtin/merge.c:1348
 msgid "Already up-to-date."
 msgstr "Уже обновлено."
 
-#: builtin/merge.c:1359
+#: builtin/merge.c:1358
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Обновление %s..%s\n"
 
-#: builtin/merge.c:1400
+#: builtin/merge.c:1399
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Попытка тривиального слияния в индексе…\n"
 
-#: builtin/merge.c:1407
+#: builtin/merge.c:1406
 #, c-format
 msgid "Nope.\n"
 msgstr "Не вышло.\n"
 
-#: builtin/merge.c:1432
+#: builtin/merge.c:1431
 msgid "Already up-to-date. Yeeah!"
 msgstr "Уже обновлено. Круто!"
 
-#: builtin/merge.c:1438
+#: builtin/merge.c:1437
 msgid "Not possible to fast-forward, aborting."
 msgstr "Перемотка вперед невозможна, отмена."
 
-#: builtin/merge.c:1461 builtin/merge.c:1540
+#: builtin/merge.c:1460 builtin/merge.c:1539
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Перемотка дерева к исходному состоянию…\n"
 
-#: builtin/merge.c:1465
+#: builtin/merge.c:1464
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Попытка слияния с помощью стратегии %s…\n"
 
-#: builtin/merge.c:1531
+#: builtin/merge.c:1530
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Ни одна стратегия слияния не обработала слияние.\n"
 
-#: builtin/merge.c:1533
+#: builtin/merge.c:1532
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Сбой при слиянии с помощью стратегии %s.\n"
 
-#: builtin/merge.c:1542
+#: builtin/merge.c:1541
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "Использую %s для подготовки ручного разрешения конфликтов.\n"
 
-#: builtin/merge.c:1554
+#: builtin/merge.c:1553
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr "Автоматическое слияние прошло успешно; как и запрашивали, остановлено перед выполнением коммита\n"
 
-#: builtin/merge-base.c:29
+#: builtin/merge-base.c:30
 msgid "git merge-base [-a | --all] <commit> <commit>..."
 msgstr "git merge-base [-a | --all] <коммит> <коммит>…"
 
-#: builtin/merge-base.c:30
+#: builtin/merge-base.c:31
 msgid "git merge-base [-a | --all] --octopus <commit>..."
 msgstr "git merge-base [-a | --all] --octopus <коммит>…"
 
-#: builtin/merge-base.c:31
+#: builtin/merge-base.c:32
 msgid "git merge-base --independent <commit>..."
 msgstr "git merge-base --independent <коммит>…"
 
-#: builtin/merge-base.c:32
+#: builtin/merge-base.c:33
 msgid "git merge-base --is-ancestor <commit> <commit>"
 msgstr "git merge-base --is-ancestor <коммит> <коммит>"
 
-#: builtin/merge-base.c:33
+#: builtin/merge-base.c:34
 msgid "git merge-base --fork-point <ref> [<commit>]"
 msgstr "git merge-base --fork-point <ссылка> [<коммит>]"
 
-#: builtin/merge-base.c:217
+#: builtin/merge-base.c:218
 msgid "output all common ancestors"
 msgstr "вывести всех общих предков"
 
-#: builtin/merge-base.c:219
+#: builtin/merge-base.c:220
 msgid "find ancestors for a single n-way merge"
 msgstr "вывести предков для одного многоходового слияния"
 
-#: builtin/merge-base.c:221
+#: builtin/merge-base.c:222
 msgid "list revs not reachable from others"
 msgstr "вывести список редаций, которые не достижимы из друг друга"
 
-#: builtin/merge-base.c:223
+#: builtin/merge-base.c:224
 msgid "is the first one ancestor of the other?"
 msgstr "является первым предком второго указанного коммита?"
 
-#: builtin/merge-base.c:225
+#: builtin/merge-base.c:226
 msgid "find where <commit> forked from reflog of <ref>"
 msgstr "найти журнале ссылок <ссылка> где именно <коммит> разветвился"
 
-#: builtin/merge-file.c:8
+#: builtin/merge-file.c:9
 msgid ""
 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
 "<orig-file> <file2>"
 msgstr "git merge-file [<опции>] [-L имя1 [-L orig [-L имя2]]] <файл1> <ориг-файл> <файл2>"
 
-#: builtin/merge-file.c:32
+#: builtin/merge-file.c:33
 msgid "send results to standard output"
 msgstr "вывести результат на стандартный вывод"
 
-#: builtin/merge-file.c:33
+#: builtin/merge-file.c:34
 msgid "use a diff3 based merge"
 msgstr "использовать diff3 слияние"
 
-#: builtin/merge-file.c:34
+#: builtin/merge-file.c:35
 msgid "for conflicts, use our version"
 msgstr "при возникновении конфликтов, использовать нашу версию"
 
-#: builtin/merge-file.c:36
+#: builtin/merge-file.c:37
 msgid "for conflicts, use their version"
 msgstr "при возникновении конфликтов, использовать их версию"
 
-#: builtin/merge-file.c:38
+#: builtin/merge-file.c:39
 msgid "for conflicts, use a union version"
 msgstr "при возникновении конфликтов, использовать обе версии"
 
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:42
 msgid "for conflicts, use this marker size"
 msgstr "при возникновении конфликтов, использовать этот размер маркера"
 
-#: builtin/merge-file.c:42
+#: builtin/merge-file.c:43
 msgid "do not warn about conflicts"
 msgstr "не предупреждать о конфликтах"
 
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:45
 msgid "set labels for file1/orig-file/file2"
 msgstr "установить метки для файл1/ориг-файл/файл2"
 
@@ -9745,508 +9837,508 @@ msgstr "Слияние %s и %s\n"
 msgid "git mktree [-z] [--missing] [--batch]"
 msgstr "git mktree [-z] [--missing] [--batch]"
 
-#: builtin/mktree.c:152
+#: builtin/mktree.c:153
 msgid "input is NUL terminated"
 msgstr "ввод отделённый НУЛЕВЫМИ символами"
 
-#: builtin/mktree.c:153 builtin/write-tree.c:24
+#: builtin/mktree.c:154 builtin/write-tree.c:25
 msgid "allow missing objects"
 msgstr "допустить отсутствие объектов"
 
-#: builtin/mktree.c:154
+#: builtin/mktree.c:155
 msgid "allow creation of more than one tree"
 msgstr "допустить создание более одного дерева"
 
-#: builtin/mv.c:16
+#: builtin/mv.c:17
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<опции>] <источник>… <назначение>"
 
-#: builtin/mv.c:82
+#: builtin/mv.c:83
 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr "Каталог %s в индексе и не является подмодулем?"
 
-#: builtin/mv.c:84 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:290
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr "Чтобы продолжить, проиндексируйте или спрячьте ваши изменения в файле .gitmodules"
 
-#: builtin/mv.c:102
+#: builtin/mv.c:103
 #, c-format
 msgid "%.*s is in index"
 msgstr "%.*s в индесе"
 
-#: builtin/mv.c:124
+#: builtin/mv.c:125
 msgid "force move/rename even if target exists"
 msgstr "принудительно перемещать/переименовать, даже если цель существует"
 
-#: builtin/mv.c:125
+#: builtin/mv.c:126
 msgid "skip move/rename errors"
 msgstr "пропускать ошибки при перемещении/переименовании"
 
-#: builtin/mv.c:167
+#: builtin/mv.c:168
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "целевой путь «%s» не является каталогом"
 
-#: builtin/mv.c:178
+#: builtin/mv.c:179
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Проверка переименования из «%s» в «%s»\n"
 
-#: builtin/mv.c:182
+#: builtin/mv.c:183
 msgid "bad source"
 msgstr "плохой источник"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:186
 msgid "can not move directory into itself"
 msgstr "нельзя переместить каталог в самого себя"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:189
 msgid "cannot move directory over file"
 msgstr "нельзя переместить каталог в файл"
 
-#: builtin/mv.c:197
+#: builtin/mv.c:198
 msgid "source directory is empty"
 msgstr "исходный каталог пуст"
 
-#: builtin/mv.c:222
+#: builtin/mv.c:223
 msgid "not under version control"
 msgstr "не под версионным контролем"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:226
 msgid "destination exists"
 msgstr "целевой путь уже существует"
 
-#: builtin/mv.c:233
+#: builtin/mv.c:234
 #, c-format
 msgid "overwriting '%s'"
 msgstr "перезапись «%s»"
 
-#: builtin/mv.c:236
+#: builtin/mv.c:237
 msgid "Cannot overwrite"
 msgstr "Не удалось перезаписать"
 
-#: builtin/mv.c:239
+#: builtin/mv.c:240
 msgid "multiple sources for the same target"
 msgstr "несколько источников для одного целевого пути"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:242
 msgid "destination directory does not exist"
 msgstr "целевой каталог не существует"
 
-#: builtin/mv.c:248
+#: builtin/mv.c:249
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, откуда=%s, куда=%s"
 
-#: builtin/mv.c:269
+#: builtin/mv.c:270
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Переименование %s в %s\n"
 
-#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384
+#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "сбой при переименовании «%s»"
 
-#: builtin/name-rev.c:289
+#: builtin/name-rev.c:338
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<опции>] <коммит>…"
 
-#: builtin/name-rev.c:290
+#: builtin/name-rev.c:339
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<опции>] --all"
 
-#: builtin/name-rev.c:291
+#: builtin/name-rev.c:340
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<опции>] --stdin"
 
-#: builtin/name-rev.c:346
+#: builtin/name-rev.c:395
 msgid "print only names (no SHA-1)"
 msgstr "выводить только имена (без SHA-1)"
 
-#: builtin/name-rev.c:347
+#: builtin/name-rev.c:396
 msgid "only use tags to name the commits"
 msgstr "использовать только метки для именования коммитов"
 
-#: builtin/name-rev.c:349
+#: builtin/name-rev.c:398
 msgid "only use refs matching <pattern>"
 msgstr "использовать только ссылки, соответствующие <шаблону> "
 
-#: builtin/name-rev.c:351
+#: builtin/name-rev.c:400
 msgid "ignore refs matching <pattern>"
 msgstr "игнорировать ссылки, соответствующие <шаблону>"
 
-#: builtin/name-rev.c:353
+#: builtin/name-rev.c:402
 msgid "list all commits reachable from all refs"
 msgstr "вывести список всех коммитов, достижимых со всех ссылок"
 
-#: builtin/name-rev.c:354
+#: builtin/name-rev.c:403
 msgid "read from stdin"
 msgstr "прочитать из стандартного ввода"
 
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:404
 msgid "allow to print `undefined` names (default)"
 msgstr "разрешить вывод «undefined», если не найдено (по умолчанию)"
 
-#: builtin/name-rev.c:361
+#: builtin/name-rev.c:410
 msgid "dereference tags in the input (internal use)"
 msgstr "разыменовывать введенные метки (для внутреннего использования)"
 
-#: builtin/notes.c:25
+#: builtin/notes.c:26
 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
 msgstr "git notes [--ref <ссылка-на-заметку>] [list [<объект>]]"
 
-#: builtin/notes.c:26
+#: builtin/notes.c:27
 msgid ""
 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file>"
 " | (-c | -C) <object>] [<object>]"
 msgstr "git notes [--ref <ссылка-на-заметку>] add [-f] [--allow-empty] [-m <сообщение> | -F <файл> | (-c | -C) <объект>] [<объект>]"
 
-#: builtin/notes.c:27
+#: builtin/notes.c:28
 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
 msgstr "git notes [--ref <ссылка-на-заметку>] copy [-f] <из-объекта> <в-объект>"
 
-#: builtin/notes.c:28
+#: builtin/notes.c:29
 msgid ""
 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> |"
 " (-c | -C) <object>] [<object>]"
 msgstr "git notes [--ref <ссылка-на-заметку>] append [--allow-empty] [-m <сообщение> | -F <файл> | (-c | -C) <объект>] [<объект>]"
 
-#: builtin/notes.c:29
+#: builtin/notes.c:30
 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
 msgstr "git notes [--ref <ссылка-на-заметку>] edit [--allow-empty] [<объект>]"
 
-#: builtin/notes.c:30
+#: builtin/notes.c:31
 msgid "git notes [--ref <notes-ref>] show [<object>]"
 msgstr "git notes [--ref <ссылка-на-заметку>] show [<объект>]"
 
-#: builtin/notes.c:31
+#: builtin/notes.c:32
 msgid ""
 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
 msgstr "git notes [--ref <ссылка-на-заметку>] merge [-v | -q] [-s <стратегия>] <ссылка-на-заметку>"
 
-#: builtin/notes.c:32
+#: builtin/notes.c:33
 msgid "git notes merge --commit [-v | -q]"
 msgstr "git notes merge --commit [-v | -q]"
 
-#: builtin/notes.c:33
+#: builtin/notes.c:34
 msgid "git notes merge --abort [-v | -q]"
 msgstr "git notes merge --abort [-v | -q]"
 
-#: builtin/notes.c:34
+#: builtin/notes.c:35
 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
 msgstr "git notes [--ref <ссылка-на-заметку>] remove [<объект>…]"
 
-#: builtin/notes.c:35
+#: builtin/notes.c:36
 msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
 msgstr "git notes [--ref <ссылка-на-заметку>] prune [-n | -v]"
 
-#: builtin/notes.c:36
+#: builtin/notes.c:37
 msgid "git notes [--ref <notes-ref>] get-ref"
 msgstr "git notes [--ref <ссылка-на-заметку>] get-ref"
 
-#: builtin/notes.c:41
+#: builtin/notes.c:42
 msgid "git notes [list [<object>]]"
 msgstr "git notes [list [<объект>]]"
 
-#: builtin/notes.c:46
+#: builtin/notes.c:47
 msgid "git notes add [<options>] [<object>]"
 msgstr "git notes add [<опции>] [<объект>]"
 
-#: builtin/notes.c:51
+#: builtin/notes.c:52
 msgid "git notes copy [<options>] <from-object> <to-object>"
 msgstr "git notes copy [<опции>] <из-объекта> <в-объект>"
 
-#: builtin/notes.c:52
+#: builtin/notes.c:53
 msgid "git notes copy --stdin [<from-object> <to-object>]..."
 msgstr "git notes copy --stdin [<из-объекта> <в-объект>]…"
 
-#: builtin/notes.c:57
+#: builtin/notes.c:58
 msgid "git notes append [<options>] [<object>]"
 msgstr "git notes append [<опции>] [<объект>]"
 
-#: builtin/notes.c:62
+#: builtin/notes.c:63
 msgid "git notes edit [<object>]"
 msgstr "git notes edit [<объект>]"
 
-#: builtin/notes.c:67
+#: builtin/notes.c:68
 msgid "git notes show [<object>]"
 msgstr "git notes show [<объект>]"
 
-#: builtin/notes.c:72
+#: builtin/notes.c:73
 msgid "git notes merge [<options>] <notes-ref>"
 msgstr "git notes merge [<опции>] <ссылка-на-заметку>"
 
-#: builtin/notes.c:73
+#: builtin/notes.c:74
 msgid "git notes merge --commit [<options>]"
 msgstr "git notes merge --commit [<опции>]"
 
-#: builtin/notes.c:74
+#: builtin/notes.c:75
 msgid "git notes merge --abort [<options>]"
 msgstr "git notes merge --abort [<опции>]"
 
-#: builtin/notes.c:79
+#: builtin/notes.c:80
 msgid "git notes remove [<object>]"
 msgstr "git notes remove [<опции>]"
 
-#: builtin/notes.c:84
+#: builtin/notes.c:85
 msgid "git notes prune [<options>]"
 msgstr "git notes prune [<опции>]"
 
-#: builtin/notes.c:89
+#: builtin/notes.c:90
 msgid "git notes get-ref"
 msgstr "git notes get-ref"
 
-#: builtin/notes.c:94
+#: builtin/notes.c:95
 msgid "Write/edit the notes for the following object:"
 msgstr "Записать/изменить заметки для следующего объекта:"
 
-#: builtin/notes.c:147
+#: builtin/notes.c:148
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "не удалось запустить «show» для объекта «%s»"
 
-#: builtin/notes.c:151
+#: builtin/notes.c:152
 msgid "could not read 'show' output"
 msgstr "не удалось прочитать вывод «show»"
 
-#: builtin/notes.c:159
+#: builtin/notes.c:160
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "не удалось завершить «show» для объекта «%s»"
 
-#: builtin/notes.c:194
+#: builtin/notes.c:195
 msgid "please supply the note contents using either -m or -F option"
 msgstr "пожалуйста, укажите содержимое заметки, используя опцию -m или -F"
 
-#: builtin/notes.c:203
+#: builtin/notes.c:204
 msgid "unable to write note object"
 msgstr "не удалось записать объект заметки"
 
-#: builtin/notes.c:205
+#: builtin/notes.c:206
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr "содержимое заметки осталось в %s"
 
-#: builtin/notes.c:233 builtin/tag.c:516
+#: builtin/notes.c:234 builtin/tag.c:517
 #, c-format
 msgid "cannot read '%s'"
 msgstr "не удалось прочитать «%s»"
 
-#: builtin/notes.c:235 builtin/tag.c:519
+#: builtin/notes.c:236 builtin/tag.c:520
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "не удалось открыть или прочитать «%s»"
 
-#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
-#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
-#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658
+#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
+#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
+#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr "не удалось разрешить «%s» как ссылку."
 
-#: builtin/notes.c:257
+#: builtin/notes.c:258
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "не удалось прочитать объект «%s»."
 
-#: builtin/notes.c:261
+#: builtin/notes.c:262
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr "не удалось прочитать данные заметки из недвоичного объекта «%s»."
 
-#: builtin/notes.c:301
+#: builtin/notes.c:302
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "неправильная введенная строка: «%s»."
 
-#: builtin/notes.c:316
+#: builtin/notes.c:317
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr "не удалось скопировать заметку из «%s» в «%s»"
 
-#. TRANSLATORS: the first %s will be replaced by a
-#. git notes command: 'add', 'merge', 'remove', etc.
-#: builtin/notes.c:345
+#. TRANSLATORS: the first %s will be replaced by a git
+#. notes command: 'add', 'merge', 'remove', etc.
+#: builtin/notes.c:348
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "отказ в перезаписи %s заметок в %s (за пределами refs/notes/)"
 
-#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
-#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651
-#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969
+#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
+#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
+#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
 msgid "too many parameters"
 msgstr "передано слишком много параметров"
 
-#: builtin/notes.c:378 builtin/notes.c:664
+#: builtin/notes.c:381 builtin/notes.c:667
 #, c-format
 msgid "no note found for object %s."
 msgstr "не найдена заметка для объекта %s."
 
-#: builtin/notes.c:399 builtin/notes.c:562
+#: builtin/notes.c:402 builtin/notes.c:565
 msgid "note contents as a string"
 msgstr "текстовое содержимое заметки"
 
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:405 builtin/notes.c:568
 msgid "note contents in a file"
 msgstr "содержимое заметки в файле"
 
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:408 builtin/notes.c:571
 msgid "reuse and edit specified note object"
 msgstr "использовать и отредактировать указанный объект заметки"
 
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:411 builtin/notes.c:574
 msgid "reuse specified note object"
 msgstr "использовать указанный объект заметки"
 
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:414 builtin/notes.c:577
 msgid "allow storing empty note"
 msgstr "разрешить сохранение пустой заметки"
 
-#: builtin/notes.c:412 builtin/notes.c:483
+#: builtin/notes.c:415 builtin/notes.c:486
 msgid "replace existing notes"
 msgstr "заменить существующие заметки"
 
-#: builtin/notes.c:437
+#: builtin/notes.c:440
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr "Не удалось добавить заметку. Найдена существующая заметка у объекта %s. Используйте параметр «-f» для перезаписи существующих заметок."
 
-#: builtin/notes.c:452 builtin/notes.c:531
+#: builtin/notes.c:455 builtin/notes.c:534
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Перезапись существующих заметок у объекта %s\n"
 
-#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888
+#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Удаление заметки у объекта %s\n"
 
-#: builtin/notes.c:484
+#: builtin/notes.c:487
 msgid "read objects from stdin"
 msgstr "прочитать объекты из стандартного ввода"
 
-#: builtin/notes.c:486
+#: builtin/notes.c:489
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr "загрузить настройки перезаписи для команды <команда> (включает в себя --stdin)"
 
-#: builtin/notes.c:504
+#: builtin/notes.c:507
 msgid "too few parameters"
 msgstr "передано слишком мало параметров"
 
-#: builtin/notes.c:525
+#: builtin/notes.c:528
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite"
 " existing notes"
 msgstr "Не удалось скопировать заметку. Найдена существующая заметка у объекта %s. Используйте параметр «-f» для перезаписи существующих заметок."
 
-#: builtin/notes.c:537
+#: builtin/notes.c:540
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "нет заметок у исходного объекта %s. Нельзя скопировать."
 
-#: builtin/notes.c:589
+#: builtin/notes.c:592
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
 msgstr "Опции -m/-F/-c/-C для подкоманды «edit» устарели.\nИспользуйте вместо них «git notes add -f -m/-F/-c/-C».\n"
 
-#: builtin/notes.c:684
+#: builtin/notes.c:687
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "не удалось удалить ссылку NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:686
+#: builtin/notes.c:689
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "не удалось удалить ссылку NOTES_MERGE_REF"
 
-#: builtin/notes.c:688
+#: builtin/notes.c:691
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "не удалось удалить рабочий каталог «git notes merge»"
 
-#: builtin/notes.c:708
+#: builtin/notes.c:711
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "не удалось прочитать ссылку NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:710
+#: builtin/notes.c:713
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "не удалось найти коммит из NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:712
+#: builtin/notes.c:715
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "не удалось разобрать коммит из NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:725
+#: builtin/notes.c:728
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "не удалось разрешить NOTES_MERGE_REF"
 
-#: builtin/notes.c:728
+#: builtin/notes.c:731
 msgid "failed to finalize notes merge"
 msgstr "не удалось завершить слиние заметок"
 
-#: builtin/notes.c:754
+#: builtin/notes.c:757
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "неизвестная стратегия слияния заметок %s"
 
-#: builtin/notes.c:770
+#: builtin/notes.c:773
 msgid "General options"
 msgstr "Общие опции"
 
-#: builtin/notes.c:772
+#: builtin/notes.c:775
 msgid "Merge options"
 msgstr "Опции слияния"
 
-#: builtin/notes.c:774
+#: builtin/notes.c:777
 msgid ""
 "resolve notes conflicts using the given strategy "
 "(manual/ours/theirs/union/cat_sort_uniq)"
 msgstr "разрешить конфликты заметок с помощью указанной стратегии (manual/ours/theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:776
+#: builtin/notes.c:779
 msgid "Committing unmerged notes"
 msgstr "Коммит не слитых заметок"
 
-#: builtin/notes.c:778
+#: builtin/notes.c:781
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "завершить слияние заметок коммитом не слитых заметок"
 
-#: builtin/notes.c:780
+#: builtin/notes.c:783
 msgid "Aborting notes merge resolution"
 msgstr "Отмена разрешения слияния заметок"
 
-#: builtin/notes.c:782
+#: builtin/notes.c:785
 msgid "abort notes merge"
 msgstr "отменить слияние заметок"
 
-#: builtin/notes.c:793
+#: builtin/notes.c:796
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "нельзя использовать одновременно --commit, --abort и -s/--strategy"
 
-#: builtin/notes.c:798
+#: builtin/notes.c:801
 msgid "must specify a notes ref to merge"
 msgstr "вы должны указать ссылку заметки для слияния"
 
-#: builtin/notes.c:822
+#: builtin/notes.c:825
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "неизвестный параметр для -s/--strategy: %s"
 
-#: builtin/notes.c:859
+#: builtin/notes.c:862
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "слияние заметок в %s уже выполняется на %s"
 
-#: builtin/notes.c:862
+#: builtin/notes.c:865
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "не удалось сохранить адрес текущей ссылки на заметку (%s)"
 
-#: builtin/notes.c:864
+#: builtin/notes.c:867
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with"
@@ -10254,218 +10346,218 @@ msgid ""
 "--abort'.\n"
 msgstr "Не удалось автоматически слить заметки. Исправьте конфликты в %s и закоммитьте результат с помощью «git notes merge --commit», или прервите процесс слияния с помощью «git notes merge --abort».\n"
 
-#: builtin/notes.c:886
+#: builtin/notes.c:889
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "У объекта %s нет заметки\n"
 
-#: builtin/notes.c:898
+#: builtin/notes.c:901
 msgid "attempt to remove non-existent note is not an error"
 msgstr "попытка удаления несуществующей заметки не является ошибкой"
 
-#: builtin/notes.c:901
+#: builtin/notes.c:904
 msgid "read object names from the standard input"
 msgstr "прочитать имена объектов из стандартного ввода"
 
-#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
 msgid "do not remove, show only"
 msgstr "не удалять, только показать список"
 
-#: builtin/notes.c:940
+#: builtin/notes.c:943
 msgid "report pruned notes"
 msgstr "вывести список удаленных заметок"
 
-#: builtin/notes.c:982
+#: builtin/notes.c:985
 msgid "notes-ref"
 msgstr "ссылка-на-заметку"
 
-#: builtin/notes.c:983
+#: builtin/notes.c:986
 msgid "use notes from <notes-ref>"
 msgstr "использовать заметку из <ссылка-на-заметку>"
 
-#: builtin/notes.c:1018
+#: builtin/notes.c:1021
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "неизвестная подкоманда: %s"
 
-#: builtin/pack-objects.c:29
+#: builtin/pack-objects.c:30
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects --stdout [<опции>…] [< <список-ссылок> | < <список-объектов>]"
 
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:31
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects [<опции>…] <имя-базы> [< <список-ссылок> | < <список-объектов>]"
 
-#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
+#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
 #, c-format
 msgid "deflate error (%d)"
 msgstr "ошибка сжатия (%d)"
 
-#: builtin/pack-objects.c:770
+#: builtin/pack-objects.c:776
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr "отключение записи битовых карт, так как карты были разбиты на части из-за pack.packSizeLimit"
 
-#: builtin/pack-objects.c:783
+#: builtin/pack-objects.c:789
 msgid "Writing objects"
 msgstr "Запись объектов"
 
-#: builtin/pack-objects.c:1063
+#: builtin/pack-objects.c:1069
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "отключение записи битовых карт, так как некоторые объекты не были упакованы"
 
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2434
 msgid "Compressing objects"
 msgstr "Сжатие объектов"
 
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2843
 #, c-format
 msgid "unsupported index version %s"
 msgstr "неподдерживаемая версия индекса %s"
 
-#: builtin/pack-objects.c:2833
+#: builtin/pack-objects.c:2847
 #, c-format
 msgid "bad index version '%s'"
 msgstr "плохая версия индекса «%s»"
 
-#: builtin/pack-objects.c:2863
+#: builtin/pack-objects.c:2877
 msgid "do not show progress meter"
 msgstr "не выводить прогресс выполнения"
 
-#: builtin/pack-objects.c:2865
+#: builtin/pack-objects.c:2879
 msgid "show progress meter"
 msgstr "показать прогресс выполнения"
 
-#: builtin/pack-objects.c:2867
+#: builtin/pack-objects.c:2881
 msgid "show progress meter during object writing phase"
 msgstr "показать прогресс выполнения во время записи объектов"
 
-#: builtin/pack-objects.c:2870
+#: builtin/pack-objects.c:2884
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "похоже на --all-progress при включенном прогрессе выполнения"
 
-#: builtin/pack-objects.c:2871
+#: builtin/pack-objects.c:2885
 msgid "version[,offset]"
 msgstr "версия[,смещение]"
 
-#: builtin/pack-objects.c:2872
+#: builtin/pack-objects.c:2886
 msgid "write the pack index file in the specified idx format version"
 msgstr "записать файл индекса пакета в указанной версии формата"
 
-#: builtin/pack-objects.c:2875
+#: builtin/pack-objects.c:2889
 msgid "maximum size of each output pack file"
 msgstr "максимальный размер каждого выходного файла пакета"
 
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2891
 msgid "ignore borrowed objects from alternate object store"
 msgstr "игнорировать чужие объекты, взятые из альтернативного хранилища объектов"
 
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2893
 msgid "ignore packed objects"
 msgstr "игнорировать упакованные объекты"
 
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2895
 msgid "limit pack window by objects"
 msgstr "ограничить окно пакета по количеству объектов"
 
-#: builtin/pack-objects.c:2883
+#: builtin/pack-objects.c:2897
 msgid "limit pack window by memory in addition to object limit"
 msgstr "дополнительно к количеству объектов ограничить окно пакета по памяти"
 
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2899
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "максимальная разрешенная длина цепочки дельт в результирующем пакете"
 
-#: builtin/pack-objects.c:2887
+#: builtin/pack-objects.c:2901
 msgid "reuse existing deltas"
 msgstr "использовать повторно существующие дельты"
 
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2903
 msgid "reuse existing objects"
 msgstr "использовать повторно существующие объекты"
 
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2905
 msgid "use OFS_DELTA objects"
 msgstr "использовать объекты OFS_DELTA"
 
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2907
 msgid "use threads when searching for best delta matches"
 msgstr "использовать многопоточность при поиске лучших совпадений дельт"
 
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2909
 msgid "do not create an empty pack output"
 msgstr "не создавать пустые выходные пакеты"
 
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2911
 msgid "read revision arguments from standard input"
 msgstr "прочитать аргументы редакций из стандартного ввода"
 
-#: builtin/pack-objects.c:2899
+#: builtin/pack-objects.c:2913
 msgid "limit the objects to those that are not yet packed"
 msgstr "ограничиться объектами, которые еще не упакованы"
 
-#: builtin/pack-objects.c:2902
+#: builtin/pack-objects.c:2916
 msgid "include objects reachable from any reference"
 msgstr "включить объекты, которые достижимы по любой из ссылок"
 
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2919
 msgid "include objects referred by reflog entries"
 msgstr "включить объекты, на которые ссылаются записи журнала ссылок"
 
-#: builtin/pack-objects.c:2908
+#: builtin/pack-objects.c:2922
 msgid "include objects referred to by the index"
 msgstr "включить объекты, на которые ссылается индекс"
 
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2925
 msgid "output pack to stdout"
 msgstr "вывести пакет на  стандартный вывод"
 
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2927
 msgid "include tag objects that refer to objects to be packed"
 msgstr "включить объекты меток, которые ссылаются на упаковываемые объекты"
 
-#: builtin/pack-objects.c:2915
+#: builtin/pack-objects.c:2929
 msgid "keep unreachable objects"
 msgstr "сохранять ссылки на недоступные объекты"
 
-#: builtin/pack-objects.c:2917
+#: builtin/pack-objects.c:2931
 msgid "pack loose unreachable objects"
 msgstr "паковать недостижимые объекты"
 
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2933
 msgid "unpack unreachable objects newer than <time>"
 msgstr "распаковать недоступные объекты, которые новее, чем <время>"
 
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:2936
 msgid "create thin packs"
 msgstr "создавать тонкие пакеты"
 
-#: builtin/pack-objects.c:2924
+#: builtin/pack-objects.c:2938
 msgid "create packs suitable for shallow fetches"
 msgstr "создавать пакеты, подходящие для частичных извлечений"
 
-#: builtin/pack-objects.c:2926
+#: builtin/pack-objects.c:2940
 msgid "ignore packs that have companion .keep file"
 msgstr "игнорировать пакеты, рядом с которыми лежит .keep файл"
 
-#: builtin/pack-objects.c:2928
+#: builtin/pack-objects.c:2942
 msgid "pack compression level"
 msgstr "уровень сжатия пакета"
 
-#: builtin/pack-objects.c:2930
+#: builtin/pack-objects.c:2944
 msgid "do not hide commits by grafts"
 msgstr "не скрывать коммиты сращениями"
 
-#: builtin/pack-objects.c:2932
+#: builtin/pack-objects.c:2946
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "по возможности использовать индекс в битовых картах, для ускорения подсчета объектов"
 
-#: builtin/pack-objects.c:2934
+#: builtin/pack-objects.c:2948
 msgid "write a bitmap index together with the pack index"
 msgstr "запись индекса в битовых картах вместе с индексом пакета"
 
-#: builtin/pack-objects.c:3061
+#: builtin/pack-objects.c:3075
 msgid "Counting objects"
 msgstr "Подсчет объектов"
 
@@ -10505,62 +10597,66 @@ msgstr "удалить объекты старее чем <дата-оконча
 msgid "cannot prune in a precious-objects repo"
 msgstr "нельзя почистить неиспользуемые объекты в precious-objects репозитории"
 
-#: builtin/pull.c:51 builtin/pull.c:53
+#: builtin/pull.c:54 builtin/pull.c:56
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "Неправильное значение %s: %s"
 
-#: builtin/pull.c:73
+#: builtin/pull.c:76
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<опции>] [<репозиторий> [<спецификатор-ссылки>…]]"
 
-#: builtin/pull.c:121
+#: builtin/pull.c:124
+msgid "control for recursive fetching of submodules"
+msgstr "управление рекурсивным извлечением подмодулей"
+
+#: builtin/pull.c:128
 msgid "Options related to merging"
 msgstr "Опции, связанные со слиянием"
 
-#: builtin/pull.c:124
+#: builtin/pull.c:131
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "забрать изменения с помощью перебазирования, а не слияния"
 
-#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120
+#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
 msgid "allow fast-forward"
 msgstr "разрешить перемотку вперед"
 
-#: builtin/pull.c:157
+#: builtin/pull.c:164
 msgid "automatically stash/stash pop before and after rebase"
 msgstr "автоматически выполнять stash/stash pop до и после перемещения"
 
-#: builtin/pull.c:173
+#: builtin/pull.c:180
 msgid "Options related to fetching"
 msgstr "Опции, связанные с извлечением изменений"
 
-#: builtin/pull.c:195
+#: builtin/pull.c:198
 msgid "number of submodules pulled in parallel"
 msgstr "количество подмодулей, которые будут получены парралельно"
 
-#: builtin/pull.c:284
+#: builtin/pull.c:287
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Неправильное значение для pull.ff: %s"
 
-#: builtin/pull.c:397
+#: builtin/pull.c:399
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr "Нет претендентов для перемещения среди ссылок, которые вы только что получили."
 
-#: builtin/pull.c:399
+#: builtin/pull.c:401
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr "Нет претендентов для слияния среди ссылок, которые вы только что получили."
 
-#: builtin/pull.c:400
+#: builtin/pull.c:402
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgstr "Обычно это означает, что вы передали спецификацию ссылки с помощью шаблона и этот шаблон ни с чем не совпал на внешнем репозитории."
 
-#: builtin/pull.c:403
+#: builtin/pull.c:405
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -10568,69 +10664,69 @@ msgid ""
 "for your current branch, you must specify a branch on the command line."
 msgstr "Вы попросили получить изменения со внешнего репозитория «%s», но не указали ветку. Так как это не репозиторий по умолчанию для  вашей текущей ветки, вы должны указать ветку в командной строке."
 
-#: builtin/pull.c:408 git-parse-remote.sh:73
+#: builtin/pull.c:410 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Вы сейчас ни на одной из веток."
 
-#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
+#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "Пожалуйста, укажите на какую ветку вы хотите переместить изменения."
 
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
+#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "Пожалуйста, укажите с какой веткой вы хотите слить изменения."
 
-#: builtin/pull.c:413 builtin/pull.c:428
+#: builtin/pull.c:415 builtin/pull.c:430
 msgid "See git-pull(1) for details."
 msgstr "Для дополнительной информации, смотрите git-pull(1)."
 
-#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
+#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
 #: git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<внешний-репозиторий>"
 
-#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456
+#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<ветка>"
 
-#: builtin/pull.c:423 git-parse-remote.sh:75
+#: builtin/pull.c:425 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "У текущей ветки нет информации об отслеживании."
 
-#: builtin/pull.c:432 git-parse-remote.sh:95
+#: builtin/pull.c:434 git-parse-remote.sh:95
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr "Если вы хотите указать информацию о отслеживаемой ветке, выполните:"
 
-#: builtin/pull.c:437
+#: builtin/pull.c:439
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
 "from the remote, but no such ref was fetched."
 msgstr "Ваша конфигурация указывает, что нужно слить изменения со ссылкой\n«%s» из внешнего репозитория, но такая ссылка не была получена."
 
-#: builtin/pull.c:754
+#: builtin/pull.c:792
 msgid "ignoring --verify-signatures for rebase"
 msgstr "игнорирование --verify-signatures при перемещении"
 
-#: builtin/pull.c:801
+#: builtin/pull.c:840
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "--[no-]autostash можно использовать только вместе с --rebase."
 
-#: builtin/pull.c:809
+#: builtin/pull.c:848
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "Обновление еще не начавшейся ветки с изменениями, добавленными в индекс."
 
-#: builtin/pull.c:812
+#: builtin/pull.c:851
 msgid "pull with rebase"
 msgstr "получение с перемещением"
 
-#: builtin/pull.c:813
+#: builtin/pull.c:852
 msgid "please commit or stash them."
 msgstr "сделайте коммит или спрячьте их."
 
-#: builtin/pull.c:838
+#: builtin/pull.c:877
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -10638,7 +10734,7 @@ msgid ""
 "commit %s."
 msgstr "извлечение обновило указатель на вашу текущую ветку.\nперемотка вашего рабочего каталога\nс коммита %s."
 
-#: builtin/pull.c:843
+#: builtin/pull.c:882
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -10649,33 +10745,37 @@ msgid ""
 "to recover."
 msgstr "Не удалось перемотать вперёд изменения в вашем рабочем каталоге.\nПосле того, как вы убедитесь, что вы сохранили всё необходимое из вывода\n$ git diff %s\n, запустите\n$ git reset --hard\nдля восстановления исходного состояния."
 
-#: builtin/pull.c:858
+#: builtin/pull.c:897
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Нельзя слить несколько веток в пустой указатель на ветку."
 
-#: builtin/pull.c:862
+#: builtin/pull.c:901
 msgid "Cannot rebase onto multiple branches."
 msgstr "Невозможно переместить над несколькими ветками."
 
-#: builtin/push.c:16
+#: builtin/pull.c:908
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr "невозможно выполнить перемещение с записанными локальными изменениями в подмодулях"
+
+#: builtin/push.c:17
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [<опции>] [<репозиторий> [<спецификатор-ссылки>…]]"
 
-#: builtin/push.c:89
+#: builtin/push.c:90
 msgid "tag shorthand without <tag>"
 msgstr "указано сокращение tag, но не указана сама <метка>"
 
-#: builtin/push.c:99
+#: builtin/push.c:100
 msgid "--delete only accepts plain target ref names"
 msgstr "опция --delete принимает только простые целевые имена ссылок"
 
-#: builtin/push.c:143
+#: builtin/push.c:144
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
 msgstr "\nЧтобы выбрать любую из опций на постоянной основе, смотрите push.default в «git help config»."
 
-#: builtin/push.c:146
+#: builtin/push.c:147
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -10690,7 +10790,7 @@ msgid ""
 "%s"
 msgstr "Имя вышестоящей ветки и вашей текущей ветки различаются. Чтобы отправить изменения в вышестоящую ветку на внешнем репозитории, используйте:\n\n    git push %s HEAD:%s\n\nЧтобы отправить изменения в ветку с таким же именем на внешнем репозитории, используйте:\n\n    git push %s %s\n%s"
 
-#: builtin/push.c:161
+#: builtin/push.c:162
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -10700,7 +10800,7 @@ msgid ""
 "    git push %s HEAD:<name-of-remote-branch>\n"
 msgstr "Вы сейчас не находитесь ни на одной из веток.\nЧтобы отправить историю, ведущую к текущему (отделённый HEAD) состоянию, используйте\n\n    git push %s HEAD:<имя-внешней-ветки>\n"
 
-#: builtin/push.c:175
+#: builtin/push.c:176
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -10709,13 +10809,13 @@ msgid ""
 "    git push --set-upstream %s %s\n"
 msgstr "Текущая ветка %s не имеет вышестоящей ветки.\nЧтобы отправить текущую ветку и установить внешнюю ветку как вышестоящую для этой ветки, используйте\n\n    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:183
+#: builtin/push.c:184
 #, c-format
 msgid ""
 "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "Ваша текущая ветка %s имеет несколько вышестоящих веток, отказ в отправке изменений."
 
-#: builtin/push.c:186
+#: builtin/push.c:187
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -10723,11 +10823,11 @@ msgid ""
 "to update which remote branch."
 msgstr "Вы сейчас отправляете изменения на внешний репозиторий «%s», который не является вышестоящим для вашей текущей ветки «%s», без указания того, что отправлять и в какую внешнюю ветку."
 
-#: builtin/push.c:245
+#: builtin/push.c:246
 msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr "Вы не указали спецификацию ссылки для отправки, а push.default указан как «nothing»."
 
-#: builtin/push.c:252
+#: builtin/push.c:253
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -10735,7 +10835,7 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr "Обновления были отклонены, так как верхушка вашей текущей ветки\nпозади ее внешней части. Заберите и слейте внешние изменения \n(например, с помощью «git pull …») перед повторной попыткой отправки\nизменений.\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»."
 
-#: builtin/push.c:258
+#: builtin/push.c:259
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -10743,7 +10843,7 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr "Обновления были отклонены, так как верхушка отправляемой ветки\nпозади ее внешней части. Переключитесь на ветку и заберите внешние\nизменения (например, с помощью «git pull …») перед повторной\nпопыткой отправки изменений.\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»."
 
-#: builtin/push.c:264
+#: builtin/push.c:265
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -10752,33 +10852,33 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr "Обновления были отклонены, так как внешний репозиторий содержит\nизменения, которых у вас нет в вашем локальном репозитории.\nОбычно, это связанно с тем, что кто-то уже отправил изменения в \nто же место. Перед повторной отправкой ваших изменений, вам нужно\nзабрать и слить изменения из внешнего репозитория себе\n(например, с помощью «git pull …»).\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»."
 
-#: builtin/push.c:271
+#: builtin/push.c:272
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr "Обновления были отклонены, так как метка уже существует во внешнем репозитории."
 
-#: builtin/push.c:274
+#: builtin/push.c:275
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
 "without using the '--force' option.\n"
 msgstr "Вы не можете обновить внешнюю ссылку, которая указывает на объект, не являющийся коммитом или обновить внешнюю ссылку так, чтобы она указывала на объект, не являющийся коммитом, без указания опции «--force».\n"
 
-#: builtin/push.c:334
+#: builtin/push.c:335
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Отправка в %s\n"
 
-#: builtin/push.c:338
+#: builtin/push.c:339
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "не удалось отправить некоторые ссылки в «%s»"
 
-#: builtin/push.c:369
+#: builtin/push.c:370
 #, c-format
 msgid "bad repository '%s'"
 msgstr "плохой репозитория «%s»"
 
-#: builtin/push.c:370
+#: builtin/push.c:371
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote repository using\n"
@@ -10790,112 +10890,112 @@ msgid ""
 "    git push <name>\n"
 msgstr "Не настроена точка назначения для отправки.\nЛибо укажите URL с помощью командной строки, либо настройте внешний репозиторий с помощью\n\n    git remote add <имя> <адрес>\n\nа затем отправьте изменения с помощью имени внешнего репозитория\n\n    git push <имя>\n"
 
-#: builtin/push.c:388
+#: builtin/push.c:389
 msgid "--all and --tags are incompatible"
 msgstr "--all и --tags нельзя использовать одновременно"
 
-#: builtin/push.c:389
+#: builtin/push.c:390
 msgid "--all can't be combined with refspecs"
 msgstr "--all нельзя использовать вместе со спецификаторами ссылок"
 
-#: builtin/push.c:394
+#: builtin/push.c:395
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror и --tags нельзя использовать одновременно"
 
-#: builtin/push.c:395
+#: builtin/push.c:396
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror нельзя использовать вместе со спецификаторами ссылок"
 
-#: builtin/push.c:400
+#: builtin/push.c:401
 msgid "--all and --mirror are incompatible"
 msgstr "--all и --mirror нельзя использовать одновременно"
 
-#: builtin/push.c:518
+#: builtin/push.c:523
 msgid "repository"
 msgstr "репозиторий"
 
-#: builtin/push.c:519 builtin/send-pack.c:162
+#: builtin/push.c:524 builtin/send-pack.c:163
 msgid "push all refs"
 msgstr "отправить все ссылки"
 
-#: builtin/push.c:520 builtin/send-pack.c:164
+#: builtin/push.c:525 builtin/send-pack.c:165
 msgid "mirror all refs"
 msgstr "сделать зеркало всех ссылок"
 
-#: builtin/push.c:522
+#: builtin/push.c:527
 msgid "delete refs"
 msgstr "удалить ссылки"
 
-#: builtin/push.c:523
+#: builtin/push.c:528
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "отправить метки (нельзя использовать вместе с --all или --mirror)"
 
-#: builtin/push.c:526 builtin/send-pack.c:165
+#: builtin/push.c:531 builtin/send-pack.c:166
 msgid "force updates"
 msgstr "принудительное обновление"
 
-#: builtin/push.c:528 builtin/send-pack.c:179
+#: builtin/push.c:533 builtin/send-pack.c:180
 msgid "refname>:<expect"
 msgstr "имя-ссылки>:<ожидается"
 
-#: builtin/push.c:529 builtin/send-pack.c:180
+#: builtin/push.c:534 builtin/send-pack.c:181
 msgid "require old value of ref to be at this value"
 msgstr "требовать, чтобы старое значение ссылки было ожидаемым"
 
-#: builtin/push.c:532
+#: builtin/push.c:537
 msgid "control recursive pushing of submodules"
 msgstr "управление рекурсивной отправкой подмодулей"
 
-#: builtin/push.c:534 builtin/send-pack.c:173
+#: builtin/push.c:539 builtin/send-pack.c:174
 msgid "use thin pack"
 msgstr "использовать тонкие пакеты"
 
-#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159
-#: builtin/send-pack.c:160
+#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
+#: builtin/send-pack.c:161
 msgid "receive pack program"
 msgstr "путь к программе упаковки на сервере"
 
-#: builtin/push.c:537
+#: builtin/push.c:542
 msgid "set upstream for git pull/status"
 msgstr "установить вышестоящую ветку для git pull/status"
 
-#: builtin/push.c:540
+#: builtin/push.c:545
 msgid "prune locally removed refs"
 msgstr "почистить локально удаленные ссылки"
 
-#: builtin/push.c:542
+#: builtin/push.c:547
 msgid "bypass pre-push hook"
 msgstr "пропустить перехватчик pre-push"
 
-#: builtin/push.c:543
+#: builtin/push.c:548
 msgid "push missing but relevant tags"
 msgstr "отправить пропущенные, но нужные метки"
 
-#: builtin/push.c:546 builtin/send-pack.c:167
+#: builtin/push.c:551 builtin/send-pack.c:168
 msgid "GPG sign the push"
 msgstr "подписать отправку с помощью GPG"
 
-#: builtin/push.c:548 builtin/send-pack.c:174
+#: builtin/push.c:553 builtin/send-pack.c:175
 msgid "request atomic transaction on remote side"
 msgstr "запросить выполнение атомарной транзакции на внешней стороне"
 
-#: builtin/push.c:549 builtin/send-pack.c:170
+#: builtin/push.c:554 builtin/send-pack.c:171
 msgid "server-specific"
 msgstr "зависит-от-сервера"
 
-#: builtin/push.c:549 builtin/send-pack.c:171
+#: builtin/push.c:554 builtin/send-pack.c:172
 msgid "option to transmit"
 msgstr "передаваемые опции"
 
-#: builtin/push.c:563
+#: builtin/push.c:568
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete несовместимо с  --all, --mirror и --tags"
 
-#: builtin/push.c:565
+#: builtin/push.c:570
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete не имеет смысла без указания ссылок"
 
-#: builtin/push.c:584
+#: builtin/push.c:589
 msgid "push options must not have new line characters"
 msgstr "опции для отправки не должны содержать символы перевода строк"
 
@@ -10906,87 +11006,87 @@ msgid ""
 "[--index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
 msgstr "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<префикс>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<файл>] (--empty | <указатель-дерева-1> [<указатель-дерева-2> [<указатель-дерева-3>]])"
 
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:121
 msgid "write resulting index to <file>"
 msgstr "записать результирующий индекс в <файл>"
 
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:124
 msgid "only empty the index"
 msgstr "просто очистить индекс"
 
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:126
 msgid "Merging"
 msgstr "Слияние"
 
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:128
 msgid "perform a merge in addition to a read"
 msgstr "выполнить слияние в дополнение к чтению"
 
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:130
 msgid "3-way merge if no file level merging required"
 msgstr "трехходовое слияние, если не требуется слияние на уровне файлов"
 
-#: builtin/read-tree.c:141
+#: builtin/read-tree.c:132
 msgid "3-way merge in presence of adds and removes"
 msgstr "трехходовое слияние в случае присутствия добавлений или удалений файлов"
 
-#: builtin/read-tree.c:143
+#: builtin/read-tree.c:134
 msgid "same as -m, but discard unmerged entries"
 msgstr "тоже, что и -m, но отменяет изменения не слитых записей"
 
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:135
 msgid "<subdirectory>/"
 msgstr "<подкаталог>/"
 
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:136
 msgid "read the tree into the index under <subdirectory>/"
 msgstr "прочитать дерево в индекс в <подкаталог>/"
 
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:139
 msgid "update working tree with merge result"
 msgstr "обновить рабочий каталог результатом слияния"
 
-#: builtin/read-tree.c:150
+#: builtin/read-tree.c:141
 msgid "gitignore"
 msgstr "gitignore"
 
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:142
 msgid "allow explicitly ignored files to be overwritten"
 msgstr "разрешить перезапись явно игнорируемых файлов"
 
-#: builtin/read-tree.c:154
+#: builtin/read-tree.c:145
 msgid "don't check the working tree after merging"
 msgstr "не проверять рабочий каталог после слияния"
 
-#: builtin/read-tree.c:155
+#: builtin/read-tree.c:146
 msgid "don't update the index or the work tree"
 msgstr "не обновлять индекс или рабочий каталог"
 
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:148
 msgid "skip applying sparse checkout filter"
 msgstr "пропустить применение фильтра частичного переключения на состояние"
 
-#: builtin/read-tree.c:159
+#: builtin/read-tree.c:150
 msgid "debug unpack-trees"
 msgstr "отладка unpack-trees"
 
-#: builtin/rebase--helper.c:7
+#: builtin/rebase--helper.c:8
 msgid "git rebase--helper [<options>]"
 msgstr "git rebase--helper [<опции>]"
 
-#: builtin/rebase--helper.c:19
+#: builtin/rebase--helper.c:20
 msgid "continue rebase"
 msgstr "продолжить перемещение"
 
-#: builtin/rebase--helper.c:21
+#: builtin/rebase--helper.c:22
 msgid "abort rebase"
 msgstr "остановить перемещение"
 
-#: builtin/receive-pack.c:27
+#: builtin/receive-pack.c:28
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <каталог-git>"
 
-#: builtin/receive-pack.c:795
+#: builtin/receive-pack.c:838
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -11003,7 +11103,7 @@ msgid ""
 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
 msgstr "По умолчанию, обновлять текущую ветку в репозитории с рабочей\nкопией (не голом) запрещено, так как это сделает состояние индекса\nи рабочего каталога противоречивым, и вам прийдется выполнить\n«git reset --hard», чтобы состояние рабочего каталога снова\nсоответствовало HEAD.\n\nВы можете установить значение опции «receive.denyCurrentBranch»\nв «ignore» или «warn» во внешнем репозитории, чтобы разрешить\nотправку в его текущую ветку; но это не рекомендуется, если только\nвы не намерены обновить его рабочий каталог способом подобным\nвышеописанному.\n\nЧтобы пропустить это сообщение и все равно оставить поведение\nпо умолчанию, установите значение опции «receive.denyCurrentBranch»\nв «refuse»."
 
-#: builtin/receive-pack.c:815
+#: builtin/receive-pack.c:858
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -11015,194 +11115,194 @@ msgid ""
 "To squelch this message, you can set it to 'refuse'."
 msgstr "По умолчанию, удаление текущей ветки запрещено, так как последующий\n«git clone» не сможет получить никаких файлов, что приведет к путанице.\n\nВы можете установить значение опции «receive.denyDeleteCurrent»\nв «warn» или «ignore», во внешнем репозитории,  чтобы разрешить\nудаление текущей ветки с или без предупреждающего сообщения.\n\nЧтобы пропустить это сообщение, вы можете установить значение опции\nв «refuse»."
 
-#: builtin/receive-pack.c:1888
+#: builtin/receive-pack.c:1933
 msgid "quiet"
 msgstr "тихий режим"
 
-#: builtin/receive-pack.c:1902
+#: builtin/receive-pack.c:1947
 msgid "You must specify a directory."
 msgstr "Вы должны указать каталог."
 
-#: builtin/reflog.c:423
+#: builtin/reflog.c:424
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "«%s» для «%s» не является допустимой меткой даты/времени"
 
-#: builtin/reflog.c:540 builtin/reflog.c:545
+#: builtin/reflog.c:541 builtin/reflog.c:546
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "«%s» не является допустимой меткой даты/времени"
 
-#: builtin/remote.c:12
+#: builtin/remote.c:13
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
-#: builtin/remote.c:13
+#: builtin/remote.c:14
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] "
 "[--mirror=<fetch|push>] <name> <url>"
 msgstr "git remote add [-t <ветка>] [-m <мастер-ветка>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <имя> <адрес>"
 
-#: builtin/remote.c:14 builtin/remote.c:34
+#: builtin/remote.c:15 builtin/remote.c:35
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename <старое-название> <новое-название>"
 
-#: builtin/remote.c:15 builtin/remote.c:39
+#: builtin/remote.c:16 builtin/remote.c:40
 msgid "git remote remove <name>"
 msgstr "git remote remove <имя>"
 
-#: builtin/remote.c:16 builtin/remote.c:44
+#: builtin/remote.c:17 builtin/remote.c:45
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <имя> (-a | --auto | -d | --delete | <ветка>)"
 
-#: builtin/remote.c:17
+#: builtin/remote.c:18
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <имя>"
 
-#: builtin/remote.c:18
+#: builtin/remote.c:19
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <имя>"
 
-#: builtin/remote.c:19
+#: builtin/remote.c:20
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<группа> | <имя-внешнего-репозитория>)…]"
 
-#: builtin/remote.c:20
+#: builtin/remote.c:21
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <имя> <ветка>…"
 
-#: builtin/remote.c:21 builtin/remote.c:70
+#: builtin/remote.c:22 builtin/remote.c:71
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <имя>"
 
-#: builtin/remote.c:22 builtin/remote.c:75
+#: builtin/remote.c:23 builtin/remote.c:76
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <имя> <новый-url> [<старый-url>]"
 
-#: builtin/remote.c:23 builtin/remote.c:76
+#: builtin/remote.c:24 builtin/remote.c:77
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <имя> <новый-url>"
 
-#: builtin/remote.c:24 builtin/remote.c:77
+#: builtin/remote.c:25 builtin/remote.c:78
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <имя> <url>"
 
-#: builtin/remote.c:29
+#: builtin/remote.c:30
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<опции>] <имя> <url>"
 
-#: builtin/remote.c:49
+#: builtin/remote.c:50
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <имя> <ветка>…"
 
-#: builtin/remote.c:50
+#: builtin/remote.c:51
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <имя> <ветка>…"
 
-#: builtin/remote.c:55
+#: builtin/remote.c:56
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<опции>] <имя>"
 
-#: builtin/remote.c:60
+#: builtin/remote.c:61
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<опции>] <имя>"
 
-#: builtin/remote.c:65
+#: builtin/remote.c:66
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<опции>] [<группа> | <имя-внешнего-репозитория>]…"
 
-#: builtin/remote.c:94
+#: builtin/remote.c:95
 #, c-format
 msgid "Updating %s"
 msgstr "Обновление %s"
 
-#: builtin/remote.c:126
+#: builtin/remote.c:127
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
 msgstr "ключ --mirror небезопасен и не рекомендуется к использованию;\nиспользуйте вместо него --mirror=fetch или --mirror=push"
 
-#: builtin/remote.c:143
+#: builtin/remote.c:144
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "неизвестный аргумент для mirror: %s"
 
-#: builtin/remote.c:159
+#: builtin/remote.c:160
 msgid "fetch the remote branches"
 msgstr "извлечь внешние ветки"
 
-#: builtin/remote.c:161
+#: builtin/remote.c:162
 msgid "import all tags and associated objects when fetching"
 msgstr "импортировать все метки и ассоциированные объекты при извлечении"
 
-#: builtin/remote.c:164
+#: builtin/remote.c:165
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "или не извлекать метки вообще (--no-tags)"
 
-#: builtin/remote.c:166
+#: builtin/remote.c:167
 msgid "branch(es) to track"
 msgstr "отслеживаемые ветки"
 
-#: builtin/remote.c:167
+#: builtin/remote.c:168
 msgid "master branch"
 msgstr "мастер ветка"
 
-#: builtin/remote.c:168
+#: builtin/remote.c:169
 msgid "push|fetch"
 msgstr "push|fetch"
 
-#: builtin/remote.c:169
+#: builtin/remote.c:170
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr "настроить внешний репозиторий как зеркало для отправки или извлечения изменений"
 
-#: builtin/remote.c:181
+#: builtin/remote.c:182
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "указание мастер ветки не имеет смысла с параметром --mirror"
 
-#: builtin/remote.c:183
+#: builtin/remote.c:184
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "указание отслеживаемых веток имеет смысл только при зеркальном извлечении"
 
-#: builtin/remote.c:190 builtin/remote.c:629
+#: builtin/remote.c:191 builtin/remote.c:630
 #, c-format
 msgid "remote %s already exists."
 msgstr "внешний репозиторий %s уже существует"
 
-#: builtin/remote.c:194 builtin/remote.c:633
+#: builtin/remote.c:195 builtin/remote.c:634
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "«%s» не является допустимым именем внешнего репозитория."
 
-#: builtin/remote.c:234
+#: builtin/remote.c:235
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "Не удалось настроить мастер ветку «%s»"
 
-#: builtin/remote.c:336
+#: builtin/remote.c:337
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "Не удалось извлечь карту для спецификатора ссылки %s"
 
-#: builtin/remote.c:437 builtin/remote.c:445
+#: builtin/remote.c:438 builtin/remote.c:446
 msgid "(matching)"
 msgstr "(соответствующая)"
 
-#: builtin/remote.c:449
+#: builtin/remote.c:450
 msgid "(delete)"
 msgstr "(удаленная)"
 
-#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856
+#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
 #, c-format
 msgid "No such remote: %s"
 msgstr "Нет такого внешнего репозитория: %s"
 
-#: builtin/remote.c:639
+#: builtin/remote.c:640
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Не удалось переименовать секцию конфигурации с «%s» на «%s»"
 
-#: builtin/remote.c:659
+#: builtin/remote.c:660
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -11210,17 +11310,17 @@ msgid ""
 "\tPlease update the configuration manually if necessary."
 msgstr "Не обновляю нестандартную спецификатор ссылки для извлечения\n\t%s\n\tПожалуйста, если требуется, обновите конфигурацию вручную."
 
-#: builtin/remote.c:695
+#: builtin/remote.c:696
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "не удалось удалить «%s»"
 
-#: builtin/remote.c:729
+#: builtin/remote.c:730
 #, c-format
 msgid "creating '%s' failed"
 msgstr "не удалось создать «%s»"
 
-#: builtin/remote.c:794
+#: builtin/remote.c:795
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -11232,142 +11332,143 @@ msgstr[1] "Примечание: Некоторые ветки вне иерар
 msgstr[2] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:"
 msgstr[3] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:"
 
-#: builtin/remote.c:808
+#: builtin/remote.c:809
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Не удалось удалить секцию файла конфигурации «%s»"
 
-#: builtin/remote.c:909
+#: builtin/remote.c:910
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " новая (следующее извлечение сохранит ее в remotes/%s)"
 
-#: builtin/remote.c:912
+#: builtin/remote.c:913
 msgid " tracked"
 msgstr " отслеживается"
 
-#: builtin/remote.c:914
+#: builtin/remote.c:915
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " недействительна (используйте «git remote prune», чтобы удалить)"
 
-#: builtin/remote.c:916
+#: builtin/remote.c:917
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:957
+#: builtin/remote.c:958
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "неправильный параметр конфигурации branch.%s.merge; невозможно переместить более чем над 1 веткой"
 
-#: builtin/remote.c:965
+#: builtin/remote.c:966
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "перемещается интерактивно над внешней веткой %s"
 
-#: builtin/remote.c:966
+#: builtin/remote.c:967
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "перемещается над внешней веткой %s"
 
-#: builtin/remote.c:969
+#: builtin/remote.c:970
 #, c-format
 msgid " merges with remote %s"
 msgstr " будет слита с внешней веткой %s"
 
-#: builtin/remote.c:972
+#: builtin/remote.c:973
 #, c-format
 msgid "merges with remote %s"
 msgstr "будет слита с внешней веткой %s"
 
-#: builtin/remote.c:975
+#: builtin/remote.c:976
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    и с внешней веткой %s\n"
 
-#: builtin/remote.c:1018
+#: builtin/remote.c:1019
 msgid "create"
 msgstr "создана"
 
-#: builtin/remote.c:1021
+#: builtin/remote.c:1022
 msgid "delete"
 msgstr "удалена"
 
-#: builtin/remote.c:1025
+#: builtin/remote.c:1026
 msgid "up to date"
 msgstr "уже актуальна"
 
-#: builtin/remote.c:1028
+#: builtin/remote.c:1029
 msgid "fast-forwardable"
 msgstr "возможна перемотка вперед"
 
-#: builtin/remote.c:1031
+#: builtin/remote.c:1032
 msgid "local out of date"
 msgstr "локальная ветка устарела"
 
-#: builtin/remote.c:1038
+#: builtin/remote.c:1039
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s будет принудительно отправлена в %-*s (%s)"
 
-#: builtin/remote.c:1041
+#: builtin/remote.c:1042
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s будет отправлена в %-*s (%s)"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1046
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s будет принудительно отправлена в %s"
 
-#: builtin/remote.c:1048
+#: builtin/remote.c:1049
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s будет отправлена в %s"
 
-#: builtin/remote.c:1116
+#: builtin/remote.c:1117
 msgid "do not query remotes"
 msgstr "не опрашивать внешние репозитории"
 
-#: builtin/remote.c:1143
+#: builtin/remote.c:1144
 #, c-format
 msgid "* remote %s"
 msgstr "* внешний репозиторий %s"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL для извлечения: %s"
 
-#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297
+#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
 msgid "(no URL)"
 msgstr "(нет URL)"
 
-#. TRANSLATORS: the colon ':' should align with
-#. the one in "  Fetch URL: %s" translation
-#: builtin/remote.c:1156 builtin/remote.c:1158
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#: builtin/remote.c:1160 builtin/remote.c:1162
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "    URL для отправки: %s"
 
-#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164
+#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  HEAD ветка: %s"
 
-#: builtin/remote.c:1160
+#: builtin/remote.c:1164
 msgid "(not queried)"
 msgstr "(не запрашивался)"
 
-#: builtin/remote.c:1162
+#: builtin/remote.c:1166
 msgid "(unknown)"
 msgstr "(неизвестно)"
 
-#: builtin/remote.c:1166
+#: builtin/remote.c:1170
 #, c-format
 msgid "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  HEAD ветка (HEAD внешнего репозитория неоднозначный, может быть одним из):\n"
 
-#: builtin/remote.c:1178
+#: builtin/remote.c:1182
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
@@ -11376,11 +11477,11 @@ msgstr[1] "  Внешние ветки:%s"
 msgstr[2] "  Внешние ветки:%s"
 msgstr[3] "  Внешние ветки:%s"
 
-#: builtin/remote.c:1181 builtin/remote.c:1207
+#: builtin/remote.c:1185 builtin/remote.c:1211
 msgid " (status not queried)"
 msgstr " (статус не запрашивался)"
 
-#: builtin/remote.c:1190
+#: builtin/remote.c:1194
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Локальная ветка, настроенная для «git pull»:"
@@ -11388,11 +11489,11 @@ msgstr[1] "  Локальные ветки, настроенные для «git
 msgstr[2] "  Локальные ветки, настроенные для «git pull»:"
 msgstr[3] "  Локальные ветки, настроенные для «git pull»:"
 
-#: builtin/remote.c:1198
+#: builtin/remote.c:1202
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr " Локальные ссылки, зеркалируемые с помощью «git push»"
 
-#: builtin/remote.c:1204
+#: builtin/remote.c:1208
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
@@ -11401,465 +11502,469 @@ msgstr[1] "  Локальные ссылки, настроенные для «gi
 msgstr[2] "  Локальные ссылки, настроенные для «git push»%s:"
 msgstr[3] "  Локальные ссылки, настроенные для «git push»%s:"
 
-#: builtin/remote.c:1225
+#: builtin/remote.c:1229
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "установить refs/remotes/<имя>/HEAD в зависимости от внешнего репозитория"
 
-#: builtin/remote.c:1227
+#: builtin/remote.c:1231
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "удалить refs/remotes/<имя>/HEAD"
 
-#: builtin/remote.c:1242
+#: builtin/remote.c:1246
 msgid "Cannot determine remote HEAD"
 msgstr "Не удалось определить внешний HEAD"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1248
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "Несколько внешних HEAD веток. Укажите явно одну из них:"
 
-#: builtin/remote.c:1254
+#: builtin/remote.c:1258
 #, c-format
 msgid "Could not delete %s"
 msgstr "Не удалось удалить %s"
 
-#: builtin/remote.c:1262
+#: builtin/remote.c:1266
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Недопустимая ссылка: %s"
 
-#: builtin/remote.c:1264
+#: builtin/remote.c:1268
 #, c-format
 msgid "Could not setup %s"
 msgstr "Не удалось настроить %s"
 
-#: builtin/remote.c:1282
+#: builtin/remote.c:1286
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s будет висящей веткой!"
 
-#: builtin/remote.c:1283
+#: builtin/remote.c:1287
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s стала висящей веткой!"
 
-#: builtin/remote.c:1293
+#: builtin/remote.c:1297
 #, c-format
 msgid "Pruning %s"
 msgstr "Очистка %s"
 
-#: builtin/remote.c:1294
+#: builtin/remote.c:1298
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1314
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [будет удалена] %s"
 
-#: builtin/remote.c:1313
+#: builtin/remote.c:1317
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [удалена] %s"
 
-#: builtin/remote.c:1358
+#: builtin/remote.c:1362
 msgid "prune remotes after fetching"
 msgstr "почистить внешние репозитории после извлечения"
 
-#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Нет такого внешнего репозитория «%s»"
 
-#: builtin/remote.c:1437
+#: builtin/remote.c:1441
 msgid "add branch"
 msgstr "добавить ветку"
 
-#: builtin/remote.c:1444
+#: builtin/remote.c:1448
 msgid "no remote specified"
 msgstr "не указан внешний репозиторий"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1465
 msgid "query push URLs rather than fetch URLs"
 msgstr "запросить URL отправки, вместо URL извлечения"
 
-#: builtin/remote.c:1463
+#: builtin/remote.c:1467
 msgid "return all URLs"
 msgstr "вернуть все URL"
 
-#: builtin/remote.c:1491
+#: builtin/remote.c:1495
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "URL не настроены для внешнего репозитория «%s»"
 
-#: builtin/remote.c:1517
+#: builtin/remote.c:1521
 msgid "manipulate push URLs"
 msgstr "управление URL отправки"
 
-#: builtin/remote.c:1519
+#: builtin/remote.c:1523
 msgid "add URL"
 msgstr "добавить URL"
 
-#: builtin/remote.c:1521
+#: builtin/remote.c:1525
 msgid "delete URLs"
 msgstr "удалить URL"
 
-#: builtin/remote.c:1528
+#: builtin/remote.c:1532
 msgid "--add --delete doesn't make sense"
 msgstr "--add нельзя использовать одновременно с --delete"
 
-#: builtin/remote.c:1569
+#: builtin/remote.c:1573
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Неправильный шаблон старого URL: %s"
 
-#: builtin/remote.c:1577
+#: builtin/remote.c:1581
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Не найдены совпадения URL: %s"
 
-#: builtin/remote.c:1579
+#: builtin/remote.c:1583
 msgid "Will not delete all non-push URLs"
 msgstr "Нельзя удалить все URL не-отправки"
 
-#: builtin/remote.c:1593
+#: builtin/remote.c:1597
 msgid "be verbose; must be placed before a subcommand"
 msgstr "быть многословнее; должно стоять перед подкомандой"
 
-#: builtin/remote.c:1624
+#: builtin/remote.c:1628
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Неизвестная подкоманда: %s"
 
-#: builtin/repack.c:17
+#: builtin/repack.c:18
 msgid "git repack [<options>]"
 msgstr "git repack [<опции>]"
 
-#: builtin/repack.c:22
+#: builtin/repack.c:23
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
 msgstr "Инкрементальные перепаковки не совместимы с индексами в битовых картах.  Используйте опцию --no-write-bitmap-index или отключите параметр конфигурации pack.writebitmaps."
 
-#: builtin/repack.c:166
+#: builtin/repack.c:168
 msgid "pack everything in a single pack"
 msgstr "упаковать всё в один пакет"
 
-#: builtin/repack.c:168
+#: builtin/repack.c:170
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "тоже, что и -a, но дополнительно отбросить недостижимые объекты"
 
-#: builtin/repack.c:171
+#: builtin/repack.c:173
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "удалите лишние пакеты и запустите git-prune-packed"
 
-#: builtin/repack.c:173
+#: builtin/repack.c:175
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "передать опцию --no-reuse-delta в git-pack-objects"
 
-#: builtin/repack.c:175
+#: builtin/repack.c:177
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "передать опцию --no-reuse-object в git-pack-objects"
 
-#: builtin/repack.c:177
+#: builtin/repack.c:179
 msgid "do not run git-update-server-info"
 msgstr "не запускать git-update-server-info"
 
-#: builtin/repack.c:180
+#: builtin/repack.c:182
 msgid "pass --local to git-pack-objects"
 msgstr "передать опцию --local в git-pack-objects"
 
-#: builtin/repack.c:182
+#: builtin/repack.c:184
 msgid "write bitmap index"
 msgstr "запись индекса в битовых картах"
 
-#: builtin/repack.c:183
+#: builtin/repack.c:185
 msgid "approxidate"
 msgstr "примерная-дата"
 
-#: builtin/repack.c:184
+#: builtin/repack.c:186
 msgid "with -A, do not loosen objects older than this"
 msgstr "с опцией -A, не отбрасывать объекты старее, чем указано"
 
-#: builtin/repack.c:186
+#: builtin/repack.c:188
 msgid "with -a, repack unreachable objects"
 msgstr "с параметром -a, перепаковать недоступные объекты"
 
-#: builtin/repack.c:188
+#: builtin/repack.c:190
 msgid "size of the window used for delta compression"
 msgstr "размер окна, используемый для компрессии дельт"
 
-#: builtin/repack.c:189 builtin/repack.c:193
+#: builtin/repack.c:191 builtin/repack.c:197
 msgid "bytes"
 msgstr "количество-байт"
 
-#: builtin/repack.c:190
+#: builtin/repack.c:192
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr "тоже, что и выше, но ограничить размер памяти, а не количество записей"
 
-#: builtin/repack.c:192
+#: builtin/repack.c:194
 msgid "limits the maximum delta depth"
 msgstr "ограничение на максимальную глубину дельт"
 
-#: builtin/repack.c:194
+#: builtin/repack.c:196
+msgid "limits the maximum number of threads"
+msgstr "ограничение на максимальное количество потоков"
+
+#: builtin/repack.c:198
 msgid "maximum size of each packfile"
 msgstr "максимальный размер каждого из файлов пакета"
 
-#: builtin/repack.c:196
+#: builtin/repack.c:200
 msgid "repack objects in packs marked with .keep"
 msgstr "переупаковать объекты в пакеты, помеченные файлом .keep"
 
-#: builtin/repack.c:206
+#: builtin/repack.c:210
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "нельзя удалять пакеты в precious-objects репозитории"
 
-#: builtin/repack.c:210
+#: builtin/repack.c:214
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable и -A нельзя использовать одновременно"
 
-#: builtin/repack.c:400 builtin/worktree.c:115
+#: builtin/repack.c:406 builtin/worktree.c:116
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "сбой удаления «%s»"
 
-#: builtin/replace.c:19
+#: builtin/replace.c:20
 msgid "git replace [-f] <object> <replacement>"
 msgstr "git replace [-f] <объект> <замена>"
 
-#: builtin/replace.c:20
+#: builtin/replace.c:21
 msgid "git replace [-f] --edit <object>"
 msgstr "git replace [-f] --edit <объект>"
 
-#: builtin/replace.c:21
+#: builtin/replace.c:22
 msgid "git replace [-f] --graft <commit> [<parent>...]"
 msgstr "git replace [-f] --graft <коммит> [<родитель>…]"
 
-#: builtin/replace.c:22
+#: builtin/replace.c:23
 msgid "git replace -d <object>..."
 msgstr "git replace -d <объект>…"
 
-#: builtin/replace.c:23
+#: builtin/replace.c:24
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr "git replace [--format=<формат>] [-l [<шаблон>]]"
 
-#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396
+#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
 #, c-format
 msgid "Not a valid object name: '%s'"
 msgstr "Недопустимое имя объекта: «%s»"
 
-#: builtin/replace.c:360
+#: builtin/replace.c:361
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "плохая метка слияния в коммите «%s»"
 
-#: builtin/replace.c:362
+#: builtin/replace.c:363
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "повреждённая метка слияния в коммите «%s»"
 
-#: builtin/replace.c:373
+#: builtin/replace.c:374
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
 "instead of --graft"
 msgstr "оригинальный коммит «%s» содержит метку слияния «%s», которая была отброшена; используйте --edit вместо --graft"
 
-#: builtin/replace.c:406
+#: builtin/replace.c:407
 #, c-format
 msgid "the original commit '%s' has a gpg signature."
 msgstr "оригинальный коммит «%s» содержит подпись gpg."
 
-#: builtin/replace.c:407
+#: builtin/replace.c:408
 msgid "the signature will be removed in the replacement commit!"
 msgstr "подпись будет удалена в замененном коммите!"
 
-#: builtin/replace.c:413
+#: builtin/replace.c:414
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "не удалось записать замену для коммита: «%s»"
 
-#: builtin/replace.c:437
+#: builtin/replace.c:438
 msgid "list replace refs"
 msgstr "вывести список заменяемых ссылок"
 
-#: builtin/replace.c:438
+#: builtin/replace.c:439
 msgid "delete replace refs"
 msgstr "удаление заменяемых ссылок"
 
-#: builtin/replace.c:439
+#: builtin/replace.c:440
 msgid "edit existing object"
 msgstr "изменение существующего объекта"
 
-#: builtin/replace.c:440
+#: builtin/replace.c:441
 msgid "change a commit's parents"
 msgstr "изменение родителя коммита"
 
-#: builtin/replace.c:441
+#: builtin/replace.c:442
 msgid "replace the ref if it exists"
 msgstr "замена ссылки, если она существует"
 
-#: builtin/replace.c:442
+#: builtin/replace.c:443
 msgid "do not pretty-print contents for --edit"
 msgstr "не делать структурированный вывод содержимого для --edit"
 
-#: builtin/replace.c:443
+#: builtin/replace.c:444
 msgid "use this format"
 msgstr "использовать этот формат"
 
-#: builtin/rerere.c:12
+#: builtin/rerere.c:13
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr "git rerere [clear | forget <путь>… | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:58
+#: builtin/rerere.c:59
 msgid "register clean resolutions in index"
 msgstr "записать чистые разрешения конфликтов в индекс"
 
-#: builtin/reset.c:26
+#: builtin/reset.c:29
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<коммит>]"
 
-#: builtin/reset.c:27
+#: builtin/reset.c:30
 msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
 msgstr "git reset [-q] [<указатель-дерева>] [--] <пути>…"
 
-#: builtin/reset.c:28
+#: builtin/reset.c:31
 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
 msgstr "git reset --patch [<указатель-дерева>] [--] [<пути>…]"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:37
 msgid "mixed"
 msgstr "смешанный"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:37
 msgid "soft"
 msgstr "мягкий"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:37
 msgid "hard"
 msgstr "жесткий"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:37
 msgid "merge"
 msgstr "слиянием"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:37
 msgid "keep"
 msgstr "оставлением"
 
-#: builtin/reset.c:74
+#: builtin/reset.c:77
 msgid "You do not have a valid HEAD."
 msgstr "У вас нет верного HEAD."
 
-#: builtin/reset.c:76
+#: builtin/reset.c:79
 msgid "Failed to find tree of HEAD."
 msgstr "Не удалось найти дерево у HEAD."
 
-#: builtin/reset.c:82
+#: builtin/reset.c:85
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Не удалось найти дерево у %s."
 
-#: builtin/reset.c:100
+#: builtin/reset.c:103
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD сейчас на %s"
 
-#: builtin/reset.c:183
+#: builtin/reset.c:186
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "Нельзя выполнить сброс в режиме «%s» во время слияния."
 
-#: builtin/reset.c:276
+#: builtin/reset.c:286
 msgid "be quiet, only report errors"
 msgstr "тихий режим, выводить только ошибки"
 
-#: builtin/reset.c:278
+#: builtin/reset.c:288
 msgid "reset HEAD and index"
 msgstr "сбросить HEAD и индекс"
 
-#: builtin/reset.c:279
+#: builtin/reset.c:289
 msgid "reset only HEAD"
 msgstr "сбросить только HEAD"
 
-#: builtin/reset.c:281 builtin/reset.c:283
+#: builtin/reset.c:291 builtin/reset.c:293
 msgid "reset HEAD, index and working tree"
 msgstr "сбросить HEAD, индекс и рабочий каталог"
 
-#: builtin/reset.c:285
+#: builtin/reset.c:295
 msgid "reset HEAD but keep local changes"
 msgstr "сбросить HEAD, но оставить локальные изменения"
 
-#: builtin/reset.c:288
+#: builtin/reset.c:301
 msgid "record only the fact that removed paths will be added later"
 msgstr "записать только факт того, что удаленные пути будут добавлены позже"
 
-#: builtin/reset.c:305
+#: builtin/reset.c:320
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Не удалось распознать «%s» как действительную редакцию."
 
-#: builtin/reset.c:313
+#: builtin/reset.c:328
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "Не удалось распознать «%s» как действительное дерево."
 
-#: builtin/reset.c:322
+#: builtin/reset.c:337
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch нельзя использовать одновременно с --{hard,mixed,soft}"
 
-#: builtin/reset.c:331
+#: builtin/reset.c:346
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr "использование опции --mixed с путями устарело; используйте «git reset -- <пути>» instead."
 
-#: builtin/reset.c:333
+#: builtin/reset.c:348
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Нельзя выполнить сброс в режиме «%s» вместе с указанием пути."
 
-#: builtin/reset.c:343
+#: builtin/reset.c:358
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "сброс «%s» разрешен только с голым репозиторием"
 
-#: builtin/reset.c:347
+#: builtin/reset.c:362
 msgid "-N can only be used with --mixed"
 msgstr "-N можно использовать вместе с --mixed"
 
-#: builtin/reset.c:364
+#: builtin/reset.c:379
 msgid "Unstaged changes after reset:"
 msgstr "Непроиндексированные изменения после сброса:"
 
-#: builtin/reset.c:370
+#: builtin/reset.c:385
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Не удалось сбросить файл индекса на редакцию «%s»."
 
-#: builtin/reset.c:374
+#: builtin/reset.c:389
 msgid "Could not write new index file."
 msgstr "Не удалось записать новый файл индекса."
 
-#: builtin/rev-list.c:354
+#: builtin/rev-list.c:358
 msgid "rev-list does not support display of notes"
 msgstr "rev-list не поддерживает отображение заметок"
 
-#: builtin/rev-parse.c:393
+#: builtin/rev-parse.c:394
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<опции>] -- [<аргументы>…]"
 
-#: builtin/rev-parse.c:398
+#: builtin/rev-parse.c:399
 msgid "keep the `--` passed as an arg"
 msgstr "передавать далее «--» как аргумент"
 
-#: builtin/rev-parse.c:400
+#: builtin/rev-parse.c:401
 msgid "stop parsing after the first non-option argument"
 msgstr "остановить разбор после первого аргумента не являющегося опцией"
 
-#: builtin/rev-parse.c:403
+#: builtin/rev-parse.c:404
 msgid "output in stuck long form"
 msgstr "выводить аргументы в длинном формате"
 
-#: builtin/rev-parse.c:534
+#: builtin/rev-parse.c:535
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -11868,96 +11973,96 @@ msgid ""
 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
 msgstr "git rev-parse --parseopt [<опции>] -- [<аргументы>…]\n   or: git rev-parse --sq-quote [<аргумент>…]\n   or: git rev-parse [<опции>] [<аргумент>…]\n\nЗапустите команду «git rev-parse --parseopt -h» для получения подробной информации о первом использовании."
 
-#: builtin/revert.c:22
+#: builtin/revert.c:23
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<опции>] <указатель-коммита>…"
 
-#: builtin/revert.c:23
+#: builtin/revert.c:24
 msgid "git revert <subcommand>"
 msgstr "git revert <подкоманда>"
 
-#: builtin/revert.c:28
+#: builtin/revert.c:29
 msgid "git cherry-pick [<options>] <commit-ish>..."
 msgstr "git cherry-pick [<опции>] <указатель-коммита>…"
 
-#: builtin/revert.c:29
+#: builtin/revert.c:30
 msgid "git cherry-pick <subcommand>"
 msgstr "git cherry-pick <подкоманда>"
 
-#: builtin/revert.c:89
+#: builtin/revert.c:90
 #, c-format
 msgid "%s: %s cannot be used with %s"
 msgstr "%s: %s нельзя использовать одновременно с %s"
 
-#: builtin/revert.c:98
+#: builtin/revert.c:99
 msgid "end revert or cherry-pick sequence"
 msgstr "конец последовательности копирования или обращения изменений коммитов"
 
-#: builtin/revert.c:99
+#: builtin/revert.c:100
 msgid "resume revert or cherry-pick sequence"
 msgstr "продолжить последовательность копирования или обращения изменений коммитов"
 
-#: builtin/revert.c:100
+#: builtin/revert.c:101
 msgid "cancel revert or cherry-pick sequence"
 msgstr "отмена последовательности копирования или обращения изменений коммитов"
 
-#: builtin/revert.c:101
+#: builtin/revert.c:102
 msgid "don't automatically commit"
 msgstr "не коммитить автоматически"
 
-#: builtin/revert.c:102
+#: builtin/revert.c:103
 msgid "edit the commit message"
 msgstr "изменить сообщение коммита"
 
-#: builtin/revert.c:105
+#: builtin/revert.c:106
 msgid "parent-number"
 msgstr "номер-родителя"
 
-#: builtin/revert.c:106
+#: builtin/revert.c:107
 msgid "select mainline parent"
 msgstr "выбор основного родителя"
 
-#: builtin/revert.c:108
+#: builtin/revert.c:109
 msgid "merge strategy"
 msgstr "стратегия слияния"
 
-#: builtin/revert.c:109
+#: builtin/revert.c:110
 msgid "option"
 msgstr "опция"
 
-#: builtin/revert.c:110
+#: builtin/revert.c:111
 msgid "option for merge strategy"
 msgstr "опция для стратегии слияния"
 
-#: builtin/revert.c:119
+#: builtin/revert.c:120
 msgid "append commit name"
 msgstr "добавить имя коммита"
 
-#: builtin/revert.c:121
+#: builtin/revert.c:122
 msgid "preserve initially empty commits"
 msgstr "сохранить изначально пустые коммиты"
 
-#: builtin/revert.c:122
+#: builtin/revert.c:123
 msgid "allow commits with empty messages"
 msgstr "разрешить коммиты с пустыми сообщениями"
 
-#: builtin/revert.c:123
+#: builtin/revert.c:124
 msgid "keep redundant, empty commits"
 msgstr "оставить избыточные, пустые коммиты"
 
-#: builtin/revert.c:211
+#: builtin/revert.c:212
 msgid "revert failed"
 msgstr "сбой обращения изменений коммита"
 
-#: builtin/revert.c:224
+#: builtin/revert.c:225
 msgid "cherry-pick failed"
 msgstr "сбой при копировании коммита"
 
-#: builtin/rm.c:17
+#: builtin/rm.c:18
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<опции>] [--] <файл>…"
 
-#: builtin/rm.c:205
+#: builtin/rm.c:206
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -11969,13 +12074,13 @@ msgstr[1] "следующие файлы содержат проиндексир
 msgstr[2] "следующие файлы содержат проиндексированные изменения отличающиеся и от файла, и от HEAD:"
 msgstr[3] "следующие файлы содержат проиндексированные изменения отличающиеся и от файла, и от HEAD:"
 
-#: builtin/rm.c:210
+#: builtin/rm.c:211
 msgid ""
 "\n"
 "(use -f to force removal)"
 msgstr "\n(используйте опцию «-f» для принудительного удаления)"
 
-#: builtin/rm.c:214
+#: builtin/rm.c:215
 msgid "the following file has changes staged in the index:"
 msgid_plural "the following files have changes staged in the index:"
 msgstr[0] "следующие файлы содержат проиндексированные изменения в индексе:"
@@ -11983,13 +12088,13 @@ msgstr[1] "следующие файлы содержат проиндексир
 msgstr[2] "следующие файлы содержат проиндексированные изменения в индексе:"
 msgstr[3] "следующие файлы содержат проиндексированные изменения в индексе:"
 
-#: builtin/rm.c:218 builtin/rm.c:227
+#: builtin/rm.c:219 builtin/rm.c:228
 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
 msgstr "\n(используйте опцию «--cached» для оставления файла, или «-f» для принудительного удаления)"
 
-#: builtin/rm.c:224
+#: builtin/rm.c:225
 msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] "следующие файлы содержат локальные изменения:"
@@ -11997,23 +12102,23 @@ msgstr[1] "следующие файлы содержат локальные и
 msgstr[2] "следующие файлы содержат локальные изменения:"
 msgstr[3] "следующие файлы содержат локальные изменения:"
 
-#: builtin/rm.c:242
+#: builtin/rm.c:243
 msgid "do not list removed files"
 msgstr "не выводить список удаленных файлов"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:244
 msgid "only remove from the index"
 msgstr "удалить только из индекса"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "override the up-to-date check"
 msgstr "пропустить проверку актуальности"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "allow recursive removal"
 msgstr "разрешить рекурсивное удаление"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "exit with a zero status even if nothing matched"
 msgstr "выход с нулевым кодом возврата, даже если ничего не найдено"
 
@@ -12032,57 +12137,57 @@ msgstr "git rm: не удалось удалить %s"
 msgid "could not remove '%s'"
 msgstr "не удалось удалить «%s»"
 
-#: builtin/send-pack.c:18
+#: builtin/send-pack.c:19
 msgid ""
 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> [<ref>...]\n"
 "  --all and explicit <ref> specification are mutually exclusive."
 msgstr "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] [<сервер>:]<каталог> [<ссылка>…]\n  --all и явный спецификатор <ссылки> взаимно исключающие."
 
-#: builtin/send-pack.c:161
+#: builtin/send-pack.c:162
 msgid "remote name"
 msgstr "имя внешнего репозитория"
 
-#: builtin/send-pack.c:175
+#: builtin/send-pack.c:176
 msgid "use stateless RPC protocol"
 msgstr "протокол без сохранения состояния для RPC"
 
-#: builtin/send-pack.c:176
+#: builtin/send-pack.c:177
 msgid "read refs from stdin"
 msgstr "прочитать ссылки из стандартного ввода"
 
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:178
 msgid "print status from remote helper"
 msgstr "вывести статус от скрипта внешнего сервера"
 
-#: builtin/shortlog.c:13
+#: builtin/shortlog.c:14
 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
 msgstr "git shortlog [<опции>] [<диапазон-редакций>] [[--] [<путь>…]]"
 
-#: builtin/shortlog.c:248
+#: builtin/shortlog.c:249
 msgid "Group by committer rather than author"
 msgstr "Группировать по коммитеру, а не по автору"
 
-#: builtin/shortlog.c:250
+#: builtin/shortlog.c:251
 msgid "sort output according to the number of commits per author"
 msgstr "отсортировать вывод по количеству коммитов у автора"
 
-#: builtin/shortlog.c:252
+#: builtin/shortlog.c:253
 msgid "Suppress commit descriptions, only provides commit count"
 msgstr "Не выводить описания коммитов, а только их количество"
 
-#: builtin/shortlog.c:254
+#: builtin/shortlog.c:255
 msgid "Show the email address of each author"
 msgstr "Показать почту каждого из авторов"
 
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:256
 msgid "w[,i1[,i2]]"
 msgstr "w[,i1[,i2]]"
 
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:257
 msgid "Linewrap output"
 msgstr "Перенос строк на выводе"
 
-#: builtin/show-branch.c:10
+#: builtin/show-branch.c:12
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -12090,11 +12195,11 @@ msgid ""
 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
 msgstr "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n\t\t[--current] [--color[=<когда>] | --no-color] [--sparse]\n\t\t[--more=<n> | --list | --independent | --merge-base]\n\t\t[--no-name | --sha1-name] [--topics] [(<редакция> | <шаблон>)…]"
 
-#: builtin/show-branch.c:14
+#: builtin/show-branch.c:16
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
 msgstr "git show-branch (-g | --reflog)[=<n>[,<база>]] [--list] [<ссылка>]"
 
-#: builtin/show-branch.c:374
+#: builtin/show-branch.c:376
 #, c-format
 msgid "ignoring %s; cannot handle more than %d ref"
 msgid_plural "ignoring %s; cannot handle more than %d refs"
@@ -12103,90 +12208,90 @@ msgstr[1] "игнорирование %s; невозможно обработа
 msgstr[2] "игнорирование %s; невозможно обработать больше %d ссылок"
 msgstr[3] "игнорирование %s; невозможно обработать больше %d ссылки"
 
-#: builtin/show-branch.c:536
+#: builtin/show-branch.c:530
 #, c-format
 msgid "no matching refs with %s"
 msgstr "нет совпадающих записей с %s"
 
-#: builtin/show-branch.c:632
+#: builtin/show-branch.c:626
 msgid "show remote-tracking and local branches"
 msgstr "показать список и отслеживаемых внешних и локальных веток"
 
-#: builtin/show-branch.c:634
+#: builtin/show-branch.c:628
 msgid "show remote-tracking branches"
 msgstr "показать список отслеживаемых внешних веток"
 
-#: builtin/show-branch.c:636
+#: builtin/show-branch.c:630
 msgid "color '*!+-' corresponding to the branch"
 msgstr "окрашивать «*!+-» в соответствии с веткой"
 
-#: builtin/show-branch.c:638
+#: builtin/show-branch.c:632
 msgid "show <n> more commits after the common ancestor"
 msgstr "показать <n> коммитов после общего предка"
 
-#: builtin/show-branch.c:640
+#: builtin/show-branch.c:634
 msgid "synonym to more=-1"
 msgstr "синоним для more=-1"
 
-#: builtin/show-branch.c:641
+#: builtin/show-branch.c:635
 msgid "suppress naming strings"
 msgstr "не выводить именованные строки"
 
-#: builtin/show-branch.c:643
+#: builtin/show-branch.c:637
 msgid "include the current branch"
 msgstr "включить в вывод текущую ветку"
 
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:639
 msgid "name commits with their object names"
 msgstr "именовать коммиты их именами объектов"
 
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:641
 msgid "show possible merge bases"
 msgstr "вывести возможные базы слияния"
 
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:643
 msgid "show refs unreachable from any other ref"
 msgstr "вывести ссылки, недоступные из любых других ссылок"
 
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:645
 msgid "show commits in topological order"
 msgstr "вывести коммиты в топологическом порядке"
 
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:648
 msgid "show only commits not on the first branch"
 msgstr "вывести только коммиты, отсутствующие в первой ветке"
 
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:650
 msgid "show merges reachable from only one tip"
 msgstr "вывести слияния, достижимые только из одной из верхушек"
 
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:652
 msgid "topologically sort, maintaining date order where possible"
 msgstr "топологическая сортировка, с сохранением порядка дат, если возможно"
 
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:655
 msgid "<n>[,<base>]"
 msgstr "<n>[,<база>]"
 
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:656
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "показать <n> последних записей в журнале ссылок, начиная с базы"
 
-#: builtin/show-branch.c:696
+#: builtin/show-branch.c:690
 msgid ""
 "--reflog is incompatible with --all, --remotes, --independent or --merge-"
 "base"
 msgstr "--reflog несовместимо с --all, --remotes, --independent и --merge-base"
 
-#: builtin/show-branch.c:720
+#: builtin/show-branch.c:714
 msgid "no branches given, and HEAD is not valid"
 msgstr "не указаны ветки и HEAD не действительный"
 
-#: builtin/show-branch.c:723
+#: builtin/show-branch.c:717
 msgid "--reflog option needs one branch name"
 msgstr "параметр --reflog требует указания имени одной ветки"
 
-#: builtin/show-branch.c:726
+#: builtin/show-branch.c:720
 #, c-format
 msgid "only %d entry can be shown at one time."
 msgid_plural "only %d entries can be shown at one time."
@@ -12195,12 +12300,12 @@ msgstr[1] "только %d записи могут быть показаны о
 msgstr[2] "только %d записей могут быть показаны одновременно."
 msgstr[3] "только %d записи могут быть показаны одновременно."
 
-#: builtin/show-branch.c:730
+#: builtin/show-branch.c:724
 #, c-format
 msgid "no such ref %s"
 msgstr "нет такой ссылки %s"
 
-#: builtin/show-branch.c:814
+#: builtin/show-branch.c:808
 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
@@ -12209,12 +12314,12 @@ msgstr[1] "невозможно обработать больше %d редак
 msgstr[2] "невозможно обработать больше %d редакций."
 msgstr[3] "невозможно обработать больше %d редакции."
 
-#: builtin/show-branch.c:818
+#: builtin/show-branch.c:812
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "«%s» не является допустимой ссылкой на коммит."
 
-#: builtin/show-branch.c:821
+#: builtin/show-branch.c:815
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "не удалось найти коммит %s (%s)"
@@ -12261,33 +12366,33 @@ msgstr "не печатать результат на стандартный в
 msgid "show refs from stdin that aren't in local repository"
 msgstr "вывести ссылки со стандартного ввода, которых нет в локальном репозитории"
 
-#: builtin/stripspace.c:17
+#: builtin/stripspace.c:18
 msgid "git stripspace [-s | --strip-comments]"
 msgstr "git stripspace [-s | --strip-comments]"
 
-#: builtin/stripspace.c:18
+#: builtin/stripspace.c:19
 msgid "git stripspace [-c | --comment-lines]"
 msgstr "git stripspace [-c | --comment-lines]"
 
-#: builtin/stripspace.c:35
+#: builtin/stripspace.c:36
 msgid "skip and remove all lines starting with comment character"
 msgstr "пропустить и удалить все строки, начинающиеся с символа комметария"
 
-#: builtin/stripspace.c:38
+#: builtin/stripspace.c:39
 msgid "prepend comment character and space to each line"
 msgstr "добавить перед каждой строкой символ комметария и пробел"
 
-#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
 #, c-format
 msgid "No such ref: %s"
 msgstr "Нет такой ссылки: %s"
 
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Ожидалось полное имя ссылки, а получено %s"
 
-#: builtin/submodule--helper.c:71
+#: builtin/submodule--helper.c:72
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "не удалось обрезать один компонент url «%s»"
@@ -12480,79 +12585,75 @@ msgstr "рекурсивно по подмодулям"
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper embed-git-dir [<путь>…]"
 
-#: builtin/submodule--helper.c:1226
-msgid "submodule--helper subcommand must be called with a subcommand"
-msgstr "подкоманда submodule--helper должна вызываться с указанием подкоманды"
-
-#: builtin/submodule--helper.c:1233
+#: builtin/submodule--helper.c:1232
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s не поддерживает параметр --super-prefix"
 
-#: builtin/submodule--helper.c:1239
+#: builtin/submodule--helper.c:1238
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "«%s» не является подкомандой submodule--helper"
 
-#: builtin/symbolic-ref.c:7
+#: builtin/symbolic-ref.c:8
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
 msgstr "git symbolic-ref [<опции>] <имя> [<ссылка>]"
 
-#: builtin/symbolic-ref.c:8
+#: builtin/symbolic-ref.c:9
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <имя>"
 
-#: builtin/symbolic-ref.c:40
+#: builtin/symbolic-ref.c:41
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr "не выводить сообщения об ошибках для несимвольных (отсоединенных) ссылок"
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:42
 msgid "delete symbolic ref"
 msgstr "удалить символьные ссылки"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:43
 msgid "shorten ref output"
 msgstr "укороченный вывод ссылок"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
 msgid "reason"
 msgstr "причина"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
 msgid "reason of the update"
 msgstr "причина обновления"
 
-#: builtin/tag.c:23
+#: builtin/tag.c:24
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
 "[<head>]"
 msgstr "git tag [-a | -s | -u <идентификатор-ключа>] [-f] [-m <сообщение> | -F <файл>] <имя-метки> [<редакция>]"
 
-#: builtin/tag.c:24
+#: builtin/tag.c:25
 msgid "git tag -d <tagname>..."
 msgstr "git tag -d <имя-метки>…"
 
-#: builtin/tag.c:25
+#: builtin/tag.c:26
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n"
 "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
 msgstr "git tag -l [-n[<количество>]] [--contains <коммит>] [--no-contains <коммит>] [--points-at <объект>]\n\t\t[--format=<формат>] [--[no-]merged [<коммит>]] [<шаблон>…]"
 
-#: builtin/tag.c:27
+#: builtin/tag.c:28
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<формат>] <имя-метки>…"
 
-#: builtin/tag.c:83
+#: builtin/tag.c:84
 #, c-format
 msgid "tag '%s' not found."
 msgstr "метка  «%s» не найдена."
 
-#: builtin/tag.c:99
+#: builtin/tag.c:100
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Метка «%s» удалена (была %s)\n"
 
-#: builtin/tag.c:128
+#: builtin/tag.c:129
 #, c-format
 msgid ""
 "\n"
@@ -12561,7 +12662,7 @@ msgid ""
 "Lines starting with '%c' will be ignored.\n"
 msgstr "\nВведите сообщение для метки:\n  %s\nСтроки, начинающиеся с «%c» будут проигнорированы.\n"
 
-#: builtin/tag.c:132
+#: builtin/tag.c:133
 #, c-format
 msgid ""
 "\n"
@@ -12570,586 +12671,586 @@ msgid ""
 "Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n"
 msgstr "\nВведите сообщение для метки:\n  %s\nСтроки, начинающиеся с «%c» будут оставлены; вы можете удалить их вручную, если хотите.\n"
 
-#: builtin/tag.c:210
+#: builtin/tag.c:211
 msgid "unable to sign the tag"
 msgstr "не удалось подписать метку"
 
-#: builtin/tag.c:212
+#: builtin/tag.c:213
 msgid "unable to write tag file"
 msgstr "не удалось записать файл метки"
 
-#: builtin/tag.c:236
+#: builtin/tag.c:237
 msgid "bad object type."
 msgstr "неправильный тип объекта"
 
-#: builtin/tag.c:282
+#: builtin/tag.c:283
 msgid "no tag message?"
 msgstr "нет описания метки?"
 
-#: builtin/tag.c:289
+#: builtin/tag.c:290
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Сообщение метки было оставлено в %s\n"
 
-#: builtin/tag.c:397
+#: builtin/tag.c:398
 msgid "list tag names"
 msgstr "список названий меток"
 
-#: builtin/tag.c:399
+#: builtin/tag.c:400
 msgid "print <n> lines of each tag message"
 msgstr "печатать <n> строк описания от каждой метки"
 
-#: builtin/tag.c:401
+#: builtin/tag.c:402
 msgid "delete tags"
 msgstr "удалить метки"
 
-#: builtin/tag.c:402
+#: builtin/tag.c:403
 msgid "verify tags"
 msgstr "проверить метки"
 
-#: builtin/tag.c:404
+#: builtin/tag.c:405
 msgid "Tag creation options"
 msgstr "Настройки создания метки"
 
-#: builtin/tag.c:406
+#: builtin/tag.c:407
 msgid "annotated tag, needs a message"
 msgstr "для аннотированной метки нужно сообщение"
 
-#: builtin/tag.c:408
+#: builtin/tag.c:409
 msgid "tag message"
 msgstr "описание метки"
 
-#: builtin/tag.c:410
+#: builtin/tag.c:411
 msgid "annotated and GPG-signed tag"
 msgstr "аннотированная и подписанная с помощью GPG метка"
 
-#: builtin/tag.c:414
+#: builtin/tag.c:415
 msgid "use another key to sign the tag"
 msgstr "использовать другой ключ для подписания метки"
 
-#: builtin/tag.c:415
+#: builtin/tag.c:416
 msgid "replace the tag if exists"
 msgstr "замена метки, если она существует"
 
-#: builtin/tag.c:416 builtin/update-ref.c:368
+#: builtin/tag.c:417 builtin/update-ref.c:369
 msgid "create a reflog"
 msgstr "создать журнал ссылок"
 
-#: builtin/tag.c:418
+#: builtin/tag.c:419
 msgid "Tag listing options"
 msgstr "Настройки вывода списка меток"
 
-#: builtin/tag.c:419
+#: builtin/tag.c:420
 msgid "show tag list in columns"
 msgstr "показать список меток по столбцам"
 
-#: builtin/tag.c:420 builtin/tag.c:422
+#: builtin/tag.c:421 builtin/tag.c:423
 msgid "print only tags that contain the commit"
 msgstr "вывод только меток, которые содержат коммит"
 
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:422 builtin/tag.c:424
 msgid "print only tags that don't contain the commit"
 msgstr "вывод только меток, которые не содержат коммит"
 
-#: builtin/tag.c:424
+#: builtin/tag.c:425
 msgid "print only tags that are merged"
 msgstr "вывод только слитых меток"
 
-#: builtin/tag.c:425
+#: builtin/tag.c:426
 msgid "print only tags that are not merged"
 msgstr "вывод только не слитых меток"
 
-#: builtin/tag.c:430
+#: builtin/tag.c:431
 msgid "print only tags of the object"
 msgstr "вывод только меток, определенного объекта"
 
-#: builtin/tag.c:469
+#: builtin/tag.c:470
 msgid "--column and -n are incompatible"
 msgstr "--column и -n нельзя использовать одновременно"
 
-#: builtin/tag.c:491
+#: builtin/tag.c:492
 msgid "-n option is only allowed in list mode"
 msgstr "опцию -n можно использовать только в режиме списка"
 
-#: builtin/tag.c:493
+#: builtin/tag.c:494
 msgid "--contains option is only allowed in list mode"
 msgstr "опцию --contains можно использовать только в режиме списка"
 
-#: builtin/tag.c:495
+#: builtin/tag.c:496
 msgid "--no-contains option is only allowed in list mode"
 msgstr "опцию --no-contains можно использовать только в режиме списка"
 
-#: builtin/tag.c:497
+#: builtin/tag.c:498
 msgid "--points-at option is only allowed in list mode"
 msgstr "опцию --points-at можно использовать только в режиме списка"
 
-#: builtin/tag.c:499
+#: builtin/tag.c:500
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr "опции --merged и --no-merged можно использовать только в режиме списка"
 
-#: builtin/tag.c:510
+#: builtin/tag.c:511
 msgid "only one -F or -m option is allowed."
 msgstr "-F и -m нельзя использовать одновременно."
 
-#: builtin/tag.c:529
+#: builtin/tag.c:530
 msgid "too many params"
 msgstr "передано слишком много параметров"
 
-#: builtin/tag.c:535
+#: builtin/tag.c:536
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "«%s» не является допустимым именем метки."
 
-#: builtin/tag.c:540
+#: builtin/tag.c:541
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "метка «%s» уже существует"
 
-#: builtin/tag.c:570
+#: builtin/tag.c:571
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Метка «%s» обновлена (была %s)\n"
 
-#: builtin/unpack-objects.c:493
+#: builtin/unpack-objects.c:494
 msgid "Unpacking objects"
 msgstr "Распаковка объектов"
 
-#: builtin/update-index.c:79
+#: builtin/update-index.c:80
 #, c-format
 msgid "failed to create directory %s"
 msgstr "не удалось создать каталог %s"
 
-#: builtin/update-index.c:85
+#: builtin/update-index.c:86
 #, c-format
 msgid "failed to stat %s"
 msgstr "не удалось выполнить stat %s"
 
-#: builtin/update-index.c:95
+#: builtin/update-index.c:96
 #, c-format
 msgid "failed to create file %s"
 msgstr "не удалось создать файл %s"
 
-#: builtin/update-index.c:103
+#: builtin/update-index.c:104
 #, c-format
 msgid "failed to delete file %s"
 msgstr "не удалось удалить файл %s"
 
-#: builtin/update-index.c:110 builtin/update-index.c:216
+#: builtin/update-index.c:111 builtin/update-index.c:217
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "не удалось удалить каталог %s"
 
-#: builtin/update-index.c:135
+#: builtin/update-index.c:136
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Проверка mtime в «%s» "
 
-#: builtin/update-index.c:149
+#: builtin/update-index.c:150
 msgid "directory stat info does not change after adding a new file"
 msgstr "информация статистики каталога не изменяется после добавления нового файла"
 
-#: builtin/update-index.c:162
+#: builtin/update-index.c:163
 msgid "directory stat info does not change after adding a new directory"
 msgstr "информация статистики каталога не изменяется после добавления нового каталога"
 
-#: builtin/update-index.c:175
+#: builtin/update-index.c:176
 msgid "directory stat info changes after updating a file"
 msgstr "информация статистики каталога изменяется после добавления нового файла"
 
-#: builtin/update-index.c:186
+#: builtin/update-index.c:187
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr "информация статистики каталога изменяется после добавления нового файла внутри подкаталога"
 
-#: builtin/update-index.c:197
+#: builtin/update-index.c:198
 msgid "directory stat info does not change after deleting a file"
 msgstr "информация статистики каталога не изменяется после удаления файла"
 
-#: builtin/update-index.c:210
+#: builtin/update-index.c:211
 msgid "directory stat info does not change after deleting a directory"
 msgstr "информация статистики каталога не изменяется после удаления каталога"
 
-#: builtin/update-index.c:217
+#: builtin/update-index.c:218
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:568
+#: builtin/update-index.c:569
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<опции>] [--] [<файл>…]"
 
-#: builtin/update-index.c:923
+#: builtin/update-index.c:924
 msgid "continue refresh even when index needs update"
 msgstr "продолжить обновление, даже если индекс требует обновления"
 
-#: builtin/update-index.c:926
+#: builtin/update-index.c:927
 msgid "refresh: ignore submodules"
 msgstr "обновление: игнорировать подмодули"
 
-#: builtin/update-index.c:929
+#: builtin/update-index.c:930
 msgid "do not ignore new files"
 msgstr "не игнорировать новые файлы"
 
-#: builtin/update-index.c:931
+#: builtin/update-index.c:932
 msgid "let files replace directories and vice-versa"
 msgstr "разрешить файлам заменять каталоги и наоборот"
 
-#: builtin/update-index.c:933
+#: builtin/update-index.c:934
 msgid "notice files missing from worktree"
 msgstr "замечать файлы отсутствующие в рабочем каталоге"
 
-#: builtin/update-index.c:935
+#: builtin/update-index.c:936
 msgid "refresh even if index contains unmerged entries"
 msgstr "обновить, даже если в индексе имеются не слитые записи"
 
-#: builtin/update-index.c:938
+#: builtin/update-index.c:939
 msgid "refresh stat information"
 msgstr "обновить информацию о статусе файлов"
 
-#: builtin/update-index.c:942
+#: builtin/update-index.c:943
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "как --refresh, но игнорировать настройку assume-unchanged"
 
-#: builtin/update-index.c:946
+#: builtin/update-index.c:947
 msgid "<mode>,<object>,<path>"
 msgstr "<режим доступа>,<объект>,<путь>"
 
-#: builtin/update-index.c:947
+#: builtin/update-index.c:948
 msgid "add the specified entry to the index"
 msgstr "добавить указанную запись в индекс"
 
-#: builtin/update-index.c:956
+#: builtin/update-index.c:957
 msgid "mark files as \"not changing\""
 msgstr "пометить файлы как «не измененные»"
 
-#: builtin/update-index.c:959
+#: builtin/update-index.c:960
 msgid "clear assumed-unchanged bit"
 msgstr "убрать пометку assumed-unchanged"
 
-#: builtin/update-index.c:962
+#: builtin/update-index.c:963
 msgid "mark files as \"index-only\""
 msgstr "пометить файлы как «только в индексе»"
 
-#: builtin/update-index.c:965
+#: builtin/update-index.c:966
 msgid "clear skip-worktree bit"
 msgstr "убрать пометку skip-worktree"
 
-#: builtin/update-index.c:968
+#: builtin/update-index.c:969
 msgid "add to index only; do not add content to object database"
 msgstr "только добавить в индекс; не добавлять содержимое в базу данных объектов"
 
-#: builtin/update-index.c:970
+#: builtin/update-index.c:971
 msgid "remove named paths even if present in worktree"
 msgstr "удалить указанные пути, даже если они существуют в рабочем каталоге"
 
-#: builtin/update-index.c:972
+#: builtin/update-index.c:973
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "с опцией --stdin: строки на вводе отделяются НУЛЕВЫМ байтом"
 
-#: builtin/update-index.c:974
+#: builtin/update-index.c:975
 msgid "read list of paths to be updated from standard input"
 msgstr "прочитать список обновляемых путей из стандартного ввода"
 
-#: builtin/update-index.c:978
+#: builtin/update-index.c:979
 msgid "add entries from standard input to the index"
 msgstr "добавить записи из стандартного ввода в индекс"
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:983
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "заново заполнить индекс #2 и #3 для указанных путей"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:987
 msgid "only update entries that differ from HEAD"
 msgstr "обновить только записи, которые отличаются от HEAD"
 
-#: builtin/update-index.c:990
+#: builtin/update-index.c:991
 msgid "ignore files missing from worktree"
 msgstr "игнорировать файлы, отсутствующие в рабочем каталоге"
 
-#: builtin/update-index.c:993
+#: builtin/update-index.c:994
 msgid "report actions to standard output"
 msgstr "вывести выполняемые действия на стандартный вывод"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:996
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(для машинной обработки) забыть сохраненные неразрешенные конфликты"
 
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1000
 msgid "write index in this format"
 msgstr "записать индекс в указанном формате"
 
-#: builtin/update-index.c:1001
+#: builtin/update-index.c:1002
 msgid "enable or disable split index"
 msgstr "разрешить или запретить раздельный индекс"
 
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1004
 msgid "enable/disable untracked cache"
 msgstr "включить/отключить кэш неотслеживаемых файлов"
 
-#: builtin/update-index.c:1005
+#: builtin/update-index.c:1006
 msgid "test if the filesystem supports untracked cache"
 msgstr "проверить, что файловая система поддерживает кэш неотслеживаемых файлов"
 
-#: builtin/update-index.c:1007
+#: builtin/update-index.c:1008
 msgid "enable untracked cache without testing the filesystem"
 msgstr "включить кэш неотслеживаемых файлов без проверки файловой системы"
 
-#: builtin/update-index.c:1107
+#: builtin/update-index.c:1108
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
 msgstr "параметр  core.splitIndex установлен в false; удалите или измените его, если вы действительно хотите включить разделенный индекс"
 
-#: builtin/update-index.c:1116
+#: builtin/update-index.c:1117
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
 msgstr "параметр  core.splitIndex установлен в true; удалите или измените его, если вы действительно хотите отключить разделенный индекс"
 
-#: builtin/update-index.c:1127
+#: builtin/update-index.c:1128
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
 msgstr "параметр core.untrackedCache установлен true; удалите или измените его, если вы действительно хотите удалить кэш неотслеживаемых файлов"
 
-#: builtin/update-index.c:1131
+#: builtin/update-index.c:1132
 msgid "Untracked cache disabled"
 msgstr "Кэш неотслеживаемых файлов отключен"
 
-#: builtin/update-index.c:1139
+#: builtin/update-index.c:1140
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want"
 " to enable the untracked cache"
 msgstr "параметр core.untrackedCache установлен false; удалите или измените его, если вы действительно хотите включить кэш неотслеживаемых файлов"
 
-#: builtin/update-index.c:1143
+#: builtin/update-index.c:1144
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Кэш неотслеживаемых файлов включен для «%s»"
 
-#: builtin/update-ref.c:9
+#: builtin/update-ref.c:10
 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
 msgstr "git update-ref [<опции>] -d <имя-ссылки> [<старое-значение>]"
 
-#: builtin/update-ref.c:10
+#: builtin/update-ref.c:11
 msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
 msgstr "git update-ref [<опции>]    <имя-ссылки> <новое-значение> [<старое-значение>]"
 
-#: builtin/update-ref.c:11
+#: builtin/update-ref.c:12
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<опции>] --stdin [-z]"
 
-#: builtin/update-ref.c:363
+#: builtin/update-ref.c:364
 msgid "delete the reference"
 msgstr "удалить ссылку"
 
-#: builtin/update-ref.c:365
+#: builtin/update-ref.c:366
 msgid "update <refname> not the one it points to"
 msgstr "обновить <имя-ссылки> а не то, на что она указывает"
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:367
 msgid "stdin has NUL-terminated arguments"
 msgstr "ввод отделённый НУЛЕВЫМИ символами"
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:368
 msgid "read updates from stdin"
 msgstr "прочитать обновления из стандартного ввода"
 
-#: builtin/update-server-info.c:6
+#: builtin/update-server-info.c:7
 msgid "git update-server-info [--force]"
 msgstr "git update-server-info [--force]"
 
-#: builtin/update-server-info.c:14
+#: builtin/update-server-info.c:15
 msgid "update the info files from scratch"
 msgstr "обновить информацию о серверах с нуля"
 
-#: builtin/verify-commit.c:17
+#: builtin/verify-commit.c:18
 msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr "git verify-commit [-v | --verbose] <коммит>…"
 
-#: builtin/verify-commit.c:72
+#: builtin/verify-commit.c:73
 msgid "print commit contents"
 msgstr "вывести содержимое коммита"
 
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:37
+#: builtin/verify-commit.c:74 builtin/verify-tag.c:38
 msgid "print raw gpg status output"
 msgstr "выводить сырой вывод статуса от gpg"
 
-#: builtin/verify-pack.c:54
+#: builtin/verify-pack.c:55
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <пакет>…"
 
-#: builtin/verify-pack.c:64
+#: builtin/verify-pack.c:65
 msgid "verbose"
 msgstr "быть многословнее"
 
-#: builtin/verify-pack.c:66
+#: builtin/verify-pack.c:67
 msgid "show statistics only"
 msgstr "вывести только статистику"
 
-#: builtin/verify-tag.c:18
+#: builtin/verify-tag.c:19
 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
 msgstr "git verify-tag [-v | --verbose] [--format=<формат>] <метка>…"
 
-#: builtin/verify-tag.c:36
+#: builtin/verify-tag.c:37
 msgid "print tag contents"
 msgstr "вывести содержимое метки"
 
-#: builtin/worktree.c:15
+#: builtin/worktree.c:16
 msgid "git worktree add [<options>] <path> [<branch>]"
 msgstr "git worktree add [<опции>] <путь> [<ветка>]"
 
-#: builtin/worktree.c:16
+#: builtin/worktree.c:17
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<опции>]"
 
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<опции>] <путь>"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<опции>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <путь>"
 
-#: builtin/worktree.c:43
+#: builtin/worktree.c:44
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "Удаление рабочих каталогов/%s: не является каталогом"
 
-#: builtin/worktree.c:49
+#: builtin/worktree.c:50
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "Удаление рабочих каталогов/%s: файл gitdir не существует"
 
-#: builtin/worktree.c:54
+#: builtin/worktree.c:55
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "Удаление рабочих каталогов/%s: не удалось прочитать файл gitdir (%s)"
 
-#: builtin/worktree.c:65
+#: builtin/worktree.c:66
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "Удаление рабочих каталогов/%s: недействительный файл gitdir"
 
-#: builtin/worktree.c:81
+#: builtin/worktree.c:82
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr "Удаление рабочих каталогов/%s: gitdir указывает на несуществующее расположение"
 
-#: builtin/worktree.c:128
+#: builtin/worktree.c:129
 msgid "report pruned working trees"
 msgstr "вывести список удаленных рабочих каталогов"
 
-#: builtin/worktree.c:130
+#: builtin/worktree.c:131
 msgid "expire working trees older than <time>"
 msgstr "удалить рабочие каталоги старее чем <дата-окончания>"
 
-#: builtin/worktree.c:204
+#: builtin/worktree.c:205
 #, c-format
 msgid "'%s' already exists"
 msgstr "«%s» уже существует"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:236
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "не удалось создать каталог «%s»"
 
-#: builtin/worktree.c:274
+#: builtin/worktree.c:275
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "Подготовка %s (идентификатор %s)"
 
-#: builtin/worktree.c:328
+#: builtin/worktree.c:327
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "переключиться на <ветка> даже если она уже активна в другом рабочесм каталоге"
 
-#: builtin/worktree.c:330
+#: builtin/worktree.c:329
 msgid "create a new branch"
 msgstr "создать новую ветку"
 
-#: builtin/worktree.c:332
+#: builtin/worktree.c:331
 msgid "create or reset a branch"
 msgstr "создать или перейти на ветку"
 
-#: builtin/worktree.c:334
+#: builtin/worktree.c:333
 msgid "populate the new working tree"
 msgstr "наполнить новый рабочий каталог"
 
-#: builtin/worktree.c:335
+#: builtin/worktree.c:334
 msgid "keep the new working tree locked"
 msgstr "держать рабочий каталог заблокированным"
 
-#: builtin/worktree.c:343
+#: builtin/worktree.c:342
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B и --detach нельзя использовать одновременно"
 
-#: builtin/worktree.c:478
+#: builtin/worktree.c:479
 msgid "reason for locking"
 msgstr "причина блокировки"
 
-#: builtin/worktree.c:490 builtin/worktree.c:523
+#: builtin/worktree.c:491 builtin/worktree.c:524
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "«%s» не является рабочим каталогом"
 
-#: builtin/worktree.c:492 builtin/worktree.c:525
+#: builtin/worktree.c:493 builtin/worktree.c:526
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "Главный рабочий каталог не может быть заблокирован или разблокирован"
 
-#: builtin/worktree.c:497
+#: builtin/worktree.c:498
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "«%s» уже заблокирован, причина: %s"
 
-#: builtin/worktree.c:499
+#: builtin/worktree.c:500
 #, c-format
 msgid "'%s' is already locked"
 msgstr "«%s» уже заблокирован"
 
-#: builtin/worktree.c:527
+#: builtin/worktree.c:528
 #, c-format
 msgid "'%s' is not locked"
 msgstr "«%s» не заблокирован"
 
-#: builtin/write-tree.c:13
+#: builtin/write-tree.c:14
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<префикс>/]"
 
-#: builtin/write-tree.c:26
+#: builtin/write-tree.c:27
 msgid "<prefix>/"
 msgstr "<префикс>/"
 
-#: builtin/write-tree.c:27
+#: builtin/write-tree.c:28
 msgid "write tree object for a subdirectory <prefix>"
 msgstr "вывести объект дерева для подкаталога с <префикс>"
 
-#: builtin/write-tree.c:30
+#: builtin/write-tree.c:31
 msgid "only useful for debugging"
 msgstr "используется только при отладке"
 
-#: upload-pack.c:22
+#: upload-pack.c:23
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<опции>] <каталог>"
 
-#: upload-pack.c:1040
+#: upload-pack.c:1041
 msgid "quit after a single request/response exchange"
 msgstr "выход после обмена одним запросом/ответом"
 
-#: upload-pack.c:1042
+#: upload-pack.c:1043
 msgid "exit immediately after initial ref advertisement"
 msgstr "выходить сразу после начального объявления списка ссылок"
 
-#: upload-pack.c:1044
+#: upload-pack.c:1045
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr "не проверять <каталог>/.git/ если <каталог> не является каталогом Git"
 
-#: upload-pack.c:1046
+#: upload-pack.c:1047
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "прервать передачу после <кол> секунд простоя"
 
-#: credential-cache--daemon.c:223
+#: credential-cache--daemon.c:224
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -13158,31 +13259,31 @@ msgid ""
 "\tchmod 0700 %s"
 msgstr "Права доступа к вашему каталогу сокетов слишком свободны; друге пользователи могуи читать ваши закэшированные пароли доступа. Обдумайте запуск команды:\n\n\tchmod 0700 %s"
 
-#: credential-cache--daemon.c:271
+#: credential-cache--daemon.c:272
 msgid "print debugging messages to stderr"
 msgstr "вывод отладочных сообщений на stderr"
 
-#: git.c:14
+#: git.c:15
 msgid ""
 "'git help -a' and 'git help -g' list available subcommands and some\n"
 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
 "to read about a specific subcommand or concept."
 msgstr "«git help -а» и «git help -g» выводит список доступных подкоманд и\nнекоторые руководства по темам. Запустите «git help <команда>» или\n«git help <термин>», чтобы прочесть о конкретных подкоманде или теме."
 
-#: http.c:336
+#: http.c:337
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "отрицательное значение http.postbuffer; использую стандартное значение %d"
 
-#: http.c:357
+#: http.c:358
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "Делегация проверки полномочий не поддерживается с cURL < 7.22.0"
 
-#: http.c:366
+#: http.c:367
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "Public key pinning не поддерживается с cURL < 7.44.0"
 
-#: http.c:1766
+#: http.c:1764
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -13190,7 +13291,7 @@ msgid ""
 "   redirect: %s"
 msgstr "не удалось обновить базовый url из переадресации:\n  запрошено: %s\n   переадресовано: %s"
 
-#: remote-curl.c:323
+#: remote-curl.c:324
 #, c-format
 msgid "redirecting to %s"
 msgstr "переадресация на %s"
@@ -13555,6 +13656,10 @@ msgstr "Когда вы разрешите этот конфликт, запус
 msgid "Could not move back to $head_name"
 msgstr "Не удалось перейти назад на $head_name"
 
+#: git-rebase.sh:169
+msgid "Applied autostash."
+msgstr "Применены автоматически спрятанные изменения."
+
 #: git-rebase.sh:172
 #, sh-format
 msgid "Cannot store $stash_sha1"
@@ -13626,7 +13731,7 @@ msgstr "критическая ошибка: нет такой ветки: $bran
 
 #: git-rebase.sh:562
 msgid "Cannot autostash"
-msgstr "Не удалось выполнить автоматическое прятанье"
+msgstr "Не удалось автоматически спрятать изменения"
 
 #: git-rebase.sh:567
 #, sh-format
@@ -13661,39 +13766,39 @@ msgstr "Сначала перематываем указатель текуще
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "Перемотана вперед $branch_name до $onto_name."
 
-#: git-stash.sh:53
+#: git-stash.sh:54
 msgid "git stash clear with parameters is unimplemented"
 msgstr "git stash очистка с параметрами не реализована"
 
-#: git-stash.sh:94
+#: git-stash.sh:95
 msgid "You do not have the initial commit yet"
 msgstr "У вас еще нет начального коммита"
 
-#: git-stash.sh:109
+#: git-stash.sh:110
 msgid "Cannot save the current index state"
 msgstr "Не удалось сохранить текущее состояние индекса"
 
-#: git-stash.sh:124
+#: git-stash.sh:125
 msgid "Cannot save the untracked files"
 msgstr "Невозможно сохранить неотслеживаемые файлы"
 
-#: git-stash.sh:144 git-stash.sh:157
+#: git-stash.sh:145 git-stash.sh:158
 msgid "Cannot save the current worktree state"
 msgstr "Не удалось сохранить текущее состояние рабочего каталога"
 
-#: git-stash.sh:161
+#: git-stash.sh:162
 msgid "No changes selected"
 msgstr "Изменения не выбраны"
 
-#: git-stash.sh:164
+#: git-stash.sh:165
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "Не удалось удалить временный индекс (не должно случаться)"
 
-#: git-stash.sh:177
+#: git-stash.sh:178
 msgid "Cannot record working tree state"
 msgstr "Не удалось записать состояние рабочего каталога"
 
-#: git-stash.sh:209
+#: git-stash.sh:210
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr "Не удалось обновить $ref_stash с помощью $w_commit"
@@ -13707,114 +13812,114 @@ msgstr "Не удалось обновить $ref_stash с помощью $w_com
 #. $ git stash save --blah-blah 2>&1 | head -n 2
 #. error: unknown option for 'stash save': --blah-blah
 #. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:265
+#: git-stash.sh:266
 #, sh-format
 msgid ""
 "error: unknown option for 'stash save': $option\n"
 "       To provide a message, use git stash save -- '$option'"
 msgstr "ошибка: неизвестная опция для «stash save»: $option\n        Для предоставления сообщения, используйте git stash save -- «$option»"
 
-#: git-stash.sh:278
+#: git-stash.sh:281
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "Нельзя использовать --patch и --include-untracked или --all одновременно"
 
-#: git-stash.sh:286
+#: git-stash.sh:289
 msgid "No local changes to save"
 msgstr "Нет локальных изменений для сохранения"
 
-#: git-stash.sh:291
+#: git-stash.sh:294
 msgid "Cannot initialize stash"
 msgstr "Не удалось инициализировать спрятанные изменения"
 
-#: git-stash.sh:295
+#: git-stash.sh:298
 msgid "Cannot save the current status"
 msgstr "Не удалось сохранить текущий статус"
 
-#: git-stash.sh:296
+#: git-stash.sh:299
 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr "Рабочий каталог и состояние индекса сохранены $stash_msg"
 
-#: git-stash.sh:323
+#: git-stash.sh:326
 msgid "Cannot remove worktree changes"
 msgstr "Не удалось удалить изменения рабочего каталога"
 
-#: git-stash.sh:471
+#: git-stash.sh:474
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "неизвестная опция: $opt"
 
-#: git-stash.sh:484
-msgid "No stash found."
+#: git-stash.sh:487
+msgid "No stash entries found."
 msgstr "Не найдены спрятанные изменения."
 
-#: git-stash.sh:491
+#: git-stash.sh:494
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "Передано слишком много редакций: $REV"
 
-#: git-stash.sh:506
+#: git-stash.sh:509
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference не является действительной ссылкой"
 
-#: git-stash.sh:534
+#: git-stash.sh:537
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "«$args» не похоже на коммит со спрятанными изменениями"
 
-#: git-stash.sh:545
+#: git-stash.sh:548
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "«$args» не является ссылкой на спрятанные изменения"
 
-#: git-stash.sh:553
+#: git-stash.sh:556
 msgid "unable to refresh index"
 msgstr "не удалось обновить индекс"
 
-#: git-stash.sh:557
+#: git-stash.sh:560
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "Нельзя применить спрятанные изменения во время выполнения слияния"
 
-#: git-stash.sh:565
+#: git-stash.sh:568
 msgid "Conflicts in index. Try without --index."
 msgstr "Конфликты в индексе. Попробуйте без --index."
 
-#: git-stash.sh:567
+#: git-stash.sh:570
 msgid "Could not save index tree"
 msgstr "Не удалось сохранить дерево индекса"
 
-#: git-stash.sh:576
-msgid "Could not restore untracked files from stash"
-msgstr "Невозможно восстановить неотслеживаемые файлы из спятанных файлов"
+#: git-stash.sh:579
+msgid "Could not restore untracked files from stash entry"
+msgstr "Невозможно восстановить неотслеживаемые файлы из спрятанных изменений"
 
-#: git-stash.sh:601
+#: git-stash.sh:604
 msgid "Cannot unstage modified files"
 msgstr "Невозможно убрать из индекса измененные файлы"
 
-#: git-stash.sh:616
+#: git-stash.sh:619
 msgid "Index was not unstashed."
 msgstr "Индекс не был извлечён из спрятанных изменений."
 
-#: git-stash.sh:630
-msgid "The stash is kept in case you need it again."
+#: git-stash.sh:633
+msgid "The stash entry is kept in case you need it again."
 msgstr "Спрятанные изменения сохранены, на случай если они снова вам понадобятся."
 
-#: git-stash.sh:639
+#: git-stash.sh:642
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "Отброшено ${REV} ($s)"
 
-#: git-stash.sh:640
+#: git-stash.sh:643
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}: Не удалось отбросить запись из спрятанных изменений"
 
-#: git-stash.sh:648
+#: git-stash.sh:651
 msgid "No branch name specified"
 msgstr "Не указано имя ветки"
 
-#: git-stash.sh:727
+#: git-stash.sh:730
 msgid "(To restore them type \"git stash apply\")"
 msgstr "(Чтобы восстановить их, наберите «git stash apply»)"
 
@@ -13837,7 +13942,7 @@ msgstr "«$sm_path» уже содержится в индексе"
 msgid "'$sm_path' already exists in the index and is not a submodule"
 msgstr "«$sm_path» уже содержится в индексе и не является подмодулем"
 
-#: git-submodule.sh:218
+#: git-submodule.sh:219
 #, sh-format
 msgid ""
 "The following path is ignored by one of your .gitignore files:\n"
@@ -13845,22 +13950,22 @@ msgid ""
 "Use -f if you really want to add it."
 msgstr "Следующие пути игнорируются одним из ваших файлов .gitignore:\n$sm_path\nИспользуйте опцию -f, если вы действительно хотите его добавить."
 
-#: git-submodule.sh:236
+#: git-submodule.sh:237
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "Добавляю существующий репозиторий из «$sm_path» в индекс"
 
-#: git-submodule.sh:238
+#: git-submodule.sh:239
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "«$sm_path» уже существует и не является действительным репозиторием git"
 
-#: git-submodule.sh:246
+#: git-submodule.sh:247
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr "Каталог git для «$sm_name» найден локально на внешних репозиториях:"
 
-#: git-submodule.sh:248
+#: git-submodule.sh:249
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -13869,184 +13974,184 @@ msgid ""
 "or you are unsure what this means choose another name with the '--name' option."
 msgstr "Если вы хотите повторно использовать локальный каталог git вместо повторного клонирования из\n  $realrepo\nто используйте параметр «--force». Если же локальный каталог git не является нужным репозиторием или если вы не уверены, что это значит, то укажите другое имя для подмодуля с помощью параметра «--name»."
 
-#: git-submodule.sh:254
+#: git-submodule.sh:255
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr "Восстановление локального каталога git для подмодуля «$sm_name»."
 
-#: git-submodule.sh:266
+#: git-submodule.sh:267
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "Не удалось переключиться на состояние у подмодуля «$sm_path»"
 
-#: git-submodule.sh:271
+#: git-submodule.sh:272
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "Сбой добавления подмодуля «$sm_path»"
 
-#: git-submodule.sh:280
+#: git-submodule.sh:281
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "Не удалось зарегистрировать подмодуль «$sm_path»"
 
-#: git-submodule.sh:341
+#: git-submodule.sh:342
 #, sh-format
 msgid "Entering '$displaypath'"
 msgstr "Заходим в «$displaypath»"
 
-#: git-submodule.sh:361
+#: git-submodule.sh:362
 #, sh-format
 msgid "Stopping at '$displaypath'; script returned non-zero status."
 msgstr "Останавливаемся на «$displaypath»; сценарий вернул не нулевой код возврата."
 
-#: git-submodule.sh:432
+#: git-submodule.sh:433
 #, sh-format
 msgid "pathspec and --all are incompatible"
 msgstr "спецификатор пути и --all нельзя использовать одновременно"
 
-#: git-submodule.sh:437
+#: git-submodule.sh:438
 #, sh-format
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "Используйте «--all», если вы действительно хотите деинициализировать все подмодули"
 
-#: git-submodule.sh:457
+#: git-submodule.sh:458
 #, sh-format
 msgid ""
 "Submodule work tree '$displaypath' contains a .git directory\n"
 "(use 'rm -rf' if you really want to remove it including all of its history)"
 msgstr "Рабочий каталог подмодуля «$displaypath» уже содержит каталог .git\n(используйте «rm -rf», если вы действительно хотите удалить его со всей историей изменений)"
 
-#: git-submodule.sh:465
+#: git-submodule.sh:466
 #, sh-format
 msgid ""
 "Submodule work tree '$displaypath' contains local modifications; use '-f' to"
 " discard them"
 msgstr "Рабочий каталог подмодуля «$displaypath» содержит локальные изменения; используйте «-f», чтобы отменить их"
 
-#: git-submodule.sh:468
+#: git-submodule.sh:469
 #, sh-format
 msgid "Cleared directory '$displaypath'"
 msgstr "Очищен каталог «$displaypath»"
 
-#: git-submodule.sh:469
+#: git-submodule.sh:470
 #, sh-format
 msgid "Could not remove submodule work tree '$displaypath'"
 msgstr "Не удалось удалить рабочий каталог подмодуля «$displaypath»"
 
-#: git-submodule.sh:472
+#: git-submodule.sh:473
 #, sh-format
 msgid "Could not create empty submodule directory '$displaypath'"
 msgstr "Не удалось создать пустой каталог подмодуля «$displaypath»"
 
-#: git-submodule.sh:481
+#: git-submodule.sh:482
 #, sh-format
 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
 msgstr "Подмодуль «$name» ($url) был снят с регистрации по пути «$displaypath»"
 
-#: git-submodule.sh:637
+#: git-submodule.sh:638
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "Не удалось найти текущую редакцию для подмодуля по пути «$displaypath»"
 
-#: git-submodule.sh:647
+#: git-submodule.sh:648
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "Не удалось выполнить извлечение для подмодуля по пути «$sm_path»"
 
-#: git-submodule.sh:652
+#: git-submodule.sh:653
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
 "'$sm_path'"
 msgstr "Не удалось найти текущую редакцию ${remote_name}/${branch} для подмодуля по пути «$sm_path»"
 
-#: git-submodule.sh:670
+#: git-submodule.sh:671
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "Не удалось выполнить извлечение для подмодуля по пути «$displaypath»"
 
-#: git-submodule.sh:676
+#: git-submodule.sh:677
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
 "Direct fetching of that commit failed."
 msgstr "Получен по пути подмодуля «$displaypath», но не содержит $sha1. Сбой при прямом получении коммита."
 
-#: git-submodule.sh:683
+#: git-submodule.sh:684
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "Не удалось переключиться на состояние «$sha1» для подмодуля по пути «$displaypath»"
 
-#: git-submodule.sh:684
+#: git-submodule.sh:685
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Подмодуль по пути «$displaypath»: забрано состояние «$sha1»"
 
-#: git-submodule.sh:688
+#: git-submodule.sh:689
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "Не удалось переместить «$sha1» для подмодуля по пути «$displaypath»"
 
-#: git-submodule.sh:689
+#: git-submodule.sh:690
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Подмодуль по пути «$displaypath»: перемещен над «$sha1»"
 
-#: git-submodule.sh:694
+#: git-submodule.sh:695
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "Не удалось выполнить слияние с «$sha1» для подмодуля по пути «$displaypath»"
 
-#: git-submodule.sh:695
+#: git-submodule.sh:696
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Подмодуль по пути «$displaypath»: слито с «$sha1»"
 
-#: git-submodule.sh:700
+#: git-submodule.sh:701
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr "Сбой выполнения «$command $sha1» для подмодуля по пути «$displaypath»"
 
-#: git-submodule.sh:701
+#: git-submodule.sh:702
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Подмодуль по пути «$displaypath»: «$command $sha1»"
 
-#: git-submodule.sh:732
+#: git-submodule.sh:733
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Не удалось выполнить рекурсивно для подмодуля по пути «$displaypath»"
 
-#: git-submodule.sh:840
+#: git-submodule.sh:841
 msgid "The --cached option cannot be used with the --files option"
 msgstr "Опцию --cached нельзя использовать одновременно с опцией --files"
 
-#: git-submodule.sh:892
+#: git-submodule.sh:893
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "неизвестный режим $mod_dst"
 
-#: git-submodule.sh:912
+#: git-submodule.sh:913
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  Предупреждение: $display_name не содержит коммит $sha1_src"
 
-#: git-submodule.sh:915
+#: git-submodule.sh:916
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  Предупреждение: $display_name не содержит коммит $sha1_dst"
 
-#: git-submodule.sh:918
+#: git-submodule.sh:919
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr "  Предупреждение: $display_name не содержит коммиты $sha1_src и $sha1_dst"
 
-#: git-submodule.sh:1064
+#: git-submodule.sh:1065
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr "Не удалось выполнить рекурсивно для подмодуля по пути «$sm_path»"
 
-#: git-submodule.sh:1136
+#: git-submodule.sh:1137
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr "Синхронизация url для подмодуля «$displaypath»"
@@ -14445,32 +14550,32 @@ msgid "Unable to determine absolute path of git directory"
 msgstr "Не удалось определить абсолютный путь к каталогу git"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:238
+#: git-add--interactive.perl:196
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %12s %s"
 
-#: git-add--interactive.perl:239
+#: git-add--interactive.perl:197
 msgid "staged"
 msgstr "в индексе"
 
-#: git-add--interactive.perl:239
+#: git-add--interactive.perl:197
 msgid "unstaged"
 msgstr "не в индексе"
 
-#: git-add--interactive.perl:288 git-add--interactive.perl:313
+#: git-add--interactive.perl:246 git-add--interactive.perl:271
 msgid "binary"
 msgstr "двоичный"
 
-#: git-add--interactive.perl:297 git-add--interactive.perl:351
+#: git-add--interactive.perl:255 git-add--interactive.perl:309
 msgid "nothing"
 msgstr "ничего"
 
-#: git-add--interactive.perl:333 git-add--interactive.perl:348
+#: git-add--interactive.perl:291 git-add--interactive.perl:306
 msgid "unchanged"
 msgstr "нет изменений"
 
-#: git-add--interactive.perl:644
+#: git-add--interactive.perl:602
 #, perl-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
@@ -14479,7 +14584,7 @@ msgstr[1] "добавлено %d пути\n"
 msgstr[2] "добавлено %d путей\n"
 msgstr[3] "добавлено %d пути\n"
 
-#: git-add--interactive.perl:647
+#: git-add--interactive.perl:605
 #, perl-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
@@ -14488,7 +14593,7 @@ msgstr[1] "обновлено %d пути\n"
 msgstr[2] "обновлено %d путей\n"
 msgstr[3] "обновлено %d пути\n"
 
-#: git-add--interactive.perl:650
+#: git-add--interactive.perl:608
 #, perl-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
@@ -14497,7 +14602,7 @@ msgstr[1] "обращены изменения %d путей\n"
 msgstr[2] "обращены изменения %d путей\n"
 msgstr[3] "обращены изменения %d путей\n"
 
-#: git-add--interactive.perl:653
+#: git-add--interactive.perl:611
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
@@ -14506,67 +14611,67 @@ msgstr[1] "тронуты %d пути\n"
 msgstr[2] "тронуты %d путей\n"
 msgstr[3] "тронуты %d пути\n"
 
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:620
 msgid "Update"
 msgstr "Обновить"
 
-#: git-add--interactive.perl:674
+#: git-add--interactive.perl:632
 msgid "Revert"
 msgstr "Обратить изменения"
 
-#: git-add--interactive.perl:697
+#: git-add--interactive.perl:655
 #, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr "примечание: %s теперь неотслеживаемый.\n"
 
-#: git-add--interactive.perl:708
+#: git-add--interactive.perl:666
 msgid "Add untracked"
 msgstr "Добавить неотслеживаемый"
 
-#: git-add--interactive.perl:714
+#: git-add--interactive.perl:672
 msgid "No untracked files.\n"
 msgstr "Нет неотслеживаемых файлов.\n"
 
-#: git-add--interactive.perl:1030
+#: git-add--interactive.perl:985
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
 msgstr "Если патч применяется без ошибок, то изменённый блок будет сразу помечен для индексирования."
 
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:988
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
 msgstr "Если патч применяется без ошибок, то изменённый блок будет сразу помечен для прятанья."
 
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:991
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
 msgstr "Если патч применяется без ошибок, то изменённый блок будет сразу помечен для убирания из индекса."
 
-#: git-add--interactive.perl:1039 git-add--interactive.perl:1048
+#: git-add--interactive.perl:994 git-add--interactive.perl:1003
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
 msgstr "Если патч применяется без ошибок, то изменённый блок будет сразу помечен для применения."
 
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1045
+#: git-add--interactive.perl:997 git-add--interactive.perl:1000
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
 msgstr "Если патч применяется без ошибок, то изменённый блок будет сразу помечен для отмены изменений."
 
-#: git-add--interactive.perl:1058
+#: git-add--interactive.perl:1013
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "не удалось открыть файл редактирования блока изменений для записи: %s"
 
-#: git-add--interactive.perl:1059
+#: git-add--interactive.perl:1014
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "Ручной режим редактирования блока изменений — смотрите ниже для небольшого руководства.\n"
 
-#: git-add--interactive.perl:1065
+#: git-add--interactive.perl:1020
 #, perl-format
 msgid ""
 "---\n"
@@ -14576,14 +14681,14 @@ msgid ""
 msgstr "---\nЧтобы удалить «%s» строки, сделайте их ' ' строками (контекст).\nЧтобы удалить «%s» строки, удалите их.\nСтроки, начинающиеся с %s будут удалены.\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1073
+#: git-add--interactive.perl:1028
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
 "aborted and the hunk is left unchanged.\n"
 msgstr "Если патч не применяется без ошибок, вам будет дана\nвозможность изменить его снова. Если все строки блока\nизменений удалены, то редактирование будет отменено\nи блок останется без изменений.\n"
 
-#: git-add--interactive.perl:1087
+#: git-add--interactive.perl:1042
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "не удалось открыть файл редактирования блока изменений для чтения: %s"
@@ -14594,13 +14699,13 @@ msgstr "не удалось открыть файл редактирования
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: git-add--interactive.perl:1178
+#: git-add--interactive.perl:1134
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]?"
 " "
 msgstr "Изменённый вами блок не применяется. Редактировать снова (ответ «y» означает «нет»!) [y/n]? "
 
-#: git-add--interactive.perl:1187
+#: git-add--interactive.perl:1143
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -14609,7 +14714,7 @@ msgid ""
 "d - do not stage this hunk or any of the later hunks in the file"
 msgstr "y - проиндексировать блок изменений\nn - не индексировать этот блок изменений\nq - выход; не индексировать этот и последующие блоки\na - проиндексировать этот и все последующие блоки файла\nd - не индексировать этот и последующие блоки файла"
 
-#: git-add--interactive.perl:1193
+#: git-add--interactive.perl:1149
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -14618,7 +14723,7 @@ msgid ""
 "d - do not stash this hunk or any of the later hunks in the file"
 msgstr "y - спрятать изменения блока\nq - выход; не прятать изменения этого и последующих блоков\na - спрятать этот и все последующие блоки файла\nd - не прятать этот и последующие блоки файла"
 
-#: git-add--interactive.perl:1199
+#: git-add--interactive.perl:1155
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -14627,7 +14732,7 @@ msgid ""
 "d - do not unstage this hunk or any of the later hunks in the file"
 msgstr "y - убрать из индекса этот блок изменений\nn - не убирать из индекса этот блок изменений\nq - выход; не убирать из индекса этот и последующие блоки\na - убрать из индекса этот и все последующие блоки файла\nd - не убирать из индекса этот и последующие блоки файла"
 
-#: git-add--interactive.perl:1205
+#: git-add--interactive.perl:1161
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -14636,7 +14741,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr "y - применить блок изменений к индексу\nn - не применять этот блок изменений к индексу\nq - выход; не применять этот и последующие блоки\na - применить этот блок и все последующие блоки файла\nd - не применять этот и последующие блоки файла"
 
-#: git-add--interactive.perl:1211
+#: git-add--interactive.perl:1167
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -14645,7 +14750,7 @@ msgid ""
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr "y - отменить изменения этого блока в рабочем каталоге\nn - не отменять изменения этого блока в рабочем каталоге\nq - выход; не отменять изменения этого блока и всех последующих\na - отменить изменения этого и всех последующих блоков файла\nd - не отменять изменения этого и всех последующих блоков файла"
 
-#: git-add--interactive.perl:1217
+#: git-add--interactive.perl:1173
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -14654,7 +14759,7 @@ msgid ""
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr "y - отменить изменения этого блока в индексе и рабочем каталоге\nn - не отменять изменения этого блока в индексе и рабочем каталоге\nq - выход; не отменять изменения этого блока и всех последующих\na - отменить изменения этого и всех последующих блоков файла\nd - не отменять изменения этого и всех последующих блоков файла"
 
-#: git-add--interactive.perl:1223
+#: git-add--interactive.perl:1179
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -14663,7 +14768,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr "y - применить блок изменений к индексу и рабочему каталогу\nn - не применять этот блок изменений к индексу и рабочему каталогу\nq - выход; не применять этот и последующие блоки\na - применить этот блок и все последующие блоки файла\nd - не применять этот и последующие блоки файла"
 
-#: git-add--interactive.perl:1232
+#: git-add--interactive.perl:1188
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -14676,154 +14781,154 @@ msgid ""
 "? - print help\n"
 msgstr "g - выбрать блок изменений на который нужно перейти\n/ - поиск блока изменений с помощью регулярного выражения\nj - не принимать решение по этому блоку, перейти на следующий без решения\nJ - не принимать решение по этому блоку, перейти на следующий\nk - не принимать решение по этому блоку, перейти на предыдущий без решения\nK - не принимать решение по этому блоку, перейти на предыдущий\ns - разделить текущий блок на блоки меньшего размера\ne - вручную отредактировать текущий блок\n? - вывести справку\n"
 
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1219
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Выбранные блоки не применяются без ошибок к индексу!\n"
 
-#: git-add--interactive.perl:1264
+#: git-add--interactive.perl:1220
 msgid "Apply them to the worktree anyway? "
 msgstr "Все равно применить их к рабочему каталогу?"
 
-#: git-add--interactive.perl:1267
+#: git-add--interactive.perl:1223
 msgid "Nothing was applied.\n"
 msgstr "Ничего не применено.\n"
 
-#: git-add--interactive.perl:1278
+#: git-add--interactive.perl:1234
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "игнорирую не слитое: %s\n"
 
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1243
 msgid "Only binary files changed.\n"
 msgstr "Только изменения двоичных файлов.\n"
 
-#: git-add--interactive.perl:1289
+#: git-add--interactive.perl:1245
 msgid "No changes.\n"
 msgstr "Нет изменений.\n"
 
-#: git-add--interactive.perl:1297
+#: git-add--interactive.perl:1253
 msgid "Patch update"
 msgstr "Обновление патча"
 
-#: git-add--interactive.perl:1349
+#: git-add--interactive.perl:1305
 #, perl-format
 msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
 msgstr "Проиндексировать изменение режима доступа [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1350
+#: git-add--interactive.perl:1306
 #, perl-format
 msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
 msgstr "Проиндексировать удаление [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1351
+#: git-add--interactive.perl:1307
 #, perl-format
 msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
 msgstr "Проиндексировать этот блок изменений [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1354
+#: git-add--interactive.perl:1310
 #, perl-format
 msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
 msgstr "Спрятать изменение режима доступа [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1311
 #, perl-format
 msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
 msgstr "Спрятать удаление файла [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1356
+#: git-add--interactive.perl:1312
 #, perl-format
 msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
 msgstr "Спрятать этот блок изменений [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1359
+#: git-add--interactive.perl:1315
 #, perl-format
 msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
 msgstr "Убрать изменения режима доступа из индекса [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1316
 #, perl-format
 msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
 msgstr "Убрать удаление из индекса [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1361
+#: git-add--interactive.perl:1317
 #, perl-format
 msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
 msgstr "Убрать из индекса этот блок измений [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1364
+#: git-add--interactive.perl:1320
 #, perl-format
 msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
 msgstr "Применить изменение режима доступа к индексу [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1365
+#: git-add--interactive.perl:1321
 #, perl-format
 msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
 msgstr "Применить удаление к индексу [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1366
+#: git-add--interactive.perl:1322
 #, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
 msgstr "Применить этот блок к индексу [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1369
+#: git-add--interactive.perl:1325
 #, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
 msgstr "Отменить изменения режима доступа в рабочем каталоге [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1370
+#: git-add--interactive.perl:1326
 #, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
 msgstr "Отменить удаление в рабочем каталоге [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1371
+#: git-add--interactive.perl:1327
 #, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
 msgstr "Отменить изменения этого блока в рабочем каталоге [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1374
+#: git-add--interactive.perl:1330
 #, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr "Отменить изменения режима доступа в индексе и рабочем каталоге [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1375
+#: git-add--interactive.perl:1331
 #, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr "Отменить удаление в индексе и рабочем каталоге [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1376
+#: git-add--interactive.perl:1332
 #, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr "Отменить изменения этого блока в индексе и рабочем каталоге [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1379
+#: git-add--interactive.perl:1335
 #, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr "Применить изменения режима доступа к индексу и рабочему каталогу [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1380
+#: git-add--interactive.perl:1336
 #, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr "Применить удаление к индексу и рабочему каталогу [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1381
+#: git-add--interactive.perl:1337
 #, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr "Применить изменения этого блока к индексу и рабочему каталогу [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1484
+#: git-add--interactive.perl:1440
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "на какой блок перейти (нажмите <ввод> чтобы увидеть еще)? "
 
-#: git-add--interactive.perl:1486
+#: git-add--interactive.perl:1442
 msgid "go to which hunk? "
 msgstr "на какой блок перейти? "
 
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1451
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Неверный номер: «%s»\n"
 
-#: git-add--interactive.perl:1500
+#: git-add--interactive.perl:1456
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
@@ -14832,28 +14937,28 @@ msgstr[1] "Простите, но только %d блока изменений
 msgstr[2] "Простите, но только %d блоков изменений доступно.\n"
 msgstr[3] "Простите, но только %d блока изменений доступно.\n"
 
-#: git-add--interactive.perl:1526
+#: git-add--interactive.perl:1482
 msgid "search for regex? "
 msgstr "искать с помощью регулярного выражения? "
 
-#: git-add--interactive.perl:1539
+#: git-add--interactive.perl:1495
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Регулярное выражение для поиска в неверном формате %s: %s\n"
 
-#: git-add--interactive.perl:1549
+#: git-add--interactive.perl:1505
 msgid "No hunk matches the given pattern\n"
 msgstr "Не найдены блоки, которые соответствуют указанному шаблону\n"
 
-#: git-add--interactive.perl:1561 git-add--interactive.perl:1583
+#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
 msgid "No previous hunk\n"
 msgstr "Нет предыдущего блока\n"
 
-#: git-add--interactive.perl:1570 git-add--interactive.perl:1589
+#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
 msgid "No next hunk\n"
 msgstr "Не следующего блока\n"
 
-#: git-add--interactive.perl:1597
+#: git-add--interactive.perl:1553
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
@@ -14862,13 +14967,13 @@ msgstr[1] "Разбито на %d блока изменений.\n"
 msgstr[2] "Разбито на %d блоков изменений.\n"
 msgstr[3] "Разбито на %d блока изменений.\n"
 
-#: git-add--interactive.perl:1649
+#: git-add--interactive.perl:1605
 msgid "Review diff"
 msgstr "Просмотреть изменения"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1668
+#: git-add--interactive.perl:1624
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -14878,83 +14983,83 @@ msgid ""
 "add untracked - add contents of untracked files to the staged set of changes\n"
 msgstr "status        - показать пути с изменениями\nupdate        - добавить состояние рабочего каталога индекс\nrevert        - вернуть проиндексированный набор изменений к HEAD версии\npatch         - выбрать и выборочно обновить блоки\ndiff          - просмотреть различия между HEAD и индексом\nadd untracked - добавить содержимое неотслеживаемых файлов в индекс\n"
 
-#: git-add--interactive.perl:1685 git-add--interactive.perl:1690
-#: git-add--interactive.perl:1693 git-add--interactive.perl:1700
-#: git-add--interactive.perl:1704 git-add--interactive.perl:1710
+#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
+#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
+#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
 msgid "missing --"
 msgstr "отсутствует --"
 
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1662
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "неизвестный режим для --patch: %s"
 
-#: git-add--interactive.perl:1712 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "недопустимый аргумент %s, ожидается --"
 
-#: git-send-email.perl:121
+#: git-send-email.perl:126
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "локальный часовой пояс отличается от GMT на не минутный интервал\n"
 
-#: git-send-email.perl:128 git-send-email.perl:134
+#: git-send-email.perl:133 git-send-email.perl:139
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "локальный сдвиг времени больше или равен 24 часа\n"
 
-#: git-send-email.perl:202 git-send-email.perl:208
+#: git-send-email.perl:208 git-send-email.perl:214
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "редактор был завершен с ошибкой, отменяю всё"
 
-#: git-send-email.perl:282
+#: git-send-email.perl:291
 #, perl-format
 msgid "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "«%s» содержит промежуточную версию письма, которое вы готовите.\n"
 
-#: git-send-email.perl:287
+#: git-send-email.perl:296
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "«%s.final» содержит подготовленное письмо.\n"
 
-#: git-send-email.perl:305
+#: git-send-email.perl:314
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases не совместимо с другими опциями\n"
 
-#: git-send-email.perl:368 git-send-email.perl:623
+#: git-send-email.perl:379 git-send-email.perl:634
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "Нельзя запускать git format-patch вне репозитория\n"
 
-#: git-send-email.perl:437
+#: git-send-email.perl:448
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Неизвестное поле --suppress-cc: «%s»\n"
 
-#: git-send-email.perl:466
+#: git-send-email.perl:477
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Неизвестный параметр --confirm: «%s»\n"
 
-#: git-send-email.perl:498
+#: git-send-email.perl:509
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "предупреждение: сокращение для sendmail с кавычками не поддерживается: %s\n"
 
-#: git-send-email.perl:500
+#: git-send-email.perl:511
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "предупреждение: «:include:» не поддерживается: %s\n"
 
-#: git-send-email.perl:502
+#: git-send-email.perl:513
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "предупреждение: перенаправление «/file» или «|pipe» не поддерживается: %s\n"
 
-#: git-send-email.perl:507
+#: git-send-email.perl:518
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "предупреждение: строка sendmail не распознана: %s\n"
 
-#: git-send-email.perl:589
+#: git-send-email.perl:600
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -14964,36 +15069,36 @@ msgid ""
 "    * Giving --format-patch option if you mean a range.\n"
 msgstr "Файл «%s» существует, но это также может быть и\nдиапазоном коммитов для которых нужно сделать патчи. \nУстраните неоднозначность…\n\n    * Указав \"./%s\" если вы имеете в виду имя файла; или\n    * Передав опцию --format-patch если вы имеете в виду диапазон коммитов.\n"
 
-#: git-send-email.perl:610
+#: git-send-email.perl:621
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Не удалось выполнить opendir %s: %s"
 
-#: git-send-email.perl:634
+#: git-send-email.perl:645
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
 "warning: no patches were sent\n"
 msgstr "критическая ошибка: %s: %s\nпредупреждение: патчи не были отправлены\n"
 
-#: git-send-email.perl:645
+#: git-send-email.perl:656
 msgid ""
 "\n"
 "No patch files specified!\n"
 "\n"
 msgstr "\nФайл с патчем не указан!\n\n"
 
-#: git-send-email.perl:658
+#: git-send-email.perl:669
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Нет строки с темой в %s?"
 
-#: git-send-email.perl:668
+#: git-send-email.perl:679
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Не удалось открыть для записи %s: %s"
 
-#: git-send-email.perl:678
+#: git-send-email.perl:689
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -15002,41 +15107,41 @@ msgid ""
 "Clear the body content if you don't wish to send a summary.\n"
 msgstr "Строки, начинающиеся с «GIT:» будут удалены.\nВозможно будет полезно включить статистику добавлений\nи удалений или таблицу содержимого в патч, который вы пишете.\n\nОчистите содержимое, если вы не хотите отправлять письмо с краткой информацией.\n"
 
-#: git-send-email.perl:701
+#: git-send-email.perl:712
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "Не удалось открыть %s.final: %s"
 
-#: git-send-email.perl:704
+#: git-send-email.perl:715
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Не удалось открыть %s: %s"
 
-#: git-send-email.perl:739
+#: git-send-email.perl:750
 msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
 msgstr "Поля To/Cc/Bcc пока еще не обрабатываются и будут проигнорированы\n"
 
-#: git-send-email.perl:748
+#: git-send-email.perl:759
 msgid "Summary email is empty, skipping it\n"
 msgstr "Письмо с краткой информацией пустое, попускаю его\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:780
+#: git-send-email.perl:791
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "Вы уверены, что хотите использовать <%s> [y/N]? "
 
-#: git-send-email.perl:809
+#: git-send-email.perl:820
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
 msgstr "Следующие файлы 8 битные, но не содержат Content-Transfer-Encoding.\n"
 
-#: git-send-email.perl:814
+#: git-send-email.perl:825
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Какую 8 битную кодировку нужно указать [UTF-8]? "
 
-#: git-send-email.perl:822
+#: git-send-email.perl:833
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -15044,20 +15149,20 @@ msgid ""
 "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really want to send.\n"
 msgstr "Отказываюсь отправить, т.к. патч\n\t%s\nсодержит шаблонный заголовок «*** SUBJECT HERE ***». Укажите параметр --force, если вы  действительно хотите отправить его.\n"
 
-#: git-send-email.perl:841
+#: git-send-email.perl:852
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "Кому должны быть отправлены письма (если нужно)?"
 
-#: git-send-email.perl:859
+#: git-send-email.perl:870
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "критическая ошибка: сокращение «%s» раскрывается само в себя\n"
 
-#: git-send-email.perl:871
+#: git-send-email.perl:882
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr "Message-ID который нужно использовать в поле In-Reply-To для первого письма (если нужно)? "
 
-#: git-send-email.perl:921 git-send-email.perl:929
+#: git-send-email.perl:932 git-send-email.perl:940
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "ошибка: не удалось выделить действительный адрес из: %s\n"
@@ -15065,16 +15170,16 @@ msgstr "ошибка: не удалось выделить действител
 #. TRANSLATORS: Make sure to include [q] [d] [e] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:933
+#: git-send-email.perl:944
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "Что нужно сделать с этим адресом? ([q] - выход|[d] - отбросить|[e] - редактировать): "
 
-#: git-send-email.perl:1234
+#: git-send-email.perl:1245
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "путь CA «%s» не существует"
 
-#: git-send-email.perl:1309
+#: git-send-email.perl:1320
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -15091,123 +15196,128 @@ msgstr "    Список Cc (получателей копии письма) б
 #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1324
+#: git-send-email.perl:1335
 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
 msgstr "Отправить это письмо? ([y] - да|[n] - нет|[q] - выход|[a] - все): "
 
-#: git-send-email.perl:1327
+#: git-send-email.perl:1338
 msgid "Send this email reply required"
 msgstr "Отправка этого ответа на письмо обязательна"
 
-#: git-send-email.perl:1353
+#: git-send-email.perl:1364
 msgid "The required SMTP server is not properly defined."
 msgstr "Требуемый SMTP сервер не был правильно объявлен."
 
-#: git-send-email.perl:1397
+#: git-send-email.perl:1411
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Сервер не поддерживает STARTTLS! %s"
 
-#: git-send-email.perl:1403
+#: git-send-email.perl:1416 git-send-email.perl:1420
+#, perl-format
+msgid "STARTTLS failed! %s"
+msgstr "Ошибка STARTTLS! %s"
+
+#: git-send-email.perl:1430
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr "Не удалось инициализировать SMTP. Проверьте ваши настройки и попробуйте запустить в параметром --smtp-debug."
 
-#: git-send-email.perl:1421
+#: git-send-email.perl:1448
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Не удалось отправить %s\n"
 
-#: git-send-email.perl:1424
+#: git-send-email.perl:1451
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Имитация отправки %s\n"
 
-#: git-send-email.perl:1424
+#: git-send-email.perl:1451
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Отправлено %s\n"
 
-#: git-send-email.perl:1426
+#: git-send-email.perl:1453
 msgid "Dry-OK. Log says:\n"
 msgstr "Имитация OK. Журнал содержит:\n"
 
-#: git-send-email.perl:1426
+#: git-send-email.perl:1453
 msgid "OK. Log says:\n"
 msgstr "OK. Журнал содержит:\n"
 
-#: git-send-email.perl:1438
+#: git-send-email.perl:1465
 msgid "Result: "
 msgstr "Результат: "
 
-#: git-send-email.perl:1441
+#: git-send-email.perl:1468
 msgid "Result: OK\n"
 msgstr "Результат: OK\n"
 
-#: git-send-email.perl:1454
+#: git-send-email.perl:1481
 #, perl-format
 msgid "can't open file %s"
 msgstr "не удалось открыть файл %s"
 
-#: git-send-email.perl:1501 git-send-email.perl:1521
+#: git-send-email.perl:1528 git-send-email.perl:1548
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Добавление cc: %s со строки «%s»\n"
 
-#: git-send-email.perl:1507
+#: git-send-email.perl:1534
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Добавление to: %s со строки «%s»\n"
 
-#: git-send-email.perl:1555
+#: git-send-email.perl:1582
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) Добавление cc: %s со строки «%s»\n"
 
-#: git-send-email.perl:1578
+#: git-send-email.perl:1605
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) Добавление cc: %s со строки «%s»\n"
 
-#: git-send-email.perl:1676
+#: git-send-email.perl:1711
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Не удалось выполнить «%s»"
 
-#: git-send-email.perl:1683
+#: git-send-email.perl:1718
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Добавление %s: %s из: «%s»\n"
 
-#: git-send-email.perl:1687
+#: git-send-email.perl:1722
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) не удалось закрыть поток к «%s»"
 
-#: git-send-email.perl:1714
+#: git-send-email.perl:1749
 msgid "cannot send message as 7bit"
 msgstr "не удалось отправить сообщение в 7 битной кодировке"
 
-#: git-send-email.perl:1722
+#: git-send-email.perl:1757
 msgid "invalid transfer encoding"
 msgstr "недопустимая кодировка передачи"
 
-#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802
+#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "не удалось открыть %s: %s\n"
 
-#: git-send-email.perl:1744
+#: git-send-email.perl:1798
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr "%s: патч содержит строку длиннее чем 998 символов"
 
-#: git-send-email.perl:1760
+#: git-send-email.perl:1814
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr "Пропускаю %s с окончанием резервной копии «%s».\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1764
+#: git-send-email.perl:1818
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Вы действительно хотите отправить %s? [y - да|N - нет]: "
diff --git a/po/vi.po b/po/vi.po
index 37e0e03dbd..9c9f99b4fa 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git v2.14.0\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-15 11:57+0800\n"
-"PO-Revision-Date: 2017-07-15 13:51+0700\n"
+"POT-Creation-Date: 2017-07-24 21:54+0800\n"
+"PO-Revision-Date: 2017-07-25 07:06+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
 "Language: vi\n"
@@ -1476,19 +1476,62 @@ msgstr "LF nên thay bằng CRLF trong %s"
 
 #: date.c:116
 msgid "in the future"
-msgstr "trong tương lai"
+msgstr "ở thời tương lai"
 
-#: date.c:122 date.c:129 date.c:136 date.c:143 date.c:149 date.c:156 date.c:167
-#: date.c:175 date.c:180
-msgid "%"
-msgid_plural "%"
-msgstr[0] "%"
+#: date.c:122
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "%<PRIuMAX> giây trước"
+
+#: date.c:129
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "%<PRIuMAX> phút trước"
+
+#: date.c:136
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "%<PRIuMAX> giờ trước"
+
+#: date.c:143
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "%<PRIuMAX> ngày trước"
+
+#: date.c:149
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "%<PRIuMAX> tuần trước"
+
+#: date.c:156
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "%<PRIuMAX> tháng trước"
+
+#: date.c:167
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> năm"
 
 #. TRANSLATORS: "%s" is "<n> years"
 #: date.c:170
-msgid "%s, %"
-msgid_plural "%s, %"
-msgstr[0] "%s, %"
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "%s, %<PRIuMAX> tháng trước"
+
+#: date.c:175 date.c:180
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "%<PRIuMAX> năm trước"
 
 #: diffcore-order.c:24
 #, c-format
@@ -1662,7 +1705,7 @@ msgstr "lần chuyển giao %s không hợp lệ"
 msgid "giving up"
 msgstr "chịu thua"
 
-#: fetch-pack.c:533 progress.c:235
+#: fetch-pack.c:533 progress.c:237
 msgid "done"
 msgstr "xong"
 
@@ -8471,7 +8514,7 @@ msgstr "Tự động đóng gói kho chứa để tối ưu hóa hiệu suất l
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Xem \"git help gc\" để có hướng dẫn cụ thể về cách dọn dẹp kho git.\n"
 
-#: builtin/gc.c:432
+#: builtin/gc.c:436
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8479,7 +8522,7 @@ msgstr ""
 "gc đang được thực hiện trên máy “%s” pid %<PRIuMAX> (dùng --force nếu không "
 "phải thế)"
 
-#: builtin/gc.c:476
+#: builtin/gc.c:480
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
@@ -16331,44 +16374,16 @@ msgstr "Bỏ qua %s với hậu tố sao lưu dự phòng “%s”.\n"
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Bạn có thực sự muốn gửi %s? [y|N]: "
 
-#~ msgid "Could not open file '%s'"
-#~ msgstr "Không thể mở tập tin “%s”"
-
-#~ msgid "%lu second ago"
-#~ msgid_plural "%lu seconds ago"
-#~ msgstr[0] "%lu giây trước"
-
-#~ msgid "%lu minute ago"
-#~ msgid_plural "%lu minutes ago"
-#~ msgstr[0] "%lu phút trước"
+#~ msgid "%"
+#~ msgid_plural "%"
+#~ msgstr[0] "%"
 
-#~ msgid "%lu hour ago"
-#~ msgid_plural "%lu hours ago"
-#~ msgstr[0] "%lu giờ trước"
+#~ msgid "%s, %"
+#~ msgid_plural "%s, %"
+#~ msgstr[0] "%s, %"
 
-#~ msgid "%lu day ago"
-#~ msgid_plural "%lu days ago"
-#~ msgstr[0] "%lu ngày trước"
-
-#~ msgid "%lu week ago"
-#~ msgid_plural "%lu weeks ago"
-#~ msgstr[0] "%lu tuần trước"
-
-#~ msgid "%lu month ago"
-#~ msgid_plural "%lu months ago"
-#~ msgstr[0] "%lu tháng trước"
-
-#~ msgid "%lu year"
-#~ msgid_plural "%lu years"
-#~ msgstr[0] "%lu năm"
-
-#~ msgid "%s, %lu month ago"
-#~ msgid_plural "%s, %lu months ago"
-#~ msgstr[0] "%s, %lu tháng trước"
-
-#~ msgid "%lu year ago"
-#~ msgid_plural "%lu years ago"
-#~ msgstr[0] "%lu năm trước"
+#~ msgid "Could not open file '%s'"
+#~ msgstr "Không thể mở tập tin “%s”"
 
 #~ msgid "in %0.1f seconds automatically..."
 #~ msgstr "trong %0.1f giây một cách tự động…"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 22d9961948..51f5bc9a40 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,6 +10,7 @@
 #   - Thynson <lanxingcan AT gmail.com>
 #   - ws3389 <willsmith3389 AT gmail.com>
 #   - Wang Sheng <wangsheng2008love AT 163.com>
+#   - 依云 <lilydjwg AT gmail.com>
 #   - Yichao Yu <yyc1992 AT gmail.com>
 #   - Zhuang Ya <zhuangya AT me.com>
 #
@@ -112,7 +113,7 @@
 #   smart HTTP protocol              |  智能 HTTP 协议
 #   squash                           |  压缩
 #   stage                            |  n. 暂存区（即索引）; v. 暂存
-#   stash                            |  n. 进度保存; v. 保存进度
+#   stash                            |  n. 贮藏区; v. 贮藏
 #   submodule                        |  子模组
 #   symref                           |  符号引用
 #   tag                              |  n. 标签; v. 打标签
@@ -135,8 +136,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-05-05 09:35+0800\n"
-"PO-Revision-Date: 2017-05-09 21:54+0800\n"
+"POT-Creation-Date: 2017-07-24 21:54+0800\n"
+"PO-Revision-Date: 2017-08-02 08:00+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
 "Language: zh_CN\n"
@@ -145,37 +146,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: advice.c:55
+#: advice.c:58
 #, c-format
 msgid "hint: %.*s\n"
 msgstr "提示：%.*s\n"
 
-#: advice.c:83
+#: advice.c:86
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "无法拣选，因为您有未合并的文件。"
 
-#: advice.c:85
+#: advice.c:88
 msgid "Committing is not possible because you have unmerged files."
 msgstr "无法提交，因为您有未合并的文件。"
 
-#: advice.c:87
+#: advice.c:90
 msgid "Merging is not possible because you have unmerged files."
 msgstr "无法合并，因为您有未合并的文件。"
 
-#: advice.c:89
+#: advice.c:92
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "无法拉取，因为您有未合并的文件。"
 
-#: advice.c:91
+#: advice.c:94
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "无法回退，因为您有未合并的文件。"
 
-#: advice.c:93
+#: advice.c:96
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "无法 %s，因为您有未合并的文件。"
 
-#: advice.c:101
+#: advice.c:104
 msgid ""
 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 "as appropriate to mark resolution and make a commit."
@@ -183,23 +184,23 @@ msgstr ""
 "请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"
 "解决方案并提交。"
 
-#: advice.c:109
+#: advice.c:112
 msgid "Exiting because of an unresolved conflict."
 msgstr "因为存在未解决的冲突而退出。"
 
-#: advice.c:114 builtin/merge.c:1185
+#: advice.c:117 builtin/merge.c:1184
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
 
-#: advice.c:116
+#: advice.c:119
 msgid "Please, commit your changes before merging."
 msgstr "请在合并前先提交您的修改。"
 
-#: advice.c:117
+#: advice.c:120
 msgid "Exiting because of unfinished merge."
 msgstr "因为存在未完成的合并而退出。"
 
-#: advice.c:123
+#: advice.c:126
 #, c-format
 msgid ""
 "Note: checking out '%s'.\n"
@@ -226,82 +227,92 @@ msgstr ""
 "  git checkout -b <new-branch-name>\n"
 "\n"
 
-#: apply.c:57
+#: apply.c:58
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "未能识别的空白字符选项 '%s'"
 
-#: apply.c:73
+#: apply.c:74
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "未能识别的空白字符忽略选项 '%s'"
 
-#: apply.c:125
+#: apply.c:126
 msgid "--reject and --3way cannot be used together."
 msgstr "--reject 和 --3say 不能同时使用。"
 
-#: apply.c:127
+#: apply.c:128
 msgid "--cached and --3way cannot be used together."
 msgstr "--cached 和 --3way 不能同时使用。"
 
-#: apply.c:130
+#: apply.c:131
 msgid "--3way outside a repository"
 msgstr "--3way 在一个仓库之外"
 
-#: apply.c:141
+#: apply.c:142
 msgid "--index outside a repository"
 msgstr "--index 在一个仓库之外"
 
-#: apply.c:144
+#: apply.c:145
 msgid "--cached outside a repository"
 msgstr "--cached 在一个仓库之外"
 
-#: apply.c:845
+#: apply.c:836
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "无法准备时间戳正则表达式 %s"
 
-#: apply.c:854
+#: apply.c:845
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec 返回 %d，输入为：%s"
 
-#: apply.c:938
+#: apply.c:929
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "不能在补丁的第 %d 行找到文件名"
 
-#: apply.c:977
+#: apply.c:967
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"
 
-#: apply.c:983
+#: apply.c:973
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
 
-#: apply.c:984
+#: apply.c:974
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
 
-#: apply.c:990
+#: apply.c:979
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"
 
-#: apply.c:1488
+#: apply.c:1008
+#, c-format
+msgid "invalid mode on line %d: %s"
+msgstr "第 %d 行包含无效文件模式：%s"
+
+#: apply.c:1326
+#, c-format
+msgid "inconsistent header lines %d and %d"
+msgstr "不一致的文件头，%d 行和 %d 行"
+
+#: apply.c:1498
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount：意外的行：%.*s"
 
-#: apply.c:1557
+#: apply.c:1567
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "第 %d 行的补丁片段没有头信息：%.*s"
 
-#: apply.c:1577
+#: apply.c:1587
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -312,82 +323,82 @@ msgid_plural ""
 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
 
-#: apply.c:1589
+#: apply.c:1600
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）"
 
-#: apply.c:1759
+#: apply.c:1770
 msgid "new file depends on old contents"
 msgstr "新文件依赖旧内容"
 
-#: apply.c:1761
+#: apply.c:1772
 msgid "deleted file still has contents"
 msgstr "删除的文件仍有内容"
 
-#: apply.c:1795
+#: apply.c:1806
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "补丁在第 %d 行损坏"
 
-#: apply.c:1832
+#: apply.c:1843
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "新文件 %s 依赖旧内容"
 
-#: apply.c:1834
+#: apply.c:1845
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "删除的文件 %s 仍有内容"
 
-#: apply.c:1837
+#: apply.c:1848
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** 警告：文件 %s 成为空文件但并未删除"
 
-#: apply.c:1984
+#: apply.c:1995
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "二进制补丁在第 %d 行损坏：%.*s"
 
-#: apply.c:2021
+#: apply.c:2032
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "未能识别的二进制补丁位于第 %d 行"
 
-#: apply.c:2182
+#: apply.c:2193
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "补丁文件的第 %d 行只有垃圾数据"
 
-#: apply.c:2265
+#: apply.c:2276
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "无法读取符号链接 %s"
 
-#: apply.c:2269
+#: apply.c:2280
 #, c-format
 msgid "unable to open or read %s"
 msgstr "不能打开或读取 %s"
 
-#: apply.c:2922
+#: apply.c:2933
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "无效的行首字符：'%c'"
 
-#: apply.c:3041
+#: apply.c:3052
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）"
 msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）"
 
-#: apply.c:3053
+#: apply.c:3064
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
 
-#: apply.c:3059
+#: apply.c:3070
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -396,561 +407,561 @@ msgstr ""
 "当查询：\n"
 "%.*s"
 
-#: apply.c:3081
+#: apply.c:3092
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "缺失 '%s' 的二进制补丁数据"
 
-#: apply.c:3089
+#: apply.c:3100
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
 
-#: apply.c:3135
+#: apply.c:3146
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
 
-#: apply.c:3145
+#: apply.c:3156
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。"
 
-#: apply.c:3153
+#: apply.c:3164
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "补丁应用到空文件 '%s'，但其并非空文件"
 
-#: apply.c:3171
+#: apply.c:3182
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "无法读取 '%2$s' 必须的目标文件 %1$s"
 
-#: apply.c:3184
+#: apply.c:3195
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "二进制补丁未应用到 '%s'"
 
-#: apply.c:3190
+#: apply.c:3201
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
 
-#: apply.c:3211
+#: apply.c:3222
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "打补丁失败：%s:%ld"
 
-#: apply.c:3333
+#: apply.c:3344
 #, c-format
 msgid "cannot checkout %s"
 msgstr "不能检出 %s"
 
-#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253
+#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
 #, c-format
 msgid "failed to read %s"
 msgstr "无法读取 %s"
 
-#: apply.c:3389
+#: apply.c:3400
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "读取位于符号链接中的 '%s'"
 
-#: apply.c:3418 apply.c:3658
+#: apply.c:3429 apply.c:3669
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "路径 %s 已经被重命名/删除"
 
-#: apply.c:3501 apply.c:3672
+#: apply.c:3512 apply.c:3683
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s：不存在于索引中"
 
-#: apply.c:3510 apply.c:3680
+#: apply.c:3521 apply.c:3691
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s：和索引不匹配"
 
-#: apply.c:3545
+#: apply.c:3556
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
 
-#: apply.c:3548
+#: apply.c:3559
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "回落到三方合并...\n"
 
-#: apply.c:3564 apply.c:3568
+#: apply.c:3575 apply.c:3579
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "无法读取 '%s' 的当前内容"
 
-#: apply.c:3580
+#: apply.c:3591
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "无法回落到三方合并...\n"
 
-#: apply.c:3594
+#: apply.c:3605
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "应用补丁到 '%s' 存在冲突。\n"
 
-#: apply.c:3599
+#: apply.c:3610
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "成功应用补丁到 '%s'。\n"
 
-#: apply.c:3625
+#: apply.c:3636
 msgid "removal patch leaves file contents"
 msgstr "移除补丁仍留下了文件内容"
 
-#: apply.c:3697
+#: apply.c:3708
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s：错误类型"
 
-#: apply.c:3699
+#: apply.c:3710
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s 的类型是 %o，应为 %o"
 
-#: apply.c:3850 apply.c:3852
+#: apply.c:3860 apply.c:3862
 #, c-format
 msgid "invalid path '%s'"
 msgstr "无效路径 '%s'"
 
-#: apply.c:3908
+#: apply.c:3918
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s：已经存在于索引中"
 
-#: apply.c:3911
+#: apply.c:3921
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s：已经存在于工作区中"
 
-#: apply.c:3931
+#: apply.c:3941
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
 
-#: apply.c:3936
+#: apply.c:3946
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"
 
-#: apply.c:3956
+#: apply.c:3966
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "受影响的文件 '%s' 位于符号链接中"
 
-#: apply.c:3960
+#: apply.c:3970
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s：补丁未应用"
 
-#: apply.c:3975
+#: apply.c:3985
 #, c-format
 msgid "Checking patch %s..."
 msgstr "检查补丁 %s..."
 
-#: apply.c:4066
+#: apply.c:4076
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "子模组 %s 的 sha1 信息缺失或无效"
 
-#: apply.c:4073
+#: apply.c:4083
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "%s 的模式被改变，但它不在当前 HEAD 中"
 
-#: apply.c:4076
+#: apply.c:4086
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "sha1 信息缺失或无效（%s）。"
 
-#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135
+#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
 
-#: apply.c:4085
+#: apply.c:4095
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "不能在临时索引中添加 %s"
 
-#: apply.c:4095
+#: apply.c:4105
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "不能把临时索引写入到 %s"
 
-#: apply.c:4233
+#: apply.c:4243
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "不能从索引中移除 %s"
 
-#: apply.c:4268
+#: apply.c:4278
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "子模组 %s 损坏的补丁"
 
-#: apply.c:4274
+#: apply.c:4284
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "不能对新建文件 '%s' 调用 stat"
 
-#: apply.c:4282
+#: apply.c:4292
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "不能为新建文件 %s 创建后端存储"
 
-#: apply.c:4288 apply.c:4432
+#: apply.c:4298 apply.c:4442
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "无法为 %s 添加缓存条目"
 
-#: apply.c:4329
+#: apply.c:4339
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "无法写入 '%s'"
 
-#: apply.c:4333
+#: apply.c:4343
 #, c-format
 msgid "closing file '%s'"
 msgstr "关闭文件 '%s'"
 
-#: apply.c:4403
+#: apply.c:4413
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "不能写文件 '%s' 权限 %o"
 
-#: apply.c:4501
+#: apply.c:4511
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "成功应用补丁 %s。"
 
-#: apply.c:4509
+#: apply.c:4519
 msgid "internal error"
 msgstr "内部错误"
 
-#: apply.c:4512
+#: apply.c:4522
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
 msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."
 
-#: apply.c:4523
+#: apply.c:4533
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "截短 .rej 文件名为 %.*s.rej"
 
-#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988
+#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
 #, c-format
 msgid "cannot open %s"
 msgstr "不能打开 %s"
 
-#: apply.c:4545
+#: apply.c:4555
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "第 #%d 个片段成功应用。"
 
-#: apply.c:4549
+#: apply.c:4559
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "拒绝第 #%d 个片段。"
 
-#: apply.c:4659
+#: apply.c:4669
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "略过补丁 '%s'。"
 
-#: apply.c:4667
+#: apply.c:4677
 msgid "unrecognized input"
 msgstr "未能识别的输入"
 
-#: apply.c:4686
+#: apply.c:4696
 msgid "unable to read index file"
 msgstr "无法读取索引文件"
 
-#: apply.c:4823
+#: apply.c:4833
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "不能打开补丁 '%s'：%s"
 
-#: apply.c:4850
+#: apply.c:4860
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "抑制下仍有 %d 个空白字符误用"
 msgstr[1] "抑制下仍有 %d 个空白字符误用"
 
-#: apply.c:4856 apply.c:4871
+#: apply.c:4866 apply.c:4881
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
-msgstr[0] "%d 行有空白字符误用。"
-msgstr[1] "%d 行有空白字符误用。"
+msgstr[0] "%d 行新增了空白字符误用。"
+msgstr[1] "%d 行新增了空白字符误用。"
 
-#: apply.c:4864
+#: apply.c:4874
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] "修复空白错误后，应用了 %d 行。"
 msgstr[1] "修复空白错误后，应用了 %d 行。"
 
-#: apply.c:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
+#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
 msgid "Unable to write new index file"
 msgstr "无法写入新索引文件"
 
-#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279
-#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180
+#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
+#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
 #: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
 #: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
 #: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
-#: git-add--interactive.perl:239
+#: git-add--interactive.perl:197
 msgid "path"
 msgstr "路径"
 
-#: apply.c:4912
+#: apply.c:4922
 msgid "don't apply changes matching the given path"
 msgstr "不要应用与给出路径向匹配的变更"
 
-#: apply.c:4915
+#: apply.c:4925
 msgid "apply changes matching the given path"
 msgstr "应用与给出路径向匹配的变更"
 
-#: apply.c:4917 builtin/am.c:2285
+#: apply.c:4927 builtin/am.c:2266
 msgid "num"
 msgstr "数字"
 
-#: apply.c:4918
+#: apply.c:4928
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
 
-#: apply.c:4921
+#: apply.c:4931
 msgid "ignore additions made by the patch"
 msgstr "忽略补丁中的添加的文件"
 
-#: apply.c:4923
+#: apply.c:4933
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
 
-#: apply.c:4927
+#: apply.c:4937
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "以十进制数显示添加和删除的行数"
 
-#: apply.c:4929
+#: apply.c:4939
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "不应用补丁，而是显示输入的概要"
 
-#: apply.c:4931
+#: apply.c:4941
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "不应用补丁，而是查看补丁是否可应用"
 
-#: apply.c:4933
+#: apply.c:4943
 msgid "make sure the patch is applicable to the current index"
 msgstr "确认补丁可以应用到当前索引"
 
-#: apply.c:4935
+#: apply.c:4945
 msgid "apply a patch without touching the working tree"
 msgstr "应用补丁而不修改工作区"
 
-#: apply.c:4937
+#: apply.c:4947
 msgid "accept a patch that touches outside the working area"
 msgstr "接受修改工作区之外文件的补丁"
 
-#: apply.c:4939
+#: apply.c:4949
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
 
-#: apply.c:4941
+#: apply.c:4951
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "如果一个补丁不能应用则尝试三方合并"
 
-#: apply.c:4943
+#: apply.c:4953
 msgid "build a temporary index based on embedded index information"
 msgstr "创建一个临时索引基于嵌入的索引信息"
 
-#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515
+#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
 msgid "paths are separated with NUL character"
 msgstr "路径以 NUL 字符分隔"
 
-#: apply.c:4948
+#: apply.c:4958
 msgid "ensure at least <n> lines of context match"
 msgstr "确保至少匹配 <n> 行上下文"
 
-#: apply.c:4949 builtin/am.c:2264
+#: apply.c:4959 builtin/am.c:2245
 msgid "action"
 msgstr "动作"
 
-#: apply.c:4950
+#: apply.c:4960
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "检查新增和修改的行中间的空白字符滥用"
 
-#: apply.c:4953 apply.c:4956
+#: apply.c:4963 apply.c:4966
 msgid "ignore changes in whitespace when finding context"
 msgstr "查找上下文时忽略空白字符的变更"
 
-#: apply.c:4959
+#: apply.c:4969
 msgid "apply the patch in reverse"
 msgstr "反向应用补丁"
 
-#: apply.c:4961
+#: apply.c:4971
 msgid "don't expect at least one line of context"
 msgstr "无需至少一行上下文"
 
-#: apply.c:4963
+#: apply.c:4973
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
 
-#: apply.c:4965
+#: apply.c:4975
 msgid "allow overlapping hunks"
 msgstr "允许重叠的补丁片段"
 
-#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19
-#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651
-#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134
+#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
+#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
+#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
 msgid "be verbose"
 msgstr "冗长输出"
 
-#: apply.c:4968
+#: apply.c:4978
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "允许不正确的文件末尾换行符"
 
-#: apply.c:4971
+#: apply.c:4981
 msgid "do not trust the line counts in the hunk headers"
 msgstr "不信任补丁片段的头信息中的行号"
 
-#: apply.c:4973 builtin/am.c:2273
+#: apply.c:4983 builtin/am.c:2254
 msgid "root"
 msgstr "根目录"
 
-#: apply.c:4974
+#: apply.c:4984
 msgid "prepend <root> to all filenames"
 msgstr "为所有文件名前添加 <根目录>"
 
-#: archive.c:12
+#: archive.c:13
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<选项>] <树或提交> [<路径>...]"
 
-#: archive.c:13
+#: archive.c:14
 msgid "git archive --list"
 msgstr "git archive --list"
 
-#: archive.c:14
+#: archive.c:15
 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 msgstr ""
 "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
 
-#: archive.c:15
+#: archive.c:16
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <仓库> [--exec <命令>] --list"
 
-#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
+#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "路径规格 '%s' 未匹配任何文件"
 
-#: archive.c:417
+#: archive.c:418
 msgid "fmt"
 msgstr "格式"
 
-#: archive.c:417
+#: archive.c:418
 msgid "archive format"
 msgstr "归档格式"
 
-#: archive.c:418 builtin/log.c:1436
+#: archive.c:419 builtin/log.c:1446
 msgid "prefix"
 msgstr "前缀"
 
-#: archive.c:419
+#: archive.c:420
 msgid "prepend prefix to each pathname in the archive"
 msgstr "为归档中每个路径名加上前缀"
 
-#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60
-#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061
-#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129
+#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
+#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
+#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
+#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
 #: parse-options.h:153
 msgid "file"
 msgstr "文件"
 
-#: archive.c:421 builtin/archive.c:89
+#: archive.c:422 builtin/archive.c:89
 msgid "write the archive to this file"
 msgstr "归档写入此文件"
 
-#: archive.c:423
+#: archive.c:424
 msgid "read .gitattributes in working directory"
 msgstr "读取工作区中的 .gitattributes"
 
-#: archive.c:424
+#: archive.c:425
 msgid "report archived files on stderr"
 msgstr "在标准错误上报告归档文件"
 
-#: archive.c:425
+#: archive.c:426
 msgid "store only"
 msgstr "只存储"
 
-#: archive.c:426
+#: archive.c:427
 msgid "compress faster"
 msgstr "压缩速度更快"
 
-#: archive.c:434
+#: archive.c:435
 msgid "compress better"
 msgstr "压缩效果更好"
 
-#: archive.c:437
+#: archive.c:438
 msgid "list supported archive formats"
 msgstr "列出支持的归档格式"
 
-#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106
+#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
 #: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
 msgid "repo"
 msgstr "仓库"
 
-#: archive.c:440 builtin/archive.c:91
+#: archive.c:441 builtin/archive.c:91
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "从远程仓库（<仓库>）提取归档文件"
 
-#: archive.c:441 builtin/archive.c:92 builtin/notes.c:485
+#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
 msgid "command"
 msgstr "命令"
 
-#: archive.c:442 builtin/archive.c:93
+#: archive.c:443 builtin/archive.c:93
 msgid "path to the remote git-upload-archive command"
 msgstr "远程 git-upload-archive 命令的路径"
 
-#: archive.c:449
+#: archive.c:450
 msgid "Unexpected option --remote"
 msgstr "未知参数 --remote"
 
-#: archive.c:451
+#: archive.c:452
 msgid "Option --exec can only be used together with --remote"
 msgstr "选项 --exec 只能和 --remote 同时使用"
 
-#: archive.c:453
+#: archive.c:454
 msgid "Unexpected option --output"
 msgstr "未知参数 --output"
 
-#: archive.c:475
+#: archive.c:476
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "未知归档格式 '%s'"
 
-#: archive.c:482
+#: archive.c:483
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "参数不支持此格式 '%s'：-%d"
 
-#: attr.c:212
+#: attr.c:214
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s 不是一个有效的属性名"
 
-#: attr.c:408
+#: attr.c:410
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -958,27 +969,22 @@ msgstr ""
 "负值模版在 git attributes 中被忽略\n"
 "当字符串确实要以感叹号开始时，使用 '\\!'。"
 
-#: bisect.c:444
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "不能打开文件 '%s'"
-
-#: bisect.c:449
+#: bisect.c:447
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "文件 '%s' 包含错误的引用格式：%s"
 
-#: bisect.c:657
+#: bisect.c:655
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "我们无法进行更多的二分查找！\n"
 
-#: bisect.c:710
+#: bisect.c:708
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "不是一个有效的提交名 %s"
 
-#: bisect.c:734
+#: bisect.c:732
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -987,7 +993,7 @@ msgstr ""
 "合并基线 %s 是坏的。\n"
 "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
 
-#: bisect.c:739
+#: bisect.c:737
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -996,7 +1002,7 @@ msgstr ""
 "合并基线 %s 是新的。\n"
 "介于 %s 和 [%s] 之间的属性已经被修改。\n"
 
-#: bisect.c:744
+#: bisect.c:742
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1005,7 +1011,7 @@ msgstr ""
 "合并基线 %s 是 %s。\n"
 "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
 
-#: bisect.c:752
+#: bisect.c:750
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1016,7 +1022,7 @@ msgstr ""
 "这种情况下 git 二分查找无法正常工作。\n"
 "您可能弄错了 %s 和 %s 版本？\n"
 
-#: bisect.c:765
+#: bisect.c:763
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1027,36 +1033,36 @@ msgstr ""
 "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
 "我们仍旧继续。"
 
-#: bisect.c:800
+#: bisect.c:798
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "二分查找中：合并基线必须是经过测试的\n"
 
-#: bisect.c:851
+#: bisect.c:849
 #, c-format
 msgid "a %s revision is needed"
 msgstr "需要一个 %s 版本"
 
-#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255
+#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
 #, c-format
 msgid "could not create file '%s'"
 msgstr "不能创建文件 '%s'"
 
-#: bisect.c:919
+#: bisect.c:917
 #, c-format
 msgid "could not read file '%s'"
 msgstr "不能读取文件 '%s'"
 
-#: bisect.c:949
+#: bisect.c:947
 msgid "reading bisect refs failed"
 msgstr "读取二分查找引用失败"
 
-#: bisect.c:969
+#: bisect.c:967
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s 同时为 %s 和 %s\n"
 
-#: bisect.c:977
+#: bisect.c:975
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1065,15 +1071,16 @@ msgstr ""
 "没有发现可测试的提交。\n"
 "可能您在运行时使用了错误的路径参数？\n"
 
-#: bisect.c:996
+#: bisect.c:994
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
 msgstr[0] "（大概 %d 步）"
 msgstr[1] "（大概 %d 步）"
 
-#. TRANSLATORS: the last %s will be replaced with
-#. "(roughly %d steps)" translation
+#. TRANSLATORS: the last %s will be replaced with "(roughly %d
+#. steps)" translation.
+#.
 #: bisect.c:1000
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
@@ -1081,6 +1088,40 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
 msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
 
+#: blame.c:1757
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents 和 --reverse 不能混用。"
+
+#: blame.c:1768
+msgid "cannot use --contents with final commit object name"
+msgstr "不能将 --contents 和最终的提交对象名共用"
+
+#: blame.c:1788
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
+
+#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
+#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
+#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
+#: builtin/shortlog.c:177
+msgid "revision walk setup failed"
+msgstr "版本遍历设置失败"
+
+#: blame.c:1815
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"
+
+#: blame.c:1826
+#, c-format
+msgid "no such path %s in %s"
+msgstr "在 %2$s 中无此路径 %1$s"
+
+#: blame.c:1837
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "不能为路径 %2$s 读取数据对象 %1$s"
+
 #: branch.c:53
 #, c-format
 msgid ""
@@ -1209,7 +1250,7 @@ msgstr "无效的分支点：'%s'。"
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' 已经检出到 '%s'"
 
-#: branch.c:364
+#: branch.c:366
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "工作区 %s 的 HEAD 指向没有被更新"
@@ -1219,92 +1260,85 @@ msgstr "工作区 %s 的 HEAD 指向没有被更新"
 msgid "'%s' does not look like a v2 bundle file"
 msgstr "'%s' 不像是一个 v2 版本的包文件"
 
-#: bundle.c:61
+#: bundle.c:62
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "未能识别的包头：%s%s (%d)"
 
-#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777
+#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
 #, c-format
 msgid "could not open '%s'"
 msgstr "不能打开 '%s'"
 
-#: bundle.c:139
+#: bundle.c:140
 msgid "Repository lacks these prerequisite commits:"
 msgstr "仓库中缺少这些必备的提交："
 
-#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321
-#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353
-#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916
-#: builtin/merge.c:359 builtin/shortlog.c:176
-msgid "revision walk setup failed"
-msgstr "版本遍历设置失败"
-
-#: bundle.c:185
+#: bundle.c:186
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "这个包中含有这个引用："
 msgstr[1] "这个包中含有 %d 个引用："
 
-#: bundle.c:192
+#: bundle.c:193
 msgid "The bundle records a complete history."
 msgstr "这个包记录一个完整历史。"
 
-#: bundle.c:194
+#: bundle.c:195
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "这个包需要这个引用："
 msgstr[1] "这个包需要 %d 个引用："
 
-#: bundle.c:253
+#: bundle.c:254
 msgid "Could not spawn pack-objects"
 msgstr "不能生成 pack-objects 进程"
 
-#: bundle.c:264
+#: bundle.c:265
 msgid "pack-objects died"
 msgstr "pack-objects 终止"
 
-#: bundle.c:304
+#: bundle.c:307
 msgid "rev-list died"
 msgstr "rev-list 终止"
 
-#: bundle.c:353
+#: bundle.c:356
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "引用 '%s' 被 rev-list 选项排除"
 
-#: bundle.c:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281
+#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "未能识别的参数：%s"
 
-#: bundle.c:451
+#: bundle.c:454
 msgid "Refusing to create empty bundle."
 msgstr "不能创建空包。"
 
-#: bundle.c:463
+#: bundle.c:466
 #, c-format
 msgid "cannot create '%s'"
 msgstr "不能创建 '%s'"
 
-#: bundle.c:491
+#: bundle.c:494
 msgid "index-pack died"
 msgstr "index-pack 终止"
 
-#: color.c:300
+#: color.c:301
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "无效的颜色值：%.*s"
 
-#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455
-#: builtin/am.c:1489 builtin/am.c:2126
+#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
+#: builtin/am.c:1469 builtin/am.c:2107
 #, c-format
 msgid "could not parse %s"
 msgstr "不能解析 %s"
 
-#: commit.c:42
+#: commit.c:43
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s 不是一个提交!"
@@ -1323,161 +1357,161 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "内存耗尽"
 
-#: config.c:191
+#: config.c:186
 msgid "relative config include conditionals must come from files"
 msgstr "包含相对路径的条件引用必须来自于文件"
 
-#: config.c:711
+#: config.c:720
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "数据对象 %2$s 中错误的配置行 %1$d"
 
-#: config.c:715
+#: config.c:724
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "文件 %2$s 中错误的配置行 %1$d"
 
-#: config.c:719
+#: config.c:728
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "标准输入中错误的配置行 %d"
 
-#: config.c:723
+#: config.c:732
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
 
-#: config.c:727
+#: config.c:736
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "命令行 %2$s 中错误的配置行 %1$d"
 
-#: config.c:731
+#: config.c:740
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "在 %2$s 中错误的配置行 %1$d"
 
-#: config.c:859
+#: config.c:868
 msgid "out of range"
 msgstr "超出范围"
 
-#: config.c:859
+#: config.c:868
 msgid "invalid unit"
 msgstr "无效的单位"
 
-#: config.c:865
+#: config.c:874
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"
 
-#: config.c:870
+#: config.c:879
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
 
-#: config.c:873
+#: config.c:882
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
 
-#: config.c:876
+#: config.c:885
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"
 
-#: config.c:879
+#: config.c:888
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
 
-#: config.c:882
+#: config.c:891
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
 
-#: config.c:885
+#: config.c:894
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
 
-#: config.c:980
+#: config.c:989
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "无法扩展 '%s' 中的用户目录"
 
-#: config.c:1075 config.c:1086
+#: config.c:1084 config.c:1095
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "错误的 zlib 压缩级别 %d"
 
-#: config.c:1203
+#: config.c:1212
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "无效的对象创建模式：%s"
 
-#: config.c:1359
+#: config.c:1368
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "错误的打包压缩级别 %d"
 
-#: config.c:1557
+#: config.c:1564
 msgid "unable to parse command-line config"
 msgstr "无法解析命令行中的配置"
 
-#: config.c:1611
+#: config.c:1894
 msgid "unknown error occurred while reading the configuration files"
 msgstr "在读取配置文件时遇到未知错误"
 
-#: config.c:1970
+#: config.c:2064
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "无效 %s：'%s'"
 
-#: config.c:1991
+#: config.c:2085
 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr "未知的 core.untrackedCache 取值 '%s'，使用默认值 'keep'"
 
-#: config.c:2017
+#: config.c:2111
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
 
-#: config.c:2028
+#: config.c:2122
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "无法解析命令行配置中的 '%s'"
 
-#: config.c:2030
+#: config.c:2124
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
 
-#: config.c:2089
+#: config.c:2183
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s 有多个取值"
 
-#: config.c:2423 config.c:2648
+#: config.c:2517 config.c:2745
 #, c-format
 msgid "fstat on %s failed"
 msgstr "对 %s 调用 fstat 失败"
 
-#: config.c:2541
+#: config.c:2635
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "不能设置 '%s' 为 '%s'"
 
-#: config.c:2543 builtin/remote.c:774
+#: config.c:2637 builtin/remote.c:775
 #, c-format
 msgid "could not unset '%s'"
 msgstr "不能取消设置 '%s'"
 
-#: connect.c:49
+#: connect.c:50
 msgid "The remote end hung up upon initial contact"
 msgstr "远端在连接发起时即挂断"
 
-#: connect.c:51
+#: connect.c:52
 msgid ""
 "Could not read from remote repository.\n"
 "\n"
@@ -1488,7 +1522,7 @@ msgstr ""
 "\n"
 "请确认您有正确的访问权限并且仓库存在。"
 
-#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140
+#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
 msgid "Checking connectivity"
 msgstr "检查连接中"
 
@@ -1504,7 +1538,7 @@ msgstr "无法写入 rev-list"
 msgid "failed to close rev-list's stdin"
 msgstr "无法关闭 rev-list 的标准输入"
 
-#: convert.c:201
+#: convert.c:205
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
@@ -1513,12 +1547,12 @@ msgstr ""
 "文件 %s 中的 CRLF 将被 LF 替换。\n"
 "在工作区中该文件仍保持原有的换行符。"
 
-#: convert.c:205
+#: convert.c:209
 #, c-format
 msgid "CRLF would be replaced by LF in %s."
 msgstr "文件 %s 中的 CRLF 将被 LF 替换。"
 
-#: convert.c:211
+#: convert.c:215
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -1527,78 +1561,78 @@ msgstr ""
 "文件 %s 中的 LF 将被 CRLF 替换。\n"
 "在工作区中该文件仍保持原有的换行符。"
 
-#: convert.c:215
+#: convert.c:219
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr "文件 %s 中的 LF 将被 CRLF 替换"
 
-#: date.c:97
+#: date.c:116
 msgid "in the future"
 msgstr "在将来"
 
-#: date.c:103
+#: date.c:122
 #, c-format
-msgid "%lu second ago"
-msgid_plural "%lu seconds ago"
-msgstr[0] "%lu 秒钟前"
-msgstr[1] "%lu 秒钟前"
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "%<PRIuMAX> 秒钟前"
+msgstr[1] "%<PRIuMAX> 秒钟前"
 
-#: date.c:110
+#: date.c:129
 #, c-format
-msgid "%lu minute ago"
-msgid_plural "%lu minutes ago"
-msgstr[0] "%lu 分钟前"
-msgstr[1] "%lu 分钟前"
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "%<PRIuMAX> 分钟前"
+msgstr[1] "%<PRIuMAX> 分钟前"
 
-#: date.c:117
+#: date.c:136
 #, c-format
-msgid "%lu hour ago"
-msgid_plural "%lu hours ago"
-msgstr[0] "%lu 小时前"
-msgstr[1] "%lu 小时前"
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "%<PRIuMAX> 小时前"
+msgstr[1] "%<PRIuMAX> 小时前"
 
-#: date.c:124
+#: date.c:143
 #, c-format
-msgid "%lu day ago"
-msgid_plural "%lu days ago"
-msgstr[0] "%lu 天前"
-msgstr[1] "%lu 天前"
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "%<PRIuMAX> 天前"
+msgstr[1] "%<PRIuMAX> 天前"
 
-#: date.c:130
+#: date.c:149
 #, c-format
-msgid "%lu week ago"
-msgid_plural "%lu weeks ago"
-msgstr[0] "%lu 周前"
-msgstr[1] "%lu 周前"
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "%<PRIuMAX> 周前"
+msgstr[1] "%<PRIuMAX> 周前"
 
-#: date.c:137
+#: date.c:156
 #, c-format
-msgid "%lu month ago"
-msgid_plural "%lu months ago"
-msgstr[0] "%lu 个月前"
-msgstr[1] "%lu 个月前"
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "%<PRIuMAX> 个月前"
+msgstr[1] "%<PRIuMAX> 个月前"
 
-#: date.c:148
+#: date.c:167
 #, c-format
-msgid "%lu year"
-msgid_plural "%lu years"
-msgstr[0] "%lu 年"
-msgstr[1] "%lu 年"
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> 年"
+msgstr[1] "%<PRIuMAX> 年"
 
 #. TRANSLATORS: "%s" is "<n> years"
-#: date.c:151
+#: date.c:170
 #, c-format
-msgid "%s, %lu month ago"
-msgid_plural "%s, %lu months ago"
-msgstr[0] "%s %lu 个月前"
-msgstr[1] "%s %lu 个月前"
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "%s %<PRIuMAX> 个月前"
+msgstr[1] "%s %<PRIuMAX> 个月前"
 
-#: date.c:156 date.c:161
+#: date.c:175 date.c:180
 #, c-format
-msgid "%lu year ago"
-msgid_plural "%lu years ago"
-msgstr[0] "%lu 年前"
-msgstr[1] "%lu 年前"
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "%<PRIuMAX> 年前"
+msgstr[1] "%<PRIuMAX> 年前"
 
 #: diffcore-order.c:24
 #, c-format
@@ -1609,29 +1643,29 @@ msgstr "无法读取排序文件 '%s'"
 msgid "Performing inexact rename detection"
 msgstr "正在进行非精确的重命名探测"
 
-#: diff.c:62
+#: diff.c:63
 #, c-format
 msgid "option '%s' requires a value"
 msgstr "选项 '%s'  需要一个值"
 
 #  译者：注意保持前导空格
-#: diff.c:124
+#: diff.c:125
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  无法解析 dirstat 截止（cut-off）百分比 '%s'\n"
 
 #  译者：注意保持前导空格
-#: diff.c:129
+#: diff.c:130
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  未知的 dirstat 参数 '%s'\n"
 
-#: diff.c:281
+#: diff.c:282
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"
 
-#: diff.c:344
+#: diff.c:342
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -1640,20 +1674,20 @@ msgstr ""
 "发现配置变量 'diff.dirstat' 中的错误：\n"
 "%s"
 
-#: diff.c:3102
+#: diff.c:3101
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "外部 diff 退出，停止在 %s"
 
-#: diff.c:3428
+#: diff.c:3427
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
 
-#: diff.c:3518
+#: diff.c:3517
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow 明确要求只跟一个路径规格"
 
-#: diff.c:3681
+#: diff.c:3680
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -1662,277 +1696,277 @@ msgstr ""
 "无法解析 --dirstat/-X 选项的参数：\n"
 "%s"
 
-#: diff.c:3695
+#: diff.c:3694
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "无法解析 --submodule 选项的参数：'%s'"
 
-#: diff.c:4719
+#: diff.c:4716
 msgid "inexact rename detection was skipped due to too many files."
 msgstr "因为文件太多，略过不严格的重命名检查。"
 
-#: diff.c:4722
+#: diff.c:4719
 msgid "only found copies from modified paths due to too many files."
 msgstr "因为文件太多，只在修改的路径中查找拷贝。"
 
-#: diff.c:4725
+#: diff.c:4722
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
 
-#: dir.c:1899
+#: dir.c:1948
 msgid "failed to get kernel name and information"
 msgstr "无法获得内核名称和信息"
 
-#: dir.c:2018
+#: dir.c:2067
 msgid "Untracked cache is disabled on this system or location."
 msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
 
-#: dir.c:2776 dir.c:2781
+#: dir.c:2846 dir.c:2851
 #, c-format
 msgid "could not create directories for %s"
 msgstr "不能为 %s 创建目录"
 
-#: dir.c:2806
+#: dir.c:2876
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
 
-#: entry.c:280
+#: entry.c:281
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "不能对文件 '%s' 调用 stat"
 
-#: fetch-pack.c:249
+#: fetch-pack.c:251
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack：应为 shallow 列表"
 
-#: fetch-pack.c:261
+#: fetch-pack.c:263
 msgid "git fetch-pack: expected ACK/NAK, got EOF"
 msgstr "git fetch-pack：应为 ACK/NAK，却得到 EOF"
 
-#: fetch-pack.c:280 builtin/archive.c:63
+#: fetch-pack.c:282 builtin/archive.c:63
 #, c-format
 msgid "remote error: %s"
 msgstr "远程错误：%s"
 
-#: fetch-pack.c:281
+#: fetch-pack.c:283
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
 
-#: fetch-pack.c:333
+#: fetch-pack.c:335
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc 需要 multi_ack_detailed"
 
-#: fetch-pack.c:419
+#: fetch-pack.c:421
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "无效的 shallow 信息：%s"
 
-#: fetch-pack.c:425
+#: fetch-pack.c:427
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "无效的 unshallow 信息：%s"
 
-#: fetch-pack.c:427
+#: fetch-pack.c:429
 #, c-format
 msgid "object not found: %s"
 msgstr "对象未找到：%s"
 
-#: fetch-pack.c:430
+#: fetch-pack.c:432
 #, c-format
 msgid "error in object: %s"
 msgstr "对象中出错：%s"
 
-#: fetch-pack.c:432
+#: fetch-pack.c:434
 #, c-format
 msgid "no shallow found: %s"
 msgstr "未发现 shallow：%s"
 
-#: fetch-pack.c:435
+#: fetch-pack.c:437
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "应为 shallow/unshallow，却得到 %s"
 
-#: fetch-pack.c:474
+#: fetch-pack.c:476
 #, c-format
 msgid "got %s %d %s"
 msgstr "得到 %s %d %s"
 
-#: fetch-pack.c:488
+#: fetch-pack.c:490
 #, c-format
 msgid "invalid commit %s"
 msgstr "无效提交 %s"
 
-#: fetch-pack.c:521
+#: fetch-pack.c:523
 msgid "giving up"
 msgstr "放弃"
 
-#: fetch-pack.c:531 progress.c:235
+#: fetch-pack.c:533 progress.c:237
 msgid "done"
 msgstr "完成"
 
-#: fetch-pack.c:543
+#: fetch-pack.c:545
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "得到 %s (%d) %s"
 
-#: fetch-pack.c:589
+#: fetch-pack.c:591
 #, c-format
 msgid "Marking %s as complete"
 msgstr "标记 %s 为完成"
 
-#: fetch-pack.c:737
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr "已经有 %s（%s）"
 
-#: fetch-pack.c:775
+#: fetch-pack.c:813
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack：无法派生 sideband 多路输出"
 
-#: fetch-pack.c:783
+#: fetch-pack.c:821
 msgid "protocol error: bad pack header"
 msgstr "协议错误：坏的包头"
 
-#: fetch-pack.c:839
+#: fetch-pack.c:877
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack：无法派生进程 %s"
 
-#: fetch-pack.c:855
+#: fetch-pack.c:893
 #, c-format
 msgid "%s failed"
 msgstr "%s 失败"
 
-#: fetch-pack.c:857
+#: fetch-pack.c:895
 msgid "error in sideband demultiplexer"
 msgstr "sideband 多路输出出错"
 
-#: fetch-pack.c:884
+#: fetch-pack.c:922
 msgid "Server does not support shallow clients"
 msgstr "服务器不支持 shalllow 客户端"
 
-#: fetch-pack.c:888
+#: fetch-pack.c:926
 msgid "Server supports multi_ack_detailed"
 msgstr "服务器支持 multi_ack_detailed"
 
-#: fetch-pack.c:891
+#: fetch-pack.c:929
 msgid "Server supports no-done"
 msgstr "服务器支持 no-done"
 
-#: fetch-pack.c:897
+#: fetch-pack.c:935
 msgid "Server supports multi_ack"
 msgstr "服务器支持 multi_ack"
 
-#: fetch-pack.c:901
+#: fetch-pack.c:939
 msgid "Server supports side-band-64k"
 msgstr "服务器支持 side-band-64k"
 
-#: fetch-pack.c:905
+#: fetch-pack.c:943
 msgid "Server supports side-band"
 msgstr "服务器支持 side-band"
 
-#: fetch-pack.c:909
+#: fetch-pack.c:947
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "服务器支持 allow-tip-sha1-in-want"
 
-#: fetch-pack.c:913
+#: fetch-pack.c:951
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "服务器支持 allow-reachable-sha1-in-want"
 
-#: fetch-pack.c:923
+#: fetch-pack.c:961
 msgid "Server supports ofs-delta"
 msgstr "服务器支持 ofs-delta"
 
-#: fetch-pack.c:930
+#: fetch-pack.c:968
 #, c-format
 msgid "Server version is %.*s"
 msgstr "服务器版本 %.*s"
 
-#: fetch-pack.c:936
+#: fetch-pack.c:974
 msgid "Server does not support --shallow-since"
 msgstr "服务器不支持 --shallow-since"
 
-#: fetch-pack.c:940
+#: fetch-pack.c:978
 msgid "Server does not support --shallow-exclude"
 msgstr "服务器不支持 --shallow-exclude"
 
-#: fetch-pack.c:942
+#: fetch-pack.c:980
 msgid "Server does not support --deepen"
 msgstr "服务器不支持 --deepen"
 
-#: fetch-pack.c:953
+#: fetch-pack.c:991
 msgid "no common commits"
 msgstr "没有共同的提交"
 
-#: fetch-pack.c:965
+#: fetch-pack.c:1003
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack：获取失败。"
 
-#: fetch-pack.c:1127
+#: fetch-pack.c:1165
 msgid "no matching remote head"
 msgstr "没有匹配的远程分支"
 
-#: fetch-pack.c:1149
+#: fetch-pack.c:1187
 #, c-format
 msgid "no such remote ref %s"
 msgstr "没有这样的远程引用 %s"
 
-#: fetch-pack.c:1152
+#: fetch-pack.c:1190
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "服务器不允许请求未公开的对象 %s"
 
-#: gpg-interface.c:185
+#: gpg-interface.c:181
 msgid "gpg failed to sign the data"
 msgstr "gpg 无法为数据签名"
 
-#: gpg-interface.c:215
+#: gpg-interface.c:211
 msgid "could not create temporary file"
 msgstr "不能创建临时文件"
 
-#: gpg-interface.c:217
+#: gpg-interface.c:213
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "无法将分离式签名写入 '%s'"
 
-#: graph.c:96
+#: graph.c:97
 #, c-format
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
 
-#: grep.c:1796
+#: grep.c:1981
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s'：无法读取 %s"
 
-#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133
+#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "对 '%s' 调用 stat 失败"
 
-#: grep.c:1824
+#: grep.c:2009
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s'：读取不完整"
 
-#: help.c:218
+#: help.c:179
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "在 '%s' 下可用的 git 命令"
 
-#: help.c:225
+#: help.c:186
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
 
-#: help.c:256
+#: help.c:217
 msgid "These are common Git commands used in various situations:"
 msgstr "这些是各种场合常见的 Git 命令："
 
-#: help.c:321
+#: help.c:281
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -1941,30 +1975,50 @@ msgstr ""
 "'%s' 像是一个 git 命令，但却无法运行。\n"
 "可能是 git-%s 受损？"
 
-#: help.c:376
+#: help.c:336
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "唉呀，您的系统中未发现 Git 命令。"
 
-#: help.c:398
+#: help.c:358
 #, c-format
-msgid ""
-"WARNING: You called a Git command named '%s', which does not exist.\n"
-"Continuing under the assumption that you meant '%s'"
-msgstr ""
-"警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要运行的\n"
-"是 '%s'"
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。"
+
+#: help.c:363
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "假定你想要的是 '%s' 并继续。"
 
-#: help.c:403
+#: help.c:368
 #, c-format
-msgid "in %0.1f seconds automatically..."
-msgstr "在 %0.1f 秒钟后自动运行..."
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"
 
-#: help.c:410
+#: help.c:376
 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
 
-#: help.c:414 help.c:480
+#: help.c:380
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] "\n最相似的命令是"
+msgstr[1] "\n最相似的命令是"
+
+#: help.c:395
+msgid "git version [<options>]"
+msgstr "git version [<选项>]"
+
+#: help.c:456
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s：%s - %s"
+
+#: help.c:460
 msgid ""
 "\n"
 "Did you mean this?"
@@ -1978,12 +2032,7 @@ msgstr[1] ""
 "\n"
 "您指的是这其中的某一个么？"
 
-#: help.c:476
-#, c-format
-msgid "%s: %s - %s"
-msgstr "%s：%s - %s"
-
-#: ident.c:343
+#: ident.c:342
 msgid ""
 "\n"
 "*** Please tell me who you are.\n"
@@ -2008,35 +2057,35 @@ msgstr ""
 "来设置您账号的缺省身份标识。\n"
 "如果仅在本仓库设置身份标识，则省略 --global 参数。\n"
 
-#: ident.c:367
+#: ident.c:366
 msgid "no email was given and auto-detection is disabled"
 msgstr "未提供邮件地址且自动探测被禁用"
 
-#: ident.c:372
+#: ident.c:371
 #, c-format
 msgid "unable to auto-detect email address (got '%s')"
 msgstr "无法自动探测邮件地址（得到 '%s'）"
 
-#: ident.c:382
+#: ident.c:381
 msgid "no name was given and auto-detection is disabled"
 msgstr "未提供姓名且自动探测被禁用"
 
-#: ident.c:388
+#: ident.c:387
 #, c-format
 msgid "unable to auto-detect name (got '%s')"
 msgstr "无法自动探测姓名（得到 '%s'）"
 
-#: ident.c:396
+#: ident.c:395
 #, c-format
 msgid "empty ident name (for <%s>) not allowed"
 msgstr "不允许空的姓名（对于 <%s>）"
 
-#: ident.c:402
+#: ident.c:401
 #, c-format
 msgid "name consists only of disallowed characters: %s"
 msgstr "姓名中仅包含禁用字符：%s"
 
-#: ident.c:417 builtin/commit.c:611
+#: ident.c:416 builtin/commit.c:612
 #, c-format
 msgid "invalid date format: %s"
 msgstr "无效的日期格式：%s"
@@ -2068,78 +2117,78 @@ msgstr "不能创建 '%s.lock'：%s"
 msgid "failed to read the cache"
 msgstr "无法读取缓存"
 
-#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393
-#: builtin/checkout.c:607 builtin/clone.c:749
+#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
+#: builtin/checkout.c:591 builtin/clone.c:753
 msgid "unable to write new index file"
 msgstr "无法写新的索引文件"
 
-#: merge-recursive.c:209
+#: merge-recursive.c:210
 msgid "(bad commit)\n"
 msgstr "（坏提交）\n"
 
-#: merge-recursive.c:231 merge-recursive.c:239
+#: merge-recursive.c:232 merge-recursive.c:240
 #, c-format
 msgid "addinfo_cache failed for path '%s'"
 msgstr "为路径 '%s' addinfo_cache 失败"
 
-#: merge-recursive.c:303
+#: merge-recursive.c:304
 msgid "error building trees"
 msgstr "无法创建树"
 
-#: merge-recursive.c:727
+#: merge-recursive.c:728
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "无法创建路径 '%s'%s"
 
-#: merge-recursive.c:738
+#: merge-recursive.c:739
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "删除 %s 以便为子目录留出空间\n"
 
-#: merge-recursive.c:752 merge-recursive.c:771
+#: merge-recursive.c:753 merge-recursive.c:772
 msgid ": perhaps a D/F conflict?"
 msgstr "：可能是一个目录/文件冲突？"
 
-#: merge-recursive.c:761
+#: merge-recursive.c:762
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
 
-#: merge-recursive.c:803 builtin/cat-file.c:34
+#: merge-recursive.c:804 builtin/cat-file.c:36
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "不能读取对象 %s '%s'"
 
-#: merge-recursive.c:805
+#: merge-recursive.c:806
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "%s '%s' 应为数据对象"
 
-#: merge-recursive.c:829
+#: merge-recursive.c:830
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "无法打开 '%s'：%s"
 
-#: merge-recursive.c:840
+#: merge-recursive.c:841
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "无法创建符号链接 '%s'：%s"
 
-#: merge-recursive.c:845
+#: merge-recursive.c:846
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "不知道如何处理 %06o %s '%s'"
 
-#: merge-recursive.c:985
+#: merge-recursive.c:986
 msgid "Failed to execute internal merge"
 msgstr "无法执行内部合并"
 
-#: merge-recursive.c:989
+#: merge-recursive.c:990
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "不能添加 %s 至对象库"
 
-#: merge-recursive.c:1092
+#: merge-recursive.c:1093
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2148,7 +2197,7 @@ msgstr ""
 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
 "本被保留。"
 
-#: merge-recursive.c:1097
+#: merge-recursive.c:1098
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2157,7 +2206,7 @@ msgstr ""
 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
 "%7$s 版本被保留。"
 
-#: merge-recursive.c:1104
+#: merge-recursive.c:1105
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2166,7 +2215,7 @@ msgstr ""
 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
 "本保留在 %8$s 中。"
 
-#: merge-recursive.c:1109
+#: merge-recursive.c:1110
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2175,20 +2224,20 @@ msgstr ""
 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
 "%7$s 版本保留在 %9$s 中。"
 
-#: merge-recursive.c:1143
+#: merge-recursive.c:1144
 msgid "rename"
 msgstr "重命名"
 
-#: merge-recursive.c:1143
+#: merge-recursive.c:1144
 msgid "renamed"
 msgstr "重命名"
 
-#: merge-recursive.c:1200
+#: merge-recursive.c:1201
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
 
-#: merge-recursive.c:1225
+#: merge-recursive.c:1226
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2197,135 +2246,135 @@ msgstr ""
 "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "
 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
 
-#: merge-recursive.c:1230
+#: merge-recursive.c:1231
 msgid " (left unresolved)"
 msgstr "（留下未解决）"
 
-#: merge-recursive.c:1292
+#: merge-recursive.c:1293
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"
 "%5$s"
 
-#: merge-recursive.c:1325
+#: merge-recursive.c:1326
 #, c-format
 msgid "Renaming %s to %s and %s to %s instead"
 msgstr "而是重命名 %s 至 %s，以及 %s 至 %s"
 
-#: merge-recursive.c:1528
+#: merge-recursive.c:1529
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
 
-#: merge-recursive.c:1543
+#: merge-recursive.c:1544
 #, c-format
 msgid "Adding merged %s"
 msgstr "添加合并后的 %s"
 
-#: merge-recursive.c:1550 merge-recursive.c:1780
+#: merge-recursive.c:1551 merge-recursive.c:1781
 #, c-format
 msgid "Adding as %s instead"
 msgstr "而是以 %s 为名添加"
 
-#: merge-recursive.c:1607
+#: merge-recursive.c:1608
 #, c-format
 msgid "cannot read object %s"
 msgstr "不能读取对象 %s"
 
-#: merge-recursive.c:1610
+#: merge-recursive.c:1611
 #, c-format
 msgid "object %s is not a blob"
 msgstr "对象 %s 不是一个数据对象"
 
-#: merge-recursive.c:1679
+#: merge-recursive.c:1680
 msgid "modify"
 msgstr "修改"
 
-#: merge-recursive.c:1679
+#: merge-recursive.c:1680
 msgid "modified"
 msgstr "修改"
 
-#: merge-recursive.c:1689
+#: merge-recursive.c:1690
 msgid "content"
 msgstr "内容"
 
-#: merge-recursive.c:1696
+#: merge-recursive.c:1697
 msgid "add/add"
 msgstr "添加/添加"
 
-#: merge-recursive.c:1732
+#: merge-recursive.c:1733
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "略过 %s（已经做过相同合并）"
 
-#: merge-recursive.c:1746
+#: merge-recursive.c:1747
 #, c-format
 msgid "Auto-merging %s"
 msgstr "自动合并 %s"
 
-#: merge-recursive.c:1750 git-submodule.sh:944
+#: merge-recursive.c:1751 git-submodule.sh:945
 msgid "submodule"
 msgstr "子模组"
 
-#: merge-recursive.c:1751
+#: merge-recursive.c:1752
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "冲突（%s）：合并冲突于 %s"
 
-#: merge-recursive.c:1845
+#: merge-recursive.c:1846
 #, c-format
 msgid "Removing %s"
 msgstr "删除 %s"
 
-#: merge-recursive.c:1871
+#: merge-recursive.c:1872
 msgid "file/directory"
 msgstr "文件/目录"
 
-#: merge-recursive.c:1877
+#: merge-recursive.c:1878
 msgid "directory/file"
 msgstr "目录/文件"
 
-#: merge-recursive.c:1883
+#: merge-recursive.c:1884
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
 
-#: merge-recursive.c:1892
+#: merge-recursive.c:1893
 #, c-format
 msgid "Adding %s"
 msgstr "添加 %s"
 
-#: merge-recursive.c:1929
+#: merge-recursive.c:1930
 msgid "Already up-to-date!"
 msgstr "已经是最新的！"
 
-#: merge-recursive.c:1938
+#: merge-recursive.c:1939
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "无法合并树 %s 和 %s"
 
-#: merge-recursive.c:2021
+#: merge-recursive.c:2022
 msgid "Merging:"
 msgstr "合并："
 
-#: merge-recursive.c:2034
+#: merge-recursive.c:2035
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "发现 %u 个共同祖先："
 msgstr[1] "发现 %u 个共同祖先："
 
-#: merge-recursive.c:2073
+#: merge-recursive.c:2074
 msgid "merge returned no commit"
 msgstr "合并未返回提交"
 
-#: merge-recursive.c:2136
+#: merge-recursive.c:2137
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "不能解析对象 '%s'"
 
-#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792
+#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
 msgid "Unable to write index."
 msgstr "不能写入索引。"
 
@@ -2345,23 +2394,25 @@ msgstr ""
 msgid "You have not concluded your notes merge (%s exists)."
 msgstr "您尚未结束注释合并（存在 %s）。"
 
-#: notes-utils.c:41
+#: notes-utils.c:42
 msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr "不能提交未初始化/未引用的注解树"
 
-#: notes-utils.c:100
+#: notes-utils.c:101
 #, c-format
 msgid "Bad notes.rewriteMode value: '%s'"
 msgstr "坏的 notes.rewriteMode 值：'%s'"
 
-#: notes-utils.c:110
+#: notes-utils.c:111
 #, c-format
 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"
 
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: notes-utils.c:137
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#: notes-utils.c:141
 #, c-format
 msgid "Bad %s value: '%s'"
 msgstr "坏的 %s 值：'%s'"
@@ -2371,29 +2422,30 @@ msgstr "坏的 %s 值：'%s'"
 msgid "unable to parse object: %s"
 msgstr "不能解析对象：%s"
 
-#: parse-options.c:572
+#: parse-options.c:573
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:590
+#: parse-options.c:591
 #, c-format
 msgid "usage: %s"
 msgstr "用法：%s"
 
 #. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation
-#: parse-options.c:594
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:597
 #, c-format
 msgid "   or: %s"
 msgstr "  或：%s"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
-#: parse-options.c:597
+#: parse-options.c:600
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:631
+#: parse-options.c:634
 msgid "-NUM"
 msgstr "-数字"
 
@@ -2402,83 +2454,78 @@ msgstr "-数字"
 msgid "malformed object name '%s'"
 msgstr "非法的对象名 '%s'"
 
-#: path.c:810
+#: path.c:890
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "不能设置 %s 为组可写"
 
-#: pathspec.c:125
+#: pathspec.c:129
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
 
-#: pathspec.c:143
+#: pathspec.c:147
 msgid "Only one 'attr:' specification is allowed."
 msgstr "只允许一个 'attr:' 规格。"
 
-#: pathspec.c:146
+#: pathspec.c:150
 msgid "attr spec must not be empty"
 msgstr "属性规格不能为空"
 
-#: pathspec.c:189
+#: pathspec.c:193
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "无效的属性名 %s"
 
-#: pathspec.c:254
+#: pathspec.c:258
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
 
-#: pathspec.c:261
+#: pathspec.c:265
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
 msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
 
-#: pathspec.c:301
+#: pathspec.c:305
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "路径规格包含无效的神奇前缀"
 
-#: pathspec.c:322
+#: pathspec.c:326
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
 
-#: pathspec.c:327
+#: pathspec.c:331
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
 
-#: pathspec.c:365
+#: pathspec.c:369
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
 
-#: pathspec.c:421 pathspec.c:443
-#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
-
-#: pathspec.c:483
+#: pathspec.c:428
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s：'literal' 和 'glob' 不兼容"
 
-#: pathspec.c:496
+#: pathspec.c:441
 #, c-format
 msgid "%s: '%s' is outside repository"
 msgstr "%s：'%s' 在仓库之外"
 
-#: pathspec.c:584
+#: pathspec.c:515
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s'（助记符：'%c'）"
 
-#: pathspec.c:594
+#: pathspec.c:525
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s：路径规格神奇前缀不被此命令支持：%s"
 
-#: pathspec.c:644
+#: pathspec.c:575
 msgid ""
 "empty strings as pathspecs will be made invalid in upcoming releases. please "
 "use . instead if you meant to match all paths"
@@ -2486,16 +2533,16 @@ msgstr ""
 "在下一个版本中，使用空字符串作为路径规格将被视作非法。如果要匹配所有路径，\n"
 "请代之以 ."
 
-#: pathspec.c:668
+#: pathspec.c:599
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "路径规格 '%s' 位于符号链接中"
 
-#: pretty.c:982
+#: pretty.c:963
 msgid "unable to parse --pretty format"
 msgstr "不能解析 --pretty 格式"
 
-#: read-cache.c:1442
+#: read-cache.c:1443
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -2504,7 +2551,7 @@ msgstr ""
 "设置了 index.version，但是取值无效。\n"
 "使用版本 %i"
 
-#: read-cache.c:1452
+#: read-cache.c:1453
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2513,46 +2560,51 @@ msgstr ""
 "设置了 GIT_INDEX_VERSION，但是取值无效。\n"
 "使用版本 %i"
 
-#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048
+#: read-cache.c:2308 builtin/merge.c:1019
+#, c-format
+msgid "could not close '%s'"
+msgstr "不能关闭 '%s'"
+
+#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
 #, c-format
 msgid "could not stat '%s'"
 msgstr "不能对 '%s' 调用 stat"
 
-#: read-cache.c:2388
+#: read-cache.c:2396
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "不能打开 git 目录：%s"
 
-#: read-cache.c:2400
+#: read-cache.c:2408
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "无法删除：%s"
 
-#: refs.c:620 builtin/merge.c:844
+#: refs.c:622
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "无法打开 '%s' 进行写入"
 
-#: refs.c:1667
+#: refs.c:1769
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "在隔离环境中禁止更新引用"
 
-#: refs/files-backend.c:1631
+#: refs/files-backend.c:1664
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "无法删除引用 %s：%s"
 
-#: refs/files-backend.c:1634
+#: refs/files-backend.c:1667
 #, c-format
 msgid "could not delete references: %s"
 msgstr "无法删除引用：%s"
 
-#: refs/files-backend.c:1643
+#: refs/files-backend.c:1676
 #, c-format
 msgid "could not remove reference %s"
 msgstr "无法删除引用 %s"
 
-#: ref-filter.c:35 wt-status.c:1780
+#: ref-filter.c:35 wt-status.c:1811
 msgid "gone"
 msgstr "丢失"
 
@@ -2571,301 +2623,303 @@ msgstr "落后 %d"
 msgid "ahead %d, behind %d"
 msgstr "领先 %d，落后 %d"
 
-#: ref-filter.c:104
+#: ref-filter.c:105
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "期望的格式：%%(color:<color>)"
 
-#: ref-filter.c:106
+#: ref-filter.c:107
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "未能识别的颜色：%%(color:%s)"
 
-#: ref-filter.c:120
+#: ref-filter.c:121
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "期望整数值 refname:lstrip=%s"
 
-#: ref-filter.c:124
+#: ref-filter.c:125
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "期望整数值 refname:rstrip=%s"
 
-#: ref-filter.c:126
+#: ref-filter.c:127
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "未能识别的 %%(%s) 参数：%s"
 
-#: ref-filter.c:166
+#: ref-filter.c:167
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) 不带参数"
 
-#: ref-filter.c:173
+#: ref-filter.c:174
 #, c-format
 msgid "%%(subject) does not take arguments"
 msgstr "%%(subject) 不带参数"
 
-#: ref-filter.c:180
+#: ref-filter.c:181
 #, c-format
 msgid "%%(trailers) does not take arguments"
 msgstr "%%(trailers) 不带参数"
 
-#: ref-filter.c:199
+#: ref-filter.c:200
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "期望一个正数 contents:lines=%s"
 
-#: ref-filter.c:201
+#: ref-filter.c:202
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "未能识别的 %%(contents) 参数：%s"
 
-#: ref-filter.c:214
+#: ref-filter.c:215
 #, c-format
 msgid "positive value expected objectname:short=%s"
 msgstr "期望一个正数 objectname:short=%s"
 
-#: ref-filter.c:218
+#: ref-filter.c:219
 #, c-format
 msgid "unrecognized %%(objectname) argument: %s"
 msgstr "未能识别的 %%(objectname) 参数：%s"
 
-#: ref-filter.c:245
+#: ref-filter.c:246
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "期望的格式：%%(align:<width>,<position>)"
 
-#: ref-filter.c:257
+#: ref-filter.c:258
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "未能识别的位置：%s"
 
-#: ref-filter.c:261
+#: ref-filter.c:262
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "未能识别的宽度：%s"
 
-#: ref-filter.c:267
+#: ref-filter.c:268
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "未能识别的 %%(align) 参数：%s"
 
-#: ref-filter.c:271
+#: ref-filter.c:272
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "元素 %%(align) 需要一个正数的宽度"
 
-#: ref-filter.c:286
+#: ref-filter.c:287
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "未能识别的 %%(if) 参数：%s"
 
-#: ref-filter.c:371
+#: ref-filter.c:378
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "非法的字段名：%.*s"
 
-#: ref-filter.c:397
+#: ref-filter.c:404
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "未知的字段名：%.*s"
 
-#: ref-filter.c:501
+#: ref-filter.c:508
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"
 
-#: ref-filter.c:561
+#: ref-filter.c:568
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"
 
-#: ref-filter.c:563
+#: ref-filter.c:570
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "格式：%%(then) 元素用了多次"
 
-#: ref-filter.c:565
+#: ref-filter.c:572
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "格式：%%(then) 元素用在了 %%(else) 之后"
 
-#: ref-filter.c:591
+#: ref-filter.c:598
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"
 
-#: ref-filter.c:593
+#: ref-filter.c:600
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"
 
-#: ref-filter.c:595
+#: ref-filter.c:602
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "格式：%%(else) 元素用了多次"
 
-#: ref-filter.c:608
+#: ref-filter.c:615
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"
 
-#: ref-filter.c:663
+#: ref-filter.c:670
 #, c-format
 msgid "malformed format string %s"
 msgstr "非法的格式化字符串 %s"
 
-#: ref-filter.c:1247
+#: ref-filter.c:1254
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "（非分支，正变基 %s）"
 
-#: ref-filter.c:1250
+#: ref-filter.c:1257
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "（非分支，二分查找开始于 %s）"
 
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached at " in wt-status.c
-#: ref-filter.c:1256
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached at " in wt-status.c
+#.
+#: ref-filter.c:1265
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "（头指针分离于 %s）"
 
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached from " in wt-status.c
-#: ref-filter.c:1261
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached from " in wt-status.c
+#.
+#: ref-filter.c:1272
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "（头指针分离自 %s）"
 
-#: ref-filter.c:1265
+#: ref-filter.c:1276
 msgid "(no branch)"
 msgstr "（非分支）"
 
-#: ref-filter.c:1420 ref-filter.c:1451
+#: ref-filter.c:1426 ref-filter.c:1457
 #, c-format
 msgid "missing object %s for %s"
 msgstr "缺失 %2$s 的对象 %1$s"
 
-#: ref-filter.c:1423 ref-filter.c:1454
+#: ref-filter.c:1429 ref-filter.c:1460
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
 
-#: ref-filter.c:1692
+#: ref-filter.c:1760
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "非法的对象于 '%s'"
 
-#: ref-filter.c:1759
+#: ref-filter.c:1827
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "忽略带有错误名称 %s 的引用"
 
-#: ref-filter.c:1764
+#: ref-filter.c:1832
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "忽略损坏的引用 %s"
 
-#: ref-filter.c:2028
+#: ref-filter.c:2095
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "格式：缺少 %%(end) 元素"
 
-#: ref-filter.c:2109
+#: ref-filter.c:2176
 #, c-format
 msgid "malformed object name %s"
 msgstr "非法的对象名 %s"
 
-#: remote.c:754
+#: remote.c:747
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "不能同时获取 %s 和 %s 至 %s"
 
-#: remote.c:758
+#: remote.c:751
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s 通常跟踪 %s，而非 %s"
 
-#: remote.c:762
+#: remote.c:755
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s 同时跟踪 %s 和 %s"
 
-#: remote.c:770
+#: remote.c:763
 msgid "Internal error"
 msgstr "内部错误"
 
-#: remote.c:1685 remote.c:1787
+#: remote.c:1680 remote.c:1782
 msgid "HEAD does not point to a branch"
 msgstr "HEAD 没有指向一个分支"
 
-#: remote.c:1694
+#: remote.c:1689
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "没有此分支：'%s'"
 
-#: remote.c:1697
+#: remote.c:1692
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "尚未给分支 '%s' 设置上游"
 
-#: remote.c:1703
+#: remote.c:1698
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
 
-#: remote.c:1718
+#: remote.c:1713
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
 
-#: remote.c:1730
+#: remote.c:1725
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "分支 '%s' 没有设置要推送的远程服务器"
 
-#: remote.c:1741
+#: remote.c:1736
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "向 '%s' 推送引用规格未包含 '%s'"
 
-#: remote.c:1754
+#: remote.c:1749
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "推送无目标（push.default 是 'nothing'）"
 
-#: remote.c:1776
+#: remote.c:1771
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "无法解析 'simple' 推送至一个单独的目标"
 
-#: remote.c:2081
+#: remote.c:2076
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"
 
-#: remote.c:2085
+#: remote.c:2080
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  （使用 \"git branch --unset-upstream\" 来修复）\n"
 
-#: remote.c:2088
+#: remote.c:2083
 #, c-format
 msgid "Your branch is up-to-date with '%s'.\n"
 msgstr "您的分支与上游分支 '%s' 一致。\n"
 
-#: remote.c:2092
+#: remote.c:2087
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
 
-#: remote.c:2098
+#: remote.c:2093
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  （使用 \"git push\" 来发布您的本地提交）\n"
 
-#: remote.c:2101
+#: remote.c:2096
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -2874,11 +2928,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
 msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
 
 #  译者：注意保持前导空格
-#: remote.c:2109
+#: remote.c:2104
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  （使用 \"git pull\" 来更新您的本地分支）\n"
 
-#: remote.c:2112
+#: remote.c:2107
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -2894,82 +2948,77 @@ msgstr[1] ""
 "并且分别有 %d 和 %d 处不同的提交。\n"
 
 #  译者：注意保持前导空格
-#: remote.c:2122
+#: remote.c:2117
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  （使用 \"git pull\" 来合并远程分支）\n"
 
-#: revision.c:2158
+#: revision.c:2187
 msgid "your current branch appears to be broken"
 msgstr "您的当前分支好像被损坏"
 
-#: revision.c:2161
+#: revision.c:2190
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "您的当前分支 '%s' 尚无任何提交"
 
-#: revision.c:2355
+#: revision.c:2384
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent 与 --bisect 不兼容"
 
-#: run-command.c:125
+#: run-command.c:644
 msgid "open /dev/null failed"
 msgstr "不能打开 /dev/null"
 
-#: run-command.c:127
-#, c-format
-msgid "dup2(%d,%d) failed"
-msgstr "不能调用 dup2(%d,%d)"
-
-#: send-pack.c:150
+#: send-pack.c:151
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "不能解析远程解包状态：%s"
 
-#: send-pack.c:152
+#: send-pack.c:153
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "远程解包失败：%s"
 
-#: send-pack.c:315
+#: send-pack.c:316
 msgid "failed to sign the push certificate"
 msgstr "无法为推送证书签名"
 
-#: send-pack.c:428
+#: send-pack.c:429
 msgid "the receiving end does not support --signed push"
 msgstr "接收端不支持签名推送"
 
-#: send-pack.c:430
+#: send-pack.c:431
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
 msgstr "未发送推送证书，因为接收端不支持签名推送"
 
-#: send-pack.c:442
+#: send-pack.c:443
 msgid "the receiving end does not support --atomic push"
 msgstr "接收端不支持原子推送"
 
-#: send-pack.c:447
+#: send-pack.c:448
 msgid "the receiving end does not support push options"
 msgstr "接收端不支持推送选项"
 
-#: sequencer.c:215
+#: sequencer.c:216
 msgid "revert"
 msgstr "还原"
 
-#: sequencer.c:217
+#: sequencer.c:218
 msgid "cherry-pick"
 msgstr "拣选"
 
-#: sequencer.c:219
+#: sequencer.c:220
 msgid "rebase -i"
 msgstr "rebase -i"
 
-#: sequencer.c:221
+#: sequencer.c:222
 #, c-format
 msgid "Unknown action: %d"
 msgstr "未知动作：%d"
 
-#: sequencer.c:278
+#: sequencer.c:279
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -2977,7 +3026,7 @@ msgstr ""
 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
 "命令标记修正后的文件"
 
-#: sequencer.c:281
+#: sequencer.c:282
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -2986,63 +3035,63 @@ msgstr ""
 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
 "对修正后的文件做标记，然后用 'git commit' 提交"
 
-#: sequencer.c:294 sequencer.c:1682
+#: sequencer.c:295 sequencer.c:1685
 #, c-format
 msgid "could not lock '%s'"
 msgstr "不能锁定 '%s'"
 
-#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701
+#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
 #, c-format
 msgid "could not write to '%s'"
 msgstr "不能写入 '%s'"
 
-#: sequencer.c:301
+#: sequencer.c:302
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "不能将换行符写入 '%s'"
 
-#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689
+#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
 #, c-format
 msgid "failed to finalize '%s'."
 msgstr "无法完成 '%s'。"
 
-#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257
-#: builtin/commit.c:749 builtin/merge.c:1018
+#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
+#: builtin/commit.c:750 builtin/merge.c:1017
 #, c-format
 msgid "could not read '%s'"
 msgstr "不能读取 '%s'"
 
-#: sequencer.c:355
+#: sequencer.c:356
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "您的本地修改将被%s覆盖。"
 
-#: sequencer.c:359
+#: sequencer.c:360
 msgid "commit your changes or stash them to proceed."
-msgstr "提交您的修改或保存进度后再继续。"
+msgstr "提交您的修改或贮藏后再继续。"
 
-#: sequencer.c:388
+#: sequencer.c:389
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s：快进"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. * "rebase -i".
+#. "rebase -i".
 #.
-#: sequencer.c:470
+#: sequencer.c:472
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s：无法写入新索引文件"
 
-#: sequencer.c:489
+#: sequencer.c:491
 msgid "could not resolve HEAD commit\n"
 msgstr "不能解析 HEAD 提交\n"
 
-#: sequencer.c:509
+#: sequencer.c:511
 msgid "unable to update cache tree\n"
 msgstr "不能更新缓存树\n"
 
-#: sequencer.c:592
+#: sequencer.c:595
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -3071,17 +3120,17 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:694
+#: sequencer.c:697
 #, c-format
 msgid "could not parse commit %s\n"
 msgstr "不能解析提交 %s\n"
 
-#: sequencer.c:699
+#: sequencer.c:702
 #, c-format
 msgid "could not parse parent commit %s\n"
 msgstr "不能解析父提交 %s\n"
 
-#: sequencer.c:821
+#: sequencer.c:824
 #, c-format
 msgid ""
 "unexpected 1st line of squash message:\n"
@@ -3092,7 +3141,7 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:827
+#: sequencer.c:830
 #, c-format
 msgid ""
 "invalid 1st line of squash message:\n"
@@ -3103,230 +3152,230 @@ msgstr ""
 "\n"
 "\t%.*s"
 
-#: sequencer.c:833 sequencer.c:858
+#: sequencer.c:836 sequencer.c:861
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "这是一个 %d 个提交的组合。"
 
-#: sequencer.c:842
+#: sequencer.c:845
 msgid "need a HEAD to fixup"
 msgstr "需要一个 HEAD 来修复"
 
-#: sequencer.c:844
+#: sequencer.c:847
 msgid "could not read HEAD"
 msgstr "不能读取 HEAD"
 
-#: sequencer.c:846
+#: sequencer.c:849
 msgid "could not read HEAD's commit message"
 msgstr "不能读取 HEAD 的提交说明"
 
-#: sequencer.c:852
+#: sequencer.c:855
 #, c-format
 msgid "cannot write '%s'"
 msgstr "不能写 '%s'"
 
-#: sequencer.c:861 git-rebase--interactive.sh:445
+#: sequencer.c:864 git-rebase--interactive.sh:445
 msgid "This is the 1st commit message:"
 msgstr "这是第一个提交说明："
 
-#: sequencer.c:869
+#: sequencer.c:872
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "不能读取 %s 的提交说明"
 
-#: sequencer.c:876
+#: sequencer.c:879
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "这是提交说明 #%d："
 
-#: sequencer.c:881
+#: sequencer.c:884
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "提交说明 #%d 将被跳过："
 
-#: sequencer.c:886
+#: sequencer.c:889
 #, c-format
 msgid "unknown command: %d"
 msgstr "未知命令：%d"
 
-#: sequencer.c:952
+#: sequencer.c:955
 msgid "your index file is unmerged."
 msgstr "您的索引文件未完成合并。"
 
-#: sequencer.c:970
+#: sequencer.c:973
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
 
-#: sequencer.c:978
+#: sequencer.c:981
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "提交 %s 没有第 %d 个父提交"
 
-#: sequencer.c:982
+#: sequencer.c:985
 #, c-format
 msgid "mainline was specified but commit %s is not a merge."
 msgstr "指定了主线，但是提交 %s 不是一个合并提交。"
 
-#: sequencer.c:988
+#: sequencer.c:991
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "不能得到 %s 的提交说明"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1009
+#: sequencer.c:1012
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s：不能解析父提交 %s"
 
-#: sequencer.c:1071 sequencer.c:1827
+#: sequencer.c:1075 sequencer.c:1830
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "不能将 '%s' 重命名为 '%s'"
 
-#: sequencer.c:1122
+#: sequencer.c:1126
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "不能还原 %s... %s"
 
-#: sequencer.c:1123
+#: sequencer.c:1127
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "不能应用 %s... %s"
 
-#: sequencer.c:1165
+#: sequencer.c:1169
 msgid "empty commit set passed"
 msgstr "提供了空的提交集"
 
-#: sequencer.c:1175
+#: sequencer.c:1179
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s：无法读取索引"
 
-#: sequencer.c:1182
+#: sequencer.c:1186
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s：无法刷新索引"
 
-#: sequencer.c:1303
+#: sequencer.c:1306
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "无效行 %d：%.*s"
 
-#: sequencer.c:1311
+#: sequencer.c:1314
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "没有父提交的情况下不能 '%s'"
 
-#: sequencer.c:1344
+#: sequencer.c:1347
 #, c-format
 msgid "could not read '%s'."
 msgstr "不能读取 '%s'。"
 
-#: sequencer.c:1356
+#: sequencer.c:1359
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "请用 'git rebase --edit-todo' 来修改。"
 
-#: sequencer.c:1358
+#: sequencer.c:1361
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "不可用的指令清单：'%s'"
 
-#: sequencer.c:1363
+#: sequencer.c:1366
 msgid "no commits parsed."
 msgstr "没有解析提交。"
 
-#: sequencer.c:1374
+#: sequencer.c:1377
 msgid "cannot cherry-pick during a revert."
 msgstr "不能在回退中执行拣选。"
 
-#: sequencer.c:1376
+#: sequencer.c:1379
 msgid "cannot revert during a cherry-pick."
 msgstr "不能在拣选中执行回退。"
 
-#: sequencer.c:1439
+#: sequencer.c:1442
 #, c-format
 msgid "invalid key: %s"
 msgstr "无效键名：%s"
 
-#: sequencer.c:1442
+#: sequencer.c:1445
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "%s 的值无效：%s"
 
-#: sequencer.c:1499
+#: sequencer.c:1502
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "非法的选项清单：'%s'"
 
-#: sequencer.c:1537
+#: sequencer.c:1540
 msgid "a cherry-pick or revert is already in progress"
 msgstr "一个拣选或还原操作已在进行"
 
-#: sequencer.c:1538
+#: sequencer.c:1541
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
 
-#: sequencer.c:1541
+#: sequencer.c:1544
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "不能创建序列目录 '%s'"
 
-#: sequencer.c:1555
+#: sequencer.c:1558
 msgid "could not lock HEAD"
 msgstr "不能锁定 HEAD"
 
-#: sequencer.c:1611 sequencer.c:2181
+#: sequencer.c:1614 sequencer.c:2188
 msgid "no cherry-pick or revert in progress"
 msgstr "拣选或还原操作并未进行"
 
-#: sequencer.c:1613
+#: sequencer.c:1616
 msgid "cannot resolve HEAD"
 msgstr "不能解析 HEAD"
 
-#: sequencer.c:1615 sequencer.c:1649
+#: sequencer.c:1618 sequencer.c:1652
 msgid "cannot abort from a branch yet to be born"
 msgstr "不能从尚未建立的分支终止"
 
-#: sequencer.c:1635 builtin/grep.c:910
+#: sequencer.c:1638 builtin/grep.c:929
 #, c-format
 msgid "cannot open '%s'"
 msgstr "不能打开 '%s'"
 
-#: sequencer.c:1637
+#: sequencer.c:1640
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "不能读取 '%s'：%s"
 
-#: sequencer.c:1638
+#: sequencer.c:1641
 msgid "unexpected end of file"
 msgstr "意外的文件结束"
 
-#: sequencer.c:1644
+#: sequencer.c:1647
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
 
-#: sequencer.c:1655
+#: sequencer.c:1658
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"
 
-#: sequencer.c:1792 sequencer.c:2080
+#: sequencer.c:1795 sequencer.c:2086
 msgid "cannot read HEAD"
 msgstr "不能读取 HEAD"
 
-#: sequencer.c:1832 builtin/difftool.c:616
+#: sequencer.c:1835 builtin/difftool.c:633
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "不能拷贝 '%s' 至 '%s'"
 
-#: sequencer.c:1848
+#: sequencer.c:1851
 msgid "could not read index"
 msgstr "不能读取索引"
 
 #  译者：注意保持前导空格
-#: sequencer.c:1853
+#: sequencer.c:1856
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3341,11 +3390,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1859
+#: sequencer.c:1862
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "并且修改索引和/或工作区\n"
 
-#: sequencer.c:1865
+#: sequencer.c:1868
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3357,22 +3406,22 @@ msgid ""
 msgstr ""
 "执行成功：%s\n"
 "但是在索引和/或工作区中存在变更\n"
-"提交或暂存修改，然后运行\n"
+"提交或贮藏修改，然后运行\n"
 "\n"
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1920 git-rebase.sh:169
+#: sequencer.c:1925
 #, c-format
-msgid "Applied autostash."
-msgstr "成功应用 autostash。"
+msgid "Applied autostash.\n"
+msgstr "已应用 autostash。\n"
 
-#: sequencer.c:1932
+#: sequencer.c:1937
 #, c-format
 msgid "cannot store %s"
 msgstr "不能存储 %s"
 
-#: sequencer.c:1934 git-rebase.sh:173
+#: sequencer.c:1940 git-rebase.sh:173
 #, c-format
 msgid ""
 "Applying autostash resulted in conflicts.\n"
@@ -3380,60 +3429,60 @@ msgid ""
 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr ""
 "应用 autostash 导致冲突。\n"
-"您的修改安全地保存在 stash 中。\n"
+"您的修改安全地保存在贮藏区中。\n"
 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
 
-#: sequencer.c:2016
+#: sequencer.c:2022
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "停止在 %s... %.*s\n"
 
-#: sequencer.c:2058
+#: sequencer.c:2064
 #, c-format
 msgid "unknown command %d"
 msgstr "未知命令 %d"
 
-#: sequencer.c:2088
+#: sequencer.c:2094
 msgid "could not read orig-head"
 msgstr "不能读取 orig-head"
 
-#: sequencer.c:2092
+#: sequencer.c:2099
 msgid "could not read 'onto'"
 msgstr "不能读取 'onto'"
 
-#: sequencer.c:2099
+#: sequencer.c:2106
 #, c-format
 msgid "could not update %s"
 msgstr "不能更新 %s"
 
-#: sequencer.c:2106
+#: sequencer.c:2113
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "不能更新 HEAD 为 %s"
 
-#: sequencer.c:2190
+#: sequencer.c:2197
 msgid "cannot rebase: You have unstaged changes."
 msgstr "不能变基：您有未暂存的变更。"
 
-#: sequencer.c:2195
+#: sequencer.c:2202
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "不能删除 CHERRY_PICK_HEAD"
 
-#: sequencer.c:2204
+#: sequencer.c:2211
 msgid "cannot amend non-existing commit"
 msgstr "不能修补不存在的提交"
 
-#: sequencer.c:2206
+#: sequencer.c:2213
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "无效文件：'%s'"
 
-#: sequencer.c:2208
+#: sequencer.c:2215
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "无效内容：'%s'"
 
-#: sequencer.c:2211
+#: sequencer.c:2218
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3442,25 +3491,25 @@ msgstr ""
 "\n"
 "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
 
-#: sequencer.c:2221
+#: sequencer.c:2228
 msgid "could not commit staged changes."
 msgstr "不能提交暂存的修改。"
 
-#: sequencer.c:2301
+#: sequencer.c:2308
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s：不能拣选一个%s"
 
-#: sequencer.c:2305
+#: sequencer.c:2312
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s：错误的版本"
 
-#: sequencer.c:2338
+#: sequencer.c:2345
 msgid "can't revert as initial commit"
 msgstr "不能作为初始提交回退"
 
-#: setup.c:165
+#: setup.c:171
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -3469,7 +3518,7 @@ msgstr ""
 "%s：工作区中无此路径。\n"
 "使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。"
 
-#: setup.c:178
+#: setup.c:184
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -3480,7 +3529,7 @@ msgstr ""
 "使用 '--' 来分隔版本和路径，例如：\n"
 "'git <command> [<revision>...] -- [<file>...]'"
 
-#: setup.c:228
+#: setup.c:252
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -3491,34 +3540,34 @@ msgstr ""
 "使用 '--' 来分隔版本和路径，例如：\n"
 "'git <command> [<revision>...] -- [<file>...]'"
 
-#: setup.c:475
+#: setup.c:504
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "期望 git 仓库版本 <= %d，却得到 %d"
 
-#: setup.c:483
+#: setup.c:512
 msgid "unknown repository extensions found:"
 msgstr "发现未知的仓库扩展："
 
-#: setup.c:776
+#: setup.c:810
 #, c-format
 msgid "Not a git repository (or any of the parent directories): %s"
 msgstr "不是一个 git 仓库（或者任何父目录）：%s"
 
-#: setup.c:778 builtin/index-pack.c:1646
+#: setup.c:812 builtin/index-pack.c:1652
 msgid "Cannot come back to cwd"
 msgstr "无法返回当前工作目录"
 
-#: setup.c:1010
+#: setup.c:1050
 msgid "Unable to read current working directory"
 msgstr "不能读取当前工作目录"
 
-#: setup.c:1022 setup.c:1028
+#: setup.c:1062 setup.c:1068
 #, c-format
 msgid "Cannot change to '%s'"
 msgstr "不能切换到 '%s'"
 
-#: setup.c:1041
+#: setup.c:1081
 #, c-format
 msgid ""
 "Not a git repository (or any parent up to mount point %s)\n"
@@ -3527,7 +3576,7 @@ msgstr ""
 "不是一个 git 仓库（或者向上递归至挂载点 %s 的任何祖先目录）\n"
 "停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
 
-#: setup.c:1106
+#: setup.c:1173
 #, c-format
 msgid ""
 "Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3536,27 +3585,27 @@ msgstr ""
 "参数 core.sharedRepository 的文件权限值有错（0%.3o）。\n"
 "文件属主必须始终拥有读写权限。"
 
-#: sha1_file.c:559
+#: sha1_file.c:560
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "路径 '%s' 不存在"
 
-#: sha1_file.c:585
+#: sha1_file.c:586
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
 
-#: sha1_file.c:591
+#: sha1_file.c:592
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "参考仓库 '%s' 不是一个本地仓库。"
 
-#: sha1_file.c:597
+#: sha1_file.c:598
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "参考仓库 '%s' 是一个浅克隆"
 
-#: sha1_file.c:605
+#: sha1_file.c:606
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "参考仓库 '%s' 已被嫁接"
@@ -3565,26 +3614,26 @@ msgstr "参考仓库 '%s' 已被嫁接"
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
 
-#: sha1_file.c:2721
+#: sha1_file.c:2729
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
 
-#: sha1_file.c:2725
+#: sha1_file.c:2733
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
 
-#: sha1_name.c:409
+#: sha1_name.c:419
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "短 SHA1 %s 存在歧义"
 
-#: sha1_name.c:420
+#: sha1_name.c:430
 msgid "The candidates are:"
 msgstr "候选者有："
 
-#: sha1_name.c:580
+#: sha1_name.c:589
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -3605,71 +3654,81 @@ msgstr ""
 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
 "命令关闭本消息通知。"
 
-#: submodule.c:67 submodule.c:101
+#: submodule.c:70 submodule.c:104
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"
 
-#: submodule.c:71 submodule.c:105
+#: submodule.c:74 submodule.c:108
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
 
-#: submodule.c:79
+#: submodule.c:82
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "不能更新 .gitmodules 条目 %s"
 
-#: submodule.c:112
+#: submodule.c:115
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
 msgstr "无法移除 %s 的 .gitmodules 条目"
 
-#: submodule.c:123
+#: submodule.c:126
 msgid "staging updated .gitmodules failed"
 msgstr "将更新后 .gitmodules 添加暂存区失败"
 
-#: submodule.c:161
+#: submodule.c:165
 msgid "negative values not allowed for submodule.fetchJobs"
 msgstr "submodule.fetchJobs 不允许为负值"
 
-#: submodule.c:1194
+#: submodule.c:376
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "位于未检出的子模组 '%s'"
+
+#: submodule.c:407
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
+
+#: submodule.c:1337
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "无法将 '%s' 识别为一个 git 仓库"
 
-#: submodule.c:1332
+#: submodule.c:1475
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "无法在子模组 '%s' 中启动 'git status'"
 
-#: submodule.c:1345
+#: submodule.c:1488
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "无法在子模组 '%s' 中执行 'git status'"
 
-#: submodule.c:1421
+#: submodule.c:1581
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "子模组 '%s' 中有脏索引"
 
-#: submodule.c:1678
+#: submodule.c:1845
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
 
-#: submodule.c:1690 submodule.c:1746
+#: submodule.c:1857 submodule.c:1913
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "不能查询子模组 '%s' 的名称"
 
-#: submodule.c:1694 builtin/submodule--helper.c:678
+#: submodule.c:1861 builtin/submodule--helper.c:678
 #: builtin/submodule--helper.c:688
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "不能创建目录 '%s'"
 
-#: submodule.c:1697
+#: submodule.c:1864
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3680,101 +3739,101 @@ msgstr ""
 "'%s' 迁移至\n"
 "'%s'\n"
 
-#: submodule.c:1781
+#: submodule.c:1948
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "无法递归进子模组路径 '%s'"
 
-#: submodule.c:1825
+#: submodule.c:1992
 msgid "could not start ls-files in .."
 msgstr "无法在 .. 中启动 ls-files"
 
-#: submodule.c:1845
+#: submodule.c:2012
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr "BUG：返回的路径和当前路径不匹配？"
 
-#: submodule.c:1864
+#: submodule.c:2031
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree 返回未知返回值 %d"
 
-#: submodule-config.c:380
+#: submodule-config.c:420
 #, c-format
 msgid "invalid value for %s"
 msgstr "%s 的值无效"
 
-#: trailer.c:240
+#: trailer.c:241
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "执行 trailer 命令 '%s' 失败"
 
-#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539
-#: trailer.c:543
+#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
+#: trailer.c:544
 #, c-format
 msgid "unknown value '%s' for key '%s'"
 msgstr "键 '%2$s' 的未知取值 '%1$s'"
 
-#: trailer.c:525 trailer.c:530 builtin/remote.c:289
+#: trailer.c:526 trailer.c:531 builtin/remote.c:290
 #, c-format
 msgid "more than one %s"
 msgstr "多于一个 %s"
 
-#: trailer.c:702
+#: trailer.c:703
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "签名 '%.*s' 的键为空"
 
-#: trailer.c:722
+#: trailer.c:723
 #, c-format
 msgid "could not read input file '%s'"
 msgstr "不能读取输入文件 '%s'"
 
-#: trailer.c:725
+#: trailer.c:726
 msgid "could not read from stdin"
 msgstr "不能自标准输入读取"
 
-#: trailer.c:949 builtin/am.c:44
+#: trailer.c:950 builtin/am.c:45
 #, c-format
 msgid "could not stat %s"
 msgstr "不能对 %s 调用 stat"
 
-#: trailer.c:951
+#: trailer.c:952
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "文件 %s 不是一个正规文件"
 
-#: trailer.c:953
+#: trailer.c:954
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "文件 %s 用户不可写"
 
-#: trailer.c:965
+#: trailer.c:966
 msgid "could not open temporary file"
 msgstr "不能打开临时文件"
 
-#: trailer.c:1001
+#: trailer.c:1002
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "不能重命名临时文件为 %s"
 
-#: transport.c:62
+#: transport.c:63
 #, c-format
 msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
 
-#: transport.c:151
+#: transport.c:152
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "传输：无效的深度选项 '%s'"
 
-#: transport.c:889
+#: transport.c:890
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
 "not be found on any remote:\n"
 msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"
 
-#: transport.c:893
+#: transport.c:894
 #, c-format
 msgid ""
 "\n"
@@ -3801,11 +3860,11 @@ msgstr ""
 "以推送至远程。\n"
 "\n"
 
-#: transport.c:901
+#: transport.c:902
 msgid "Aborting."
 msgstr "正在终止。"
 
-#: transport-helper.c:1080
+#: transport-helper.c:1071
 #, c-format
 msgid "Could not read ref %s"
 msgstr "不能读取引用 %s"
@@ -3826,16 +3885,16 @@ msgstr "树对象条目中空的文件名"
 msgid "too-short tree file"
 msgstr "太短的树文件"
 
-#: unpack-trees.c:104
+#: unpack-trees.c:105
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%sPlease commit your changes or stash them before you switch branches."
 msgstr ""
 "您对下列文件的本地修改将被检出操作覆盖：\n"
-"%%s请在切换分支前提交您的修改或者保存进度。"
+"%%s请在切换分支前提交或贮藏您的修改。"
 
-#: unpack-trees.c:106
+#: unpack-trees.c:107
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3844,16 +3903,16 @@ msgstr ""
 "您对下列文件的本地修改将被检出操作覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:109
+#: unpack-trees.c:110
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%sPlease commit your changes or stash them before you merge."
 msgstr ""
 "您对下列文件的本地修改将被合并操作覆盖：\n"
-"%%s请在合并前提交您的修改或者保存进度。"
+"%%s请在合并前提交或贮藏您的修改。"
 
-#: unpack-trees.c:111
+#: unpack-trees.c:112
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -3862,16 +3921,16 @@ msgstr ""
 "您对下列文件的本地修改将被合并操作覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:114
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 "%%sPlease commit your changes or stash them before you %s."
 msgstr ""
 "您对下列文件的本地修改将被 %s 覆盖：\n"
-"%%s请在 %s 之前提交您的修改或者保存进度。"
+"%%s请在 %s 之前提交或贮藏您的修改。"
 
-#: unpack-trees.c:116
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -3880,7 +3939,7 @@ msgstr ""
 "您对下列文件的本地修改将被 %s 覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:121
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -3889,7 +3948,7 @@ msgstr ""
 "更新如下目录将会丢失其中未跟踪的文件：\n"
 "%s"
 
-#: unpack-trees.c:125
+#: unpack-trees.c:126
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -3898,7 +3957,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
 "%%s请在切换分支之前移动或删除。"
 
-#: unpack-trees.c:127
+#: unpack-trees.c:128
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -3907,7 +3966,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
 "%%s"
 
-#: unpack-trees.c:130
+#: unpack-trees.c:131
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -3916,7 +3975,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
 "%%s请在合并前移动或删除。"
 
-#: unpack-trees.c:132
+#: unpack-trees.c:133
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -3925,7 +3984,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
 "%%s"
 
-#: unpack-trees.c:135
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -3934,7 +3993,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
 "%%s请在 %s 前移动或删除。"
 
-#: unpack-trees.c:137
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -3943,7 +4002,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
 "%%s"
 
-#: unpack-trees.c:142
+#: unpack-trees.c:143
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -3953,7 +4012,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
 "%%s请在切换分支前移动或删除。"
 
-#: unpack-trees.c:144
+#: unpack-trees.c:145
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -3963,7 +4022,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:147
+#: unpack-trees.c:148
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -3972,7 +4031,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
 "%%s请在合并前移动或删除。"
 
-#: unpack-trees.c:149
+#: unpack-trees.c:150
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -3981,7 +4040,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:152
+#: unpack-trees.c:153
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -3990,7 +4049,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
 "%%s请在 %s 前移动或删除。"
 
-#: unpack-trees.c:154
+#: unpack-trees.c:155
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -3999,12 +4058,12 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:161
+#: unpack-trees.c:162
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
 
-#: unpack-trees.c:164
+#: unpack-trees.c:165
 #, c-format
 msgid ""
 "Cannot update sparse checkout: the following entries are not up-to-date:\n"
@@ -4013,7 +4072,7 @@ msgstr ""
 "无法更新稀疏检出：如下条目不是最新：\n"
 "%s"
 
-#: unpack-trees.c:166
+#: unpack-trees.c:167
 #, c-format
 msgid ""
 "The following working tree files would be overwritten by sparse checkout "
@@ -4023,7 +4082,7 @@ msgstr ""
 "工作区中下列文件将被稀疏检出更新所覆盖：\n"
 "%s"
 
-#: unpack-trees.c:168
+#: unpack-trees.c:169
 #, c-format
 msgid ""
 "The following working tree files would be removed by sparse checkout "
@@ -4033,7 +4092,7 @@ msgstr ""
 "工作区中下列文件将被稀疏检出更新所删除：\n"
 "%s"
 
-#: unpack-trees.c:170
+#: unpack-trees.c:171
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -4042,17 +4101,17 @@ msgstr ""
 "无法更新子模组：\n"
 "%s"
 
-#: unpack-trees.c:247
+#: unpack-trees.c:248
 #, c-format
 msgid "Aborting\n"
 msgstr "终止中\n"
 
-#: unpack-trees.c:272
+#: unpack-trees.c:277
 #, c-format
 msgid "submodule update strategy not supported for submodule '%s'"
 msgstr "子模组 %s 不支持子模组更新策略"
 
-#: unpack-trees.c:340
+#: unpack-trees.c:346
 msgid "Checking out files"
 msgstr "正在检出文件"
 
@@ -4085,196 +4144,202 @@ msgstr "无效的端口号"
 msgid "invalid '..' path segment"
 msgstr "无效的 '..' 路径片段"
 
-#: worktree.c:285
+#: worktree.c:245
 #, c-format
 msgid "failed to read '%s'"
 msgstr "无法读取 '%s'"
 
-#: wrapper.c:222 wrapper.c:392
+#: wrapper.c:223 wrapper.c:393
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "无法打开 '%s' 进行读写"
 
-#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
+#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "无法打开 '%s' 进行写入"
 
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757
-#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015
-#: builtin/pull.c:341
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
+#: builtin/am.c:849 builtin/merge.c:1014
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "无法打开 '%s' 进行读取"
 
-#: wrapper.c:581 wrapper.c:602
+#: wrapper.c:424 wrapper.c:624
 #, c-format
 msgid "unable to access '%s'"
 msgstr "不能访问 '%s'"
 
-#: wrapper.c:610
+#: wrapper.c:632
 msgid "unable to get current working directory"
 msgstr "不能获取当前工作目录"
 
-#: wrapper.c:634
+#: wrapper.c:656
 #, c-format
 msgid "could not write to %s"
 msgstr "不能写入 %s"
 
-#: wrapper.c:636
+#: wrapper.c:658
 #, c-format
 msgid "could not close %s"
 msgstr "不能关闭 %s"
 
-#: wt-status.c:151
+#: wt-status.c:152
 msgid "Unmerged paths:"
 msgstr "未合并的路径："
 
 #  译者：注意保持前导空格
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:179 wt-status.c:206
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  （使用 \"git reset %s <文件>...\" 以取消暂存）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:180 wt-status.c:207
+#: wt-status.c:181 wt-status.c:208
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  （使用 \"git rm --cached <文件>...\" 以取消暂存）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:184
+#: wt-status.c:185
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  （使用 \"git add <文件>...\" 标记解决方案）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:186 wt-status.c:190
+#: wt-status.c:187 wt-status.c:191
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr "  （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:188
+#: wt-status.c:189
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  （使用 \"git rm <文件>...\" 标记解决方案）"
 
-#: wt-status.c:199 wt-status.c:958
+#: wt-status.c:200 wt-status.c:981
 msgid "Changes to be committed:"
 msgstr "要提交的变更："
 
-#: wt-status.c:217 wt-status.c:967
+#: wt-status.c:218 wt-status.c:990
 msgid "Changes not staged for commit:"
 msgstr "尚未暂存以备提交的变更："
 
 #  译者：注意保持前导空格
-#: wt-status.c:221
+#: wt-status.c:222
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr "  （使用 \"git add <文件>...\" 更新要提交的内容）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:223
+#: wt-status.c:224
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr "  （使用 \"git add/rm <文件>...\" 更新要提交的内容）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:224
+#: wt-status.c:225
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr "  （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:226
+#: wt-status.c:227
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr "  （提交或丢弃子模组中未跟踪或修改的内容）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:238
+#: wt-status.c:239
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr "  （使用 \"git %s <文件>...\" 以包含要提交的内容）"
 
-#: wt-status.c:253
+#: wt-status.c:254
 msgid "both deleted:"
 msgstr "双方删除："
 
-#: wt-status.c:255
+#: wt-status.c:256
 msgid "added by us:"
 msgstr "由我们添加："
 
-#: wt-status.c:257
+#: wt-status.c:258
 msgid "deleted by them:"
 msgstr "由他们删除："
 
-#: wt-status.c:259
+#: wt-status.c:260
 msgid "added by them:"
 msgstr "由他们添加："
 
-#: wt-status.c:261
+#: wt-status.c:262
 msgid "deleted by us:"
 msgstr "由我们删除："
 
-#: wt-status.c:263
+#: wt-status.c:264
 msgid "both added:"
 msgstr "双方添加："
 
-#: wt-status.c:265
+#: wt-status.c:266
 msgid "both modified:"
 msgstr "双方修改："
 
-#: wt-status.c:275
+#: wt-status.c:276
 msgid "new file:"
 msgstr "新文件："
 
-#: wt-status.c:277
+#: wt-status.c:278
 msgid "copied:"
 msgstr "拷贝："
 
-#: wt-status.c:279
+#: wt-status.c:280
 msgid "deleted:"
 msgstr "删除："
 
-#: wt-status.c:281
+#: wt-status.c:282
 msgid "modified:"
 msgstr "修改："
 
-#: wt-status.c:283
+#: wt-status.c:284
 msgid "renamed:"
 msgstr "重命名："
 
-#: wt-status.c:285
+#: wt-status.c:286
 msgid "typechange:"
 msgstr "类型变更："
 
-#: wt-status.c:287
+#: wt-status.c:288
 msgid "unknown:"
 msgstr "未知："
 
-#: wt-status.c:289
+#: wt-status.c:290
 msgid "unmerged:"
 msgstr "未合并："
 
 #  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:371
+#: wt-status.c:372
 msgid "new commits, "
 msgstr "新提交, "
 
 #  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:373
+#: wt-status.c:374
 msgid "modified content, "
 msgstr "修改的内容, "
 
 #  译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:375
+#: wt-status.c:376
 msgid "untracked content, "
 msgstr "未跟踪的内容, "
 
-#: wt-status.c:831
+#: wt-status.c:821
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "您的贮藏区当前有 %d 条记录"
+msgstr[1] "您的贮藏区当前有 %d 条记录"
+
+#: wt-status.c:853
 msgid "Submodules changed but not updated:"
 msgstr "子模组已修改但尚未更新："
 
-#: wt-status.c:833
+#: wt-status.c:855
 msgid "Submodule changes to be committed:"
 msgstr "要提交的子模组变更："
 
-#: wt-status.c:914
+#: wt-status.c:937
 msgid ""
 "Do not touch the line above.\n"
 "Everything below will be removed."
@@ -4282,77 +4347,77 @@ msgstr ""
 "不要改动上面的一行。\n"
 "下面的所有内容均将被删除。"
 
-#: wt-status.c:1026
+#: wt-status.c:1049
 msgid "You have unmerged paths."
 msgstr "您有尚未合并的路径。"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1029
+#: wt-status.c:1052
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  （解决冲突并运行 \"git commit\"）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1031
+#: wt-status.c:1054
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  （使用 \"git merge --abort\" 终止合并）"
 
-#: wt-status.c:1036
+#: wt-status.c:1059
 msgid "All conflicts fixed but you are still merging."
 msgstr "所有冲突已解决但您仍处于合并中。"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1039
+#: wt-status.c:1062
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  （使用 \"git commit\" 结束合并）"
 
-#: wt-status.c:1049
+#: wt-status.c:1072
 msgid "You are in the middle of an am session."
 msgstr "您正处于 am 操作过程中。"
 
-#: wt-status.c:1052
+#: wt-status.c:1075
 msgid "The current patch is empty."
 msgstr "当前的补丁为空。"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1056
+#: wt-status.c:1079
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  （解决冲突，然后运行 \"git am --continue\"）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1058
+#: wt-status.c:1081
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  （使用 \"git am --skip\" 跳过此补丁）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1060
+#: wt-status.c:1083
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  （使用 \"git am --abort\" 恢复原有分支）"
 
-#: wt-status.c:1189
+#: wt-status.c:1214
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo 丢失。"
 
-#: wt-status.c:1191
+#: wt-status.c:1216
 msgid "No commands done."
 msgstr "没有命令被执行。"
 
-#: wt-status.c:1194
+#: wt-status.c:1219
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "最后一条命令已完成（%d 条命令被执行）："
 msgstr[1] "最后的命令已完成（%d 条命令被执行）："
 
-#: wt-status.c:1205
+#: wt-status.c:1230
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  （更多参见文件 %s）"
 
-#: wt-status.c:1210
+#: wt-status.c:1235
 msgid "No commands remaining."
 msgstr "未剩下任何命令。"
 
-#: wt-status.c:1213
+#: wt-status.c:1238
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
@@ -4360,165 +4425,169 @@ msgstr[0] "接下来要执行的命令（剩余 %d 条命令）："
 msgstr[1] "接下来要执行的命令（剩余 %d 条命令）："
 
 #  译者：注意保持前导空格
-#: wt-status.c:1221
+#: wt-status.c:1246
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  （使用 \"git rebase --edit-todo\" 来查看和编辑）"
 
-#: wt-status.c:1234
+#: wt-status.c:1259
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
 
-#: wt-status.c:1239
+#: wt-status.c:1264
 msgid "You are currently rebasing."
 msgstr "您在执行变基操作。"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1253
+#: wt-status.c:1278
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  （解决冲突，然后运行 \"git rebase --continue\"）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1255
+#: wt-status.c:1280
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  （使用 \"git rebase --skip\" 跳过此补丁）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1257
+#: wt-status.c:1282
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  （使用 \"git rebase --abort\" 以检出原有分支）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1263
+#: wt-status.c:1288
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  （所有冲突已解决：运行 \"git rebase --continue\"）"
 
-#: wt-status.c:1267
+#: wt-status.c:1292
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
 
-#: wt-status.c:1272
+#: wt-status.c:1297
 msgid "You are currently splitting a commit during a rebase."
 msgstr "您在执行变基操作时拆分提交。"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1275
+#: wt-status.c:1300
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr "  （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
 
-#: wt-status.c:1279
+#: wt-status.c:1304
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
 
-#: wt-status.c:1284
+#: wt-status.c:1309
 msgid "You are currently editing a commit during a rebase."
 msgstr "您在执行变基操作时编辑提交。"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1287
+#: wt-status.c:1312
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  （使用 \"git commit --amend\" 修补当前提交）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1289
+#: wt-status.c:1314
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr "  （当您对您的修改满意后执行 \"git rebase --continue\"）"
 
-#: wt-status.c:1299
+#: wt-status.c:1324
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "您在执行拣选提交 %s 的操作。"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1304
+#: wt-status.c:1329
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  （解决冲突并运行 \"git cherry-pick --continue\"）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1307
+#: wt-status.c:1332
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr "  （所有冲突已解决：运行 \"git cherry-pick --continue\"）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1309
+#: wt-status.c:1334
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr "  （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
 
-#: wt-status.c:1318
+#: wt-status.c:1343
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "您在执行反转提交 %s 的操作。"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1323
+#: wt-status.c:1348
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  （解决冲突并运行 \"git revert --continue\"）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1326
+#: wt-status.c:1351
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  （所有冲突已解决：运行 \"git revert --continue\"）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1328
+#: wt-status.c:1353
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  （使用 \"git revert --abort\" 以取消反转提交操作）"
 
-#: wt-status.c:1339
+#: wt-status.c:1364
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
 
-#: wt-status.c:1343
+#: wt-status.c:1368
 msgid "You are currently bisecting."
 msgstr "您在执行二分查找操作。"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1346
+#: wt-status.c:1371
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  （使用 \"git bisect reset\" 以回到原有分支）"
 
-#: wt-status.c:1543
+#: wt-status.c:1568
 msgid "On branch "
 msgstr "位于分支 "
 
-#: wt-status.c:1549
+#: wt-status.c:1574
 msgid "interactive rebase in progress; onto "
 msgstr "交互式变基操作正在进行中；至 "
 
-#: wt-status.c:1551
+#: wt-status.c:1576
 msgid "rebase in progress; onto "
 msgstr "变基操作正在进行中；至 "
 
-#: wt-status.c:1556
+#: wt-status.c:1581
 msgid "HEAD detached at "
 msgstr "头指针分离于 "
 
-#: wt-status.c:1558
+#: wt-status.c:1583
 msgid "HEAD detached from "
 msgstr "头指针分离自 "
 
-#: wt-status.c:1561
+#: wt-status.c:1586
 msgid "Not currently on any branch."
 msgstr "当前不在任何分支上。"
 
-#: wt-status.c:1579
+#: wt-status.c:1606
 msgid "Initial commit"
 msgstr "初始提交"
 
-#: wt-status.c:1593
+#: wt-status.c:1607
+msgid "No commits yet"
+msgstr "尚无提交"
+
+#: wt-status.c:1621
 msgid "Untracked files"
 msgstr "未跟踪的文件"
 
-#: wt-status.c:1595
+#: wt-status.c:1623
 msgid "Ignored files"
 msgstr "忽略的文件"
 
-#: wt-status.c:1599
+#: wt-status.c:1627
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4528,258 +4597,294 @@ msgstr ""
 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"
 "但您需要小心不要忘了添加新文件（参见 'git help status'）。"
 
-#: wt-status.c:1605
+#: wt-status.c:1633
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "未跟踪的文件没有列出%s"
 
 #  译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1607
+#: wt-status.c:1635
 msgid " (use -u option to show untracked files)"
 msgstr "（使用 -u 参数显示未跟踪的文件）"
 
-#: wt-status.c:1613
+#: wt-status.c:1641
 msgid "No changes"
 msgstr "没有修改"
 
-#: wt-status.c:1618
+#: wt-status.c:1646
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
 
-#: wt-status.c:1621
+#: wt-status.c:1649
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "修改尚未加入提交\n"
 
-#: wt-status.c:1624
+#: wt-status.c:1652
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
 
-#: wt-status.c:1627
+#: wt-status.c:1655
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "提交为空，但是存在尚未跟踪的文件\n"
 
 #  译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1630
+#: wt-status.c:1658
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"
 
-#: wt-status.c:1633 wt-status.c:1638
+#: wt-status.c:1661 wt-status.c:1666
 #, c-format
 msgid "nothing to commit\n"
 msgstr "无文件要提交\n"
 
 #  译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1636
+#: wt-status.c:1664
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"
 
 #  译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1640
+#: wt-status.c:1668
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "无文件要提交，干净的工作区\n"
 
-#  译者：注意保持句尾空格
-#: wt-status.c:1749
-msgid "Initial commit on "
-msgstr "初始提交于 "
+#: wt-status.c:1780
+msgid "No commits yet on "
+msgstr "尚无提交在 "
 
-#: wt-status.c:1753
+#: wt-status.c:1784
 msgid "HEAD (no branch)"
 msgstr "HEAD（非分支）"
 
 #  译者：注意保持句尾空格
-#: wt-status.c:1782 wt-status.c:1790
+#: wt-status.c:1813 wt-status.c:1821
 msgid "behind "
 msgstr "落后 "
 
-#: wt-status.c:1785 wt-status.c:1788
+#: wt-status.c:1816 wt-status.c:1819
 msgid "ahead "
 msgstr "领先 "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2280
+#: wt-status.c:2311
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "不能%s：您有未暂存的变更。"
 
-#: wt-status.c:2286
+#: wt-status.c:2317
 msgid "additionally, your index contains uncommitted changes."
 msgstr "另外，您的索引中包含未提交的变更。"
 
-#: wt-status.c:2288
+#: wt-status.c:2319
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "不能%s：您的索引中包含未提交的变更。"
 
-#: compat/precompose_utf8.c:57 builtin/clone.c:432
+#: compat/precompose_utf8.c:58 builtin/clone.c:436
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "无法删除 '%s'"
 
-#: builtin/add.c:22
+#: builtin/add.c:24
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<选项>] [--] <路径规格>..."
 
-#: builtin/add.c:80
+#: builtin/add.c:82
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "意外的差异状态 %c"
 
-#: builtin/add.c:85 builtin/commit.c:291
+#: builtin/add.c:87 builtin/commit.c:292
 msgid "updating files failed"
 msgstr "更新文件失败"
 
-#: builtin/add.c:95
+#: builtin/add.c:97
 #, c-format
 msgid "remove '%s'\n"
 msgstr "删除 '%s'\n"
 
-#: builtin/add.c:149
+#: builtin/add.c:151
 msgid "Unstaged changes after refreshing the index:"
 msgstr "刷新索引之后尚未被暂存的变更："
 
-#: builtin/add.c:209 builtin/rev-parse.c:872
+#: builtin/add.c:211 builtin/rev-parse.c:873
 msgid "Could not read the index"
 msgstr "不能读取索引"
 
-#: builtin/add.c:220
+#: builtin/add.c:222
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "无法打开 '%s' 进行写入。"
 
-#: builtin/add.c:224
+#: builtin/add.c:226
 msgid "Could not write patch"
 msgstr "不能生成补丁"
 
-#: builtin/add.c:227
+#: builtin/add.c:229
 msgid "editing patch failed"
 msgstr "编辑补丁失败"
 
-#: builtin/add.c:230
+#: builtin/add.c:232
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "不能对 '%s' 调用 stat"
 
-#: builtin/add.c:232
+#: builtin/add.c:234
 msgid "Empty patch. Aborted."
 msgstr "空补丁。异常终止。"
 
-#: builtin/add.c:237
+#: builtin/add.c:239
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "不能应用 '%s'"
 
-#: builtin/add.c:247
+#: builtin/add.c:249
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
 
-#: builtin/add.c:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123
-#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524
-#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163
+#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
+#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
+#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
 msgid "dry run"
 msgstr "演习"
 
-#: builtin/add.c:269
+#: builtin/add.c:272
 msgid "interactive picking"
 msgstr "交互式拣选"
 
-#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286
+#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
 msgid "select hunks interactively"
 msgstr "交互式挑选数据块"
 
-#: builtin/add.c:271
+#: builtin/add.c:274
 msgid "edit current diff and apply"
 msgstr "编辑当前差异并应用"
 
-#: builtin/add.c:272
+#: builtin/add.c:275
 msgid "allow adding otherwise ignored files"
 msgstr "允许添加忽略的文件"
 
-#: builtin/add.c:273
+#: builtin/add.c:276
 msgid "update tracked files"
 msgstr "更新已跟踪的文件"
 
-#: builtin/add.c:274
+#: builtin/add.c:277
 msgid "record only the fact that the path will be added later"
 msgstr "只记录，该路径稍后再添加"
 
-#: builtin/add.c:275
+#: builtin/add.c:278
 msgid "add changes from all tracked and untracked files"
 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
 
-#: builtin/add.c:278
+#: builtin/add.c:281
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "忽略工作区中移除的路径（和 --no-all 相同）"
 
-#: builtin/add.c:280
+#: builtin/add.c:283
 msgid "don't add, only refresh the index"
 msgstr "不添加，只刷新索引"
 
-#: builtin/add.c:281
+#: builtin/add.c:284
 msgid "just skip files which cannot be added because of errors"
 msgstr "跳过因出错不能添加的文件"
 
-#: builtin/add.c:282
+#: builtin/add.c:285
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
 
-#: builtin/add.c:283 builtin/update-index.c:951
+#: builtin/add.c:286 builtin/update-index.c:952
 msgid "(+/-)x"
 msgstr "(+/-)x"
 
-#: builtin/add.c:283 builtin/update-index.c:952
+#: builtin/add.c:286 builtin/update-index.c:953
 msgid "override the executable bit of the listed files"
 msgstr "覆盖列表里文件的可执行位"
 
-#: builtin/add.c:305
+#: builtin/add.c:288
+msgid "warn when adding an embedded repository"
+msgstr "创建一个嵌入式仓库时给予警告"
+
+#: builtin/add.c:303
+#, c-format
+msgid ""
+"You've added another git repository inside your current repository.\n"
+"Clones of the outer repository will not contain the contents of\n"
+"the embedded repository and will not know how to obtain it.\n"
+"If you meant to add a submodule, use:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"If you added this path by mistake, you can remove it from the\n"
+"index with:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"See \"git help submodule\" for more information."
+msgstr ""
+"您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容，并且不知道该如何获取它。\n"
+"如果您要添加一个子模组，使用：\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"如果您不小心添加了这个路径，可以用下面的命令将其从索引中删除：\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"参见 \"git help submodule\" 获取更多信息。"
+
+#: builtin/add.c:331
+#, c-format
+msgid "adding embedded git repository: %s"
+msgstr "正在添加嵌入式 git 仓库：%s"
+
+#: builtin/add.c:349
 #, c-format
 msgid "Use -f if you really want to add them.\n"
 msgstr "使用 -f 参数如果您确实要添加它们。\n"
 
-#: builtin/add.c:312
+#: builtin/add.c:357
 msgid "adding files failed"
 msgstr "添加文件失败"
 
-#: builtin/add.c:348
+#: builtin/add.c:394
 msgid "-A and -u are mutually incompatible"
 msgstr "-A 和 -u 选项互斥"
 
-#: builtin/add.c:355
+#: builtin/add.c:401
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
 
-#: builtin/add.c:359
+#: builtin/add.c:405
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
 
-#: builtin/add.c:374
+#: builtin/add.c:420
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "没有指定文件，也没有文件被添加。\n"
 
-#: builtin/add.c:375
+#: builtin/add.c:421
 #, c-format
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "也许您想要执行 'git add .'？\n"
 
-#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298
-#: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350
-#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271
+#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
+#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
+#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
 #: builtin/submodule--helper.c:244
 msgid "index file corrupt"
 msgstr "索引文件损坏"
 
-#: builtin/am.c:412
+#: builtin/am.c:413
 msgid "could not parse author script"
 msgstr "不能解析作者脚本"
 
@@ -4827,7 +4932,7 @@ msgstr "无效的时区偏移值"
 msgid "Patch format detection failed."
 msgstr "补丁格式探测失败。"
 
-#: builtin/am.c:991 builtin/clone.c:397
+#: builtin/am.c:991 builtin/clone.c:401
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "无法创建目录 '%s'"
@@ -4836,48 +4941,48 @@ msgstr "无法创建目录 '%s'"
 msgid "Failed to split patches."
 msgstr "无法拆分补丁。"
 
-#: builtin/am.c:1127 builtin/commit.c:376
+#: builtin/am.c:1120 builtin/commit.c:377
 msgid "unable to write index file"
 msgstr "无法写入索引文件"
 
-#: builtin/am.c:1178
+#: builtin/am.c:1171
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "当您解决这一问题，执行 \"%s --continue\"。"
 
-#: builtin/am.c:1179
+#: builtin/am.c:1172
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"
 
-#: builtin/am.c:1180
+#: builtin/am.c:1173
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"
 
-#: builtin/am.c:1315
-msgid "Patch is empty. Was it split wrong?"
-msgstr "补丁为空。是不是切分错误？"
+#: builtin/am.c:1304
+msgid "Patch is empty."
+msgstr "补丁为空。"
 
-#: builtin/am.c:1386 builtin/log.c:1557
+#: builtin/am.c:1370
 #, c-format
-msgid "invalid ident line: %s"
-msgstr "包含无效的身份标识：%s"
+msgid "invalid ident line: %.*s"
+msgstr "无效的身份标识：%.*s"
 
-#: builtin/am.c:1413
+#: builtin/am.c:1392
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "不能解析提交 %s"
 
-#: builtin/am.c:1606
+#: builtin/am.c:1586
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
 
-#: builtin/am.c:1608
+#: builtin/am.c:1588
 msgid "Using index info to reconstruct a base tree..."
 msgstr "使用索引来重建一个（三方合并的）基础目录树..."
 
-#: builtin/am.c:1627
+#: builtin/am.c:1607
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -4885,37 +4990,37 @@ msgstr ""
 "您是否曾手动编辑过您的补丁？\n"
 "无法应用补丁到索引中的数据对象上。"
 
-#: builtin/am.c:1633
+#: builtin/am.c:1613
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "回落到基础版本上打补丁及进行三方合并..."
 
-#: builtin/am.c:1658
+#: builtin/am.c:1638
 msgid "Failed to merge in the changes."
 msgstr "无法合并变更。"
 
-#: builtin/am.c:1682 builtin/merge.c:631
+#: builtin/am.c:1662 builtin/merge.c:632
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree 无法写入一树对象"
 
-#: builtin/am.c:1689
+#: builtin/am.c:1669
 msgid "applying to an empty history"
 msgstr "正应用到一个空历史上"
 
-#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802
-#: builtin/merge.c:827
+#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
+#: builtin/merge.c:828
 msgid "failed to write commit object"
 msgstr "无法写提交对象"
 
-#: builtin/am.c:1735 builtin/am.c:1739
+#: builtin/am.c:1715 builtin/am.c:1719
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "无法继续：%s 不存在。"
 
-#: builtin/am.c:1755
+#: builtin/am.c:1735
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr "标准输入没有和终端关联，不能进行交互式操作。"
 
-#: builtin/am.c:1760
+#: builtin/am.c:1740
 msgid "Commit Body is:"
 msgstr "提交内容为："
 
@@ -4924,35 +5029,35 @@ msgstr "提交内容为："
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1770
+#: builtin/am.c:1750
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："
 
-#: builtin/am.c:1820
+#: builtin/am.c:1800
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "脏索引：不能应用补丁（脏文件：%s）"
 
-#: builtin/am.c:1860 builtin/am.c:1932
+#: builtin/am.c:1840 builtin/am.c:1912
 #, c-format
 msgid "Applying: %.*s"
 msgstr "应用：%.*s"
 
-#: builtin/am.c:1876
+#: builtin/am.c:1856
 msgid "No changes -- Patch already applied."
 msgstr "没有变更 —— 补丁已经应用过。"
 
-#: builtin/am.c:1884
+#: builtin/am.c:1864
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "打补丁失败于 %s %.*s"
 
-#: builtin/am.c:1890
+#: builtin/am.c:1870
 #, c-format
 msgid "The copy of the patch that failed is found in: %s"
 msgstr "失败的补丁文件副本位于：%s"
 
-#: builtin/am.c:1935
+#: builtin/am.c:1915
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -4962,157 +5067,161 @@ msgstr ""
 "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
 "您也许想要跳过这个补丁。"
 
-#: builtin/am.c:1942
+#: builtin/am.c:1922
 msgid ""
 "You still have unmerged paths in your index.\n"
-"Did you forget to use 'git add'?"
+"You should 'git add' each file with resolved conflicts to mark them as "
+"such.\n"
+"You might run `git rm` on a file to accept \"deleted by them\" for it."
 msgstr ""
-"您的索引中仍有未合并的路径。\n"
-"您是否忘了执行 'git add'？"
+"在您的索引中仍存在未合并的路径。\n"
+"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
+"你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
 
-#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308
-#: builtin/reset.c:316
+#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
+#: builtin/reset.c:331
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "不能解析对象 '%s'。"
 
-#: builtin/am.c:2102
+#: builtin/am.c:2083
 msgid "failed to clean index"
 msgstr "无法清空索引"
 
-#: builtin/am.c:2136
+#: builtin/am.c:2117
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
 
-#: builtin/am.c:2199
+#: builtin/am.c:2180
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "无效的 --patch-format 值：%s"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2213
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2233
+#: builtin/am.c:2214
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<选项>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2220
 msgid "run interactively"
 msgstr "以交互式方式运行"
 
-#: builtin/am.c:2241
+#: builtin/am.c:2222
 msgid "historical option -- no-op"
 msgstr "老的参数 —— 无作用"
 
-#: builtin/am.c:2243
+#: builtin/am.c:2224
 msgid "allow fall back on 3way merging if needed"
 msgstr "如果必要，允许使用三方合并。"
 
-#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57
-#: builtin/repack.c:178
+#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/repack.c:180
 msgid "be quiet"
 msgstr "静默模式"
 
-#: builtin/am.c:2246
+#: builtin/am.c:2227
 msgid "add a Signed-off-by line to the commit message"
 msgstr "在提交说明中添加一个 Signed-off-by 签名"
 
-#: builtin/am.c:2249
+#: builtin/am.c:2230
 msgid "recode into utf8 (default)"
 msgstr "使用 utf8 字符集（默认）"
 
-#: builtin/am.c:2251
+#: builtin/am.c:2232
 msgid "pass -k flag to git-mailinfo"
 msgstr "向 git-mailinfo 传递 -k 参数"
 
-#: builtin/am.c:2253
+#: builtin/am.c:2234
 msgid "pass -b flag to git-mailinfo"
 msgstr "向 git-mailinfo 传递 -b 参数"
 
-#: builtin/am.c:2255
+#: builtin/am.c:2236
 msgid "pass -m flag to git-mailinfo"
 msgstr "向 git-mailinfo 传递 -m 参数"
 
-#: builtin/am.c:2257
+#: builtin/am.c:2238
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
 
-#: builtin/am.c:2260
+#: builtin/am.c:2241
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
 
-#: builtin/am.c:2263
+#: builtin/am.c:2244
 msgid "strip everything before a scissors line"
 msgstr "丢弃裁切线前的所有内容"
 
-#: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274
-#: builtin/am.c:2277 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286
-#: builtin/am.c:2292
+#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2273
 msgid "pass it through git-apply"
 msgstr "传递给 git-apply"
 
-#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
-#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135
-#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191
-#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398
-#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
+#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
+#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193
+#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169
+#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134
+#: parse-options.h:245
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37
-#: builtin/replace.c:443 builtin/tag.c:433 builtin/verify-tag.c:38
+#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
+#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
 msgid "format"
 msgstr "格式"
 
-#: builtin/am.c:2289
+#: builtin/am.c:2270
 msgid "format the patch(es) are in"
 msgstr "补丁的格式"
 
-#: builtin/am.c:2295
+#: builtin/am.c:2276
 msgid "override error message when patch failure occurs"
 msgstr "打补丁失败时显示的错误信息"
 
-#: builtin/am.c:2297
+#: builtin/am.c:2278
 msgid "continue applying patches after resolving a conflict"
 msgstr "冲突解决后继续应用补丁"
 
-#: builtin/am.c:2300
+#: builtin/am.c:2281
 msgid "synonyms for --continue"
 msgstr "和 --continue 同义"
 
-#: builtin/am.c:2303
+#: builtin/am.c:2284
 msgid "skip the current patch"
 msgstr "跳过当前补丁"
 
-#: builtin/am.c:2306
+#: builtin/am.c:2287
 msgid "restore the original branch and abort the patching operation."
 msgstr "恢复原始分支并终止打补丁操作。"
 
-#: builtin/am.c:2310
+#: builtin/am.c:2291
 msgid "lie about committer date"
 msgstr "将作者日期作为提交日期"
 
-#: builtin/am.c:2312
+#: builtin/am.c:2293
 msgid "use current timestamp for author date"
 msgstr "用当前时间作为作者日期"
 
-#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232
-#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
+#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
+#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
 msgid "key-id"
 msgstr "key-id"
 
-#: builtin/am.c:2315
+#: builtin/am.c:2296
 msgid "GPG-sign commits"
 msgstr "使用 GPG 签名提交"
 
-#: builtin/am.c:2318
+#: builtin/am.c:2299
 msgid "(internal use for git-rebase)"
 msgstr "（内部使用，用于 git-rebase）"
 
-#: builtin/am.c:2333
+#: builtin/am.c:2317
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -5120,16 +5229,16 @@ msgstr ""
 "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"
 "请不要再使用它了。"
 
-#: builtin/am.c:2340
+#: builtin/am.c:2324
 msgid "failed to read the index"
 msgstr "无法读取索引"
 
-#: builtin/am.c:2355
+#: builtin/am.c:2339
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
 
-#: builtin/am.c:2379
+#: builtin/am.c:2363
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -5138,7 +5247,7 @@ msgstr ""
 "发现了错误的 %s 目录。\n"
 "使用 \"git am --abort\" 删除它。"
 
-#: builtin/am.c:2385
+#: builtin/am.c:2369
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "解决操作未进行，我们不会继续。"
 
@@ -5188,192 +5297,167 @@ msgstr "执行 'git bisect next'"
 msgid "update BISECT_HEAD instead of checking out the current commit"
 msgstr "更新 BISECT_HEAD 而非检出当前提交"
 
-#: builtin/blame.c:33
+#: builtin/blame.c:27
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
 
-#: builtin/blame.c:38
+#: builtin/blame.c:32
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
 
-#: builtin/blame.c:1777
-msgid "Blaming lines"
-msgstr "追踪代码行"
-
-#: builtin/blame.c:2573
+#: builtin/blame.c:668
 msgid "Show blame entries as we find them, incrementally"
 msgstr "增量式地显示发现的 blame 条目"
 
-#: builtin/blame.c:2574
+#: builtin/blame.c:669
 msgid "Show blank SHA-1 for boundary commits (Default: off)"
 msgstr "边界提交显示空的 SHA-1（默认：关闭）"
 
-#: builtin/blame.c:2575
+#: builtin/blame.c:670
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr "不把根提交作为边界（默认：关闭）"
 
-#: builtin/blame.c:2576
+#: builtin/blame.c:671
 msgid "Show work cost statistics"
 msgstr "显示命令消耗统计"
 
-#: builtin/blame.c:2577
+#: builtin/blame.c:672
 msgid "Force progress reporting"
 msgstr "强制进度显示"
 
-#: builtin/blame.c:2578
+#: builtin/blame.c:673
 msgid "Show output score for blame entries"
 msgstr "显示判断 blame 条目位移的得分诊断信息"
 
-#: builtin/blame.c:2579
+#: builtin/blame.c:674
 msgid "Show original filename (Default: auto)"
 msgstr "显示原始文件名（默认：自动）"
 
-#: builtin/blame.c:2580
+#: builtin/blame.c:675
 msgid "Show original linenumber (Default: off)"
 msgstr "显示原始的行号（默认：关闭）"
 
-#: builtin/blame.c:2581
+#: builtin/blame.c:676
 msgid "Show in a format designed for machine consumption"
 msgstr "显示为一个适合机器读取的格式"
 
-#: builtin/blame.c:2582
+#: builtin/blame.c:677
 msgid "Show porcelain format with per-line commit information"
 msgstr "为每一行显示机器适用的提交信息"
 
-#: builtin/blame.c:2583
+#: builtin/blame.c:678
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"
 
-#: builtin/blame.c:2584
+#: builtin/blame.c:679
 msgid "Show raw timestamp (Default: off)"
 msgstr "显示原始时间戳（默认：关闭）"
 
-#: builtin/blame.c:2585
+#: builtin/blame.c:680
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "显示长的 SHA1 提交号（默认：关闭）"
 
-#: builtin/blame.c:2586
+#: builtin/blame.c:681
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "隐藏作者名字和时间戳（默认：关闭）"
 
-#: builtin/blame.c:2587
+#: builtin/blame.c:682
 msgid "Show author email instead of name (Default: off)"
 msgstr "显示作者的邮箱而不是名字（默认：关闭）"
 
-#: builtin/blame.c:2588
+#: builtin/blame.c:683
 msgid "Ignore whitespace differences"
 msgstr "忽略空白差异"
 
-#: builtin/blame.c:2595
+#: builtin/blame.c:690
 msgid "Use an experimental heuristic to improve diffs"
 msgstr "使用一个试验性的启发式算法改进差异显示"
 
-#: builtin/blame.c:2597
+#: builtin/blame.c:692
 msgid "Spend extra cycles to find better match"
 msgstr "花费额外的循环来找到更好的匹配"
 
-#: builtin/blame.c:2598
+#: builtin/blame.c:693
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
 
-#: builtin/blame.c:2599
+#: builtin/blame.c:694
 msgid "Use <file>'s contents as the final image"
 msgstr "使用 <文件> 的内容作为最终的图片"
 
-#: builtin/blame.c:2600 builtin/blame.c:2601
+#: builtin/blame.c:695 builtin/blame.c:696
 msgid "score"
 msgstr "得分"
 
-#: builtin/blame.c:2600
+#: builtin/blame.c:695
 msgid "Find line copies within and across files"
 msgstr "找到文件内及跨文件的行拷贝"
 
-#: builtin/blame.c:2601
+#: builtin/blame.c:696
 msgid "Find line movements within and across files"
 msgstr "找到文件内及跨文件的行移动"
 
-#: builtin/blame.c:2602
+#: builtin/blame.c:697
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:2602
+#: builtin/blame.c:697
 msgid "Process only line range n,m, counting from 1"
 msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"
 
-#: builtin/blame.c:2649
+#: builtin/blame.c:744
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
 
-#. TRANSLATORS: This string is used to tell us the maximum
-#. display width for a relative timestamp in "git blame"
-#. output.  For C locale, "4 years, 11 months ago", which
-#. takes 22 places, is the longest among various forms of
-#. relative timestamps, but your language may need more or
-#. fewer display columns.
-#: builtin/blame.c:2697
+#. TRANSLATORS: This string is used to tell us the
+#. maximum display width for a relative timestamp in
+#. "git blame" output.  For C locale, "4 years, 11
+#. months ago", which takes 22 places, is the longest
+#. among various forms of relative timestamps, but
+#. your language may need more or fewer display
+#. columns.
+#.
+#: builtin/blame.c:795
 msgid "4 years, 11 months ago"
 msgstr "4 年 11 个月前"
 
-#: builtin/blame.c:2777
-msgid "--contents and --reverse do not blend well."
-msgstr "--contents 和 --reverse 不能混用。"
-
-#: builtin/blame.c:2797
-msgid "cannot use --contents with final commit object name"
-msgstr "不能将 --contents 和最终的提交对象名共用"
-
-#: builtin/blame.c:2802
-msgid "--reverse and --first-parent together require specified latest commit"
-msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
-
-#: builtin/blame.c:2829
-msgid ""
-"--reverse --first-parent together require range along first-parent chain"
-msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"
-
-#: builtin/blame.c:2840
-#, c-format
-msgid "no such path %s in %s"
-msgstr "在 %2$s 中无此路径 %1$s"
-
-#: builtin/blame.c:2851
-#, c-format
-msgid "cannot read blob %s for path %s"
-msgstr "不能为路径 %2$s 读取数据对象 %1$s"
-
-#: builtin/blame.c:2870
+#: builtin/blame.c:882
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "文件 %s 只有 %lu 行"
 msgstr[1] "文件 %s 只有 %lu 行"
 
-#: builtin/branch.c:26
+#: builtin/blame.c:928
+msgid "Blaming lines"
+msgstr "追踪代码行"
+
+#: builtin/branch.c:27
 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
 msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
 
-#: builtin/branch.c:27
+#: builtin/branch.c:28
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
 msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
 
-#: builtin/branch.c:28
+#: builtin/branch.c:29
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
 
-#: builtin/branch.c:29
+#: builtin/branch.c:30
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
 
-#: builtin/branch.c:30
+#: builtin/branch.c:31
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<选项>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:31
+#: builtin/branch.c:32
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<选项>] [-r | -a] [--format]"
 
 #  译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:144
+#: builtin/branch.c:145
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -5383,7 +5467,7 @@ msgstr ""
 "         '%s'，但未合并到 HEAD。"
 
 #  译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:148
+#: builtin/branch.c:149
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -5392,12 +5476,12 @@ msgstr ""
 "并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n"
 "         然而却尚未被合并到分支 '%s' 。"
 
-#: builtin/branch.c:162
+#: builtin/branch.c:163
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "无法查询 '%s' 指向的提交对象"
 
-#: builtin/branch.c:166
+#: builtin/branch.c:167
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -5406,91 +5490,91 @@ msgstr ""
 "分支 '%s' 没有完全合并。\n"
 "如果您确认要删除它，执行 'git branch -D %s'。"
 
-#: builtin/branch.c:179
+#: builtin/branch.c:180
 msgid "Update of config-file failed"
 msgstr "无法更新 config 文件"
 
-#: builtin/branch.c:210
+#: builtin/branch.c:211
 msgid "cannot use -a with -d"
 msgstr "不能将 -a 和 -d 同时使用"
 
-#: builtin/branch.c:216
+#: builtin/branch.c:217
 msgid "Couldn't look up commit object for HEAD"
 msgstr "无法查询 HEAD 指向的提交对象"
 
-#: builtin/branch.c:230
+#: builtin/branch.c:231
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
 
-#: builtin/branch.c:245
+#: builtin/branch.c:246
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "未能找到远程跟踪分支 '%s'。"
 
-#: builtin/branch.c:246
+#: builtin/branch.c:247
 #, c-format
 msgid "branch '%s' not found."
 msgstr "分支 '%s' 未发现。"
 
-#: builtin/branch.c:261
+#: builtin/branch.c:262
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr "无法删除远程跟踪分支 '%s'"
 
-#: builtin/branch.c:262
+#: builtin/branch.c:263
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "无法删除分支 '%s'"
 
-#: builtin/branch.c:269
+#: builtin/branch.c:270
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"
 
-#: builtin/branch.c:270
+#: builtin/branch.c:271
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "已删除分支 %s（曾为 %s）。\n"
 
-#: builtin/branch.c:441
+#: builtin/branch.c:445
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "分支 %s 正被变基到 %s"
 
-#: builtin/branch.c:445
+#: builtin/branch.c:449
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "分支 %s 正被二分查找于 %s"
 
-#: builtin/branch.c:460
+#: builtin/branch.c:464
 msgid "cannot rename the current branch while not on any."
 msgstr "无法重命名当前分支因为不处于任何分支上。"
 
-#: builtin/branch.c:470
+#: builtin/branch.c:474
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "无效的分支名：'%s'"
 
-#: builtin/branch.c:487
+#: builtin/branch.c:491
 msgid "Branch rename failed"
 msgstr "分支重命名失败"
 
-#: builtin/branch.c:490
+#: builtin/branch.c:494
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "重命名掉一个错误命名的旧分支 '%s'"
 
-#: builtin/branch.c:493
+#: builtin/branch.c:497
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "分支重命名为 %s，但 HEAD 没有更新！"
 
-#: builtin/branch.c:502
+#: builtin/branch.c:506
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "分支被重命名，但更新 config 文件失败"
 
-#: builtin/branch.c:518
+#: builtin/branch.c:522
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -5501,213 +5585,213 @@ msgstr ""
 "  %s\n"
 "以 '%c' 开头的行将被过滤。\n"
 
-#: builtin/branch.c:551
+#: builtin/branch.c:555
 msgid "Generic options"
 msgstr "通用选项"
 
-#: builtin/branch.c:553
+#: builtin/branch.c:557
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"
 
-#: builtin/branch.c:554
+#: builtin/branch.c:558
 msgid "suppress informational messages"
 msgstr "不显示信息"
 
-#: builtin/branch.c:555
+#: builtin/branch.c:559
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "设置跟踪模式（参见 git-pull(1)）"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:561
 msgid "change upstream info"
 msgstr "改变上游信息"
 
-#: builtin/branch.c:559
+#: builtin/branch.c:563
 msgid "upstream"
 msgstr "上游"
 
-#: builtin/branch.c:559
+#: builtin/branch.c:563
 msgid "change the upstream info"
 msgstr "改变上游信息"
 
-#: builtin/branch.c:560
+#: builtin/branch.c:564
 msgid "Unset the upstream info"
 msgstr "取消上游信息的设置"
 
-#: builtin/branch.c:561
+#: builtin/branch.c:565
 msgid "use colored output"
 msgstr "使用彩色输出"
 
-#: builtin/branch.c:562
+#: builtin/branch.c:566
 msgid "act on remote-tracking branches"
 msgstr "作用于远程跟踪分支"
 
-#: builtin/branch.c:564 builtin/branch.c:566
+#: builtin/branch.c:568 builtin/branch.c:570
 msgid "print only branches that contain the commit"
 msgstr "只打印包含该提交的分支"
 
-#: builtin/branch.c:565 builtin/branch.c:567
+#: builtin/branch.c:569 builtin/branch.c:571
 msgid "print only branches that don't contain the commit"
 msgstr "只打印不包含该提交的分支"
 
-#: builtin/branch.c:570
+#: builtin/branch.c:574
 msgid "Specific git-branch actions:"
 msgstr "具体的 git-branch 动作："
 
-#: builtin/branch.c:571
+#: builtin/branch.c:575
 msgid "list both remote-tracking and local branches"
 msgstr "列出远程跟踪及本地分支"
 
-#: builtin/branch.c:573
+#: builtin/branch.c:577
 msgid "delete fully merged branch"
 msgstr "删除完全合并的分支"
 
-#: builtin/branch.c:574
+#: builtin/branch.c:578
 msgid "delete branch (even if not merged)"
 msgstr "删除分支（即使没有合并）"
 
-#: builtin/branch.c:575
+#: builtin/branch.c:579
 msgid "move/rename a branch and its reflog"
 msgstr "移动/重命名一个分支，以及它的引用日志"
 
-#: builtin/branch.c:576
+#: builtin/branch.c:580
 msgid "move/rename a branch, even if target exists"
 msgstr "移动/重命名一个分支，即使目标已存在"
 
-#: builtin/branch.c:577
+#: builtin/branch.c:581
 msgid "list branch names"
 msgstr "列出分支名"
 
-#: builtin/branch.c:578
+#: builtin/branch.c:582
 msgid "create the branch's reflog"
 msgstr "创建分支的引用日志"
 
-#: builtin/branch.c:580
+#: builtin/branch.c:584
 msgid "edit the description for the branch"
 msgstr "标记分支的描述"
 
-#: builtin/branch.c:581
+#: builtin/branch.c:585
 msgid "force creation, move/rename, deletion"
 msgstr "强制创建、移动/重命名、删除"
 
-#: builtin/branch.c:582
+#: builtin/branch.c:586
 msgid "print only branches that are merged"
 msgstr "只打印已经合并的分支"
 
-#: builtin/branch.c:583
+#: builtin/branch.c:587
 msgid "print only branches that are not merged"
 msgstr "只打印尚未合并的分支"
 
-#: builtin/branch.c:584
+#: builtin/branch.c:588
 msgid "list branches in columns"
 msgstr "以列的方式显示分支"
 
-#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426
+#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
 msgid "key"
 msgstr "key"
 
-#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
 msgid "field name to sort on"
 msgstr "排序的字段名"
 
-#: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404
-#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
-#: builtin/tag.c:429
+#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
+#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
+#: builtin/tag.c:430
 msgid "object"
 msgstr "对象"
 
-#: builtin/branch.c:589
+#: builtin/branch.c:593
 msgid "print only branches of the object"
 msgstr "只打印指向该对象的分支"
 
-#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434
+#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
 msgid "sorting and filtering are case insensitive"
 msgstr "排序和过滤属于大小写不敏感"
 
-#: builtin/branch.c:592 builtin/for-each-ref.c:37 builtin/tag.c:433
-#: builtin/verify-tag.c:38
+#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/verify-tag.c:39
 msgid "format to use for the output"
 msgstr "输出格式"
 
-#: builtin/branch.c:611
+#: builtin/branch.c:615
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "无法将 HEAD 解析为有效引用。"
 
-#: builtin/branch.c:615 builtin/clone.c:724
+#: builtin/branch.c:619 builtin/clone.c:728
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD 没有位于 /refs/heads 之下！"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:642
 msgid "--column and --verbose are incompatible"
 msgstr "--column 和 --verbose 不兼容"
 
-#: builtin/branch.c:649 builtin/branch.c:701
+#: builtin/branch.c:653 builtin/branch.c:705
 msgid "branch name required"
 msgstr "必须提供分支名"
 
-#: builtin/branch.c:677
+#: builtin/branch.c:681
 msgid "Cannot give description to detached HEAD"
 msgstr "不能向分离头指针提供描述"
 
-#: builtin/branch.c:682
+#: builtin/branch.c:686
 msgid "cannot edit description of more than one branch"
 msgstr "不能为一个以上的分支编辑描述"
 
-#: builtin/branch.c:689
+#: builtin/branch.c:693
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "分支 '%s' 尚无提交。"
 
-#: builtin/branch.c:692
+#: builtin/branch.c:696
 #, c-format
 msgid "No branch named '%s'."
 msgstr "没有分支 '%s'。"
 
-#: builtin/branch.c:707
+#: builtin/branch.c:711
 msgid "too many branches for a rename operation"
 msgstr "为重命名操作提供了太多的分支名"
 
-#: builtin/branch.c:712
+#: builtin/branch.c:716
 msgid "too many branches to set new upstream"
 msgstr "为设置新上游提供了太多的分支名"
 
-#: builtin/branch.c:716
+#: builtin/branch.c:720
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。"
 
-#: builtin/branch.c:719 builtin/branch.c:741 builtin/branch.c:762
+#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
 #, c-format
 msgid "no such branch '%s'"
 msgstr "没有此分支 '%s'"
 
-#: builtin/branch.c:723
+#: builtin/branch.c:727
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "分支 '%s' 不存在"
 
-#: builtin/branch.c:735
+#: builtin/branch.c:739
 msgid "too many branches to unset upstream"
 msgstr "为取消上游设置操作提供了太多的分支名"
 
-#: builtin/branch.c:739
+#: builtin/branch.c:743
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
 
-#: builtin/branch.c:745
+#: builtin/branch.c:749
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "分支 '%s' 没有上游信息"
 
-#: builtin/branch.c:759
+#: builtin/branch.c:763
 msgid "it does not make sense to create 'HEAD' manually"
 msgstr "手工创建 'HEAD' 没有意义"
 
-#: builtin/branch.c:765
+#: builtin/branch.c:769
 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
 
-#: builtin/branch.c:768
+#: builtin/branch.c:772
 #, c-format
 msgid ""
 "The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -5715,7 +5799,7 @@ msgid ""
 msgstr ""
 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
 
-#: builtin/branch.c:785
+#: builtin/branch.c:789
 #, c-format
 msgid ""
 "\n"
@@ -5739,7 +5823,7 @@ msgstr "需要一个仓库来创建包。"
 msgid "Need a repository to unbundle."
 msgstr "需要一个仓库来解包。"
 
-#: builtin/cat-file.c:513
+#: builtin/cat-file.c:519
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -5747,7 +5831,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
 
-#: builtin/cat-file.c:514
+#: builtin/cat-file.c:520
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -5755,302 +5839,302 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:551
+#: builtin/cat-file.c:557
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"
 
-#: builtin/cat-file.c:552
+#: builtin/cat-file.c:558
 msgid "show object type"
 msgstr "显示对象类型"
 
-#: builtin/cat-file.c:553
+#: builtin/cat-file.c:559
 msgid "show object size"
 msgstr "显示对象大小"
 
-#: builtin/cat-file.c:555
+#: builtin/cat-file.c:561
 msgid "exit with zero when there's no error"
 msgstr "当没有错误时退出并返回零"
 
-#: builtin/cat-file.c:556
+#: builtin/cat-file.c:562
 msgid "pretty-print object's content"
 msgstr "美观地打印对象的内容"
 
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:564
 msgid "for blob objects, run textconv on object's content"
 msgstr "对于数据对象，对其内容做文本转换"
 
-#: builtin/cat-file.c:560
+#: builtin/cat-file.c:566
 msgid "for blob objects, run filters on object's content"
 msgstr "对于数据对象，对其内容做过滤"
 
-#: builtin/cat-file.c:561 git-submodule.sh:943
+#: builtin/cat-file.c:567 git-submodule.sh:944
 msgid "blob"
 msgstr "数据对象"
 
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:568
 msgid "use a specific path for --textconv/--filters"
 msgstr "对于 --textconv/--filters 使用一个特定的路径"
 
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:570
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "允许 -s 和 -t 对损坏的对象生效"
 
-#: builtin/cat-file.c:565
+#: builtin/cat-file.c:571
 msgid "buffer --batch output"
 msgstr "缓冲 --batch 的输出"
 
-#: builtin/cat-file.c:567
+#: builtin/cat-file.c:573
 msgid "show info and content of objects fed from the standard input"
 msgstr "显示从标准输入提供的对象的信息和内容"
 
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:576
 msgid "show info about objects fed from the standard input"
 msgstr "显示从标准输入提供的对象的信息"
 
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:579
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）"
 
-#: builtin/cat-file.c:575
+#: builtin/cat-file.c:581
 msgid "show all objects with --batch or --batch-check"
 msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
 
-#: builtin/check-attr.c:11
+#: builtin/check-attr.c:12
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
 msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
 
-#: builtin/check-attr.c:12
+#: builtin/check-attr.c:13
 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
 
-#: builtin/check-attr.c:19
+#: builtin/check-attr.c:20
 msgid "report all attributes set on file"
 msgstr "报告设置在文件上的所有属性"
 
-#: builtin/check-attr.c:20
+#: builtin/check-attr.c:21
 msgid "use .gitattributes only from the index"
 msgstr "只使用索引中的 .gitattributes"
 
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
 msgid "read file names from stdin"
 msgstr "从标准输入读出文件名"
 
-#: builtin/check-attr.c:23 builtin/check-ignore.c:24
+#: builtin/check-attr.c:24 builtin/check-ignore.c:26
 msgid "terminate input and output records by a NUL character"
 msgstr "输入和输出的记录使用 NUL 字符终结"
 
-#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356
+#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
 msgid "suppress progress reporting"
 msgstr "不显示进度报告"
 
-#: builtin/check-ignore.c:26
+#: builtin/check-ignore.c:28
 msgid "show non-matching input paths"
 msgstr "显示未匹配的输入路径"
 
-#: builtin/check-ignore.c:28
+#: builtin/check-ignore.c:30
 msgid "ignore index when checking"
 msgstr "检查时忽略索引"
 
-#: builtin/check-ignore.c:154
+#: builtin/check-ignore.c:158
 msgid "cannot specify pathnames with --stdin"
 msgstr "不能同时指定路径及 --stdin 参数"
 
-#: builtin/check-ignore.c:157
+#: builtin/check-ignore.c:161
 msgid "-z only makes sense with --stdin"
 msgstr "-z 需要和 --stdin 参数共用才有意义"
 
-#: builtin/check-ignore.c:159
+#: builtin/check-ignore.c:163
 msgid "no path specified"
 msgstr "未指定路径"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:167
 msgid "--quiet is only valid with a single pathname"
 msgstr "参数 --quiet 只在提供一个路径名时有效"
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:169
 msgid "cannot have both --quiet and --verbose"
 msgstr "不能同时提供 --quiet 和 --verbose 参数"
 
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c:172
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching 选项只在使用 --verbose 时有效"
 
-#: builtin/check-mailmap.c:8
+#: builtin/check-mailmap.c:9
 msgid "git check-mailmap [<options>] <contact>..."
 msgstr "git check-mailmap [<选项>] <联系地址>..."
 
-#: builtin/check-mailmap.c:13
+#: builtin/check-mailmap.c:14
 msgid "also read contacts from stdin"
 msgstr "还从标准输入读取联系地址"
 
-#: builtin/check-mailmap.c:24
+#: builtin/check-mailmap.c:25
 #, c-format
 msgid "unable to parse contact: %s"
 msgstr "不能解析联系地址：%s"
 
-#: builtin/check-mailmap.c:47
+#: builtin/check-mailmap.c:48
 msgid "no contacts specified"
 msgstr "未指定联系地址"
 
-#: builtin/checkout-index.c:127
+#: builtin/checkout-index.c:128
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<选项>] [--] [<文件>...]"
 
-#: builtin/checkout-index.c:144
+#: builtin/checkout-index.c:145
 msgid "stage should be between 1 and 3 or all"
 msgstr "索引值应该取值 1 到 3 或者 all"
 
-#: builtin/checkout-index.c:160
+#: builtin/checkout-index.c:161
 msgid "check out all files in the index"
 msgstr "检出索引区的所有文件"
 
-#: builtin/checkout-index.c:161
+#: builtin/checkout-index.c:162
 msgid "force overwrite of existing files"
 msgstr "强制覆盖现有的文件"
 
-#: builtin/checkout-index.c:163
+#: builtin/checkout-index.c:164
 msgid "no warning for existing files and files not in index"
 msgstr "存在或不在索引中的文件都没有警告"
 
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:166
 msgid "don't checkout new files"
 msgstr "不检出新文件"
 
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:168
 msgid "update stat information in the index file"
 msgstr "更新索引中文件的状态信息"
 
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:172
 msgid "read list of paths from the standard input"
 msgstr "从标准输入读取路径列表"
 
-#: builtin/checkout-index.c:173
+#: builtin/checkout-index.c:174
 msgid "write the content to temporary files"
 msgstr "将内容写入临时文件"
 
-#: builtin/checkout-index.c:174 builtin/column.c:30
+#: builtin/checkout-index.c:175 builtin/column.c:31
 #: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
 #: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:477
+#: builtin/worktree.c:478
 msgid "string"
 msgstr "字符串"
 
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:176
 msgid "when creating files, prepend <string>"
 msgstr "在创建文件时，在前面加上 <字符串>"
 
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:178
 msgid "copy out the files from named stage"
 msgstr "从指定暂存区中拷出文件"
 
-#: builtin/checkout.c:27
+#: builtin/checkout.c:26
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<选项>] <分支>"
 
-#: builtin/checkout.c:28
+#: builtin/checkout.c:27
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
 
-#: builtin/checkout.c:153 builtin/checkout.c:186
+#: builtin/checkout.c:135 builtin/checkout.c:168
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "路径 '%s' 没有我们的版本"
 
-#: builtin/checkout.c:155 builtin/checkout.c:188
+#: builtin/checkout.c:137 builtin/checkout.c:170
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "路径 '%s' 没有他们的版本"
 
-#: builtin/checkout.c:171
+#: builtin/checkout.c:153
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "路径 '%s' 没有全部必须的版本"
 
-#: builtin/checkout.c:215
+#: builtin/checkout.c:197
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "路径 '%s' 没有必须的版本"
 
-#: builtin/checkout.c:232
+#: builtin/checkout.c:214
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "path '%s'：无法合并"
 
-#: builtin/checkout.c:249
+#: builtin/checkout.c:231
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "无法为 '%s' 添加合并结果"
 
-#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275
-#: builtin/checkout.c:278
+#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
+#: builtin/checkout.c:262
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' 不能在更新路径时使用"
 
-#: builtin/checkout.c:281 builtin/checkout.c:284
+#: builtin/checkout.c:265 builtin/checkout.c:268
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' 不能和 %s 同时使用"
 
-#: builtin/checkout.c:287
+#: builtin/checkout.c:271
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "不能同时更新路径并切换到分支'%s'。"
 
-#: builtin/checkout.c:358 builtin/checkout.c:365
+#: builtin/checkout.c:342 builtin/checkout.c:349
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "路径 '%s' 未合并"
 
-#: builtin/checkout.c:513
+#: builtin/checkout.c:497
 msgid "you need to resolve your current index first"
 msgstr "您需要先解决当前索引的冲突"
 
-#: builtin/checkout.c:644
+#: builtin/checkout.c:628
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "不能对 '%s' 执行 reflog 操作：%s\n"
 
-#: builtin/checkout.c:685
+#: builtin/checkout.c:669
 msgid "HEAD is now at"
 msgstr "HEAD 目前位于"
 
-#: builtin/checkout.c:689 builtin/clone.c:678
+#: builtin/checkout.c:673 builtin/clone.c:682
 msgid "unable to update HEAD"
 msgstr "不能更新 HEAD"
 
-#: builtin/checkout.c:693
+#: builtin/checkout.c:677
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "重置分支 '%s'\n"
 
-#: builtin/checkout.c:696
+#: builtin/checkout.c:680
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "已经位于 '%s'\n"
 
-#: builtin/checkout.c:700
+#: builtin/checkout.c:684
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "切换并重置分支 '%s'\n"
 
-#: builtin/checkout.c:702 builtin/checkout.c:1090
+#: builtin/checkout.c:686 builtin/checkout.c:1075
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "切换到一个新分支 '%s'\n"
 
-#: builtin/checkout.c:704
+#: builtin/checkout.c:688
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "切换到分支 '%s'\n"
 
 #  译者：注意保持前导空格
-#: builtin/checkout.c:755
+#: builtin/checkout.c:739
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... 及其它 %d 个。\n"
 
-#: builtin/checkout.c:761
+#: builtin/checkout.c:745
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -6071,7 +6155,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:780
+#: builtin/checkout.c:764
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6098,202 +6182,198 @@ msgstr[1] ""
 " git branch <新分支名> %s\n"
 "\n"
 
-#: builtin/checkout.c:816
+#: builtin/checkout.c:800
 msgid "internal error in revision walk"
 msgstr "在版本遍历时遇到内部错误"
 
-#: builtin/checkout.c:820
+#: builtin/checkout.c:804
 msgid "Previous HEAD position was"
 msgstr "之前的 HEAD 位置是"
 
-#: builtin/checkout.c:847 builtin/checkout.c:1085
+#: builtin/checkout.c:832 builtin/checkout.c:1070
 msgid "You are on a branch yet to be born"
 msgstr "您位于一个尚未初始化的分支"
 
-#: builtin/checkout.c:991
+#: builtin/checkout.c:976
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "应只有一个引用，却给出了 %d 个"
 
-#: builtin/checkout.c:1031 builtin/worktree.c:214
+#: builtin/checkout.c:1016 builtin/worktree.c:215
 #, c-format
 msgid "invalid reference: %s"
 msgstr "无效引用：%s"
 
-#: builtin/checkout.c:1060
+#: builtin/checkout.c:1045
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "引用不是一个树：%s"
 
-#: builtin/checkout.c:1099
+#: builtin/checkout.c:1084
 msgid "paths cannot be used with switching branches"
 msgstr "路径不能和切换分支同时使用"
 
-#: builtin/checkout.c:1102 builtin/checkout.c:1106
+#: builtin/checkout.c:1087 builtin/checkout.c:1091
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' 不能和切换分支同时使用"
 
-#: builtin/checkout.c:1110 builtin/checkout.c:1113 builtin/checkout.c:1118
-#: builtin/checkout.c:1121
+#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
+#: builtin/checkout.c:1106
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' 不能和 '%s' 同时使用"
 
-#: builtin/checkout.c:1126
+#: builtin/checkout.c:1111
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "不能切换分支到一个非提交 '%s'"
 
-#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:329
-#: builtin/worktree.c:331
+#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
+#: builtin/worktree.c:330
 msgid "branch"
 msgstr "分支"
 
-#: builtin/checkout.c:1160
+#: builtin/checkout.c:1145
 msgid "create and checkout a new branch"
 msgstr "创建并检出一个新的分支"
 
-#: builtin/checkout.c:1162
+#: builtin/checkout.c:1147
 msgid "create/reset and checkout a branch"
 msgstr "创建/重置并检出一个分支"
 
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1148
 msgid "create reflog for new branch"
 msgstr "为新的分支创建引用日志"
 
-#: builtin/checkout.c:1164 builtin/worktree.c:333
+#: builtin/checkout.c:1149 builtin/worktree.c:332
 msgid "detach HEAD at named commit"
 msgstr "HEAD 从指定的提交分离"
 
-#: builtin/checkout.c:1165
+#: builtin/checkout.c:1150
 msgid "set upstream info for new branch"
 msgstr "为新的分支设置上游信息"
 
-#: builtin/checkout.c:1167
+#: builtin/checkout.c:1152
 msgid "new-branch"
 msgstr "新分支"
 
-#: builtin/checkout.c:1167
+#: builtin/checkout.c:1152
 msgid "new unparented branch"
 msgstr "新的没有父提交的分支"
 
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1153
 msgid "checkout our version for unmerged files"
 msgstr "对尚未合并的文件检出我们的版本"
 
-#: builtin/checkout.c:1170
+#: builtin/checkout.c:1155
 msgid "checkout their version for unmerged files"
 msgstr "对尚未合并的文件检出他们的版本"
 
-#: builtin/checkout.c:1172
+#: builtin/checkout.c:1157
 msgid "force checkout (throw away local modifications)"
 msgstr "强制检出（丢弃本地修改）"
 
-#: builtin/checkout.c:1173
+#: builtin/checkout.c:1158
 msgid "perform a 3-way merge with the new branch"
 msgstr "和新的分支执行三方合并"
 
-#: builtin/checkout.c:1174 builtin/merge.c:234
+#: builtin/checkout.c:1159 builtin/merge.c:235
 msgid "update ignored files (default)"
 msgstr "更新忽略的文件（默认）"
 
-#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251
+#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
 msgid "style"
 msgstr "风格"
 
-#: builtin/checkout.c:1176
+#: builtin/checkout.c:1161
 msgid "conflict style (merge or diff3)"
 msgstr "冲突输出风格（merge 或 diff3）"
 
-#: builtin/checkout.c:1179
+#: builtin/checkout.c:1164
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "对路径不做稀疏检出的限制"
 
-#: builtin/checkout.c:1181
+#: builtin/checkout.c:1166
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "二次猜测'git checkout <无此分支>'"
 
-#: builtin/checkout.c:1183
+#: builtin/checkout.c:1168
 msgid "do not check if another worktree is holding the given ref"
 msgstr "不检查指定的引用是否被其他工作区所占用"
 
-#: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119
-#: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539
-#: builtin/send-pack.c:172
+#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
+#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: builtin/send-pack.c:173
 msgid "force progress reporting"
 msgstr "强制显示进度报告"
 
-#: builtin/checkout.c:1224
+#: builtin/checkout.c:1203
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b、-B 和 --orphan 是互斥的"
 
-#: builtin/checkout.c:1241
+#: builtin/checkout.c:1220
 msgid "--track needs a branch name"
 msgstr "--track 需要一个分支名"
 
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1225
 msgid "Missing branch name; try -b"
 msgstr "缺少分支名；尝试 -b"
 
-#: builtin/checkout.c:1282
+#: builtin/checkout.c:1261
 msgid "invalid path specification"
 msgstr "无效的路径规格"
 
-#: builtin/checkout.c:1289
+#: builtin/checkout.c:1268
 #, c-format
-msgid ""
-"Cannot update paths and switch to branch '%s' at the same time.\n"
-"Did you intend to checkout '%s' which can not be resolved as commit?"
-msgstr ""
-"不能同时更新路径并切换到分支'%s'。\n"
-"您是想要检出 '%s' 但其未能解析为提交么？"
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'"
 
-#: builtin/checkout.c:1294
+#: builtin/checkout.c:1272
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout：--detach 不能接收路径参数 '%s'"
 
-#: builtin/checkout.c:1298
+#: builtin/checkout.c:1276
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
 msgstr ""
 "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
 
-#: builtin/clean.c:25
+#: builtin/clean.c:26
 msgid ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
 msgstr ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
 
-#: builtin/clean.c:29
+#: builtin/clean.c:30
 #, c-format
 msgid "Removing %s\n"
 msgstr "正删除 %s\n"
 
-#: builtin/clean.c:30
+#: builtin/clean.c:31
 #, c-format
 msgid "Would remove %s\n"
 msgstr "将删除 %s\n"
 
-#: builtin/clean.c:31
+#: builtin/clean.c:32
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "忽略仓库 %s\n"
 
-#: builtin/clean.c:32
+#: builtin/clean.c:33
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "将忽略仓库 %s\n"
 
-#: builtin/clean.c:33
+#: builtin/clean.c:34
 #, c-format
 msgid "failed to remove %s"
 msgstr "无法删除 %s"
 
-#: builtin/clean.c:297 git-add--interactive.perl:614
+#: builtin/clean.c:298 git-add--interactive.perl:572
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6306,7 +6386,7 @@ msgstr ""
 "foo        - 通过唯一前缀选择一个选项\n"
 "           - （空）什么也不选择\n"
 
-#: builtin/clean.c:301 git-add--interactive.perl:623
+#: builtin/clean.c:302 git-add--interactive.perl:581
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6327,38 +6407,38 @@ msgstr ""
 "*          - 选择所有选项\n"
 "           - （空）结束选择\n"
 
-#: builtin/clean.c:517 git-add--interactive.perl:589
-#: git-add--interactive.perl:594
+#: builtin/clean.c:518 git-add--interactive.perl:547
+#: git-add--interactive.perl:552
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "嗯（%s）？\n"
 
-#: builtin/clean.c:659
+#: builtin/clean.c:660
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "输入模版以排除条目>> "
 
-#: builtin/clean.c:696
+#: builtin/clean.c:697
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "警告：无法找到和 %s 匹配的条目"
 
-#: builtin/clean.c:717
+#: builtin/clean.c:718
 msgid "Select items to delete"
 msgstr "选择要删除的条目"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:758
+#: builtin/clean.c:759
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "删除 %s [y/N]？"
 
-#: builtin/clean.c:783 git-add--interactive.perl:1660
+#: builtin/clean.c:784 git-add--interactive.perl:1616
 #, c-format
 msgid "Bye.\n"
 msgstr "再见。\n"
 
-#: builtin/clean.c:791
+#: builtin/clean.c:792
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -6376,15 +6456,15 @@ msgstr ""
 "help                - 显示本帮助\n"
 "?                   - 显示如何在提示符下选择的帮助"
 
-#: builtin/clean.c:818 git-add--interactive.perl:1736
+#: builtin/clean.c:819 git-add--interactive.perl:1692
 msgid "*** Commands ***"
 msgstr "*** 命令 ***"
 
-#: builtin/clean.c:819 git-add--interactive.perl:1733
+#: builtin/clean.c:820 git-add--interactive.perl:1689
 msgid "What now"
 msgstr "请选择"
 
-#: builtin/clean.c:827
+#: builtin/clean.c:828
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "将删除如下条目："
@@ -6394,190 +6474,194 @@ msgstr[1] "将删除如下条目："
 msgid "No more files to clean, exiting."
 msgstr "没有要清理的文件，退出。"
 
-#: builtin/clean.c:875
+#: builtin/clean.c:906
 msgid "do not print names of files removed"
 msgstr "不打印删除文件的名称"
 
-#: builtin/clean.c:877
+#: builtin/clean.c:908
 msgid "force"
 msgstr "强制"
 
-#: builtin/clean.c:878
+#: builtin/clean.c:909
 msgid "interactive cleaning"
 msgstr "交互式清除"
 
-#: builtin/clean.c:880
+#: builtin/clean.c:911
 msgid "remove whole directories"
 msgstr "删除整个目录"
 
-#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451
-#: builtin/grep.c:1063 builtin/ls-files.c:546 builtin/name-rev.c:348
-#: builtin/name-rev.c:350 builtin/show-ref.c:176
+#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
+#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
+#: builtin/name-rev.c:399 builtin/show-ref.c:176
 msgid "pattern"
 msgstr "模式"
 
-#: builtin/clean.c:882
+#: builtin/clean.c:913
 msgid "add <pattern> to ignore rules"
 msgstr "添加 <模式> 到忽略规则"
 
-#: builtin/clean.c:883
+#: builtin/clean.c:914
 msgid "remove ignored files, too"
 msgstr "也删除忽略的文件"
 
-#: builtin/clean.c:885
+#: builtin/clean.c:916
 msgid "remove only ignored files"
 msgstr "只删除忽略的文件"
 
-#: builtin/clean.c:903
+#: builtin/clean.c:934
 msgid "-x and -X cannot be used together"
 msgstr "-x 和 -X 不能同时使用"
 
-#: builtin/clean.c:907
+#: builtin/clean.c:938
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
 msgstr ""
 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:941
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
 msgstr ""
 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
 
-#: builtin/clone.c:37
+#: builtin/clone.c:38
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
 
-#: builtin/clone.c:80
+#: builtin/clone.c:82
 msgid "don't create a checkout"
 msgstr "不创建一个检出"
 
-#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478
+#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
 msgid "create a bare repository"
 msgstr "创建一个纯仓库"
 
-#: builtin/clone.c:85
+#: builtin/clone.c:87
 msgid "create a mirror repository (implies bare)"
 msgstr "创建一个镜像仓库（也是纯仓库）"
 
-#: builtin/clone.c:87
+#: builtin/clone.c:89
 msgid "to clone from a local repository"
 msgstr "从本地仓库克隆"
 
-#: builtin/clone.c:89
+#: builtin/clone.c:91
 msgid "don't use local hardlinks, always copy"
 msgstr "不使用本地硬链接，始终复制"
 
-#: builtin/clone.c:91
+#: builtin/clone.c:93
 msgid "setup as shared repository"
 msgstr "设置为共享仓库"
 
-#: builtin/clone.c:93 builtin/clone.c:97
+#: builtin/clone.c:95 builtin/clone.c:99
 msgid "pathspec"
 msgstr "路径规格"
 
-#: builtin/clone.c:93 builtin/clone.c:97
+#: builtin/clone.c:95 builtin/clone.c:99
 msgid "initialize submodules in the clone"
 msgstr "在克隆时初始化子模组"
 
-#: builtin/clone.c:100
+#: builtin/clone.c:102
 msgid "number of submodules cloned in parallel"
 msgstr "并发克隆的子模组的数量"
 
-#: builtin/clone.c:101 builtin/init-db.c:475
+#: builtin/clone.c:103 builtin/init-db.c:476
 msgid "template-directory"
 msgstr "模板目录"
 
-#: builtin/clone.c:102 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:477
 msgid "directory from which templates will be used"
 msgstr "模板目录将被使用"
 
-#: builtin/clone.c:104 builtin/clone.c:106 builtin/submodule--helper.c:642
+#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
 #: builtin/submodule--helper.c:983
 msgid "reference repository"
 msgstr "参考仓库"
 
-#: builtin/clone.c:108
+#: builtin/clone.c:110
 msgid "use --reference only while cloning"
 msgstr "仅在克隆时参考 --reference 指向的本地仓库"
 
-#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43
+#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
 msgid "name"
 msgstr "名称"
 
-#: builtin/clone.c:110
+#: builtin/clone.c:112
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
 
-#: builtin/clone.c:112
+#: builtin/clone.c:114
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "检出 <分支> 而不是远程 HEAD"
 
-#: builtin/clone.c:114
+#: builtin/clone.c:116
 msgid "path to git-upload-pack on the remote"
 msgstr "远程 git-upload-pack 路径"
 
-#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006
-#: builtin/pull.c:202
+#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
+#: builtin/pull.c:205
 msgid "depth"
 msgstr "深度"
 
-#: builtin/clone.c:116
+#: builtin/clone.c:118
 msgid "create a shallow clone of that depth"
 msgstr "创建一个指定深度的浅克隆"
 
-#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918
+#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
 #: parse-options.h:142
 msgid "time"
 msgstr "时间"
 
-#: builtin/clone.c:118
+#: builtin/clone.c:120
 msgid "create a shallow clone since a specific time"
 msgstr "从一个特定时间创建一个浅克隆"
 
-#: builtin/clone.c:119 builtin/fetch.c:124
+#: builtin/clone.c:121 builtin/fetch.c:119
 msgid "revision"
 msgstr "版本"
 
-#: builtin/clone.c:120 builtin/fetch.c:125
+#: builtin/clone.c:122 builtin/fetch.c:120
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "深化浅克隆的历史，除了特定版本"
 
-#: builtin/clone.c:122
+#: builtin/clone.c:124
 msgid "clone only one branch, HEAD or --branch"
 msgstr "只克隆一个分支、HEAD 或 --branch"
 
-#: builtin/clone.c:124
+#: builtin/clone.c:126
+msgid "don't clone any tags, and make later fetches not to follow them"
+msgstr "不要克隆任何标签，并且后续获取操作也不下载它们"
+
+#: builtin/clone.c:128
 msgid "any cloned submodules will be shallow"
 msgstr "子模组将以浅下载模式克隆"
 
-#: builtin/clone.c:125 builtin/init-db.c:484
+#: builtin/clone.c:129 builtin/init-db.c:485
 msgid "gitdir"
 msgstr "git目录"
 
-#: builtin/clone.c:126 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:486
 msgid "separate git dir from working tree"
 msgstr "git目录和工作区分离"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:131
 msgid "key=value"
 msgstr "key=value"
 
-#: builtin/clone.c:128
+#: builtin/clone.c:132
 msgid "set config inside the new repository"
 msgstr "在新仓库中设置配置信息"
 
-#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550
+#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
 msgid "use IPv4 addresses only"
 msgstr "只使用 IPv4 地址"
 
-#: builtin/clone.c:131 builtin/fetch.c:142 builtin/push.c:552
+#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
 msgid "use IPv6 addresses only"
 msgstr "只使用 IPv6 地址"
 
-#: builtin/clone.c:268
+#: builtin/clone.c:272
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -6585,42 +6669,42 @@ msgstr ""
 "无法猜到目录名。\n"
 "请在命令行指定一个目录"
 
-#: builtin/clone.c:321
+#: builtin/clone.c:325
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: 不能为 '%s' 添加一个备用：%s\n"
 
-#: builtin/clone.c:393
+#: builtin/clone.c:397
 #, c-format
 msgid "failed to open '%s'"
 msgstr "无法打开 '%s'"
 
-#: builtin/clone.c:401
+#: builtin/clone.c:405
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s 存在且不是一个目录"
 
-#: builtin/clone.c:415
+#: builtin/clone.c:419
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "对 %s 调用 stat 失败\n"
 
-#: builtin/clone.c:437
+#: builtin/clone.c:441
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "无法创建链接 '%s'"
 
-#: builtin/clone.c:441
+#: builtin/clone.c:445
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "无法拷贝文件至 '%s'"
 
-#: builtin/clone.c:466
+#: builtin/clone.c:470
 #, c-format
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: builtin/clone.c:478
+#: builtin/clone.c:482
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -6630,179 +6714,179 @@ msgstr ""
 "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"
 "'git checkout -f HEAD' 重试\n"
 
-#: builtin/clone.c:555
+#: builtin/clone.c:559
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "不能发现要克隆的远程分支 %s。"
 
-#: builtin/clone.c:650
+#: builtin/clone.c:654
 msgid "remote did not send all necessary objects"
 msgstr "远程没有发送所有必须的对象"
 
-#: builtin/clone.c:666
+#: builtin/clone.c:670
 #, c-format
 msgid "unable to update %s"
 msgstr "不能更新 %s"
 
-#: builtin/clone.c:715
+#: builtin/clone.c:719
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
 
-#: builtin/clone.c:746
+#: builtin/clone.c:750
 msgid "unable to checkout working tree"
 msgstr "不能检出工作区"
 
-#: builtin/clone.c:786
+#: builtin/clone.c:792
 msgid "unable to write parameters to config file"
 msgstr "无法将参数写入配置文件"
 
-#: builtin/clone.c:849
+#: builtin/clone.c:855
 msgid "cannot repack to clean up"
 msgstr "无法执行 repack 来清理"
 
-#: builtin/clone.c:851
+#: builtin/clone.c:857
 msgid "cannot unlink temporary alternates file"
 msgstr "无法删除临时的 alternates 文件"
 
-#: builtin/clone.c:884 builtin/receive-pack.c:1900
+#: builtin/clone.c:890 builtin/receive-pack.c:1945
 msgid "Too many arguments."
 msgstr "太多参数。"
 
-#: builtin/clone.c:888
+#: builtin/clone.c:894
 msgid "You must specify a repository to clone."
 msgstr "您必须指定一个仓库来克隆。"
 
-#: builtin/clone.c:901
+#: builtin/clone.c:907
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "--bare 和 --origin %s 选项不兼容。"
 
-#: builtin/clone.c:904
+#: builtin/clone.c:910
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
 
-#: builtin/clone.c:917
+#: builtin/clone.c:923
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "仓库 '%s' 不存在"
 
-#: builtin/clone.c:923 builtin/fetch.c:1337
+#: builtin/clone.c:929 builtin/fetch.c:1337
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "深度 %s 不是一个正数"
 
-#: builtin/clone.c:933
+#: builtin/clone.c:939
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
 
-#: builtin/clone.c:943
+#: builtin/clone.c:949
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "工作区 '%s' 已经存在。"
 
-#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
-#: builtin/worktree.c:221 builtin/worktree.c:251
+#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
+#: builtin/worktree.c:222 builtin/worktree.c:252
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "不能为 '%s' 创建先导目录"
 
-#: builtin/clone.c:961
+#: builtin/clone.c:967
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "不能创建工作区目录 '%s'"
 
-#: builtin/clone.c:973
+#: builtin/clone.c:979
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "克隆到纯仓库 '%s'...\n"
 
-#: builtin/clone.c:975
+#: builtin/clone.c:981
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "正克隆到 '%s'...\n"
 
-#: builtin/clone.c:999
+#: builtin/clone.c:1005
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
 
-#: builtin/clone.c:1055
+#: builtin/clone.c:1067
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。"
 
-#: builtin/clone.c:1057
+#: builtin/clone.c:1069
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。"
 
-#: builtin/clone.c:1059
+#: builtin/clone.c:1071
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。"
 
-#: builtin/clone.c:1062
+#: builtin/clone.c:1074
 msgid "source repository is shallow, ignoring --local"
 msgstr "源仓库是浅克隆，忽略 --local"
 
-#: builtin/clone.c:1067
+#: builtin/clone.c:1079
 msgid "--local is ignored"
 msgstr "--local 被忽略"
 
-#: builtin/clone.c:1071
+#: builtin/clone.c:1083
 #, c-format
 msgid "Don't know how to clone %s"
 msgstr "不知道如何克隆 %s"
 
-#: builtin/clone.c:1126 builtin/clone.c:1134
+#: builtin/clone.c:1138 builtin/clone.c:1146
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "远程分支 %s 在上游 %s 未发现"
 
-#: builtin/clone.c:1137
+#: builtin/clone.c:1149
 msgid "You appear to have cloned an empty repository."
 msgstr "您似乎克隆了一个空仓库。"
 
-#: builtin/column.c:9
+#: builtin/column.c:10
 msgid "git column [<options>]"
 msgstr "git column [<选项>]"
 
-#: builtin/column.c:26
+#: builtin/column.c:27
 msgid "lookup config vars"
 msgstr "查找配置变量"
 
-#: builtin/column.c:27 builtin/column.c:28
+#: builtin/column.c:28 builtin/column.c:29
 msgid "layout to use"
 msgstr "要使用的布局"
 
-#: builtin/column.c:29
+#: builtin/column.c:30
 msgid "Maximum width"
 msgstr "最大宽度"
 
-#: builtin/column.c:30
+#: builtin/column.c:31
 msgid "Padding space on left border"
 msgstr "左边框的填充空间"
 
-#: builtin/column.c:31
+#: builtin/column.c:32
 msgid "Padding space on right border"
 msgstr "右边框的填充空间"
 
-#: builtin/column.c:32
+#: builtin/column.c:33
 msgid "Padding space between columns"
 msgstr "两列之间的填充空间"
 
-#: builtin/column.c:51
+#: builtin/column.c:52
 msgid "--command must be the first argument"
 msgstr "--command 必须是第一个参数"
 
-#: builtin/commit.c:38
+#: builtin/commit.c:39
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<选项>] [--] <路径规格>..."
 
-#: builtin/commit.c:43
+#: builtin/commit.c:44
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<选项>] [--] <路径规格>..."
 
-#: builtin/commit.c:48
+#: builtin/commit.c:49
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -6826,7 +6910,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: builtin/commit.c:61
+#: builtin/commit.c:62
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -6849,7 +6933,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: builtin/commit.c:73
+#: builtin/commit.c:74
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -6858,7 +6942,7 @@ msgstr ""
 "您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n"
 "--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
 
-#: builtin/commit.c:78
+#: builtin/commit.c:79
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -6872,11 +6956,11 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:85
+#: builtin/commit.c:86
 msgid "Otherwise, please use 'git reset'\n"
 msgstr "否则，请使用命令 'git reset'\n"
 
-#: builtin/commit.c:88
+#: builtin/commit.c:89
 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"
@@ -6892,98 +6976,98 @@ msgstr ""
 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
 "操作。\n"
 
-#: builtin/commit.c:318
+#: builtin/commit.c:319
 msgid "failed to unpack HEAD tree object"
 msgstr "无法解包 HEAD 树对象"
 
-#: builtin/commit.c:359
+#: builtin/commit.c:360
 msgid "unable to create temporary index"
 msgstr "不能创建临时索引"
 
-#: builtin/commit.c:365
+#: builtin/commit.c:366
 msgid "interactive add failed"
 msgstr "交互式添加失败"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:379
 msgid "unable to update temporary index"
 msgstr "无法更新临时索引"
 
-#: builtin/commit.c:380
+#: builtin/commit.c:381
 msgid "Failed to update main cache tree"
 msgstr "不能更新树的主缓存"
 
-#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
+#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
 msgid "unable to write new_index file"
 msgstr "无法写 new_index 文件"
 
-#: builtin/commit.c:458
+#: builtin/commit.c:459
 msgid "cannot do a partial commit during a merge."
 msgstr "在合并过程中不能做部分提交。"
 
-#: builtin/commit.c:460
+#: builtin/commit.c:461
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "在拣选过程中不能做部分提交。"
 
-#: builtin/commit.c:469
+#: builtin/commit.c:470
 msgid "cannot read the index"
 msgstr "无法读取索引"
 
-#: builtin/commit.c:488
+#: builtin/commit.c:489
 msgid "unable to write temporary index file"
 msgstr "无法写临时索引文件"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:583
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "提交 '%s' 缺少作者信息"
 
-#: builtin/commit.c:584
+#: builtin/commit.c:585
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "提交 '%s' 有非法的作者信息"
 
-#: builtin/commit.c:603
+#: builtin/commit.c:604
 msgid "malformed --author parameter"
 msgstr "非法的 --author 参数"
 
-#: builtin/commit.c:655
+#: builtin/commit.c:656
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr "无法选择一个未被当前提交说明使用的注释字符"
 
-#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
+#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "不能查询提交 %s"
 
-#: builtin/commit.c:704 builtin/shortlog.c:294
+#: builtin/commit.c:705 builtin/shortlog.c:295
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "（正从标准输入中读取日志信息）\n"
 
-#: builtin/commit.c:706
+#: builtin/commit.c:707
 msgid "could not read log from standard input"
 msgstr "不能从标准输入中读取日志信息"
 
-#: builtin/commit.c:710
+#: builtin/commit.c:711
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "不能读取日志文件 '%s'"
 
-#: builtin/commit.c:737 builtin/commit.c:745
+#: builtin/commit.c:738 builtin/commit.c:746
 msgid "could not read SQUASH_MSG"
 msgstr "不能读取 SQUASH_MSG"
 
-#: builtin/commit.c:742
+#: builtin/commit.c:743
 msgid "could not read MERGE_MSG"
 msgstr "不能读取 MERGE_MSG"
 
-#: builtin/commit.c:796
+#: builtin/commit.c:797
 msgid "could not write commit template"
 msgstr "不能写提交模版"
 
-#: builtin/commit.c:814
+#: builtin/commit.c:815
 #, c-format
 msgid ""
 "\n"
@@ -6997,7 +7081,7 @@ msgstr ""
 "\t%s\n"
 "然后重试。\n"
 
-#: builtin/commit.c:819
+#: builtin/commit.c:820
 #, c-format
 msgid ""
 "\n"
@@ -7011,7 +7095,7 @@ msgstr ""
 "\t%s\n"
 "然后重试。\n"
 
-#: builtin/commit.c:832
+#: builtin/commit.c:833
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7020,7 +7104,7 @@ msgstr ""
 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"
 "说明将会终止提交。\n"
 
-#: builtin/commit.c:839
+#: builtin/commit.c:840
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7031,346 +7115,346 @@ msgstr ""
 "也可以删除它们。一个空的提交说明将会终止提交。\n"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:859
+#: builtin/commit.c:857
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%s作者：  %.*s <%.*s>"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:867
+#: builtin/commit.c:865
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%s日期：  %s"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:874
+#: builtin/commit.c:872
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%s提交者：%.*s <%.*s>"
 
-#: builtin/commit.c:892
+#: builtin/commit.c:889
 msgid "Cannot read index"
 msgstr "无法读取索引"
 
-#: builtin/commit.c:954
+#: builtin/commit.c:951
 msgid "Error building trees"
 msgstr "无法创建树对象"
 
-#: builtin/commit.c:968 builtin/tag.c:273
+#: builtin/commit.c:965 builtin/tag.c:274
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
 
-#: builtin/commit.c:1071
+#: builtin/commit.c:1068
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr "--author '%s' 不是 'Name <email>' 格式，且未能在现有作者中找到匹配"
 
-#: builtin/commit.c:1086 builtin/commit.c:1325
+#: builtin/commit.c:1083 builtin/commit.c:1328
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "无效的未追踪文件参数 '%s'"
 
-#: builtin/commit.c:1124
+#: builtin/commit.c:1121
 msgid "--long and -z are incompatible"
 msgstr "--long 和 -z 选项不兼容"
 
-#: builtin/commit.c:1154
+#: builtin/commit.c:1151
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "同时使用 --reset-author 和 --author 没有意义"
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1160
 msgid "You have nothing to amend."
 msgstr "您没有可修补的提交。"
 
-#: builtin/commit.c:1166
+#: builtin/commit.c:1163
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
 
-#: builtin/commit.c:1168
+#: builtin/commit.c:1165
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
 
-#: builtin/commit.c:1171
+#: builtin/commit.c:1168
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "选项 --squash 和 --fixup 不能同时使用"
 
-#: builtin/commit.c:1181
+#: builtin/commit.c:1178
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
 
-#: builtin/commit.c:1183
+#: builtin/commit.c:1180
 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
 
-#: builtin/commit.c:1191
+#: builtin/commit.c:1188
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
 
-#: builtin/commit.c:1208
+#: builtin/commit.c:1205
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
 
-#: builtin/commit.c:1210
+#: builtin/commit.c:1207
 msgid "No paths with --include/--only does not make sense."
 msgstr "参数 --include/--only 不跟路径没有意义。"
 
-#: builtin/commit.c:1212
-msgid "Explicit paths specified without -i or -o; assuming --only paths..."
-msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..."
-
-#: builtin/commit.c:1224 builtin/tag.c:551
+#: builtin/commit.c:1219 builtin/tag.c:552
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "无效的清理模式 %s"
 
-#: builtin/commit.c:1229
+#: builtin/commit.c:1224
 msgid "Paths with -a does not make sense."
 msgstr "路径和 -a 选项同时使用没有意义。"
 
-#: builtin/commit.c:1339 builtin/commit.c:1612
+#: builtin/commit.c:1342 builtin/commit.c:1617
 msgid "show status concisely"
 msgstr "以简洁的格式显示状态"
 
-#: builtin/commit.c:1341 builtin/commit.c:1614
+#: builtin/commit.c:1344 builtin/commit.c:1619
 msgid "show branch information"
 msgstr "显示分支信息"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1346
+msgid "show stash information"
+msgstr "显示贮藏区信息"
+
+#: builtin/commit.c:1348
 msgid "version"
 msgstr "版本"
 
-#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
-#: builtin/worktree.c:448
+#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
+#: builtin/worktree.c:449
 msgid "machine-readable output"
 msgstr "机器可读的输出"
 
-#: builtin/commit.c:1346 builtin/commit.c:1618
+#: builtin/commit.c:1351 builtin/commit.c:1623
 msgid "show status in long format (default)"
 msgstr "以长格式显示状态（默认）"
 
-#: builtin/commit.c:1349 builtin/commit.c:1621
+#: builtin/commit.c:1354 builtin/commit.c:1626
 msgid "terminate entries with NUL"
 msgstr "条目以 NUL 字符结尾"
 
-#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:411
+#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
+#: builtin/fast-export.c:986 builtin/tag.c:412
 msgid "mode"
 msgstr "模式"
 
-#: builtin/commit.c:1352 builtin/commit.c:1624
+#: builtin/commit.c:1357 builtin/commit.c:1629
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
 
-#: builtin/commit.c:1355
+#: builtin/commit.c:1360
 msgid "show ignored files"
 msgstr "显示忽略的文件"
 
-#: builtin/commit.c:1356 parse-options.h:155
+#: builtin/commit.c:1361 parse-options.h:155
 msgid "when"
 msgstr "何时"
 
-#: builtin/commit.c:1357
+#: builtin/commit.c:1362
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
 "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"
 
-#: builtin/commit.c:1359
+#: builtin/commit.c:1364
 msgid "list untracked files in columns"
 msgstr "以列的方式显示未跟踪的文件"
 
-#: builtin/commit.c:1435
+#: builtin/commit.c:1440
 msgid "couldn't look up newly created commit"
 msgstr "无法找到新创建的提交"
 
-#: builtin/commit.c:1437
+#: builtin/commit.c:1442
 msgid "could not parse newly created commit"
 msgstr "不能解析新创建的提交"
 
-#: builtin/commit.c:1482
+#: builtin/commit.c:1487
 msgid "detached HEAD"
 msgstr "分离头指针"
 
 #  译者：中文字符串拼接，可删除前导空格
-#: builtin/commit.c:1485
+#: builtin/commit.c:1490
 msgid " (root-commit)"
 msgstr "（根提交）"
 
-#: builtin/commit.c:1582
+#: builtin/commit.c:1587
 msgid "suppress summary after successful commit"
 msgstr "提交成功后不显示概述信息"
 
-#: builtin/commit.c:1583
+#: builtin/commit.c:1588
 msgid "show diff in commit message template"
 msgstr "在提交说明模板里显示差异"
 
-#: builtin/commit.c:1585
+#: builtin/commit.c:1590
 msgid "Commit message options"
 msgstr "提交说明选项"
 
-#: builtin/commit.c:1586 builtin/tag.c:409
+#: builtin/commit.c:1591 builtin/tag.c:410
 msgid "read message from file"
 msgstr "从文件中读取提交说明"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1592
 msgid "author"
 msgstr "作者"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1592
 msgid "override author for commit"
 msgstr "提交时覆盖作者"
 
-#: builtin/commit.c:1588 builtin/gc.c:357
+#: builtin/commit.c:1593 builtin/gc.c:358
 msgid "date"
 msgstr "日期"
 
-#: builtin/commit.c:1588
+#: builtin/commit.c:1593
 msgid "override date for commit"
 msgstr "提交时覆盖日期"
 
-#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/tag.c:407
+#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
+#: builtin/notes.c:564 builtin/tag.c:408
 msgid "message"
 msgstr "说明"
 
-#: builtin/commit.c:1589
+#: builtin/commit.c:1594
 msgid "commit message"
 msgstr "提交说明"
 
-#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592
-#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
+#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
 msgid "commit"
 msgstr "提交"
 
-#: builtin/commit.c:1590
+#: builtin/commit.c:1595
 msgid "reuse and edit message from specified commit"
 msgstr "重用并编辑指定提交的提交说明"
 
-#: builtin/commit.c:1591
+#: builtin/commit.c:1596
 msgid "reuse message from specified commit"
 msgstr "重用指定提交的提交说明"
 
-#: builtin/commit.c:1592
+#: builtin/commit.c:1597
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
 
-#: builtin/commit.c:1593
+#: builtin/commit.c:1598
 msgid "use autosquash formatted message to squash specified commit"
 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
 
-#: builtin/commit.c:1594
+#: builtin/commit.c:1599
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
 
-#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104
+#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
 msgid "add Signed-off-by:"
 msgstr "添加 Signed-off-by: 签名"
 
-#: builtin/commit.c:1596
+#: builtin/commit.c:1601
 msgid "use specified template file"
 msgstr "使用指定的模板文件"
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1602
 msgid "force edit of commit"
 msgstr "强制编辑提交"
 
 #  译者：可选值，不能翻译（或是原文中笔误，应为 mode）
-#: builtin/commit.c:1598
+#: builtin/commit.c:1603
 msgid "default"
 msgstr "default"
 
-#: builtin/commit.c:1598 builtin/tag.c:412
+#: builtin/commit.c:1603 builtin/tag.c:413
 msgid "how to strip spaces and #comments from message"
 msgstr "设置如何删除提交说明里的空格和#注释"
 
-#: builtin/commit.c:1599
+#: builtin/commit.c:1604
 msgid "include status in commit message template"
 msgstr "在提交说明模板里包含状态信息"
 
-#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166
-#: builtin/revert.c:112
+#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/revert.c:113
 msgid "GPG sign commit"
 msgstr "GPG 提交签名"
 
-#: builtin/commit.c:1604
+#: builtin/commit.c:1609
 msgid "Commit contents options"
 msgstr "提交内容选项"
 
-#: builtin/commit.c:1605
+#: builtin/commit.c:1610
 msgid "commit all changed files"
 msgstr "提交所有改动的文件"
 
-#: builtin/commit.c:1606
+#: builtin/commit.c:1611
 msgid "add specified files to index for commit"
 msgstr "添加指定的文件到索引区等待提交"
 
-#: builtin/commit.c:1607
+#: builtin/commit.c:1612
 msgid "interactively add files"
 msgstr "交互式添加文件"
 
-#: builtin/commit.c:1608
+#: builtin/commit.c:1613
 msgid "interactively add changes"
 msgstr "交互式添加变更"
 
-#: builtin/commit.c:1609
+#: builtin/commit.c:1614
 msgid "commit only specified files"
 msgstr "只提交指定的文件"
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1615
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "绕过 pre-commit 和 commit-msg 钩子"
 
-#: builtin/commit.c:1611
+#: builtin/commit.c:1616
 msgid "show what would be committed"
 msgstr "显示将要提交的内容"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c:1627
 msgid "amend previous commit"
 msgstr "修改先前的提交"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1628
 msgid "bypass post-rewrite hook"
 msgstr "绕过 post-rewrite 钩子"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1633
 msgid "ok to record an empty change"
 msgstr "允许一个空提交"
 
-#: builtin/commit.c:1630
+#: builtin/commit.c:1635
 msgid "ok to record a change with an empty message"
 msgstr "允许空的提交说明"
 
-#: builtin/commit.c:1659
+#: builtin/commit.c:1665
 msgid "could not parse HEAD commit"
 msgstr "不能解析 HEAD 提交"
 
-#: builtin/commit.c:1707
+#: builtin/commit.c:1710
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "损坏的 MERGE_HEAD 文件（%s）"
 
-#: builtin/commit.c:1714
+#: builtin/commit.c:1717
 msgid "could not read MERGE_MODE"
 msgstr "不能读取 MERGE_MODE"
 
-#: builtin/commit.c:1733
+#: builtin/commit.c:1736
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "不能读取提交说明：%s"
 
-#: builtin/commit.c:1744
+#: builtin/commit.c:1747
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "终止提交；您未更改来自模版的提交说明。\n"
 
-#: builtin/commit.c:1749
+#: builtin/commit.c:1752
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "终止提交因为提交说明为空。\n"
 
-#: builtin/commit.c:1797
+#: builtin/commit.c:1800
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -7379,143 +7463,143 @@ msgstr ""
 "仓库已更新，但无法写 new_index 文件。检查是否磁盘已满\n"
 "或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。"
 
-#: builtin/config.c:9
+#: builtin/config.c:10
 msgid "git config [<options>]"
 msgstr "git config [<选项>]"
 
-#: builtin/config.c:56
+#: builtin/config.c:57
 msgid "Config file location"
 msgstr "配置文件位置"
 
-#: builtin/config.c:57
+#: builtin/config.c:58
 msgid "use global config file"
 msgstr "使用全局配置文件"
 
-#: builtin/config.c:58
+#: builtin/config.c:59
 msgid "use system config file"
 msgstr "使用系统级配置文件"
 
-#: builtin/config.c:59
+#: builtin/config.c:60
 msgid "use repository config file"
 msgstr "使用仓库级配置文件"
 
-#: builtin/config.c:60
+#: builtin/config.c:61
 msgid "use given config file"
 msgstr "使用指定的配置文件"
 
-#: builtin/config.c:61
+#: builtin/config.c:62
 msgid "blob-id"
 msgstr "数据对象 ID"
 
-#: builtin/config.c:61
+#: builtin/config.c:62
 msgid "read config from given blob object"
 msgstr "从给定的数据对象读取配置"
 
-#: builtin/config.c:62
+#: builtin/config.c:63
 msgid "Action"
 msgstr "操作"
 
-#: builtin/config.c:63
+#: builtin/config.c:64
 msgid "get value: name [value-regex]"
 msgstr "获取值：name [value-regex]"
 
-#: builtin/config.c:64
+#: builtin/config.c:65
 msgid "get all values: key [value-regex]"
 msgstr "获得所有的值：key [value-regex]"
 
-#: builtin/config.c:65
+#: builtin/config.c:66
 msgid "get values for regexp: name-regex [value-regex]"
 msgstr "根据正则表达式获得值：name-regex [value-regex]"
 
-#: builtin/config.c:66
+#: builtin/config.c:67
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "获得 URL 取值：section[.var] URL"
 
-#: builtin/config.c:67
+#: builtin/config.c:68
 msgid "replace all matching variables: name value [value_regex]"
 msgstr "替换所有匹配的变量：name value [value_regex]"
 
-#: builtin/config.c:68
+#: builtin/config.c:69
 msgid "add a new variable: name value"
 msgstr "添加一个新的变量：name value"
 
-#: builtin/config.c:69
+#: builtin/config.c:70
 msgid "remove a variable: name [value-regex]"
 msgstr "删除一个变量：name [value-regex]"
 
-#: builtin/config.c:70
+#: builtin/config.c:71
 msgid "remove all matches: name [value-regex]"
 msgstr "删除所有匹配项：name [value-regex]"
 
-#: builtin/config.c:71
+#: builtin/config.c:72
 msgid "rename section: old-name new-name"
 msgstr "重命名小节：old-name new-name"
 
-#: builtin/config.c:72
+#: builtin/config.c:73
 msgid "remove a section: name"
 msgstr "删除一个小节：name"
 
-#: builtin/config.c:73
+#: builtin/config.c:74
 msgid "list all"
 msgstr "列出所有"
 
-#: builtin/config.c:74
+#: builtin/config.c:75
 msgid "open an editor"
 msgstr "打开一个编辑器"
 
-#: builtin/config.c:75
+#: builtin/config.c:76
 msgid "find the color configured: slot [default]"
 msgstr "获得配置的颜色：配置 [默认]"
 
-#: builtin/config.c:76
+#: builtin/config.c:77
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "获得颜色设置：配置 [stdout-is-tty]"
 
-#: builtin/config.c:77
+#: builtin/config.c:78
 msgid "Type"
 msgstr "类型"
 
-#: builtin/config.c:78
+#: builtin/config.c:79
 msgid "value is \"true\" or \"false\""
 msgstr "值是 \"true\" 或 \"false\""
 
-#: builtin/config.c:79
+#: builtin/config.c:80
 msgid "value is decimal number"
 msgstr "值是十进制数"
 
-#: builtin/config.c:80
+#: builtin/config.c:81
 msgid "value is --bool or --int"
 msgstr "值是 --bool or --int"
 
-#: builtin/config.c:81
+#: builtin/config.c:82
 msgid "value is a path (file or directory name)"
 msgstr "值是一个路径（文件或目录名）"
 
-#: builtin/config.c:82
+#: builtin/config.c:83
 msgid "Other"
 msgstr "其它"
 
-#: builtin/config.c:83
+#: builtin/config.c:84
 msgid "terminate values with NUL byte"
 msgstr "终止值是 NUL 字节"
 
-#: builtin/config.c:84
+#: builtin/config.c:85
 msgid "show variable names only"
 msgstr "只显示变量名"
 
-#: builtin/config.c:85
+#: builtin/config.c:86
 msgid "respect include directives on lookup"
 msgstr "查询时参照 include 指令递归查找"
 
-#: builtin/config.c:86
+#: builtin/config.c:87
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）"
 
-#: builtin/config.c:328
+#: builtin/config.c:327
 msgid "unable to parse default color value"
 msgstr "不能解析默认颜色值"
 
-#: builtin/config.c:472
+#: builtin/config.c:471
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -7530,12 +7614,16 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:615
+#: builtin/config.c:499
+msgid "--local can only be used inside a git repository"
+msgstr "--local 只能在一个仓库内使用"
+
+#: builtin/config.c:621
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "不能创建配置文件 %s"
 
-#: builtin/config.c:627
+#: builtin/config.c:633
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -7544,75 +7632,75 @@ msgstr ""
 "无法用一个值覆盖多个值\n"
 "       使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
 
-#: builtin/count-objects.c:86
+#: builtin/count-objects.c:87
 msgid "git count-objects [-v] [-H | --human-readable]"
 msgstr "git count-objects [-v] [-H | --human-readable]"
 
-#: builtin/count-objects.c:96
+#: builtin/count-objects.c:97
 msgid "print sizes in human readable format"
 msgstr "以用户可读的格式显示大小"
 
-#: builtin/describe.c:18
+#: builtin/describe.c:19
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<选项>] [<提交号>...]"
 
-#: builtin/describe.c:19
+#: builtin/describe.c:20
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<选项>] --dirty"
 
-#: builtin/describe.c:53
+#: builtin/describe.c:54
 msgid "head"
 msgstr "头"
 
-#: builtin/describe.c:53
+#: builtin/describe.c:54
 msgid "lightweight"
 msgstr "轻量级的"
 
-#: builtin/describe.c:53
+#: builtin/describe.c:54
 msgid "annotated"
 msgstr "附注的"
 
-#: builtin/describe.c:250
+#: builtin/describe.c:253
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "附注标签 %s 无效"
 
-#: builtin/describe.c:254
+#: builtin/describe.c:257
 #, c-format
 msgid "annotated tag %s has no embedded name"
 msgstr "附注标签 %s 没有嵌入名称"
 
-#: builtin/describe.c:256
+#: builtin/describe.c:259
 #, c-format
 msgid "tag '%s' is really '%s' here"
 msgstr "标签 '%s' 的确是在 '%s'"
 
-#: builtin/describe.c:283 builtin/log.c:487
+#: builtin/describe.c:286 builtin/log.c:489
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "不是一个有效的对象名 %s"
 
-#: builtin/describe.c:286
+#: builtin/describe.c:289
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s 不是一个有效的 '%s' 对象"
 
-#: builtin/describe.c:303
+#: builtin/describe.c:306
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "没有标签准确匹配 '%s'"
 
-#: builtin/describe.c:305
+#: builtin/describe.c:308
 #, c-format
 msgid "searching to describe %s\n"
 msgstr "搜索描述 %s\n"
 
-#: builtin/describe.c:352
+#: builtin/describe.c:355
 #, c-format
 msgid "finished search at %s\n"
 msgstr "完成搜索 %s\n"
 
-#: builtin/describe.c:379
+#: builtin/describe.c:382
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -7621,7 +7709,7 @@ msgstr ""
 "没有附注标签能描述 '%s'。\n"
 "然而，存在未附注标签：尝试 --tags。"
 
-#: builtin/describe.c:383
+#: builtin/describe.c:386
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -7630,12 +7718,12 @@ msgstr ""
 "没有标签能描述 '%s'。\n"
 "尝试 --always，或者创建一些标签。"
 
-#: builtin/describe.c:413
+#: builtin/describe.c:416
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "已遍历 %lu 个提交\n"
 
-#: builtin/describe.c:416
+#: builtin/describe.c:419
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -7644,75 +7732,75 @@ msgstr ""
 "发现多于 %i 个标签，列出最近的 %i 个\n"
 "在 %s 放弃搜索\n"
 
-#: builtin/describe.c:438
+#: builtin/describe.c:441
 msgid "find the tag that comes after the commit"
 msgstr "寻找该提交之后的标签"
 
-#: builtin/describe.c:439
+#: builtin/describe.c:442
 msgid "debug search strategy on stderr"
 msgstr "在标准错误上调试搜索策略"
 
-#: builtin/describe.c:440
+#: builtin/describe.c:443
 msgid "use any ref"
 msgstr "使用任意引用"
 
-#: builtin/describe.c:441
+#: builtin/describe.c:444
 msgid "use any tag, even unannotated"
 msgstr "使用任意标签，即使未附带注释"
 
-#: builtin/describe.c:442
+#: builtin/describe.c:445
 msgid "always use long format"
 msgstr "始终使用长提交号格式"
 
-#: builtin/describe.c:443
+#: builtin/describe.c:446
 msgid "only follow first parent"
 msgstr "只跟随第一个父提交"
 
-#: builtin/describe.c:446
+#: builtin/describe.c:449
 msgid "only output exact matches"
 msgstr "只输出精确匹配"
 
-#: builtin/describe.c:448
+#: builtin/describe.c:451
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "考虑最近 <n> 个标签（默认：10）"
 
-#: builtin/describe.c:450
+#: builtin/describe.c:453
 msgid "only consider tags matching <pattern>"
 msgstr "只考虑匹配 <模式> 的标签"
 
-#: builtin/describe.c:452
+#: builtin/describe.c:455
 msgid "do not consider tags matching <pattern>"
 msgstr "不考虑匹配 <模式> 的标签"
 
-#: builtin/describe.c:454 builtin/name-rev.c:357
+#: builtin/describe.c:457 builtin/name-rev.c:406
 msgid "show abbreviated commit object as fallback"
 msgstr "显示简写的提交号作为后备"
 
-#: builtin/describe.c:455 builtin/describe.c:458
+#: builtin/describe.c:458 builtin/describe.c:461
 msgid "mark"
 msgstr "标记"
 
-#: builtin/describe.c:456
+#: builtin/describe.c:459
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "对于脏工作区，追加 <标记>（默认：\"-dirty\"）"
 
-#: builtin/describe.c:459
+#: builtin/describe.c:462
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "对于损坏的工作区，追加 <标记>（默认：\"-broken\"）"
 
-#: builtin/describe.c:477
+#: builtin/describe.c:480
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long 与 --abbrev=0 不兼容"
 
-#: builtin/describe.c:506
+#: builtin/describe.c:509
 msgid "No names found, cannot describe anything."
 msgstr "没有发现名称，无法描述任何东西。"
 
-#: builtin/describe.c:549
+#: builtin/describe.c:552
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty 与提交号不兼容"
 
-#: builtin/describe.c:551
+#: builtin/describe.c:554
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken 与提交号不兼容"
 
@@ -7721,55 +7809,55 @@ msgstr "--broken 与提交号不兼容"
 msgid "'%s': not a regular file or symlink"
 msgstr "'%s'：不是一个正规文件或符号链接"
 
-#: builtin/diff.c:234
+#: builtin/diff.c:235
 #, c-format
 msgid "invalid option: %s"
 msgstr "无效选项：%s"
 
-#: builtin/diff.c:358
+#: builtin/diff.c:359
 msgid "Not a git repository"
 msgstr "不是一个 git 仓库"
 
-#: builtin/diff.c:401
+#: builtin/diff.c:402
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "提供了无效对象 '%s'。"
 
-#: builtin/diff.c:410
+#: builtin/diff.c:411
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "提供了超过两个数据对象：'%s'"
 
-#: builtin/diff.c:417
+#: builtin/diff.c:416
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "无法处理的对象 '%s'。"
 
-#: builtin/difftool.c:28
+#: builtin/difftool.c:29
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
 
-#: builtin/difftool.c:241
+#: builtin/difftool.c:249
 #, c-format
 msgid "failed: %d"
 msgstr "失败：%d"
 
-#: builtin/difftool.c:283
+#: builtin/difftool.c:291
 #, c-format
 msgid "could not read symlink %s"
 msgstr "无法读取符号链接 %s"
 
-#: builtin/difftool.c:285
+#: builtin/difftool.c:293
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "无法读取符号链接文件 %s"
 
-#: builtin/difftool.c:293
+#: builtin/difftool.c:301
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
 
-#: builtin/difftool.c:395
+#: builtin/difftool.c:403
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
@@ -7777,292 +7865,294 @@ msgstr ""
 "不支持在目录比较模式（'-d' 和 '--dir-diff'）中采用组合差异格式（'-c' 和 '--"
 "cc'）。"
 
-#: builtin/difftool.c:609
+#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "两个文件都被修改：'%s' 和 '%s'。"
 
-#: builtin/difftool.c:611
+#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "工作区文件被留了下来。"
 
-#: builtin/difftool.c:622
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "临时文件存在于 '%s'。"
 
-#: builtin/difftool.c:623
+#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "您可能想要清理或者恢复它们。"
 
-#: builtin/difftool.c:669
+#: builtin/difftool.c:689
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "使用 `diff.guitool` 代替 `diff.tool`"
 
-#: builtin/difftool.c:671
+#: builtin/difftool.c:691
 msgid "perform a full-directory diff"
 msgstr "执行一个全目录差异比较"
 
-#: builtin/difftool.c:673
+#: builtin/difftool.c:693
 msgid "do not prompt before launching a diff tool"
 msgstr "启动差异比较工具之前不提示"
 
-#: builtin/difftool.c:679
+#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "在 dir-diff 模式中使用符号链接"
 
-#: builtin/difftool.c:680
+#: builtin/difftool.c:700
 msgid "<tool>"
 msgstr "<工具>"
 
-#: builtin/difftool.c:681
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "使用指定的差异比较工具"
 
-#: builtin/difftool.c:683
+#: builtin/difftool.c:703
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
 
-#: builtin/difftool.c:686
+#: builtin/difftool.c:706
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
 msgstr "当执行 diff 工具返回非零退出码时，使 'git-difftool' 退出"
 
-#: builtin/difftool.c:688
+#: builtin/difftool.c:708
 msgid "<command>"
 msgstr "<命令>"
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr "指定一个用于查看差异的自定义命令"
 
-#: builtin/difftool.c:713
+#: builtin/difftool.c:733
 msgid "no <tool> given for --tool=<tool>"
 msgstr "没有为 --tool=<工具> 参数提供 <工具>"
 
-#: builtin/difftool.c:720
+#: builtin/difftool.c:740
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
 
-#: builtin/fast-export.c:25
+#: builtin/fast-export.c:26
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 
-#: builtin/fast-export.c:980
+#: builtin/fast-export.c:982
 msgid "show progress after <n> objects"
 msgstr "在 <n> 个对象之后显示进度"
 
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:984
 msgid "select handling of signed tags"
 msgstr "选择如何处理签名标签"
 
-#: builtin/fast-export.c:985
+#: builtin/fast-export.c:987
 msgid "select handling of tags that tag filtered objects"
 msgstr "选择当标签指向被过滤对象时该标签的处理方式"
 
-#: builtin/fast-export.c:988
+#: builtin/fast-export.c:990
 msgid "Dump marks to this file"
 msgstr "把标记存储到这个文件"
 
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:992
 msgid "Import marks from this file"
 msgstr "从这个文件导入标记"
 
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:994
 msgid "Fake a tagger when tags lack one"
 msgstr "当标签缺少标记者字段时，假装提供一个"
 
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:996
 msgid "Output full tree for each commit"
 msgstr "每次提交都输出整个树"
 
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:998
 msgid "Use the done feature to terminate the stream"
 msgstr "使用 done 功能来终止流"
 
-#: builtin/fast-export.c:997
+#: builtin/fast-export.c:999
 msgid "Skip output of blob data"
 msgstr "跳过数据对象的输出"
 
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1000
 msgid "refspec"
 msgstr "引用规格"
 
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1001
 msgid "Apply refspec to exported refs"
 msgstr "对导出的引用应用引用规格"
 
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1002
 msgid "anonymize output"
 msgstr "匿名输出"
 
-#: builtin/fetch.c:21
+#: builtin/fetch.c:22
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
 
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<选项>] <组>"
 
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<选项>]"
 
-#: builtin/fetch.c:95 builtin/pull.c:175
+#: builtin/fetch.c:90 builtin/pull.c:182
 msgid "fetch from all remotes"
 msgstr "从所有的远程抓取"
 
-#: builtin/fetch.c:97 builtin/pull.c:178
+#: builtin/fetch.c:92 builtin/pull.c:185
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
 
-#: builtin/fetch.c:99 builtin/pull.c:181
+#: builtin/fetch.c:94 builtin/pull.c:188
 msgid "path to upload pack on remote end"
 msgstr "上传包到远程的路径"
 
-#: builtin/fetch.c:100 builtin/pull.c:183
+#: builtin/fetch.c:95 builtin/pull.c:190
 msgid "force overwrite of local branch"
 msgstr "强制覆盖本地分支"
 
-#: builtin/fetch.c:102
+#: builtin/fetch.c:97
 msgid "fetch from multiple remotes"
 msgstr "从多个远程抓取"
 
-#: builtin/fetch.c:104 builtin/pull.c:185
+#: builtin/fetch.c:99 builtin/pull.c:192
 msgid "fetch all tags and associated objects"
 msgstr "抓取所有的标签和关联对象"
 
-#: builtin/fetch.c:106
+#: builtin/fetch.c:101
 msgid "do not fetch all tags (--no-tags)"
 msgstr "不抓取任何标签(--no-tags)"
 
-#: builtin/fetch.c:108
+#: builtin/fetch.c:103
 msgid "number of submodules fetched in parallel"
 msgstr "子模组获取的并发数"
 
-#: builtin/fetch.c:110 builtin/pull.c:188
+#: builtin/fetch.c:105 builtin/pull.c:195
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "清除远程已经不存在的分支的跟踪分支"
 
 #  译者：可选值，不能翻译
-#: builtin/fetch.c:111 builtin/pull.c:191
+#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
 msgid "on-demand"
 msgstr "on-demand"
 
-#: builtin/fetch.c:112 builtin/pull.c:192
+#: builtin/fetch.c:107
 msgid "control recursive fetching of submodules"
 msgstr "控制子模组的递归抓取"
 
-#: builtin/fetch.c:116 builtin/pull.c:200
+#: builtin/fetch.c:111 builtin/pull.c:203
 msgid "keep downloaded pack"
 msgstr "保持下载包"
 
-#: builtin/fetch.c:118
+#: builtin/fetch.c:113
 msgid "allow updating of HEAD ref"
 msgstr "允许更新 HEAD 引用"
 
-#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
+#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
 msgid "deepen history of shallow clone"
 msgstr "深化浅克隆的历史"
 
-#: builtin/fetch.c:123
+#: builtin/fetch.c:118
 msgid "deepen history of shallow repository based on time"
 msgstr "基于时间来深化浅克隆的历史"
 
-#: builtin/fetch.c:129 builtin/pull.c:206
+#: builtin/fetch.c:124 builtin/pull.c:209
 msgid "convert to a complete repository"
 msgstr "转换为一个完整的仓库"
 
-#: builtin/fetch.c:131 builtin/log.c:1440
+#: builtin/fetch.c:126 builtin/log.c:1450
 msgid "dir"
 msgstr "目录"
 
-#: builtin/fetch.c:132
+#: builtin/fetch.c:127
 msgid "prepend this to submodule path output"
 msgstr "在子模组路径输出的前面加上此目录"
 
-#: builtin/fetch.c:135
-msgid "default mode for recursion"
-msgstr "递归的默认模式"
+#: builtin/fetch.c:130
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr "递归获取子模组的缺省值（比配置文件优先级低）"
 
-#: builtin/fetch.c:137 builtin/pull.c:209
+#: builtin/fetch.c:134 builtin/pull.c:212
 msgid "accept refs that update .git/shallow"
 msgstr "接受更新 .git/shallow 的引用"
 
-#: builtin/fetch.c:138 builtin/pull.c:211
+#: builtin/fetch.c:135 builtin/pull.c:214
 msgid "refmap"
 msgstr "引用映射"
 
-#: builtin/fetch.c:139 builtin/pull.c:212
+#: builtin/fetch.c:136 builtin/pull.c:215
 msgid "specify fetch refmap"
 msgstr "指定获取操作的引用映射"
 
-#: builtin/fetch.c:395
+#: builtin/fetch.c:394
 msgid "Couldn't find remote ref HEAD"
 msgstr "无法发现远程 HEAD 引用"
 
-#: builtin/fetch.c:513
+#: builtin/fetch.c:512
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "配置变量 fetch.output 包含无效值 %s"
 
-#: builtin/fetch.c:606
+#: builtin/fetch.c:605
 #, c-format
 msgid "object %s not found"
 msgstr "对象 %s 未发现"
 
-#: builtin/fetch.c:610
+#: builtin/fetch.c:609
 msgid "[up to date]"
 msgstr "[最新]"
 
-#: builtin/fetch.c:623 builtin/fetch.c:703
+#: builtin/fetch.c:622 builtin/fetch.c:702
 msgid "[rejected]"
 msgstr "[已拒绝]"
 
-#: builtin/fetch.c:624
+#: builtin/fetch.c:623
 msgid "can't fetch in current branch"
 msgstr "当前分支下不能执行获取操作"
 
-#: builtin/fetch.c:633
+#: builtin/fetch.c:632
 msgid "[tag update]"
 msgstr "[标签更新]"
 
-#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683
-#: builtin/fetch.c:698
+#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
+#: builtin/fetch.c:697
 msgid "unable to update local ref"
 msgstr "不能更新本地引用"
 
-#: builtin/fetch.c:653
+#: builtin/fetch.c:652
 msgid "[new tag]"
 msgstr "[新标签]"
 
-#: builtin/fetch.c:656
+#: builtin/fetch.c:655
 msgid "[new branch]"
 msgstr "[新分支]"
 
-#: builtin/fetch.c:659
+#: builtin/fetch.c:658
 msgid "[new ref]"
 msgstr "[新引用]"
 
-#: builtin/fetch.c:698
+#: builtin/fetch.c:697
 msgid "forced update"
 msgstr "强制更新"
 
-#: builtin/fetch.c:703
+#: builtin/fetch.c:702
 msgid "non-fast-forward"
 msgstr "非快进"
 
-#: builtin/fetch.c:748
+#: builtin/fetch.c:747
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s 未发送所有必须的对象\n"
 
-#: builtin/fetch.c:768
+#: builtin/fetch.c:767
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr "拒绝 %s 因为浅克隆不允许被更新"
@@ -8097,7 +8187,7 @@ msgstr "   （%s 已成为摇摆状态）"
 msgid "[deleted]"
 msgstr "[已删除]"
 
-#: builtin/fetch.c:955 builtin/remote.c:1022
+#: builtin/fetch.c:955 builtin/remote.c:1023
 msgid "(none)"
 msgstr "（无）"
 
@@ -8126,7 +8216,7 @@ msgstr "不知道如何从 %s 获取"
 msgid "Fetching %s\n"
 msgstr "正在获取 %s\n"
 
-#: builtin/fetch.c:1238 builtin/remote.c:96
+#: builtin/fetch.c:1238 builtin/remote.c:97
 #, c-format
 msgid "Could not fetch %s"
 msgstr "不能获取 %s"
@@ -8157,101 +8247,101 @@ msgstr "--depth 和 --unshallow 不能同时使用"
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"
 
-#: builtin/fetch.c:1352
+#: builtin/fetch.c:1349
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all 不能带一个仓库参数"
 
-#: builtin/fetch.c:1354
+#: builtin/fetch.c:1351
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all 带引用规格没有任何意义"
 
-#: builtin/fetch.c:1365
+#: builtin/fetch.c:1362
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "没有这样的远程或远程组：%s"
 
-#: builtin/fetch.c:1373
+#: builtin/fetch.c:1370
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "获取组并指定引用规格没有意义"
 
-#: builtin/fmt-merge-msg.c:14
+#: builtin/fmt-merge-msg.c:15
 msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
 
-#: builtin/fmt-merge-msg.c:663
+#: builtin/fmt-merge-msg.c:664
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明"
 
-#: builtin/fmt-merge-msg.c:666
+#: builtin/fmt-merge-msg.c:667
 msgid "alias for --log (deprecated)"
 msgstr "参数 --log 的别名（已弃用）"
 
-#: builtin/fmt-merge-msg.c:669
+#: builtin/fmt-merge-msg.c:670
 msgid "text"
 msgstr "文本"
 
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:671
 msgid "use <text> as start of message"
 msgstr "使用 <文本> 作为提交说明的开始"
 
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
 msgid "file to read from"
 msgstr "从文件中读取"
 
-#: builtin/for-each-ref.c:9
+#: builtin/for-each-ref.c:10
 msgid "git for-each-ref [<options>] [<pattern>]"
 msgstr "git for-each-ref [<选项>] [<模式>]"
 
-#: builtin/for-each-ref.c:10
+#: builtin/for-each-ref.c:11
 msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <对象>]"
 
-#: builtin/for-each-ref.c:11
+#: builtin/for-each-ref.c:12
 msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
 msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]"
 
-#: builtin/for-each-ref.c:12
+#: builtin/for-each-ref.c:13
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
 
-#: builtin/for-each-ref.c:27
+#: builtin/for-each-ref.c:28
 msgid "quote placeholders suitably for shells"
 msgstr "引用占位符适用于 shells"
 
-#: builtin/for-each-ref.c:29
+#: builtin/for-each-ref.c:30
 msgid "quote placeholders suitably for perl"
 msgstr "引用占位符适用于 perl"
 
-#: builtin/for-each-ref.c:31
+#: builtin/for-each-ref.c:32
 msgid "quote placeholders suitably for python"
 msgstr "引用占位符适用于 python"
 
-#: builtin/for-each-ref.c:33
+#: builtin/for-each-ref.c:34
 msgid "quote placeholders suitably for Tcl"
 msgstr "引用占位符适用于 Tcl"
 
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
 msgid "show only <n> matched refs"
 msgstr "只显示 <n> 个匹配的引用"
 
-#: builtin/for-each-ref.c:41
+#: builtin/for-each-ref.c:42
 msgid "print only refs which points at the given object"
 msgstr "只打印指向给定对象的引用"
 
-#: builtin/for-each-ref.c:43
+#: builtin/for-each-ref.c:44
 msgid "print only refs that are merged"
 msgstr "只打印已经合并的引用"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 msgid "print only refs that are not merged"
 msgstr "只打印没有合并的引用"
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
 msgid "print only refs which contain the commit"
 msgstr "只打印包含该提交的引用"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
 msgid "print only refs which don't contain the commit"
 msgstr "只打印不包含该提交的引用"
 
@@ -8315,21 +8405,21 @@ msgstr "显示可达对象的详细名称"
 msgid "Checking objects"
 msgstr "检查对象中"
 
-#: builtin/gc.c:25
+#: builtin/gc.c:26
 msgid "git gc [<options>]"
 msgstr "git gc [<选项>]"
 
-#: builtin/gc.c:78
+#: builtin/gc.c:79
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "对 %s 调用 fstat 失败：%s"
 
-#: builtin/gc.c:310
+#: builtin/gc.c:311
 #, c-format
 msgid "Can't stat %s"
 msgstr "不能对 %s 调用 stat"
 
-#: builtin/gc.c:319
+#: builtin/gc.c:320
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -8343,307 +8433,320 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:358
+#: builtin/gc.c:359
 msgid "prune unreferenced objects"
 msgstr "清除未引用的对象"
 
-#: builtin/gc.c:360
+#: builtin/gc.c:361
 msgid "be more thorough (increased runtime)"
 msgstr "更彻底（增加运行时间）"
 
-#: builtin/gc.c:361
+#: builtin/gc.c:362
 msgid "enable auto-gc mode"
 msgstr "启用自动垃圾回收模式"
 
-#: builtin/gc.c:362
+#: builtin/gc.c:363
 msgid "force running gc even if there may be another gc running"
 msgstr "强制执行 gc 即使另外一个 gc 正在执行"
 
-#: builtin/gc.c:379
+#: builtin/gc.c:380
 #, c-format
 msgid "Failed to parse gc.logexpiry value %s"
 msgstr "无法解析 gc.logexpiry 的值 %s"
 
-#: builtin/gc.c:407
+#: builtin/gc.c:408
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr "自动在后台执行仓库打包以求最佳性能。\n"
 
-#: builtin/gc.c:409
+#: builtin/gc.c:410
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "自动打包仓库以求最佳性能。\n"
 
-#: builtin/gc.c:410
+#: builtin/gc.c:411
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "手工维护参见 \"git help gc\"。\n"
 
-#: builtin/gc.c:431
+#: builtin/gc.c:436
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 msgstr ""
 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>（如果不是，使用 --force）"
 
-#: builtin/gc.c:475
+#: builtin/gc.c:480
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
 
-#: builtin/grep.c:25
+#: builtin/grep.c:27
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
 
-#: builtin/grep.c:232
+#: builtin/grep.c:235
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep：无法创建线程：%s"
 
-#: builtin/grep.c:290
+#: builtin/grep.c:293
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
 
-#: builtin/grep.c:769 builtin/grep.c:810
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#, c-format
+msgid "no threads support, ignoring %s"
+msgstr "没有线程支持，忽略 %s"
+
+#: builtin/grep.c:788 builtin/grep.c:829
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "无法读取树（%s）"
 
-#: builtin/grep.c:829
+#: builtin/grep.c:848
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "无法抓取来自于 %s 类型的对象"
 
-#: builtin/grep.c:893
+#: builtin/grep.c:912
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "开关 `%c' 期望一个数字值"
 
-#: builtin/grep.c:980
+#: builtin/grep.c:999
 msgid "search in index instead of in the work tree"
 msgstr "在索引区搜索而不是在工作区"
 
-#: builtin/grep.c:982
+#: builtin/grep.c:1001
 msgid "find in contents not managed by git"
 msgstr "在未被 git 管理的内容中查找"
 
 #  译者：中文字符串拼接，可删除前导空格
-#: builtin/grep.c:984
+#: builtin/grep.c:1003
 msgid "search in both tracked and untracked files"
 msgstr "在跟踪和未跟踪的文件中搜索"
 
-#: builtin/grep.c:986
+#: builtin/grep.c:1005
 msgid "ignore files specified via '.gitignore'"
 msgstr "忽略 '.gitignore' 包含的文件"
 
-#: builtin/grep.c:988
+#: builtin/grep.c:1007
 msgid "recursively search in each submodule"
 msgstr "在每一个子模组中递归搜索"
 
-#: builtin/grep.c:990
+#: builtin/grep.c:1009
 msgid "basename"
 msgstr "基本名"
 
-#: builtin/grep.c:991
+#: builtin/grep.c:1010
 msgid "prepend parent project's basename to output"
 msgstr "在输出中以父项目的基本名为前缀"
 
-#: builtin/grep.c:994
+#: builtin/grep.c:1013
 msgid "show non-matching lines"
 msgstr "显示未匹配的行"
 
-#: builtin/grep.c:996
+#: builtin/grep.c:1015
 msgid "case insensitive matching"
 msgstr "不区分大小写匹配"
 
-#: builtin/grep.c:998
+#: builtin/grep.c:1017
 msgid "match patterns only at word boundaries"
 msgstr "只在单词边界匹配模式"
 
-#: builtin/grep.c:1000
+#: builtin/grep.c:1019
 msgid "process binary files as text"
 msgstr "把二进制文件当做文本处理"
 
-#: builtin/grep.c:1002
+#: builtin/grep.c:1021
 msgid "don't match patterns in binary files"
 msgstr "不在二进制文件中匹配模式"
 
-#: builtin/grep.c:1005
+#: builtin/grep.c:1024
 msgid "process binary files with textconv filters"
 msgstr "用 textconv 过滤器处理二进制文件"
 
-#: builtin/grep.c:1007
+#: builtin/grep.c:1026
 msgid "descend at most <depth> levels"
 msgstr "最多以指定的深度向下寻找"
 
-#: builtin/grep.c:1011
+#: builtin/grep.c:1030
 msgid "use extended POSIX regular expressions"
 msgstr "使用扩展的 POSIX 正则表达式"
 
-#: builtin/grep.c:1014
+#: builtin/grep.c:1033
 msgid "use basic POSIX regular expressions (default)"
 msgstr "使用基本的 POSIX 正则表达式（默认）"
 
-#: builtin/grep.c:1017
+#: builtin/grep.c:1036
 msgid "interpret patterns as fixed strings"
 msgstr "把模式解析为固定的字符串"
 
-#: builtin/grep.c:1020
+#: builtin/grep.c:1039
 msgid "use Perl-compatible regular expressions"
 msgstr "使用 Perl 兼容的正则表达式"
 
-#: builtin/grep.c:1023
+#: builtin/grep.c:1042
 msgid "show line numbers"
 msgstr "显示行号"
 
-#: builtin/grep.c:1024
+#: builtin/grep.c:1043
 msgid "don't show filenames"
 msgstr "不显示文件名"
 
-#: builtin/grep.c:1025
+#: builtin/grep.c:1044
 msgid "show filenames"
 msgstr "显示文件名"
 
-#: builtin/grep.c:1027
+#: builtin/grep.c:1046
 msgid "show filenames relative to top directory"
 msgstr "显示相对于顶级目录的文件名"
 
-#: builtin/grep.c:1029
+#: builtin/grep.c:1048
 msgid "show only filenames instead of matching lines"
 msgstr "只显示文件名而不显示匹配的行"
 
-#: builtin/grep.c:1031
+#: builtin/grep.c:1050
 msgid "synonym for --files-with-matches"
 msgstr "和 --files-with-matches 同义"
 
-#: builtin/grep.c:1034
+#: builtin/grep.c:1053
 msgid "show only the names of files without match"
 msgstr "只显示未匹配的文件名"
 
-#: builtin/grep.c:1036
+#: builtin/grep.c:1055
 msgid "print NUL after filenames"
 msgstr "在文件名后输出 NUL 字符"
 
-#: builtin/grep.c:1038
+#: builtin/grep.c:1057
 msgid "show the number of matches instead of matching lines"
 msgstr "显示总匹配行数，而不显示匹配的行"
 
-#: builtin/grep.c:1039
+#: builtin/grep.c:1058
 msgid "highlight matches"
 msgstr "高亮显示匹配项"
 
-#: builtin/grep.c:1041
+#: builtin/grep.c:1060
 msgid "print empty line between matches from different files"
 msgstr "在不同文件的匹配项之间打印空行"
 
-#: builtin/grep.c:1043
+#: builtin/grep.c:1062
 msgid "show filename only once above matches from same file"
 msgstr "只在同一文件的匹配项的上面显示一次文件名"
 
-#: builtin/grep.c:1046
+#: builtin/grep.c:1065
 msgid "show <n> context lines before and after matches"
 msgstr "显示匹配项前后的 <n> 行上下文"
 
-#: builtin/grep.c:1049
+#: builtin/grep.c:1068
 msgid "show <n> context lines before matches"
 msgstr "显示匹配项前 <n> 行上下文"
 
-#: builtin/grep.c:1051
+#: builtin/grep.c:1070
 msgid "show <n> context lines after matches"
 msgstr "显示匹配项后 <n> 行上下文"
 
-#: builtin/grep.c:1053
+#: builtin/grep.c:1072
 msgid "use <n> worker threads"
 msgstr "使用 <n> 个工作线程"
 
-#: builtin/grep.c:1054
+#: builtin/grep.c:1073
 msgid "shortcut for -C NUM"
 msgstr "快捷键 -C 数字"
 
-#: builtin/grep.c:1057
+#: builtin/grep.c:1076
 msgid "show a line with the function name before matches"
 msgstr "在匹配的前面显示一行函数名"
 
-#: builtin/grep.c:1059
+#: builtin/grep.c:1078
 msgid "show the surrounding function"
 msgstr "显示所在函数的前后内容"
 
-#: builtin/grep.c:1062
+#: builtin/grep.c:1081
 msgid "read patterns from file"
 msgstr "从文件读取模式"
 
-#: builtin/grep.c:1064
+#: builtin/grep.c:1083
 msgid "match <pattern>"
 msgstr "匹配 <模式>"
 
-#: builtin/grep.c:1066
+#: builtin/grep.c:1085
 msgid "combine patterns specified with -e"
 msgstr "组合用 -e 参数设定的模式"
 
-#: builtin/grep.c:1078
+#: builtin/grep.c:1097
 msgid "indicate hit with exit status without output"
 msgstr "不输出，而用退出码标识命中状态"
 
-#: builtin/grep.c:1080
+#: builtin/grep.c:1099
 msgid "show only matches from files that match all patterns"
 msgstr "只显示匹配所有模式的文件中的匹配"
 
-#: builtin/grep.c:1082
+#: builtin/grep.c:1101
 msgid "show parse tree for grep expression"
 msgstr "显示 grep 表达式的解析树"
 
-#: builtin/grep.c:1086
+#: builtin/grep.c:1105
 msgid "pager"
 msgstr "分页"
 
-#: builtin/grep.c:1086
+#: builtin/grep.c:1105
 msgid "show matching files in the pager"
 msgstr "分页显示匹配的文件"
 
-#: builtin/grep.c:1089
+#: builtin/grep.c:1108
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "允许调用 grep(1)（本次构建忽略）"
 
-#: builtin/grep.c:1153
+#: builtin/grep.c:1172
 msgid "no pattern given."
 msgstr "未提供模式匹配。"
 
-#: builtin/grep.c:1189
+#: builtin/grep.c:1204
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index 或 --untracked 不能和版本同时使用"
 
-#: builtin/grep.c:1195
+#: builtin/grep.c:1211
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "不能解析版本：%s"
 
-#: builtin/grep.c:1228 builtin/index-pack.c:1485
+#: builtin/grep.c:1245 builtin/index-pack.c:1490
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "指定的线程数无效（%d）"
 
-#: builtin/grep.c:1251
+#: builtin/grep.c:1250
+msgid "no threads support, ignoring --threads"
+msgstr "没有线程支持，忽略 --threads"
+
+#: builtin/grep.c:1281
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager 仅用于工作区"
 
-#: builtin/grep.c:1274
+#: builtin/grep.c:1304
 msgid "option not supported with --recurse-submodules."
 msgstr "选项不支持和 --recurse-submodules 共用。"
 
-#: builtin/grep.c:1280
+#: builtin/grep.c:1310
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
 
-#: builtin/grep.c:1286
+#: builtin/grep.c:1316
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
 
-#: builtin/grep.c:1294
+#: builtin/grep.c:1324
 msgid "both --cached and trees are given."
 msgstr "同时给出了 --cached 和树对象。"
 
-#: builtin/hash-object.c:81
+#: builtin/hash-object.c:82
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -8651,91 +8754,91 @@ msgstr ""
 "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
 "[--] <文件>..."
 
-#: builtin/hash-object.c:82
+#: builtin/hash-object.c:83
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
 msgid "type"
 msgstr "类型"
 
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:95
 msgid "object type"
 msgstr "对象类型"
 
-#: builtin/hash-object.c:95
+#: builtin/hash-object.c:96
 msgid "write the object into the object database"
 msgstr "将对象写入对象数据库"
 
-#: builtin/hash-object.c:97
+#: builtin/hash-object.c:98
 msgid "read the object from stdin"
 msgstr "从标准输入读取对象"
 
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:100
 msgid "store file as is without filters"
 msgstr "原样存储文件不使用过滤器"
 
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:101
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:102
 msgid "process file as it were from this path"
 msgstr "处理文件并假设其来自于此路径"
 
-#: builtin/help.c:42
+#: builtin/help.c:43
 msgid "print all available commands"
 msgstr "打印所有可用的命令"
 
-#: builtin/help.c:43
+#: builtin/help.c:44
 msgid "exclude guides"
 msgstr "排除向导"
 
-#: builtin/help.c:44
+#: builtin/help.c:45
 msgid "print list of useful guides"
 msgstr "显示有用的指南列表"
 
-#: builtin/help.c:45
+#: builtin/help.c:46
 msgid "show man page"
 msgstr "显示 man 手册"
 
-#: builtin/help.c:46
+#: builtin/help.c:47
 msgid "show manual in web browser"
 msgstr "在 web 浏览器中显示手册"
 
-#: builtin/help.c:48
+#: builtin/help.c:49
 msgid "show info page"
 msgstr "显示 info 手册"
 
-#: builtin/help.c:54
+#: builtin/help.c:55
 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
 msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
 
-#: builtin/help.c:66
+#: builtin/help.c:67
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "未能识别的帮助格式 '%s'"
 
-#: builtin/help.c:93
+#: builtin/help.c:94
 msgid "Failed to start emacsclient."
 msgstr "无法启动 emacsclient。"
 
-#: builtin/help.c:106
+#: builtin/help.c:107
 msgid "Failed to parse emacsclient version."
 msgstr "无法解析 emacsclient 版本。"
 
-#: builtin/help.c:114
+#: builtin/help.c:115
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "emacsclient 版本 '%d' 太老（< 22）。"
 
-#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
+#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "无法执行 '%s'"
 
-#: builtin/help.c:207
+#: builtin/help.c:208
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -8744,7 +8847,7 @@ msgstr ""
 "'%s'：不支持的 man 手册查看器的路径。\n"
 "请使用 'man.<工具>.cmd'。"
 
-#: builtin/help.c:219
+#: builtin/help.c:220
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -8753,132 +8856,132 @@ msgstr ""
 "'%s': 支持的 man 手册查看器命令。\n"
 "请使用 'man.<工具>.path'。"
 
-#: builtin/help.c:336
+#: builtin/help.c:337
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s'：未知的 man 查看器。"
 
-#: builtin/help.c:353
+#: builtin/help.c:354
 msgid "no man viewer handled the request"
 msgstr "没有 man 查看器处理此请求"
 
-#: builtin/help.c:361
+#: builtin/help.c:362
 msgid "no info viewer handled the request"
 msgstr "没有 info 查看器处理此请求"
 
-#: builtin/help.c:403
+#: builtin/help.c:404
 msgid "Defining attributes per path"
 msgstr "定义路径的属性"
 
-#: builtin/help.c:404
+#: builtin/help.c:405
 msgid "Everyday Git With 20 Commands Or So"
 msgstr "每一天 Git 常用的约 20 条命令"
 
-#: builtin/help.c:405
+#: builtin/help.c:406
 msgid "A Git glossary"
 msgstr "Git 词汇表"
 
-#: builtin/help.c:406
+#: builtin/help.c:407
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "忽略指定的未跟踪文件"
 
-#: builtin/help.c:407
+#: builtin/help.c:408
 msgid "Defining submodule properties"
 msgstr "定义子模组属性"
 
-#: builtin/help.c:408
+#: builtin/help.c:409
 msgid "Specifying revisions and ranges for Git"
 msgstr "指定 Git 的版本和版本范围"
 
-#: builtin/help.c:409
+#: builtin/help.c:410
 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
 msgstr "一个 Git 教程（针对 1.5.1 或更新版本）"
 
-#: builtin/help.c:410
+#: builtin/help.c:411
 msgid "An overview of recommended workflows with Git"
 msgstr "Git 推荐的工作流概览"
 
-#: builtin/help.c:422
+#: builtin/help.c:423
 msgid "The common Git guides are:\n"
 msgstr "最常用的 Git 向导有：\n"
 
-#: builtin/help.c:440
+#: builtin/help.c:441
 #, c-format
 msgid "`git %s' is aliased to `%s'"
 msgstr "`git %s' 是 `%s' 的别名"
 
-#: builtin/help.c:462 builtin/help.c:479
+#: builtin/help.c:463 builtin/help.c:480
 #, c-format
 msgid "usage: %s%s"
 msgstr "用法：%s%s"
 
-#: builtin/index-pack.c:154
+#: builtin/index-pack.c:155
 #, c-format
 msgid "unable to open %s"
 msgstr "不能打开 %s"
 
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:205
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "%s 的对象类型不匹配"
 
-#: builtin/index-pack.c:224
+#: builtin/index-pack.c:225
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "未能获取预期的对象 %s"
 
-#: builtin/index-pack.c:227
+#: builtin/index-pack.c:228
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "对象 %s：应为类型 %s，却是 %s"
 
-#: builtin/index-pack.c:269
+#: builtin/index-pack.c:270
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "无法填充 %d 字节"
 msgstr[1] "无法填充 %d 字节"
 
-#: builtin/index-pack.c:279
+#: builtin/index-pack.c:280
 msgid "early EOF"
 msgstr "过早的文件结束符（EOF）"
 
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
 msgid "read error on input"
 msgstr "输入上的读错误"
 
-#: builtin/index-pack.c:292
+#: builtin/index-pack.c:293
 msgid "used more bytes than were available"
 msgstr "用掉了超过可用的字节"
 
-#: builtin/index-pack.c:299
+#: builtin/index-pack.c:300
 msgid "pack too large for current definition of off_t"
 msgstr "包太大超过了当前 off_t 的定义"
 
-#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
+#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
 msgid "pack exceeds maximum allowed size"
 msgstr "包超过了最大允许值"
 
-#: builtin/index-pack.c:317
+#: builtin/index-pack.c:318
 #, c-format
 msgid "unable to create '%s'"
 msgstr "不能创建 '%s'"
 
-#: builtin/index-pack.c:323
+#: builtin/index-pack.c:324
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "无法打开包文件 '%s'"
 
-#: builtin/index-pack.c:337
+#: builtin/index-pack.c:338
 msgid "pack signature mismatch"
 msgstr "包签名不匹配"
 
-#: builtin/index-pack.c:339
+#: builtin/index-pack.c:340
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "不支持包版本 %<PRIu32>"
 
-#: builtin/index-pack.c:357
+#: builtin/index-pack.c:358
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>：%s"
@@ -8916,14 +9019,14 @@ msgstr[1] "包文件过早结束，缺少 %<PRIuMAX> 字节"
 msgid "serious inflate inconsistency"
 msgstr "解压缩严重的不一致"
 
-#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
 #: builtin/index-pack.c:816 builtin/index-pack.c:825
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "发现 %s 出现 SHA1 冲突！"
 
-#: builtin/index-pack.c:752 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:257
+#: builtin/index-pack.c:751 builtin/pack-objects.c:167
+#: builtin/pack-objects.c:261
 #, c-format
 msgid "unable to read %s"
 msgstr "不能读 %s"
@@ -8943,250 +9046,245 @@ msgstr "不能读取现存对象 %s"
 msgid "invalid blob object %s"
 msgstr "无效的数据对象 %s"
 
-#: builtin/index-pack.c:850
+#: builtin/index-pack.c:851
 #, c-format
 msgid "invalid %s"
 msgstr "无效的 %s"
 
-#: builtin/index-pack.c:853
+#: builtin/index-pack.c:854
 msgid "Error in object"
 msgstr "对象中出错"
 
-#: builtin/index-pack.c:855
+#: builtin/index-pack.c:856
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "%s 的所有子对象并非都可达"
 
-#: builtin/index-pack.c:927 builtin/index-pack.c:958
+#: builtin/index-pack.c:928 builtin/index-pack.c:959
 msgid "failed to apply delta"
 msgstr "无法应用 delta"
 
-#: builtin/index-pack.c:1128
+#: builtin/index-pack.c:1130
 msgid "Receiving objects"
 msgstr "接收对象中"
 
-#: builtin/index-pack.c:1128
+#: builtin/index-pack.c:1130
 msgid "Indexing objects"
 msgstr "索引对象中"
 
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1164
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "包冲突（SHA1 不匹配）"
 
-#: builtin/index-pack.c:1165
+#: builtin/index-pack.c:1169
 msgid "cannot fstat packfile"
 msgstr "不能对包文件调用 fstat"
 
-#: builtin/index-pack.c:1168
+#: builtin/index-pack.c:1172
 msgid "pack has junk at the end"
 msgstr "包的结尾有垃圾数据"
 
-#: builtin/index-pack.c:1179
+#: builtin/index-pack.c:1184
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
 
-#: builtin/index-pack.c:1202
+#: builtin/index-pack.c:1207
 msgid "Resolving deltas"
 msgstr "处理 delta 中"
 
-#: builtin/index-pack.c:1213
+#: builtin/index-pack.c:1218
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "不能创建线程：%s"
 
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1260
 msgid "confusion beyond insanity"
 msgstr "不可理喻"
 
-#: builtin/index-pack.c:1261
+#: builtin/index-pack.c:1266
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "完成 %d 个本地对象"
 msgstr[1] "完成 %d 个本地对象"
 
-#: builtin/index-pack.c:1273
+#: builtin/index-pack.c:1278
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"
 
-#: builtin/index-pack.c:1277
+#: builtin/index-pack.c:1282
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "包有 %d 个未解决的 delta"
 msgstr[1] "包有 %d 个未解决的 delta"
 
-#: builtin/index-pack.c:1301
+#: builtin/index-pack.c:1306
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "不能压缩附加对象（%d）"
 
-#: builtin/index-pack.c:1377
+#: builtin/index-pack.c:1382
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "本地对象 %s 已损坏"
 
-#: builtin/index-pack.c:1403
+#: builtin/index-pack.c:1408
 msgid "error while closing pack file"
 msgstr "关闭包文件时出错"
 
-#: builtin/index-pack.c:1415
+#: builtin/index-pack.c:1420
 #, c-format
 msgid "cannot write keep file '%s'"
 msgstr "无法写保留文件 '%s'"
 
-#: builtin/index-pack.c:1423
+#: builtin/index-pack.c:1428
 #, c-format
 msgid "cannot close written keep file '%s'"
 msgstr "无法关闭保留文件 '%s'"
 
-#: builtin/index-pack.c:1433
+#: builtin/index-pack.c:1438
 msgid "cannot store pack file"
 msgstr "无法存储包文件"
 
-#: builtin/index-pack.c:1441
+#: builtin/index-pack.c:1446
 msgid "cannot store index file"
 msgstr "无法存储索引文件"
 
-#: builtin/index-pack.c:1479
+#: builtin/index-pack.c:1484
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "坏的 pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1489 builtin/index-pack.c:1686
-#, c-format
-msgid "no threads support, ignoring %s"
-msgstr "没有线程支持，忽略 %s"
-
-#: builtin/index-pack.c:1547
+#: builtin/index-pack.c:1552
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "无法打开现存包文件 '%s'"
 
-#: builtin/index-pack.c:1549
+#: builtin/index-pack.c:1554
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "无法为 %s 打开包索引文件"
 
-#: builtin/index-pack.c:1596
+#: builtin/index-pack.c:1602
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "非 delta：%d 个对象"
 msgstr[1] "非 delta：%d 个对象"
 
-#: builtin/index-pack.c:1603
+#: builtin/index-pack.c:1609
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "链长 = %d: %lu 对象"
 msgstr[1] "链长 = %d: %lu 对象"
 
-#: builtin/index-pack.c:1616
+#: builtin/index-pack.c:1622
 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
 
-#: builtin/index-pack.c:1698 builtin/index-pack.c:1701
-#: builtin/index-pack.c:1717 builtin/index-pack.c:1721
+#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
+#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
 #, c-format
 msgid "bad %s"
 msgstr "错误选项 %s"
 
-#: builtin/index-pack.c:1737
+#: builtin/index-pack.c:1743
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin 不能和 --stdin 同时使用"
 
-#: builtin/index-pack.c:1739
+#: builtin/index-pack.c:1745
 msgid "--stdin requires a git repository"
 msgstr "--stdin 需要一个 git 仓库"
 
-#: builtin/index-pack.c:1747
+#: builtin/index-pack.c:1753
 msgid "--verify with no packfile name given"
 msgstr "--verify 没有提供包文件名参数"
 
-#: builtin/init-db.c:54
+#: builtin/init-db.c:55
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "不能对 '%s' 调用 stat"
 
-#: builtin/init-db.c:60
+#: builtin/init-db.c:61
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "不能对模版 '%s' 调用 stat"
 
-#: builtin/init-db.c:65
+#: builtin/init-db.c:66
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "不能打开目录 '%s'"
 
-#: builtin/init-db.c:76
+#: builtin/init-db.c:77
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "不能读取链接 '%s'"
 
-#: builtin/init-db.c:78
+#: builtin/init-db.c:79
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
 
-#: builtin/init-db.c:84
+#: builtin/init-db.c:85
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "不能拷贝 '%s' 至 '%s'"
 
-#: builtin/init-db.c:88
+#: builtin/init-db.c:89
 #, c-format
 msgid "ignoring template %s"
 msgstr "忽略模版 %s"
 
-#: builtin/init-db.c:119
+#: builtin/init-db.c:120
 #, c-format
 msgid "templates not found %s"
 msgstr "模版未找到 %s"
 
-#: builtin/init-db.c:134
+#: builtin/init-db.c:135
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "没有从 '%s' 复制模版：%s"
 
-#: builtin/init-db.c:327
+#: builtin/init-db.c:328
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "不能处理 %d 类型的文件"
 
-#: builtin/init-db.c:330
+#: builtin/init-db.c:331
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "不能移动 %s 至 %s"
 
-#: builtin/init-db.c:347 builtin/init-db.c:350
+#: builtin/init-db.c:348 builtin/init-db.c:351
 #, c-format
 msgid "%s already exists"
 msgstr "%s 已经存在"
 
-#: builtin/init-db.c:403
+#: builtin/init-db.c:404
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
 
-#: builtin/init-db.c:404
+#: builtin/init-db.c:405
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
 
-#: builtin/init-db.c:408
+#: builtin/init-db.c:409
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
 
-#: builtin/init-db.c:409
+#: builtin/init-db.c:410
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "已初始化空的 Git 仓库于 %s%s\n"
 
-#: builtin/init-db.c:457
+#: builtin/init-db.c:458
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -9194,32 +9292,32 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
 "[<目录>]"
 
-#: builtin/init-db.c:480
+#: builtin/init-db.c:481
 msgid "permissions"
 msgstr "权限"
 
-#: builtin/init-db.c:481
+#: builtin/init-db.c:482
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "指定 git 仓库是多个用户之间共享的"
 
-#: builtin/init-db.c:515 builtin/init-db.c:520
+#: builtin/init-db.c:516 builtin/init-db.c:521
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "不能创建目录 %s"
 
-#: builtin/init-db.c:524
+#: builtin/init-db.c:525
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "不能切换目录到 %s"
 
-#: builtin/init-db.c:545
+#: builtin/init-db.c:546
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
 "dir=<directory>)"
 msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）"
 
-#: builtin/init-db.c:573
+#: builtin/init-db.c:574
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "不能访问工作区 '%s'"
@@ -9252,112 +9350,112 @@ msgstr "要添加的签名"
 msgid "no input file given for in-place editing"
 msgstr "没有给出要原位编辑的文件"
 
-#: builtin/log.c:44
+#: builtin/log.c:45
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
 
-#: builtin/log.c:45
+#: builtin/log.c:46
 msgid "git show [<options>] <object>..."
 msgstr "git show [<选项>] <对象>..."
 
-#: builtin/log.c:89
+#: builtin/log.c:90
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "无效的 --decorate 选项：%s"
 
-#: builtin/log.c:144
+#: builtin/log.c:147
 msgid "suppress diff output"
 msgstr "不显示差异输出"
 
-#: builtin/log.c:145
+#: builtin/log.c:148
 msgid "show source"
 msgstr "显示源"
 
-#: builtin/log.c:146
+#: builtin/log.c:149
 msgid "Use mail map file"
 msgstr "使用邮件映射文件"
 
-#: builtin/log.c:147
+#: builtin/log.c:150
 msgid "decorate options"
 msgstr "修饰选项"
 
-#: builtin/log.c:150
+#: builtin/log.c:153
 msgid "Process line range n,m in file, counting from 1"
 msgstr "处理文件中第 n 到 m 之间的行，从 1 开始"
 
-#: builtin/log.c:246
+#: builtin/log.c:249
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "最终输出：%d %s\n"
 
-#: builtin/log.c:493
+#: builtin/log.c:497
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: 损坏的文件"
 
-#: builtin/log.c:507 builtin/log.c:601
+#: builtin/log.c:512 builtin/log.c:606
 #, c-format
 msgid "Could not read object %s"
 msgstr "不能读取对象 %s"
 
-#: builtin/log.c:625
+#: builtin/log.c:630
 #, c-format
 msgid "Unknown type: %d"
 msgstr "未知类型：%d"
 
-#: builtin/log.c:746
+#: builtin/log.c:751
 msgid "format.headers without value"
 msgstr "format.headers 没有值"
 
-#: builtin/log.c:846
+#: builtin/log.c:852
 msgid "name of output directory is too long"
 msgstr "输出目录名太长"
 
-#: builtin/log.c:861
+#: builtin/log.c:868
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "无法打开补丁文件 %s"
 
-#: builtin/log.c:875
+#: builtin/log.c:885
 msgid "Need exactly one range."
 msgstr "只需要一个范围。"
 
-#: builtin/log.c:885
+#: builtin/log.c:895
 msgid "Not a range."
 msgstr "不是一个范围。"
 
-#: builtin/log.c:991
+#: builtin/log.c:1001
 msgid "Cover letter needs email format"
 msgstr "信封需要邮件地址格式"
 
-#: builtin/log.c:1071
+#: builtin/log.c:1081
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "不正常的 in-reply-to：%s"
 
-#: builtin/log.c:1098
+#: builtin/log.c:1108
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
 
-#: builtin/log.c:1148
+#: builtin/log.c:1158
 msgid "Two output directories?"
 msgstr "两个输出目录？"
 
-#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912
+#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
 #, c-format
 msgid "Unknown commit %s"
 msgstr "未知提交 %s"
 
-#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532
+#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "无法解析 '%s' 为一个有效引用。"
 
-#: builtin/log.c:1270
+#: builtin/log.c:1280
 msgid "Could not find exact merge base."
 msgstr "不能找到准确的合并基线。"
 
-#: builtin/log.c:1274
+#: builtin/log.c:1284
 msgid ""
 "Failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
@@ -9367,213 +9465,218 @@ msgstr ""
 "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
 "参数 --base=<base-commit-id> 手动指定一个基线提交。"
 
-#: builtin/log.c:1294
+#: builtin/log.c:1304
 msgid "Failed to find exact merge base"
 msgstr "无法找到准确的合并基线"
 
-#: builtin/log.c:1305
+#: builtin/log.c:1315
 msgid "base commit should be the ancestor of revision list"
 msgstr "基线提交应该是版本列表的祖先"
 
-#: builtin/log.c:1309
+#: builtin/log.c:1319
 msgid "base commit shouldn't be in revision list"
 msgstr "基线提交不应该出现在版本列表中"
 
-#: builtin/log.c:1358
+#: builtin/log.c:1368
 msgid "cannot get patch id"
 msgstr "无法得到补丁 id"
 
-#: builtin/log.c:1415
+#: builtin/log.c:1425
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "使用 [PATCH n/m]，即使只有一个补丁"
 
-#: builtin/log.c:1418
+#: builtin/log.c:1428
 msgid "use [PATCH] even with multiple patches"
 msgstr "使用 [PATCH]，即使有多个补丁"
 
-#: builtin/log.c:1422
+#: builtin/log.c:1432
 msgid "print patches to standard out"
 msgstr "打印补丁到标准输出"
 
-#: builtin/log.c:1424
+#: builtin/log.c:1434
 msgid "generate a cover letter"
 msgstr "生成一封附信"
 
-#: builtin/log.c:1426
+#: builtin/log.c:1436
 msgid "use simple number sequence for output file names"
 msgstr "使用简单的数字序列作为输出文件名"
 
-#: builtin/log.c:1427
+#: builtin/log.c:1437
 msgid "sfx"
 msgstr "后缀"
 
-#: builtin/log.c:1428
+#: builtin/log.c:1438
 msgid "use <sfx> instead of '.patch'"
 msgstr "使用 <后缀> 代替 '.patch'"
 
-#: builtin/log.c:1430
+#: builtin/log.c:1440
 msgid "start numbering patches at <n> instead of 1"
 msgstr "补丁以 <n> 开始编号，而不是1"
 
-#: builtin/log.c:1432
+#: builtin/log.c:1442
 msgid "mark the series as Nth re-roll"
 msgstr "标记补丁系列是第几次重制"
 
-#: builtin/log.c:1434
+#: builtin/log.c:1444
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "使用 [RFC PATCH] 代替 [PATCH]"
 
-#: builtin/log.c:1437
+#: builtin/log.c:1447
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "使用 [<前缀>] 代替 [PATCH]"
 
-#: builtin/log.c:1440
+#: builtin/log.c:1450
 msgid "store resulting files in <dir>"
 msgstr "把结果文件存储在 <目录>"
 
-#: builtin/log.c:1443
+#: builtin/log.c:1453
 msgid "don't strip/add [PATCH]"
 msgstr "不删除/添加 [PATCH]"
 
-#: builtin/log.c:1446
+#: builtin/log.c:1456
 msgid "don't output binary diffs"
 msgstr "不输出二进制差异"
 
-#: builtin/log.c:1448
+#: builtin/log.c:1458
 msgid "output all-zero hash in From header"
 msgstr "在 From 头信息中输出全为零的哈希值"
 
-#: builtin/log.c:1450
+#: builtin/log.c:1460
 msgid "don't include a patch matching a commit upstream"
 msgstr "不包含已在上游提交中的补丁"
 
-#: builtin/log.c:1452
+#: builtin/log.c:1462
 msgid "show patch format instead of default (patch + stat)"
 msgstr "显示纯补丁格式而非默认的（补丁+状态）"
 
-#: builtin/log.c:1454
+#: builtin/log.c:1464
 msgid "Messaging"
 msgstr "邮件发送"
 
-#: builtin/log.c:1455
+#: builtin/log.c:1465
 msgid "header"
 msgstr "header"
 
-#: builtin/log.c:1456
+#: builtin/log.c:1466
 msgid "add email header"
 msgstr "添加邮件头"
 
-#: builtin/log.c:1457 builtin/log.c:1459
+#: builtin/log.c:1467 builtin/log.c:1469
 msgid "email"
 msgstr "邮件地址"
 
-#: builtin/log.c:1457
+#: builtin/log.c:1467
 msgid "add To: header"
 msgstr "添加收件人"
 
-#: builtin/log.c:1459
+#: builtin/log.c:1469
 msgid "add Cc: header"
 msgstr "添加抄送"
 
-#: builtin/log.c:1461
+#: builtin/log.c:1471
 msgid "ident"
 msgstr "标识"
 
-#: builtin/log.c:1462
+#: builtin/log.c:1472
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）"
 
-#: builtin/log.c:1464
+#: builtin/log.c:1474
 msgid "message-id"
 msgstr "邮件标识"
 
-#: builtin/log.c:1465
+#: builtin/log.c:1475
 msgid "make first mail a reply to <message-id>"
 msgstr "使第一封邮件作为对 <邮件标识> 的回复"
 
-#: builtin/log.c:1466 builtin/log.c:1469
+#: builtin/log.c:1476 builtin/log.c:1479
 msgid "boundary"
 msgstr "边界"
 
-#: builtin/log.c:1467
+#: builtin/log.c:1477
 msgid "attach the patch"
 msgstr "附件方式添加补丁"
 
-#: builtin/log.c:1470
+#: builtin/log.c:1480
 msgid "inline the patch"
 msgstr "内联显示补丁"
 
-#: builtin/log.c:1474
+#: builtin/log.c:1484
 msgid "enable message threading, styles: shallow, deep"
 msgstr "启用邮件线索，风格：浅，深"
 
-#: builtin/log.c:1476
+#: builtin/log.c:1486
 msgid "signature"
 msgstr "签名"
 
-#: builtin/log.c:1477
+#: builtin/log.c:1487
 msgid "add a signature"
 msgstr "添加一个签名"
 
-#: builtin/log.c:1478
+#: builtin/log.c:1488
 msgid "base-commit"
 msgstr "基线提交"
 
-#: builtin/log.c:1479
+#: builtin/log.c:1489
 msgid "add prerequisite tree info to the patch series"
 msgstr "为补丁列表添加前置树信息"
 
-#: builtin/log.c:1481
+#: builtin/log.c:1491
 msgid "add a signature from a file"
 msgstr "从文件添加一个签名"
 
-#: builtin/log.c:1482
+#: builtin/log.c:1492
 msgid "don't print the patch filenames"
 msgstr "不要打印补丁文件名"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1567
+#, c-format
+msgid "invalid ident line: %s"
+msgstr "包含无效的身份标识：%s"
+
+#: builtin/log.c:1582
 msgid "-n and -k are mutually exclusive."
 msgstr "-n 和 -k 互斥。"
 
-#: builtin/log.c:1574
+#: builtin/log.c:1584
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr "--subject-prefix/--rfc 和 -k 互斥。"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1592
 msgid "--name-only does not make sense"
 msgstr "--name-only 无意义"
 
-#: builtin/log.c:1584
+#: builtin/log.c:1594
 msgid "--name-status does not make sense"
 msgstr "--name-status 无意义"
 
-#: builtin/log.c:1586
+#: builtin/log.c:1596
 msgid "--check does not make sense"
 msgstr "--check 无意义"
 
-#: builtin/log.c:1616
+#: builtin/log.c:1626
 msgid "standard output, or directory, which one?"
 msgstr "标准输出或目录，哪一个？"
 
-#: builtin/log.c:1618
+#: builtin/log.c:1628
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "不能创建目录 '%s'"
 
-#: builtin/log.c:1712
+#: builtin/log.c:1722
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "无法读取签名文件 '%s'"
 
-#: builtin/log.c:1784
+#: builtin/log.c:1794
 msgid "Failed to create output files"
 msgstr "无法创建输出文件"
 
-#: builtin/log.c:1833
+#: builtin/log.c:1843
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
 
-#: builtin/log.c:1887
+#: builtin/log.c:1897
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -9725,213 +9828,218 @@ msgstr "若未找到匹配的引用则以退出码2退出"
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "除了显示指向的对象外，显示指向的引用名"
 
-#: builtin/ls-tree.c:28
+#: builtin/ls-tree.c:29
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
 msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
 
-#: builtin/ls-tree.c:126
+#: builtin/ls-tree.c:127
 msgid "only show trees"
 msgstr "只显示树"
 
-#: builtin/ls-tree.c:128
+#: builtin/ls-tree.c:129
 msgid "recurse into subtrees"
 msgstr "递归到子树"
 
-#: builtin/ls-tree.c:130
+#: builtin/ls-tree.c:131
 msgid "show trees when recursing"
 msgstr "当递归时显示树"
 
-#: builtin/ls-tree.c:133
+#: builtin/ls-tree.c:134
 msgid "terminate entries with NUL byte"
 msgstr "条目以 NUL 字符终止"
 
-#: builtin/ls-tree.c:134
+#: builtin/ls-tree.c:135
 msgid "include object size"
 msgstr "包括对象大小"
 
-#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
+#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
 msgid "list only filenames"
 msgstr "只列出文件名"
 
-#: builtin/ls-tree.c:141
+#: builtin/ls-tree.c:142
 msgid "use full path names"
 msgstr "使用文件的全路径"
 
-#: builtin/ls-tree.c:143
+#: builtin/ls-tree.c:144
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr "列出整个树；不仅仅当前目录（隐含 --full-name）"
 
-#: builtin/merge.c:46
+#: builtin/mailsplit.c:241
+#, c-format
+msgid "empty mbox: '%s'"
+msgstr "空的 mbox：'%s'"
+
+#: builtin/merge.c:47
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<选项>] [<提交>...]"
 
-#: builtin/merge.c:47
+#: builtin/merge.c:48
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:48
+#: builtin/merge.c:49
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:103
+#: builtin/merge.c:104
 msgid "switch `m' requires a value"
 msgstr "开关 `m' 需要一个值"
 
-#: builtin/merge.c:140
+#: builtin/merge.c:141
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "不能找到合并策略 '%s'。\n"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:142
 #, c-format
 msgid "Available strategies are:"
 msgstr "可用的策略有："
 
-#: builtin/merge.c:146
+#: builtin/merge.c:147
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "可用的自定义策略有："
 
-#: builtin/merge.c:196 builtin/pull.c:127
+#: builtin/merge.c:197 builtin/pull.c:134
 msgid "do not show a diffstat at the end of the merge"
 msgstr "在合并的最后不显示差异统计"
 
-#: builtin/merge.c:199 builtin/pull.c:130
+#: builtin/merge.c:200 builtin/pull.c:137
 msgid "show a diffstat at the end of the merge"
 msgstr "在合并的最后显示差异统计"
 
-#: builtin/merge.c:200 builtin/pull.c:133
+#: builtin/merge.c:201 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "（和 --stat 同义）"
 
-#: builtin/merge.c:202 builtin/pull.c:136
+#: builtin/merge.c:203 builtin/pull.c:143
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
 
-#: builtin/merge.c:205 builtin/pull.c:139
+#: builtin/merge.c:206 builtin/pull.c:146
 msgid "create a single commit instead of doing a merge"
 msgstr "创建一个单独的提交而不是做一次合并"
 
-#: builtin/merge.c:207 builtin/pull.c:142
+#: builtin/merge.c:208 builtin/pull.c:149
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "如果合并成功，执行一次提交（默认）"
 
-#: builtin/merge.c:209 builtin/pull.c:145
+#: builtin/merge.c:210 builtin/pull.c:152
 msgid "edit message before committing"
 msgstr "在提交前编辑提交说明"
 
-#: builtin/merge.c:210
+#: builtin/merge.c:211
 msgid "allow fast-forward (default)"
 msgstr "允许快进（默认）"
 
-#: builtin/merge.c:212 builtin/pull.c:151
+#: builtin/merge.c:213 builtin/pull.c:158
 msgid "abort if fast-forward is not possible"
 msgstr "如果不能快进就放弃合并"
 
-#: builtin/merge.c:216 builtin/pull.c:154
+#: builtin/merge.c:217 builtin/pull.c:161
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
 
-#: builtin/merge.c:217 builtin/notes.c:773 builtin/pull.c:158
-#: builtin/revert.c:108
+#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/revert.c:109
 msgid "strategy"
 msgstr "策略"
 
-#: builtin/merge.c:218 builtin/pull.c:159
+#: builtin/merge.c:219 builtin/pull.c:166
 msgid "merge strategy to use"
 msgstr "要使用的合并策略"
 
-#: builtin/merge.c:219 builtin/pull.c:162
+#: builtin/merge.c:220 builtin/pull.c:169
 msgid "option=value"
 msgstr "option=value"
 
-#: builtin/merge.c:220 builtin/pull.c:163
+#: builtin/merge.c:221 builtin/pull.c:170
 msgid "option for selected merge strategy"
 msgstr "所选的合并策略的选项"
 
-#: builtin/merge.c:222
+#: builtin/merge.c:223
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "合并的提交说明（针对非快进式合并）"
 
-#: builtin/merge.c:226
+#: builtin/merge.c:227
 msgid "abort the current in-progress merge"
 msgstr "放弃当前正在进行的合并"
 
-#: builtin/merge.c:228
+#: builtin/merge.c:229
 msgid "continue the current in-progress merge"
 msgstr "继续当前正在进行的合并"
 
-#: builtin/merge.c:230 builtin/pull.c:170
+#: builtin/merge.c:231 builtin/pull.c:177
 msgid "allow merging unrelated histories"
 msgstr "允许合并不相关的历史"
 
-#: builtin/merge.c:258
+#: builtin/merge.c:259
 msgid "could not run stash."
-msgstr "不能进行进度保存。"
+msgstr "不能运行贮藏。"
 
-#: builtin/merge.c:263
+#: builtin/merge.c:264
 msgid "stash failed"
-msgstr "进度保存失败"
+msgstr "贮藏失败"
 
-#: builtin/merge.c:268
+#: builtin/merge.c:269
 #, c-format
 msgid "not a valid object: %s"
 msgstr "不是一个有效对象：%s"
 
-#: builtin/merge.c:287 builtin/merge.c:304
+#: builtin/merge.c:288 builtin/merge.c:305
 msgid "read-tree failed"
 msgstr "读取树失败"
 
 #  译者：注意保持前导空格
-#: builtin/merge.c:334
+#: builtin/merge.c:335
 msgid " (nothing to squash)"
 msgstr " （无可压缩）"
 
-#: builtin/merge.c:345
+#: builtin/merge.c:346
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "压缩提交 -- 未更新 HEAD\n"
 
-#: builtin/merge.c:395
+#: builtin/merge.c:396
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "无合并信息 -- 未更新 HEAD\n"
 
-#: builtin/merge.c:446
+#: builtin/merge.c:447
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' 没有指向一个提交"
 
-#: builtin/merge.c:536
+#: builtin/merge.c:537
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
 
-#: builtin/merge.c:656
+#: builtin/merge.c:657
 msgid "Not handling anything other than two heads merge."
 msgstr "未处理两个头合并之外的任何操作。"
 
-#: builtin/merge.c:670
+#: builtin/merge.c:671
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "merge-recursive 的未知选项：-X%s"
 
-#: builtin/merge.c:685
+#: builtin/merge.c:686
 #, c-format
 msgid "unable to write %s"
 msgstr "不能写 %s"
 
-#: builtin/merge.c:737
+#: builtin/merge.c:738
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "不能从 '%s' 读取"
 
-#: builtin/merge.c:746
+#: builtin/merge.c:747
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
 
-#: builtin/merge.c:752
+#: builtin/merge.c:753
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -9945,73 +10053,68 @@ msgstr ""
 "\n"
 "以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n"
 
-#: builtin/merge.c:776
+#: builtin/merge.c:777
 msgid "Empty commit message."
 msgstr "空提交信息。"
 
-#: builtin/merge.c:796
+#: builtin/merge.c:797
 #, c-format
 msgid "Wonderful.\n"
 msgstr "太棒了。\n"
 
-#: builtin/merge.c:851
+#: builtin/merge.c:850
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
 
-#: builtin/merge.c:890
+#: builtin/merge.c:889
 msgid "No current branch."
 msgstr "没有当前分支。"
 
-#: builtin/merge.c:892
+#: builtin/merge.c:891
 msgid "No remote for the current branch."
 msgstr "当前分支没有对应的远程仓库。"
 
-#: builtin/merge.c:894
+#: builtin/merge.c:893
 msgid "No default upstream defined for the current branch."
 msgstr "当前分支没有定义默认的上游分支。"
 
-#: builtin/merge.c:899
+#: builtin/merge.c:898
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
 
-#: builtin/merge.c:946
+#: builtin/merge.c:945
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
 
-#: builtin/merge.c:1020
-#, c-format
-msgid "could not close '%s'"
-msgstr "不能关闭 '%s'"
-
-#: builtin/merge.c:1047
+#: builtin/merge.c:1046
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "不能在 %s 中合并：%s"
 
-#: builtin/merge.c:1081
+#: builtin/merge.c:1080
 msgid "not something we can merge"
 msgstr "不能合并"
 
-#: builtin/merge.c:1146
+#: builtin/merge.c:1145
 msgid "--abort expects no arguments"
 msgstr "--abort 不带参数"
 
-#: builtin/merge.c:1150
+#: builtin/merge.c:1149
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
 
-#: builtin/merge.c:1162
+#: builtin/merge.c:1161
 msgid "--continue expects no arguments"
 msgstr "--continue 不带参数"
 
-#: builtin/merge.c:1166
+#: builtin/merge.c:1165
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "没有进行中的合并（MERGE_HEAD 丢失）。"
 
-#: builtin/merge.c:1182
+#: builtin/merge.c:1181
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10019,7 +10122,7 @@ msgstr ""
 "您尚未结束您的合并（存在 MERGE_HEAD）。\n"
 "请在合并前先提交您的修改。"
 
-#: builtin/merge.c:1189
+#: builtin/merge.c:1188
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10027,157 +10130,157 @@ msgstr ""
 "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
 "请在合并前先提交您的修改。"
 
-#: builtin/merge.c:1192
+#: builtin/merge.c:1191
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
 
-#: builtin/merge.c:1201
+#: builtin/merge.c:1200
 msgid "You cannot combine --squash with --no-ff."
 msgstr "您不能将 --squash 与 --no-ff 同时使用。"
 
-#: builtin/merge.c:1209
+#: builtin/merge.c:1208
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
 
-#: builtin/merge.c:1226
+#: builtin/merge.c:1225
 msgid "Squash commit into empty head not supported yet"
 msgstr "尚不支持到空分支的压缩提交"
 
-#: builtin/merge.c:1228
+#: builtin/merge.c:1227
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "到空分支的非快进式提交没有意义"
 
-#: builtin/merge.c:1233
+#: builtin/merge.c:1232
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - 不能被合并"
 
-#: builtin/merge.c:1235
+#: builtin/merge.c:1234
 msgid "Can merge only exactly one commit into empty head"
 msgstr "只能将一个提交合并到空分支上"
 
-#: builtin/merge.c:1269
+#: builtin/merge.c:1268
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
 
-#: builtin/merge.c:1272
+#: builtin/merge.c:1271
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
 
-#: builtin/merge.c:1275
+#: builtin/merge.c:1274
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "提交 %s 没有一个 GPG 签名。"
 
-#: builtin/merge.c:1278
+#: builtin/merge.c:1277
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
 
-#: builtin/merge.c:1340
+#: builtin/merge.c:1339
 msgid "refusing to merge unrelated histories"
 msgstr "拒绝合并无关的历史"
 
-#: builtin/merge.c:1349
+#: builtin/merge.c:1348
 msgid "Already up-to-date."
 msgstr "已经是最新的。"
 
-#: builtin/merge.c:1359
+#: builtin/merge.c:1358
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "更新 %s..%s\n"
 
-#: builtin/merge.c:1400
+#: builtin/merge.c:1399
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "尝试非常小的索引内合并...\n"
 
-#: builtin/merge.c:1407
+#: builtin/merge.c:1406
 #, c-format
 msgid "Nope.\n"
 msgstr "无。\n"
 
-#: builtin/merge.c:1432
+#: builtin/merge.c:1431
 msgid "Already up-to-date. Yeeah!"
 msgstr "已经是最新的。耶！"
 
-#: builtin/merge.c:1438
+#: builtin/merge.c:1437
 msgid "Not possible to fast-forward, aborting."
 msgstr "无法快进，终止。"
 
-#: builtin/merge.c:1461 builtin/merge.c:1540
+#: builtin/merge.c:1460 builtin/merge.c:1539
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "将树回滚至原始状态...\n"
 
-#: builtin/merge.c:1465
+#: builtin/merge.c:1464
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "尝试合并策略 %s...\n"
 
-#: builtin/merge.c:1531
+#: builtin/merge.c:1530
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "没有合并策略处理此合并。\n"
 
-#: builtin/merge.c:1533
+#: builtin/merge.c:1532
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "使用策略 %s 合并失败。\n"
 
-#: builtin/merge.c:1542
+#: builtin/merge.c:1541
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "使用 %s 以准备手工解决。\n"
 
-#: builtin/merge.c:1554
+#: builtin/merge.c:1553
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr "自动合并进展顺利，按要求在提交前停止\n"
 
-#: builtin/merge-base.c:29
+#: builtin/merge-base.c:30
 msgid "git merge-base [-a | --all] <commit> <commit>..."
 msgstr "git merge-base [-a | --all] <提交> <提交>..."
 
-#: builtin/merge-base.c:30
+#: builtin/merge-base.c:31
 msgid "git merge-base [-a | --all] --octopus <commit>..."
 msgstr "git merge-base [-a | --all] --octopus <提交>..."
 
-#: builtin/merge-base.c:31
+#: builtin/merge-base.c:32
 msgid "git merge-base --independent <commit>..."
 msgstr "git merge-base --independent <提交>..."
 
-#: builtin/merge-base.c:32
+#: builtin/merge-base.c:33
 msgid "git merge-base --is-ancestor <commit> <commit>"
 msgstr "git merge-base --is-ancestor <提交> <提交>"
 
-#: builtin/merge-base.c:33
+#: builtin/merge-base.c:34
 msgid "git merge-base --fork-point <ref> [<commit>]"
 msgstr "git merge-base --fork-point <引用> [<提交>]"
 
-#: builtin/merge-base.c:217
+#: builtin/merge-base.c:218
 msgid "output all common ancestors"
 msgstr "输出所有共同的祖先"
 
-#: builtin/merge-base.c:219
+#: builtin/merge-base.c:220
 msgid "find ancestors for a single n-way merge"
 msgstr "查找一个多路合并的祖先提交"
 
-#: builtin/merge-base.c:221
+#: builtin/merge-base.c:222
 msgid "list revs not reachable from others"
 msgstr "显示不能被其他访问到的版本"
 
-#: builtin/merge-base.c:223
+#: builtin/merge-base.c:224
 msgid "is the first one ancestor of the other?"
 msgstr "第一个是其他的祖先提交么？"
 
-#: builtin/merge-base.c:225
+#: builtin/merge-base.c:226
 msgid "find where <commit> forked from reflog of <ref>"
 msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
 
-#: builtin/merge-file.c:8
+#: builtin/merge-file.c:9
 msgid ""
 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
 "<orig-file> <file2>"
@@ -10185,35 +10288,35 @@ msgstr ""
 "git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
 "件> <文件2>"
 
-#: builtin/merge-file.c:32
+#: builtin/merge-file.c:33
 msgid "send results to standard output"
 msgstr "将结果发送到标准输出"
 
-#: builtin/merge-file.c:33
+#: builtin/merge-file.c:34
 msgid "use a diff3 based merge"
 msgstr "使用基于 diff3 的合并"
 
-#: builtin/merge-file.c:34
+#: builtin/merge-file.c:35
 msgid "for conflicts, use our version"
 msgstr "如果冲突，使用我们的版本"
 
-#: builtin/merge-file.c:36
+#: builtin/merge-file.c:37
 msgid "for conflicts, use their version"
 msgstr "如果冲突，使用他们的版本"
 
-#: builtin/merge-file.c:38
+#: builtin/merge-file.c:39
 msgid "for conflicts, use a union version"
 msgstr "如果冲突，使用联合版本"
 
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:42
 msgid "for conflicts, use this marker size"
 msgstr "如果冲突，使用指定长度的标记"
 
-#: builtin/merge-file.c:42
+#: builtin/merge-file.c:43
 msgid "do not warn about conflicts"
 msgstr "不要警告冲突"
 
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:45
 msgid "set labels for file1/orig-file/file2"
 msgstr "为 文件1/初始文件/文件2 设置标签"
 
@@ -10252,159 +10355,159 @@ msgstr "合并 %s 和 %s\n"
 msgid "git mktree [-z] [--missing] [--batch]"
 msgstr "git mktree [-z] [--missing] [--batch]"
 
-#: builtin/mktree.c:152
+#: builtin/mktree.c:153
 msgid "input is NUL terminated"
 msgstr "输入以 NUL 字符终止"
 
-#: builtin/mktree.c:153 builtin/write-tree.c:24
+#: builtin/mktree.c:154 builtin/write-tree.c:25
 msgid "allow missing objects"
 msgstr "允许丢失的对象"
 
-#: builtin/mktree.c:154
+#: builtin/mktree.c:155
 msgid "allow creation of more than one tree"
 msgstr "允许创建一个以上的树"
 
-#: builtin/mv.c:16
+#: builtin/mv.c:17
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<选项>] <源>... <目标>"
 
-#: builtin/mv.c:82
+#: builtin/mv.c:83
 #, c-format
 msgid "Directory %s is in index and no submodule?"
 msgstr "目录 %s 在索引中并且不是子模组？"
 
-#: builtin/mv.c:84 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:290
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
-msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
+msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
 
-#: builtin/mv.c:102
+#: builtin/mv.c:103
 #, c-format
 msgid "%.*s is in index"
 msgstr "%.*s 在索引中"
 
-#: builtin/mv.c:124
+#: builtin/mv.c:125
 msgid "force move/rename even if target exists"
 msgstr "强制移动/重命令，即使目标存在"
 
-#: builtin/mv.c:125
+#: builtin/mv.c:126
 msgid "skip move/rename errors"
 msgstr "跳过移动/重命名错误"
 
-#: builtin/mv.c:167
+#: builtin/mv.c:168
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "目标 '%s' 不是一个目录"
 
-#: builtin/mv.c:178
+#: builtin/mv.c:179
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "检查 '%s' 到 '%s' 的重命名\n"
 
-#: builtin/mv.c:182
+#: builtin/mv.c:183
 msgid "bad source"
 msgstr "坏的源"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:186
 msgid "can not move directory into itself"
 msgstr "不能将目录移动到自身"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:189
 msgid "cannot move directory over file"
 msgstr "不能将目录移动到文件"
 
-#: builtin/mv.c:197
+#: builtin/mv.c:198
 msgid "source directory is empty"
 msgstr "源目录为空"
 
-#: builtin/mv.c:222
+#: builtin/mv.c:223
 msgid "not under version control"
 msgstr "不在版本控制之下"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:226
 msgid "destination exists"
 msgstr "目标已存在"
 
-#: builtin/mv.c:233
+#: builtin/mv.c:234
 #, c-format
 msgid "overwriting '%s'"
 msgstr "覆盖 '%s'"
 
-#: builtin/mv.c:236
+#: builtin/mv.c:237
 msgid "Cannot overwrite"
 msgstr "不能覆盖"
 
-#: builtin/mv.c:239
+#: builtin/mv.c:240
 msgid "multiple sources for the same target"
 msgstr "同一目标具有多个源"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:242
 msgid "destination directory does not exist"
 msgstr "目标目录不存在"
 
-#: builtin/mv.c:248
+#: builtin/mv.c:249
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s，源=%s，目标=%s"
 
-#: builtin/mv.c:269
+#: builtin/mv.c:270
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "重命名 %s 至 %s\n"
 
-#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384
+#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "重命名 '%s' 失败"
 
-#: builtin/name-rev.c:289
+#: builtin/name-rev.c:338
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<选项>] <提交>..."
 
-#: builtin/name-rev.c:290
+#: builtin/name-rev.c:339
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<选项>] --all"
 
-#: builtin/name-rev.c:291
+#: builtin/name-rev.c:340
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<选项>] --stdin"
 
-#: builtin/name-rev.c:346
+#: builtin/name-rev.c:395
 msgid "print only names (no SHA-1)"
 msgstr "只打印名称（无 SHA-1）"
 
-#: builtin/name-rev.c:347
+#: builtin/name-rev.c:396
 msgid "only use tags to name the commits"
 msgstr "只使用标签来命名提交"
 
-#: builtin/name-rev.c:349
+#: builtin/name-rev.c:398
 msgid "only use refs matching <pattern>"
 msgstr "只使用和 <模式> 相匹配的引用"
 
-#: builtin/name-rev.c:351
+#: builtin/name-rev.c:400
 msgid "ignore refs matching <pattern>"
 msgstr "忽略和 <模式> 相匹配的引用"
 
-#: builtin/name-rev.c:353
+#: builtin/name-rev.c:402
 msgid "list all commits reachable from all refs"
 msgstr "列出可以从所有引用访问的提交"
 
-#: builtin/name-rev.c:354
+#: builtin/name-rev.c:403
 msgid "read from stdin"
 msgstr "从标准输入读取"
 
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:404
 msgid "allow to print `undefined` names (default)"
 msgstr "允许打印 `未定义` 的名称（默认）"
 
-#: builtin/name-rev.c:361
+#: builtin/name-rev.c:410
 msgid "dereference tags in the input (internal use)"
 msgstr "反向解析输入中的标签（内部使用）"
 
-#: builtin/notes.c:25
+#: builtin/notes.c:26
 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
 
-#: builtin/notes.c:26
+#: builtin/notes.c:27
 msgid ""
 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
 "| (-c | -C) <object>] [<object>]"
@@ -10412,11 +10515,11 @@ msgstr ""
 "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
 "| (-c | -C) <对象>] [<对象>]"
 
-#: builtin/notes.c:27
+#: builtin/notes.c:28
 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
 
-#: builtin/notes.c:28
+#: builtin/notes.c:29
 msgid ""
 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
 "(-c | -C) <object>] [<object>]"
@@ -10424,243 +10527,244 @@ msgstr ""
 "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
 "(-c | -C) <对象>] [<对象>]"
 
-#: builtin/notes.c:29
+#: builtin/notes.c:30
 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
 msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
 
-#: builtin/notes.c:30
+#: builtin/notes.c:31
 msgid "git notes [--ref <notes-ref>] show [<object>]"
 msgstr "git notes [--ref <注解引用>] show [<对象>]"
 
-#: builtin/notes.c:31
+#: builtin/notes.c:32
 msgid ""
 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
 
-#: builtin/notes.c:32
+#: builtin/notes.c:33
 msgid "git notes merge --commit [-v | -q]"
 msgstr "git notes merge --commit [-v | -q]"
 
-#: builtin/notes.c:33
+#: builtin/notes.c:34
 msgid "git notes merge --abort [-v | -q]"
 msgstr "git notes merge --abort [-v | -q]"
 
-#: builtin/notes.c:34
+#: builtin/notes.c:35
 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
 
-#: builtin/notes.c:35
+#: builtin/notes.c:36
 msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
 msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
 
-#: builtin/notes.c:36
+#: builtin/notes.c:37
 msgid "git notes [--ref <notes-ref>] get-ref"
 msgstr "git notes [--ref <注解引用>] get-ref"
 
-#: builtin/notes.c:41
+#: builtin/notes.c:42
 msgid "git notes [list [<object>]]"
 msgstr "git notes [list [<对象>]]"
 
-#: builtin/notes.c:46
+#: builtin/notes.c:47
 msgid "git notes add [<options>] [<object>]"
 msgstr "git notes add [<选项>] [<对象>]"
 
-#: builtin/notes.c:51
+#: builtin/notes.c:52
 msgid "git notes copy [<options>] <from-object> <to-object>"
 msgstr "git notes copy [<选项>] <源对象> <目标对象>"
 
-#: builtin/notes.c:52
+#: builtin/notes.c:53
 msgid "git notes copy --stdin [<from-object> <to-object>]..."
 msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
 
-#: builtin/notes.c:57
+#: builtin/notes.c:58
 msgid "git notes append [<options>] [<object>]"
 msgstr "git notes append [<选项>] [<对象>]"
 
-#: builtin/notes.c:62
+#: builtin/notes.c:63
 msgid "git notes edit [<object>]"
 msgstr "git notes edit [<对象>]"
 
-#: builtin/notes.c:67
+#: builtin/notes.c:68
 msgid "git notes show [<object>]"
 msgstr "git notes show [<对象>]"
 
-#: builtin/notes.c:72
+#: builtin/notes.c:73
 msgid "git notes merge [<options>] <notes-ref>"
 msgstr "git notes merge [<选项>] <注解引用>"
 
-#: builtin/notes.c:73
+#: builtin/notes.c:74
 msgid "git notes merge --commit [<options>]"
 msgstr "git notes merge --commit [<选项>]"
 
-#: builtin/notes.c:74
+#: builtin/notes.c:75
 msgid "git notes merge --abort [<options>]"
 msgstr "git notes merge --abort [<选项>]"
 
-#: builtin/notes.c:79
+#: builtin/notes.c:80
 msgid "git notes remove [<object>]"
 msgstr "git notes remove [<对象>]"
 
-#: builtin/notes.c:84
+#: builtin/notes.c:85
 msgid "git notes prune [<options>]"
 msgstr "git notes prune [<选项>]"
 
-#: builtin/notes.c:89
+#: builtin/notes.c:90
 msgid "git notes get-ref"
 msgstr "git notes get-ref"
 
-#: builtin/notes.c:94
+#: builtin/notes.c:95
 msgid "Write/edit the notes for the following object:"
 msgstr "为下面的对象写/编辑说明："
 
-#: builtin/notes.c:147
+#: builtin/notes.c:148
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "不能为对象 '%s' 开始 'show'"
 
-#: builtin/notes.c:151
+#: builtin/notes.c:152
 msgid "could not read 'show' output"
 msgstr "不能读取 'show' 的输出"
 
-#: builtin/notes.c:159
+#: builtin/notes.c:160
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "无法为对象 '%s' 完成 'show'"
 
-#: builtin/notes.c:194
+#: builtin/notes.c:195
 msgid "please supply the note contents using either -m or -F option"
 msgstr "请通过 -m 或 -F 选项为注解提供内容"
 
-#: builtin/notes.c:203
+#: builtin/notes.c:204
 msgid "unable to write note object"
 msgstr "不能写注解对象"
 
-#: builtin/notes.c:205
+#: builtin/notes.c:206
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr "注解内容被留在 %s 中"
 
-#: builtin/notes.c:233 builtin/tag.c:516
+#: builtin/notes.c:234 builtin/tag.c:517
 #, c-format
 msgid "cannot read '%s'"
 msgstr "不能读取 '%s'"
 
-#: builtin/notes.c:235 builtin/tag.c:519
+#: builtin/notes.c:236 builtin/tag.c:520
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "不能打开或读取 '%s'"
 
-#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
-#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
-#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658
+#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
+#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
+#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr "无法解析 '%s' 为一个有效引用。"
 
-#: builtin/notes.c:257
+#: builtin/notes.c:258
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "无法读取对象 '%s'。"
 
-#: builtin/notes.c:261
+#: builtin/notes.c:262
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr "不能从非数据对象 '%s' 中读取注解数据。"
 
-#: builtin/notes.c:301
+#: builtin/notes.c:302
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "非法的输入行：'%s'。"
 
-#: builtin/notes.c:316
+#: builtin/notes.c:317
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
 
-#. TRANSLATORS: the first %s will be replaced by a
-#. git notes command: 'add', 'merge', 'remove', etc.
-#: builtin/notes.c:345
+#. TRANSLATORS: the first %s will be replaced by a git
+#. notes command: 'add', 'merge', 'remove', etc.
+#.
+#: builtin/notes.c:348
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "拒绝向 %2$s（在 refs/notes/ 之外）%1$s注解"
 
-#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
-#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651
-#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969
+#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
+#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
+#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
 msgid "too many parameters"
 msgstr "参数太多"
 
-#: builtin/notes.c:378 builtin/notes.c:664
+#: builtin/notes.c:381 builtin/notes.c:667
 #, c-format
 msgid "no note found for object %s."
 msgstr "未发现对象 %s 的注解。"
 
-#: builtin/notes.c:399 builtin/notes.c:562
+#: builtin/notes.c:402 builtin/notes.c:565
 msgid "note contents as a string"
 msgstr "注解内容作为一个字符串"
 
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:405 builtin/notes.c:568
 msgid "note contents in a file"
 msgstr "注解内容到一个文件中"
 
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:408 builtin/notes.c:571
 msgid "reuse and edit specified note object"
 msgstr "重用和编辑指定的注解对象"
 
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:411 builtin/notes.c:574
 msgid "reuse specified note object"
 msgstr "重用指定的注解对象"
 
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:414 builtin/notes.c:577
 msgid "allow storing empty note"
 msgstr "允许保存空白注释"
 
-#: builtin/notes.c:412 builtin/notes.c:483
+#: builtin/notes.c:415 builtin/notes.c:486
 msgid "replace existing notes"
 msgstr "替换已存在的注解"
 
-#: builtin/notes.c:437
+#: builtin/notes.c:440
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
 
-#: builtin/notes.c:452 builtin/notes.c:531
+#: builtin/notes.c:455 builtin/notes.c:534
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "覆盖对象 %s 现存注解\n"
 
-#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888
+#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "删除对象 %s 的注解\n"
 
-#: builtin/notes.c:484
+#: builtin/notes.c:487
 msgid "read objects from stdin"
 msgstr "从标准输入读取对象"
 
-#: builtin/notes.c:486
+#: builtin/notes.c:489
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr "重新加载 <命令> 的配置（隐含 --stdin）"
 
-#: builtin/notes.c:504
+#: builtin/notes.c:507
 msgid "too few parameters"
 msgstr "参数太少"
 
-#: builtin/notes.c:525
+#: builtin/notes.c:528
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
 
-#: builtin/notes.c:537
+#: builtin/notes.c:540
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "源对象 %s 缺少注解。不能拷贝。"
 
-#: builtin/notes.c:589
+#: builtin/notes.c:592
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -10669,97 +10773,97 @@ msgstr ""
 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
 "请换用 'git notes add -f -m/-F/-c/-C'。\n"
 
-#: builtin/notes.c:684
+#: builtin/notes.c:687
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:686
+#: builtin/notes.c:689
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "无法删除引用 NOTES_MERGE_REF"
 
-#: builtin/notes.c:688
+#: builtin/notes.c:691
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "无法删除 'git notes merge' 工作区"
 
-#: builtin/notes.c:708
+#: builtin/notes.c:711
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "无法读取引用 NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:710
+#: builtin/notes.c:713
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
 
-#: builtin/notes.c:712
+#: builtin/notes.c:715
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
 
-#: builtin/notes.c:725
+#: builtin/notes.c:728
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "无法解析 NOTES_MERGE_REF"
 
-#: builtin/notes.c:728
+#: builtin/notes.c:731
 msgid "failed to finalize notes merge"
 msgstr "无法完成注解合并"
 
-#: builtin/notes.c:754
+#: builtin/notes.c:757
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "未知的注解合并策略 %s"
 
-#: builtin/notes.c:770
+#: builtin/notes.c:773
 msgid "General options"
 msgstr "通用选项"
 
-#: builtin/notes.c:772
+#: builtin/notes.c:775
 msgid "Merge options"
 msgstr "合并选项"
 
-#: builtin/notes.c:774
+#: builtin/notes.c:777
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:776
+#: builtin/notes.c:779
 msgid "Committing unmerged notes"
 msgstr "提交未合并的注解"
 
-#: builtin/notes.c:778
+#: builtin/notes.c:781
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "通过提交未合并的注解来完成注解合并"
 
-#: builtin/notes.c:780
+#: builtin/notes.c:783
 msgid "Aborting notes merge resolution"
 msgstr "中止注解合并的方案"
 
-#: builtin/notes.c:782
+#: builtin/notes.c:785
 msgid "abort notes merge"
 msgstr "中止注解合并"
 
-#: builtin/notes.c:793
+#: builtin/notes.c:796
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "不能混用 --commit、--abort 或 -s/--strategy"
 
-#: builtin/notes.c:798
+#: builtin/notes.c:801
 msgid "must specify a notes ref to merge"
 msgstr "必须指定一个注解引用来合并"
 
-#: builtin/notes.c:822
+#: builtin/notes.c:825
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "未知的 -s/--strategy：%s"
 
-#: builtin/notes.c:859
+#: builtin/notes.c:862
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
 
-#: builtin/notes.c:862
+#: builtin/notes.c:865
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "无法存储链接到当前的注解引用（%s）"
 
-#: builtin/notes.c:864
+#: builtin/notes.c:867
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -10769,218 +10873,218 @@ msgstr ""
 "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
 "交结果，或者使用命令 'git notes merge --abort' 终止合并。\n"
 
-#: builtin/notes.c:886
+#: builtin/notes.c:889
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "对象 %s 没有注解\n"
 
-#: builtin/notes.c:898
+#: builtin/notes.c:901
 msgid "attempt to remove non-existent note is not an error"
 msgstr "尝试删除不存在的注解不是一个错误"
 
-#: builtin/notes.c:901
+#: builtin/notes.c:904
 msgid "read object names from the standard input"
 msgstr "从标准输入读取对象名称"
 
-#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127
+#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
 msgid "do not remove, show only"
 msgstr "不删除，只显示"
 
-#: builtin/notes.c:940
+#: builtin/notes.c:943
 msgid "report pruned notes"
 msgstr "报告清除的注解"
 
-#: builtin/notes.c:982
+#: builtin/notes.c:985
 msgid "notes-ref"
 msgstr "注解引用"
 
-#: builtin/notes.c:983
+#: builtin/notes.c:986
 msgid "use notes from <notes-ref>"
 msgstr "从 <注解引用> 使用注解"
 
-#: builtin/notes.c:1018
+#: builtin/notes.c:1021
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "未知子命令：%s"
 
-#: builtin/pack-objects.c:29
+#: builtin/pack-objects.c:30
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
 
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:31
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
 
-#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
+#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
 #, c-format
 msgid "deflate error (%d)"
 msgstr "压缩错误 (%d)"
 
-#: builtin/pack-objects.c:770
+#: builtin/pack-objects.c:776
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个"
 
-#: builtin/pack-objects.c:783
+#: builtin/pack-objects.c:789
 msgid "Writing objects"
 msgstr "写入对象中"
 
-#: builtin/pack-objects.c:1063
+#: builtin/pack-objects.c:1069
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"
 
-#: builtin/pack-objects.c:2426
+#: builtin/pack-objects.c:2434
 msgid "Compressing objects"
 msgstr "压缩对象中"
 
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:2843
 #, c-format
 msgid "unsupported index version %s"
 msgstr "不支持的索引版本 %s"
 
-#: builtin/pack-objects.c:2833
+#: builtin/pack-objects.c:2847
 #, c-format
 msgid "bad index version '%s'"
 msgstr "坏的索引版本 '%s'"
 
-#: builtin/pack-objects.c:2863
+#: builtin/pack-objects.c:2877
 msgid "do not show progress meter"
 msgstr "不显示进度表"
 
-#: builtin/pack-objects.c:2865
+#: builtin/pack-objects.c:2879
 msgid "show progress meter"
 msgstr "显示进度表"
 
-#: builtin/pack-objects.c:2867
+#: builtin/pack-objects.c:2881
 msgid "show progress meter during object writing phase"
 msgstr "在对象写入阶段显示进度表"
 
-#: builtin/pack-objects.c:2870
+#: builtin/pack-objects.c:2884
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "当进度表显示时类似于 --all-progress"
 
-#: builtin/pack-objects.c:2871
+#: builtin/pack-objects.c:2885
 msgid "version[,offset]"
 msgstr "版本[,偏移]"
 
-#: builtin/pack-objects.c:2872
+#: builtin/pack-objects.c:2886
 msgid "write the pack index file in the specified idx format version"
 msgstr "用指定的 idx 格式版本来写包索引文件"
 
-#: builtin/pack-objects.c:2875
+#: builtin/pack-objects.c:2889
 msgid "maximum size of each output pack file"
 msgstr "每个输出包的最大尺寸"
 
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2891
 msgid "ignore borrowed objects from alternate object store"
 msgstr "忽略从备用对象存储里借用对象"
 
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2893
 msgid "ignore packed objects"
 msgstr "忽略包对象"
 
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2895
 msgid "limit pack window by objects"
 msgstr "限制打包窗口的对象数"
 
-#: builtin/pack-objects.c:2883
+#: builtin/pack-objects.c:2897
 msgid "limit pack window by memory in addition to object limit"
 msgstr "除对象数量限制外设置打包窗口的内存限制"
 
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2899
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "打包允许的 delta 链的最大长度"
 
-#: builtin/pack-objects.c:2887
+#: builtin/pack-objects.c:2901
 msgid "reuse existing deltas"
 msgstr "重用已存在的 deltas"
 
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2903
 msgid "reuse existing objects"
 msgstr "重用已存在的对象"
 
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2905
 msgid "use OFS_DELTA objects"
 msgstr "使用 OFS_DELTA 对象"
 
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2907
 msgid "use threads when searching for best delta matches"
 msgstr "使用线程查询最佳 delta 匹配"
 
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2909
 msgid "do not create an empty pack output"
 msgstr "不创建空的包输出"
 
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2911
 msgid "read revision arguments from standard input"
 msgstr "从标准输入读取版本号参数"
 
-#: builtin/pack-objects.c:2899
+#: builtin/pack-objects.c:2913
 msgid "limit the objects to those that are not yet packed"
 msgstr "限制那些尚未打包的对象"
 
-#: builtin/pack-objects.c:2902
+#: builtin/pack-objects.c:2916
 msgid "include objects reachable from any reference"
 msgstr "包括可以从任何引用访问到的对象"
 
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2919
 msgid "include objects referred by reflog entries"
 msgstr "包括被引用日志引用到的对象"
 
-#: builtin/pack-objects.c:2908
+#: builtin/pack-objects.c:2922
 msgid "include objects referred to by the index"
 msgstr "包括被索引引用到的对象"
 
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2925
 msgid "output pack to stdout"
 msgstr "输出包到标准输出"
 
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2927
 msgid "include tag objects that refer to objects to be packed"
 msgstr "包括那些引用了待打包对象的标签对象"
 
-#: builtin/pack-objects.c:2915
+#: builtin/pack-objects.c:2929
 msgid "keep unreachable objects"
 msgstr "维持不可达的对象"
 
-#: builtin/pack-objects.c:2917
+#: builtin/pack-objects.c:2931
 msgid "pack loose unreachable objects"
 msgstr "打包松散的不可达对象"
 
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2933
 msgid "unpack unreachable objects newer than <time>"
 msgstr "将比给定 <时间> 新的无法访问的对象解包"
 
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:2936
 msgid "create thin packs"
 msgstr "创建精简包"
 
-#: builtin/pack-objects.c:2924
+#: builtin/pack-objects.c:2938
 msgid "create packs suitable for shallow fetches"
 msgstr "创建适合浅克隆仓库获取的包"
 
-#: builtin/pack-objects.c:2926
+#: builtin/pack-objects.c:2940
 msgid "ignore packs that have companion .keep file"
 msgstr "忽略配有 .keep 文件的包"
 
-#: builtin/pack-objects.c:2928
+#: builtin/pack-objects.c:2942
 msgid "pack compression level"
 msgstr "打包压缩级别"
 
-#: builtin/pack-objects.c:2930
+#: builtin/pack-objects.c:2944
 msgid "do not hide commits by grafts"
 msgstr "显示被嫁接隐藏的提交"
 
-#: builtin/pack-objects.c:2932
+#: builtin/pack-objects.c:2946
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度"
 
-#: builtin/pack-objects.c:2934
+#: builtin/pack-objects.c:2948
 msgid "write a bitmap index together with the pack index"
 msgstr "在建立包索引的同时创建 bitmap 索引"
 
-#: builtin/pack-objects.c:3061
+#: builtin/pack-objects.c:3075
 msgid "Counting objects"
 msgstr "对象计数中"
 
@@ -11020,62 +11124,66 @@ msgstr "使早于给定时间的对象过期"
 msgid "cannot prune in a precious-objects repo"
 msgstr "不能在珍品仓库中执行清理操作"
 
-#: builtin/pull.c:51 builtin/pull.c:53
+#: builtin/pull.c:54 builtin/pull.c:56
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "%s 的值无效：%s"
 
-#: builtin/pull.c:73
+#: builtin/pull.c:76
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
 
-#: builtin/pull.c:121
+#: builtin/pull.c:124
+msgid "control for recursive fetching of submodules"
+msgstr "控制子模组的递归获取"
+
+#: builtin/pull.c:128
 msgid "Options related to merging"
 msgstr "和合并相关的选项"
 
-#: builtin/pull.c:124
+#: builtin/pull.c:131
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "使用变基操作取代合并操作以合入修改"
 
-#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120
+#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
 msgid "allow fast-forward"
 msgstr "允许快进式"
 
-#: builtin/pull.c:157
+#: builtin/pull.c:164
 msgid "automatically stash/stash pop before and after rebase"
-msgstr "自动在变基操作前后执行 stash/stash pop"
+msgstr "变基操作前后执行自动贮藏和弹出贮藏"
 
-#: builtin/pull.c:173
+#: builtin/pull.c:180
 msgid "Options related to fetching"
 msgstr "和获取相关的参数"
 
-#: builtin/pull.c:195
+#: builtin/pull.c:198
 msgid "number of submodules pulled in parallel"
 msgstr "并发拉取的子模组的数量"
 
-#: builtin/pull.c:284
+#: builtin/pull.c:287
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "pull.ff 的取值无效：%s"
 
-#: builtin/pull.c:397
+#: builtin/pull.c:399
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
 
-#: builtin/pull.c:399
+#: builtin/pull.c:401
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
 
-#: builtin/pull.c:400
+#: builtin/pull.c:402
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
 
-#: builtin/pull.c:403
+#: builtin/pull.c:405
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -11085,42 +11193,42 @@ msgstr ""
 "您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n"
 "分支默认的远程仓库，您必须在命令行中指定一个分支名。"
 
-#: builtin/pull.c:408 git-parse-remote.sh:73
+#: builtin/pull.c:410 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "您当前不在一个分支上。"
 
-#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
+#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "请指定您要变基到哪一个分支。"
 
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
+#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "请指定您要合并哪一个分支。"
 
-#: builtin/pull.c:413 builtin/pull.c:428
+#: builtin/pull.c:415 builtin/pull.c:430
 msgid "See git-pull(1) for details."
 msgstr "详见 git-pull(1)。"
 
-#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
+#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
 #: git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<远程>"
 
-#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456
+#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<分支>"
 
-#: builtin/pull.c:423 git-parse-remote.sh:75
+#: builtin/pull.c:425 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "当前分支没有跟踪信息。"
 
-#: builtin/pull.c:432 git-parse-remote.sh:95
+#: builtin/pull.c:434 git-parse-remote.sh:95
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr "如果您想要为此分支创建跟踪信息，您可以执行："
 
-#: builtin/pull.c:437
+#: builtin/pull.c:439
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -11129,27 +11237,27 @@ msgstr ""
 "您的配置中指定要合并远程的引用 '%s'，\n"
 "但是没有获取到这个引用。"
 
-#: builtin/pull.c:754
+#: builtin/pull.c:792
 msgid "ignoring --verify-signatures for rebase"
 msgstr "为变基操作忽略 --verify-signatures"
 
-#: builtin/pull.c:801
+#: builtin/pull.c:840
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
 
-#: builtin/pull.c:809
+#: builtin/pull.c:848
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "更新尚未诞生的分支，变更添加至索引。"
 
-#: builtin/pull.c:812
+#: builtin/pull.c:851
 msgid "pull with rebase"
 msgstr "变基式拉取"
 
-#: builtin/pull.c:813
+#: builtin/pull.c:852
 msgid "please commit or stash them."
-msgstr "请提交或为它们保存进度。"
+msgstr "请提交或贮藏它们。"
 
-#: builtin/pull.c:838
+#: builtin/pull.c:877
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -11159,7 +11267,7 @@ msgstr ""
 "fetch 更新了当前的分支。快进您的工作区\n"
 "至提交 %s。"
 
-#: builtin/pull.c:843
+#: builtin/pull.c:882
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -11176,27 +11284,31 @@ msgstr ""
 "$ git reset --hard\n"
 "恢复之前的状态。"
 
-#: builtin/pull.c:858
+#: builtin/pull.c:897
 msgid "Cannot merge multiple branches into empty head."
 msgstr "无法将多个分支合并到空分支。"
 
-#: builtin/pull.c:862
+#: builtin/pull.c:901
 msgid "Cannot rebase onto multiple branches."
 msgstr "无法变基到多个分支。"
 
-#: builtin/push.c:16
+#: builtin/pull.c:908
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr "本地子模组中有修改，无法变基"
+
+#: builtin/push.c:17
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
 
-#: builtin/push.c:89
+#: builtin/push.c:90
 msgid "tag shorthand without <tag>"
 msgstr "标签后面未提供 <标签> 参数"
 
-#: builtin/push.c:99
+#: builtin/push.c:100
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete 只接受简单的目标引用名"
 
-#: builtin/push.c:143
+#: builtin/push.c:144
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
@@ -11204,7 +11316,7 @@ msgstr ""
 "\n"
 "为了永久地选择任一选项，参见 'git help config' 中的 push.default。"
 
-#: builtin/push.c:146
+#: builtin/push.c:147
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -11228,7 +11340,7 @@ msgstr ""
 "    git push %s %s\n"
 "%s"
 
-#: builtin/push.c:161
+#: builtin/push.c:162
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -11242,7 +11354,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<远程分支名字>\n"
 
-#: builtin/push.c:175
+#: builtin/push.c:176
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -11255,12 +11367,12 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:183
+#: builtin/push.c:184
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "当前分支 %s 有多个上游分支，拒绝推送。"
 
-#: builtin/push.c:186
+#: builtin/push.c:187
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -11270,12 +11382,12 @@ msgstr ""
 "您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n"
 "而没有告诉我要推送什么、更新哪个远程分支。"
 
-#: builtin/push.c:245
+#: builtin/push.c:246
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr "您没有为推送指定任何引用规格，并且 push.default 为 \"nothing\"。"
 
-#: builtin/push.c:252
+#: builtin/push.c:253
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -11286,7 +11398,7 @@ msgstr ""
 "再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n"
 "'git push --help' 中的 'Note about fast-forwards' 小节。"
 
-#: builtin/push.c:258
+#: builtin/push.c:259
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -11297,7 +11409,7 @@ msgstr ""
 "检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n"
 "'git push --help' 中的 'Note about fast-forwards' 小节。"
 
-#: builtin/push.c:264
+#: builtin/push.c:265
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -11310,11 +11422,11 @@ msgstr ""
 "（如 'git pull ...'）。\n"
 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
 
-#: builtin/push.c:271
+#: builtin/push.c:272
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr "更新被拒绝，因为该标签在远程已经存在。"
 
-#: builtin/push.c:274
+#: builtin/push.c:275
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -11323,22 +11435,22 @@ msgstr ""
 "如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n"
 "也不能更新远程引用让其指向一个非提交对象。\n"
 
-#: builtin/push.c:334
+#: builtin/push.c:335
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "推送到 %s\n"
 
-#: builtin/push.c:338
+#: builtin/push.c:339
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "无法推送一些引用到 '%s'"
 
-#: builtin/push.c:369
+#: builtin/push.c:370
 #, c-format
 msgid "bad repository '%s'"
 msgstr "坏的仓库 '%s'"
 
-#: builtin/push.c:370
+#: builtin/push.c:371
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -11359,112 +11471,112 @@ msgstr ""
 "\n"
 "    git push <名称>\n"
 
-#: builtin/push.c:388
+#: builtin/push.c:389
 msgid "--all and --tags are incompatible"
 msgstr "--all 和 --tags 不兼容"
 
-#: builtin/push.c:389
+#: builtin/push.c:390
 msgid "--all can't be combined with refspecs"
 msgstr "--all 不能和引用规格同时使用"
 
-#: builtin/push.c:394
+#: builtin/push.c:395
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror 和 --tags 不兼容"
 
-#: builtin/push.c:395
+#: builtin/push.c:396
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror 不能和引用规格同时使用"
 
-#: builtin/push.c:400
+#: builtin/push.c:401
 msgid "--all and --mirror are incompatible"
 msgstr "--all 和 --mirror 不兼容"
 
-#: builtin/push.c:518
+#: builtin/push.c:523
 msgid "repository"
 msgstr "仓库"
 
-#: builtin/push.c:519 builtin/send-pack.c:162
+#: builtin/push.c:524 builtin/send-pack.c:163
 msgid "push all refs"
 msgstr "推送所有引用"
 
-#: builtin/push.c:520 builtin/send-pack.c:164
+#: builtin/push.c:525 builtin/send-pack.c:165
 msgid "mirror all refs"
 msgstr "镜像所有引用"
 
-#: builtin/push.c:522
+#: builtin/push.c:527
 msgid "delete refs"
 msgstr "删除引用"
 
-#: builtin/push.c:523
+#: builtin/push.c:528
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "推送标签（不能使用 --all or --mirror）"
 
-#: builtin/push.c:526 builtin/send-pack.c:165
+#: builtin/push.c:531 builtin/send-pack.c:166
 msgid "force updates"
 msgstr "强制更新"
 
-#: builtin/push.c:528 builtin/send-pack.c:179
+#: builtin/push.c:533 builtin/send-pack.c:180
 msgid "refname>:<expect"
 msgstr "引用名>:<期望值"
 
-#: builtin/push.c:529 builtin/send-pack.c:180
+#: builtin/push.c:534 builtin/send-pack.c:181
 msgid "require old value of ref to be at this value"
 msgstr "要求引用旧的取值为设定值"
 
-#: builtin/push.c:532
+#: builtin/push.c:537
 msgid "control recursive pushing of submodules"
 msgstr "控制子模组的递归推送"
 
-#: builtin/push.c:534 builtin/send-pack.c:173
+#: builtin/push.c:539 builtin/send-pack.c:174
 msgid "use thin pack"
 msgstr "使用精简打包"
 
-#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159
-#: builtin/send-pack.c:160
+#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
+#: builtin/send-pack.c:161
 msgid "receive pack program"
 msgstr "接收包程序"
 
-#: builtin/push.c:537
+#: builtin/push.c:542
 msgid "set upstream for git pull/status"
 msgstr "设置 git pull/status 的上游"
 
-#: builtin/push.c:540
+#: builtin/push.c:545
 msgid "prune locally removed refs"
 msgstr "清除本地删除的引用"
 
-#: builtin/push.c:542
+#: builtin/push.c:547
 msgid "bypass pre-push hook"
 msgstr "绕过 pre-push 钩子"
 
-#: builtin/push.c:543
+#: builtin/push.c:548
 msgid "push missing but relevant tags"
 msgstr "推送缺失但有关的标签"
 
-#: builtin/push.c:546 builtin/send-pack.c:167
+#: builtin/push.c:551 builtin/send-pack.c:168
 msgid "GPG sign the push"
 msgstr "用 GPG 为推送签名"
 
-#: builtin/push.c:548 builtin/send-pack.c:174
+#: builtin/push.c:553 builtin/send-pack.c:175
 msgid "request atomic transaction on remote side"
 msgstr "需要远端支持原子事务"
 
-#: builtin/push.c:549 builtin/send-pack.c:170
+#: builtin/push.c:554 builtin/send-pack.c:171
 msgid "server-specific"
 msgstr "server-specific"
 
-#: builtin/push.c:549 builtin/send-pack.c:171
+#: builtin/push.c:554 builtin/send-pack.c:172
 msgid "option to transmit"
 msgstr "传输选项"
 
-#: builtin/push.c:563
+#: builtin/push.c:568
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
 
-#: builtin/push.c:565
+#: builtin/push.c:570
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete 未接任何引用没有意义"
 
-#: builtin/push.c:584
+#: builtin/push.c:589
 msgid "push options must not have new line characters"
 msgstr "推送选项不能有换行符"
 
@@ -11478,87 +11590,87 @@ msgstr ""
 "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
 "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
 
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:121
 msgid "write resulting index to <file>"
 msgstr "将索引结果写入 <文件>"
 
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:124
 msgid "only empty the index"
 msgstr "只是清空索引"
 
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:126
 msgid "Merging"
 msgstr "合并"
 
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:128
 msgid "perform a merge in addition to a read"
 msgstr "读取之余再执行一个合并"
 
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:130
 msgid "3-way merge if no file level merging required"
 msgstr "如果没有文件级合并需要，执行三方合并"
 
-#: builtin/read-tree.c:141
+#: builtin/read-tree.c:132
 msgid "3-way merge in presence of adds and removes"
 msgstr "存在添加和删除时，也执行三方合并"
 
-#: builtin/read-tree.c:143
+#: builtin/read-tree.c:134
 msgid "same as -m, but discard unmerged entries"
 msgstr "类似于 -m，但丢弃未合并的条目"
 
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:135
 msgid "<subdirectory>/"
 msgstr "<子目录>/"
 
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:136
 msgid "read the tree into the index under <subdirectory>/"
 msgstr "读取树对象到索引的 <子目录>/ 下"
 
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:139
 msgid "update working tree with merge result"
 msgstr "用合并的结果更新工作区"
 
-#: builtin/read-tree.c:150
+#: builtin/read-tree.c:141
 msgid "gitignore"
 msgstr "gitignore"
 
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:142
 msgid "allow explicitly ignored files to be overwritten"
 msgstr "允许忽略文件中设定的文件可以被覆盖"
 
-#: builtin/read-tree.c:154
+#: builtin/read-tree.c:145
 msgid "don't check the working tree after merging"
 msgstr "合并后不检查工作区"
 
-#: builtin/read-tree.c:155
+#: builtin/read-tree.c:146
 msgid "don't update the index or the work tree"
 msgstr "不更新索引区和工作区"
 
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:148
 msgid "skip applying sparse checkout filter"
 msgstr "跳过应用稀疏检出过滤器"
 
-#: builtin/read-tree.c:159
+#: builtin/read-tree.c:150
 msgid "debug unpack-trees"
 msgstr "调试 unpack-trees"
 
-#: builtin/rebase--helper.c:7
+#: builtin/rebase--helper.c:8
 msgid "git rebase--helper [<options>]"
 msgstr "git rebase--helper [<选项>]"
 
-#: builtin/rebase--helper.c:19
+#: builtin/rebase--helper.c:20
 msgid "continue rebase"
 msgstr "继续变基"
 
-#: builtin/rebase--helper.c:21
+#: builtin/rebase--helper.c:22
 msgid "abort rebase"
 msgstr "中止变基"
 
-#: builtin/receive-pack.c:27
+#: builtin/receive-pack.c:28
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-dir>"
 
-#: builtin/receive-pack.c:795
+#: builtin/receive-pack.c:838
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -11584,7 +11696,7 @@ msgstr ""
 "若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n"
 "配置变量为 'refuse'。"
 
-#: builtin/receive-pack.c:815
+#: builtin/receive-pack.c:858
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -11603,29 +11715,29 @@ msgstr ""
 "\n"
 "若要屏蔽此信息，您可以设置它为 'refuse'。"
 
-#: builtin/receive-pack.c:1888
+#: builtin/receive-pack.c:1933
 msgid "quiet"
 msgstr "静默模式"
 
-#: builtin/receive-pack.c:1902
+#: builtin/receive-pack.c:1947
 msgid "You must specify a directory."
 msgstr "您必须指定一个目录。"
 
-#: builtin/reflog.c:423
+#: builtin/reflog.c:424
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
 
-#: builtin/reflog.c:540 builtin/reflog.c:545
+#: builtin/reflog.c:541 builtin/reflog.c:546
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' 不是一个有效的时间戳"
 
-#: builtin/remote.c:12
+#: builtin/remote.c:13
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
-#: builtin/remote.c:13
+#: builtin/remote.c:14
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -11633,81 +11745,81 @@ msgstr ""
 "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <名称> <地址>"
 
-#: builtin/remote.c:14 builtin/remote.c:34
+#: builtin/remote.c:15 builtin/remote.c:35
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename <旧名称> <新名称>"
 
-#: builtin/remote.c:15 builtin/remote.c:39
+#: builtin/remote.c:16 builtin/remote.c:40
 msgid "git remote remove <name>"
 msgstr "git remote remove <名称>"
 
-#: builtin/remote.c:16 builtin/remote.c:44
+#: builtin/remote.c:17 builtin/remote.c:45
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
 
-#: builtin/remote.c:17
+#: builtin/remote.c:18
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <名称>"
 
-#: builtin/remote.c:18
+#: builtin/remote.c:19
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <名称>"
 
-#: builtin/remote.c:19
+#: builtin/remote.c:20
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
 
-#: builtin/remote.c:20
+#: builtin/remote.c:21
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <名称> <分支>..."
 
-#: builtin/remote.c:21 builtin/remote.c:70
+#: builtin/remote.c:22 builtin/remote.c:71
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <名称>"
 
-#: builtin/remote.c:22 builtin/remote.c:75
+#: builtin/remote.c:23 builtin/remote.c:76
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
 
-#: builtin/remote.c:23 builtin/remote.c:76
+#: builtin/remote.c:24 builtin/remote.c:77
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <名称> <新的地址>"
 
-#: builtin/remote.c:24 builtin/remote.c:77
+#: builtin/remote.c:25 builtin/remote.c:78
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <名称> <地址>"
 
-#: builtin/remote.c:29
+#: builtin/remote.c:30
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<选项>] <名称> <地址>"
 
-#: builtin/remote.c:49
+#: builtin/remote.c:50
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <名称> <分支>..."
 
-#: builtin/remote.c:50
+#: builtin/remote.c:51
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <名称> <分支>..."
 
-#: builtin/remote.c:55
+#: builtin/remote.c:56
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<选项>] <名称>"
 
-#: builtin/remote.c:60
+#: builtin/remote.c:61
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<选项>] <名称>"
 
-#: builtin/remote.c:65
+#: builtin/remote.c:66
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<选项>] [<组> | <远程>]..."
 
-#: builtin/remote.c:94
+#: builtin/remote.c:95
 #, c-format
 msgid "Updating %s"
 msgstr "更新 %s 中"
 
-#: builtin/remote.c:126
+#: builtin/remote.c:127
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -11715,86 +11827,86 @@ msgstr ""
 "--mirror 选项危险且过时，请使用 --mirror=fetch\n"
 "\t 或 --mirror=push"
 
-#: builtin/remote.c:143
+#: builtin/remote.c:144
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "未知的镜像参数：%s"
 
-#: builtin/remote.c:159
+#: builtin/remote.c:160
 msgid "fetch the remote branches"
 msgstr "抓取远程的分支"
 
-#: builtin/remote.c:161
+#: builtin/remote.c:162
 msgid "import all tags and associated objects when fetching"
 msgstr "抓取时导入所有的标签和关联对象"
 
-#: builtin/remote.c:164
+#: builtin/remote.c:165
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "或不抓取任何标签（--no-tags）"
 
-#: builtin/remote.c:166
+#: builtin/remote.c:167
 msgid "branch(es) to track"
 msgstr "跟踪的分支"
 
-#: builtin/remote.c:167
+#: builtin/remote.c:168
 msgid "master branch"
 msgstr "主线分支"
 
-#: builtin/remote.c:168
+#: builtin/remote.c:169
 msgid "push|fetch"
 msgstr "push|fetch"
 
-#: builtin/remote.c:169
+#: builtin/remote.c:170
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr "把远程设置为用以推送或抓取的镜像"
 
-#: builtin/remote.c:181
+#: builtin/remote.c:182
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
 
-#: builtin/remote.c:183
+#: builtin/remote.c:184
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
 
-#: builtin/remote.c:190 builtin/remote.c:629
+#: builtin/remote.c:191 builtin/remote.c:630
 #, c-format
 msgid "remote %s already exists."
 msgstr "远程 %s 已经存在。"
 
-#: builtin/remote.c:194 builtin/remote.c:633
+#: builtin/remote.c:195 builtin/remote.c:634
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' 不是一个有效的远程名称"
 
-#: builtin/remote.c:234
+#: builtin/remote.c:235
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "无法设置 master '%s'"
 
-#: builtin/remote.c:336
+#: builtin/remote.c:337
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "无法得到引用规格 %s 的获取列表"
 
-#: builtin/remote.c:437 builtin/remote.c:445
+#: builtin/remote.c:438 builtin/remote.c:446
 msgid "(matching)"
 msgstr "（匹配）"
 
-#: builtin/remote.c:449
+#: builtin/remote.c:450
 msgid "(delete)"
 msgstr "（删除）"
 
-#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856
+#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
 #, c-format
 msgid "No such remote: %s"
 msgstr "没有这样的远程：%s"
 
-#: builtin/remote.c:639
+#: builtin/remote.c:640
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "不能重命名配置小节 '%s' 到 '%s'"
 
-#: builtin/remote.c:659
+#: builtin/remote.c:660
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -11805,17 +11917,17 @@ msgstr ""
 "\t%s\n"
 "\t如果必要请手动更新配置。"
 
-#: builtin/remote.c:695
+#: builtin/remote.c:696
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "删除 '%s' 失败"
 
-#: builtin/remote.c:729
+#: builtin/remote.c:730
 #, c-format
 msgid "creating '%s' failed"
 msgstr "创建 '%s' 失败"
 
-#: builtin/remote.c:794
+#: builtin/remote.c:795
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -11825,144 +11937,146 @@ msgid_plural ""
 msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用："
 msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用："
 
-#: builtin/remote.c:808
+#: builtin/remote.c:809
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "不能移除配置小节 '%s'"
 
-#: builtin/remote.c:909
+#: builtin/remote.c:910
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " 新的（下一次获取将存储于 remotes/%s）"
 
-#: builtin/remote.c:912
+#: builtin/remote.c:913
 msgid " tracked"
 msgstr " 已跟踪"
 
-#: builtin/remote.c:914
+#: builtin/remote.c:915
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " 过时（使用 'git remote prune' 来移除）"
 
-#: builtin/remote.c:916
+#: builtin/remote.c:917
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:957
+#: builtin/remote.c:958
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支"
 
-#: builtin/remote.c:965
+#: builtin/remote.c:966
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "交互式变基到远程 %s"
 
-#: builtin/remote.c:966
+#: builtin/remote.c:967
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "变基到远程 %s"
 
-#: builtin/remote.c:969
+#: builtin/remote.c:970
 #, c-format
 msgid " merges with remote %s"
 msgstr " 与远程 %s 合并"
 
-#: builtin/remote.c:972
+#: builtin/remote.c:973
 #, c-format
 msgid "merges with remote %s"
 msgstr "与远程 %s 合并"
 
-#: builtin/remote.c:975
+#: builtin/remote.c:976
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    以及和远程 %s\n"
 
-#: builtin/remote.c:1018
+#: builtin/remote.c:1019
 msgid "create"
 msgstr "创建"
 
-#: builtin/remote.c:1021
+#: builtin/remote.c:1022
 msgid "delete"
 msgstr "删除"
 
-#: builtin/remote.c:1025
+#: builtin/remote.c:1026
 msgid "up to date"
 msgstr "最新"
 
-#: builtin/remote.c:1028
+#: builtin/remote.c:1029
 msgid "fast-forwardable"
 msgstr "可快进"
 
-#: builtin/remote.c:1031
+#: builtin/remote.c:1032
 msgid "local out of date"
 msgstr "本地已过时"
 
-#: builtin/remote.c:1038
+#: builtin/remote.c:1039
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s 强制推送至 %-*s (%s)"
 
-#: builtin/remote.c:1041
+#: builtin/remote.c:1042
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s 推送至 %-*s (%s)"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1046
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s 强制推送至 %s"
 
-#: builtin/remote.c:1048
+#: builtin/remote.c:1049
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s 推送至 %s"
 
-#: builtin/remote.c:1116
+#: builtin/remote.c:1117
 msgid "do not query remotes"
 msgstr "不查询远程"
 
-#: builtin/remote.c:1143
+#: builtin/remote.c:1144
 #, c-format
 msgid "* remote %s"
 msgstr "* 远程 %s"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  获取地址：%s"
 
-#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297
+#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
 msgid "(no URL)"
 msgstr "(无 URL)"
 
-#. TRANSLATORS: the colon ':' should align with
-#. the one in "  Fetch URL: %s" translation
-#: builtin/remote.c:1156 builtin/remote.c:1158
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#: builtin/remote.c:1160 builtin/remote.c:1162
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  推送地址：%s"
 
-#: builtin/remote.c:1160 builtin/remote.c:1162 builtin/remote.c:1164
+#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  HEAD 分支：%s"
 
 #  译者：中文字符串拼接，可删除前导空格
-#: builtin/remote.c:1160
+#: builtin/remote.c:1164
 msgid "(not queried)"
 msgstr "（未查询）"
 
-#: builtin/remote.c:1162
+#: builtin/remote.c:1166
 msgid "(unknown)"
 msgstr "（未知）"
 
-#: builtin/remote.c:1166
+#: builtin/remote.c:1170
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n"
 
-#: builtin/remote.c:1178
+#: builtin/remote.c:1182
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
@@ -11970,164 +12084,164 @@ msgstr[0] "  远程分支：%s"
 msgstr[1] "  远程分支：%s"
 
 #  译者：中文字符串拼接，可删除前导空格
-#: builtin/remote.c:1181 builtin/remote.c:1207
+#: builtin/remote.c:1185 builtin/remote.c:1211
 msgid " (status not queried)"
 msgstr "（状态未查询）"
 
-#: builtin/remote.c:1190
+#: builtin/remote.c:1194
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  为 'git pull' 配置的本地分支："
 msgstr[1] "  为 'git pull' 配置的本地分支："
 
-#: builtin/remote.c:1198
+#: builtin/remote.c:1202
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  本地引用将在 'git push' 时被镜像"
 
-#: builtin/remote.c:1204
+#: builtin/remote.c:1208
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  为 'git push' 配置的本地引用%s："
 msgstr[1] "  为 'git push' 配置的本地引用%s："
 
-#: builtin/remote.c:1225
+#: builtin/remote.c:1229
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
 
-#: builtin/remote.c:1227
+#: builtin/remote.c:1231
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "删除 refs/remotes/<名称>/HEAD"
 
-#: builtin/remote.c:1242
+#: builtin/remote.c:1246
 msgid "Cannot determine remote HEAD"
 msgstr "无法确定远程 HEAD"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1248
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："
 
-#: builtin/remote.c:1254
+#: builtin/remote.c:1258
 #, c-format
 msgid "Could not delete %s"
 msgstr "无法删除 %s"
 
-#: builtin/remote.c:1262
+#: builtin/remote.c:1266
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "不是一个有效引用：%s"
 
-#: builtin/remote.c:1264
+#: builtin/remote.c:1268
 #, c-format
 msgid "Could not setup %s"
 msgstr "不能设置 %s"
 
 #  译者：注意保持前导空格
-#: builtin/remote.c:1282
+#: builtin/remote.c:1286
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s 将成为摇摆状态！"
 
 #  译者：注意保持前导空格
-#: builtin/remote.c:1283
+#: builtin/remote.c:1287
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s 已成为摇摆状态！"
 
-#: builtin/remote.c:1293
+#: builtin/remote.c:1297
 #, c-format
 msgid "Pruning %s"
 msgstr "修剪 %s"
 
-#: builtin/remote.c:1294
+#: builtin/remote.c:1298
 #, c-format
 msgid "URL: %s"
 msgstr "URL：%s"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1314
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [将删除] %s"
 
-#: builtin/remote.c:1313
+#: builtin/remote.c:1317
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [已删除] %s"
 
-#: builtin/remote.c:1358
+#: builtin/remote.c:1362
 msgid "prune remotes after fetching"
 msgstr "抓取后清除远程"
 
-#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543
+#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
 #, c-format
 msgid "No such remote '%s'"
 msgstr "没有此远程 '%s'"
 
-#: builtin/remote.c:1437
+#: builtin/remote.c:1441
 msgid "add branch"
 msgstr "添加分支"
 
-#: builtin/remote.c:1444
+#: builtin/remote.c:1448
 msgid "no remote specified"
 msgstr "未指定远程"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1465
 msgid "query push URLs rather than fetch URLs"
 msgstr "查询推送 URL 地址，而非获取 URL 地址"
 
-#: builtin/remote.c:1463
+#: builtin/remote.c:1467
 msgid "return all URLs"
 msgstr "返回所有 URL 地址"
 
-#: builtin/remote.c:1491
+#: builtin/remote.c:1495
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "没有给远程仓库 '%s' 设定 URL"
 
-#: builtin/remote.c:1517
+#: builtin/remote.c:1521
 msgid "manipulate push URLs"
 msgstr "操作推送 URLS"
 
-#: builtin/remote.c:1519
+#: builtin/remote.c:1523
 msgid "add URL"
 msgstr "添加 URL"
 
-#: builtin/remote.c:1521
+#: builtin/remote.c:1525
 msgid "delete URLs"
 msgstr "删除 URLS"
 
-#: builtin/remote.c:1528
+#: builtin/remote.c:1532
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete 无意义"
 
-#: builtin/remote.c:1569
+#: builtin/remote.c:1573
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "无效的旧 URL 匹配模版：%s"
 
-#: builtin/remote.c:1577
+#: builtin/remote.c:1581
 #, c-format
 msgid "No such URL found: %s"
 msgstr "未找到此 URL：%s"
 
-#: builtin/remote.c:1579
+#: builtin/remote.c:1583
 msgid "Will not delete all non-push URLs"
 msgstr "将不会删除所有非推送 URL 地址"
 
-#: builtin/remote.c:1593
+#: builtin/remote.c:1597
 msgid "be verbose; must be placed before a subcommand"
 msgstr "冗长输出；必须置于子命令之前"
 
-#: builtin/remote.c:1624
+#: builtin/remote.c:1628
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "未知子命令：%s"
 
-#: builtin/repack.c:17
+#: builtin/repack.c:18
 msgid "git repack [<options>]"
 msgstr "git repack [<选项>]"
 
-#: builtin/repack.c:22
+#: builtin/repack.c:23
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -12135,328 +12249,332 @@ msgstr ""
 "增量 repack 和 bitmap 索引不兼容。  使用 --no-write-bitmap-index\n"
 "或禁用 pack.writebitmaps 配置。"
 
-#: builtin/repack.c:166
+#: builtin/repack.c:168
 msgid "pack everything in a single pack"
 msgstr "所有内容打包到一个包文件中"
 
-#: builtin/repack.c:168
+#: builtin/repack.c:170
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "和 -a 相同，并将不可达的对象设为松散对象"
 
-#: builtin/repack.c:171
+#: builtin/repack.c:173
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "删除多余的包，运行 git-prune-packed"
 
-#: builtin/repack.c:173
+#: builtin/repack.c:175
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
 
-#: builtin/repack.c:175
+#: builtin/repack.c:177
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
 
-#: builtin/repack.c:177
+#: builtin/repack.c:179
 msgid "do not run git-update-server-info"
 msgstr "不运行 git-update-server-info"
 
-#: builtin/repack.c:180
+#: builtin/repack.c:182
 msgid "pass --local to git-pack-objects"
 msgstr "向 git-pack-objects 传递参数 --local"
 
-#: builtin/repack.c:182
+#: builtin/repack.c:184
 msgid "write bitmap index"
 msgstr "写 bitmap 索引"
 
-#: builtin/repack.c:183
+#: builtin/repack.c:185
 msgid "approxidate"
 msgstr "近似日期"
 
-#: builtin/repack.c:184
+#: builtin/repack.c:186
 msgid "with -A, do not loosen objects older than this"
 msgstr "使用 -A，不要将早于给定时间的对象过期"
 
-#: builtin/repack.c:186
+#: builtin/repack.c:188
 msgid "with -a, repack unreachable objects"
 msgstr "使用 -a ，重新对不可达对象打包"
 
-#: builtin/repack.c:188
+#: builtin/repack.c:190
 msgid "size of the window used for delta compression"
 msgstr "用于增量压缩的窗口值"
 
-#: builtin/repack.c:189 builtin/repack.c:193
+#: builtin/repack.c:191 builtin/repack.c:197
 msgid "bytes"
 msgstr "字节"
 
-#: builtin/repack.c:190
+#: builtin/repack.c:192
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr "和上面的相似，但限制内存大小而非条目数"
 
-#: builtin/repack.c:192
+#: builtin/repack.c:194
 msgid "limits the maximum delta depth"
 msgstr "限制最大增量深度"
 
-#: builtin/repack.c:194
+#: builtin/repack.c:196
+msgid "limits the maximum number of threads"
+msgstr "限制最大线程数"
+
+#: builtin/repack.c:198
 msgid "maximum size of each packfile"
 msgstr "每个包文件的最大尺寸"
 
-#: builtin/repack.c:196
+#: builtin/repack.c:200
 msgid "repack objects in packs marked with .keep"
 msgstr "对标记为 .keep 的包中的对象重新打包"
 
-#: builtin/repack.c:206
+#: builtin/repack.c:210
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "不能删除珍品仓库中的打包文件"
 
-#: builtin/repack.c:210
+#: builtin/repack.c:214
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable 和 -A 不兼容"
 
-#: builtin/repack.c:400 builtin/worktree.c:115
+#: builtin/repack.c:406 builtin/worktree.c:116
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "无法删除 '%s'"
 
-#: builtin/replace.c:19
+#: builtin/replace.c:20
 msgid "git replace [-f] <object> <replacement>"
 msgstr "git replace [-f] <对象> <替换物>"
 
-#: builtin/replace.c:20
+#: builtin/replace.c:21
 msgid "git replace [-f] --edit <object>"
 msgstr "git replace [-f] --edit <对象>"
 
-#: builtin/replace.c:21
+#: builtin/replace.c:22
 msgid "git replace [-f] --graft <commit> [<parent>...]"
 msgstr "git replace [-f] --graft <提交> [<父提交>...]"
 
-#: builtin/replace.c:22
+#: builtin/replace.c:23
 msgid "git replace -d <object>..."
 msgstr "git replace -d <对象>..."
 
-#: builtin/replace.c:23
+#: builtin/replace.c:24
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
 
-#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396
+#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
 #, c-format
 msgid "Not a valid object name: '%s'"
 msgstr "不是一个有效的对象名：'%s'"
 
-#: builtin/replace.c:360
+#: builtin/replace.c:361
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "提交 '%s' 中含有损坏的合并标签"
 
-#: builtin/replace.c:362
+#: builtin/replace.c:363
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "提交 '%s' 中含有非法的合并标签"
 
-#: builtin/replace.c:373
+#: builtin/replace.c:374
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
 "instead of --graft"
 msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s'，使用 --edit 代替 --graft"
 
-#: builtin/replace.c:406
+#: builtin/replace.c:407
 #, c-format
 msgid "the original commit '%s' has a gpg signature."
 msgstr "原始提交 '%s' 中包含一个 GPG 签名"
 
-#: builtin/replace.c:407
+#: builtin/replace.c:408
 msgid "the signature will be removed in the replacement commit!"
 msgstr "在替换的提交中签名将被移除！"
 
-#: builtin/replace.c:413
+#: builtin/replace.c:414
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "不能为 '%s' 写替换提交"
 
-#: builtin/replace.c:437
+#: builtin/replace.c:438
 msgid "list replace refs"
 msgstr "列出替换的引用"
 
-#: builtin/replace.c:438
+#: builtin/replace.c:439
 msgid "delete replace refs"
 msgstr "删除替换的引用"
 
-#: builtin/replace.c:439
+#: builtin/replace.c:440
 msgid "edit existing object"
 msgstr "编辑现存的对象"
 
-#: builtin/replace.c:440
+#: builtin/replace.c:441
 msgid "change a commit's parents"
 msgstr "修改一个提交的父提交"
 
-#: builtin/replace.c:441
+#: builtin/replace.c:442
 msgid "replace the ref if it exists"
 msgstr "如果存在则替换引用"
 
-#: builtin/replace.c:442
+#: builtin/replace.c:443
 msgid "do not pretty-print contents for --edit"
 msgstr "不要为 --edit 操作美观显示内容"
 
-#: builtin/replace.c:443
+#: builtin/replace.c:444
 msgid "use this format"
 msgstr "使用此格式"
 
-#: builtin/rerere.c:12
+#: builtin/rerere.c:13
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:58
+#: builtin/rerere.c:59
 msgid "register clean resolutions in index"
 msgstr "在索引中注册干净的解决方案"
 
-#: builtin/reset.c:26
+#: builtin/reset.c:29
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
 
-#: builtin/reset.c:27
+#: builtin/reset.c:30
 msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
 msgstr "git reset [-q] [<树或提交>] [--] <路径>..."
 
-#: builtin/reset.c:28
+#: builtin/reset.c:31
 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
 msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:37
 msgid "mixed"
 msgstr "混杂"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:37
 msgid "soft"
 msgstr "软性"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:37
 msgid "hard"
 msgstr "硬性"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:37
 msgid "merge"
 msgstr "合并"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:37
 msgid "keep"
 msgstr "保持"
 
-#: builtin/reset.c:74
+#: builtin/reset.c:77
 msgid "You do not have a valid HEAD."
 msgstr "您没有一个有效的 HEAD。"
 
-#: builtin/reset.c:76
+#: builtin/reset.c:79
 msgid "Failed to find tree of HEAD."
 msgstr "无法找到 HEAD 指向的树。"
 
-#: builtin/reset.c:82
+#: builtin/reset.c:85
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "无法找到 %s 指向的树。"
 
-#: builtin/reset.c:100
+#: builtin/reset.c:103
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD 现在位于 %s"
 
 #  译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:183
+#: builtin/reset.c:186
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "在合并过程中不能做%s重置操作。"
 
-#: builtin/reset.c:276
+#: builtin/reset.c:286
 msgid "be quiet, only report errors"
 msgstr "安静模式，只报告错误"
 
-#: builtin/reset.c:278
+#: builtin/reset.c:288
 msgid "reset HEAD and index"
 msgstr "重置 HEAD 和索引"
 
-#: builtin/reset.c:279
+#: builtin/reset.c:289
 msgid "reset only HEAD"
 msgstr "只重置 HEAD"
 
-#: builtin/reset.c:281 builtin/reset.c:283
+#: builtin/reset.c:291 builtin/reset.c:293
 msgid "reset HEAD, index and working tree"
 msgstr "重置 HEAD、索引和工作区"
 
-#: builtin/reset.c:285
+#: builtin/reset.c:295
 msgid "reset HEAD but keep local changes"
 msgstr "重置 HEAD 但保存本地变更"
 
-#: builtin/reset.c:288
+#: builtin/reset.c:301
 msgid "record only the fact that removed paths will be added later"
 msgstr "将删除的路径标记为稍后添加"
 
-#: builtin/reset.c:305
+#: builtin/reset.c:320
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "无法将 '%s' 解析为一个有效的版本。"
 
-#: builtin/reset.c:313
+#: builtin/reset.c:328
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "无法将 '%s' 解析为一个有效的树对象。"
 
-#: builtin/reset.c:322
+#: builtin/reset.c:337
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
 
-#: builtin/reset.c:331
+#: builtin/reset.c:346
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。"
 
 #  译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:333
+#: builtin/reset.c:348
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "不能带路径进行%s重置。"
 
 #  译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:343
+#: builtin/reset.c:358
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "不能对纯仓库进行%s重置"
 
-#: builtin/reset.c:347
+#: builtin/reset.c:362
 msgid "-N can only be used with --mixed"
 msgstr "-N 只能和 --mixed 同时使用"
 
-#: builtin/reset.c:364
+#: builtin/reset.c:379
 msgid "Unstaged changes after reset:"
 msgstr "重置后取消暂存的变更："
 
-#: builtin/reset.c:370
+#: builtin/reset.c:385
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "不能重置索引文件至版本 '%s'。"
 
-#: builtin/reset.c:374
+#: builtin/reset.c:389
 msgid "Could not write new index file."
 msgstr "不能写入新的索引文件。"
 
-#: builtin/rev-list.c:354
+#: builtin/rev-list.c:358
 msgid "rev-list does not support display of notes"
 msgstr "rev-list 不支持显示注解"
 
-#: builtin/rev-parse.c:393
+#: builtin/rev-parse.c:394
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
 
-#: builtin/rev-parse.c:398
+#: builtin/rev-parse.c:399
 msgid "keep the `--` passed as an arg"
 msgstr "保持 `--` 作为一个参数传递"
 
-#: builtin/rev-parse.c:400
+#: builtin/rev-parse.c:401
 msgid "stop parsing after the first non-option argument"
 msgstr "遇到第一个非选项参数后停止解析"
 
-#: builtin/rev-parse.c:403
+#: builtin/rev-parse.c:404
 msgid "output in stuck long form"
 msgstr "以固定长格式输出"
 
-#: builtin/rev-parse.c:534
+#: builtin/rev-parse.c:535
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12470,96 +12588,96 @@ msgstr ""
 "\n"
 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
 
-#: builtin/revert.c:22
+#: builtin/revert.c:23
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<选项>] <提交号>..."
 
-#: builtin/revert.c:23
+#: builtin/revert.c:24
 msgid "git revert <subcommand>"
 msgstr "git revert <子命令>"
 
-#: builtin/revert.c:28
+#: builtin/revert.c:29
 msgid "git cherry-pick [<options>] <commit-ish>..."
 msgstr "git cherry-pick [<选项>] <提交号>..."
 
-#: builtin/revert.c:29
+#: builtin/revert.c:30
 msgid "git cherry-pick <subcommand>"
 msgstr "git cherry-pick <子命令>"
 
-#: builtin/revert.c:89
+#: builtin/revert.c:90
 #, c-format
 msgid "%s: %s cannot be used with %s"
 msgstr "%s：%s 不能和 %s 同时使用"
 
-#: builtin/revert.c:98
+#: builtin/revert.c:99
 msgid "end revert or cherry-pick sequence"
 msgstr "终止反转或拣选操作"
 
-#: builtin/revert.c:99
+#: builtin/revert.c:100
 msgid "resume revert or cherry-pick sequence"
 msgstr "继续反转或拣选操作"
 
-#: builtin/revert.c:100
+#: builtin/revert.c:101
 msgid "cancel revert or cherry-pick sequence"
 msgstr "取消反转或拣选操作"
 
-#: builtin/revert.c:101
+#: builtin/revert.c:102
 msgid "don't automatically commit"
 msgstr "不要自动提交"
 
-#: builtin/revert.c:102
+#: builtin/revert.c:103
 msgid "edit the commit message"
 msgstr "编辑提交说明"
 
-#: builtin/revert.c:105
+#: builtin/revert.c:106
 msgid "parent-number"
 msgstr "父编号"
 
-#: builtin/revert.c:106
+#: builtin/revert.c:107
 msgid "select mainline parent"
 msgstr "选择主干父提交编号"
 
-#: builtin/revert.c:108
+#: builtin/revert.c:109
 msgid "merge strategy"
 msgstr "合并策略"
 
-#: builtin/revert.c:109
+#: builtin/revert.c:110
 msgid "option"
 msgstr "选项"
 
-#: builtin/revert.c:110
+#: builtin/revert.c:111
 msgid "option for merge strategy"
 msgstr "合并策略的选项"
 
-#: builtin/revert.c:119
+#: builtin/revert.c:120
 msgid "append commit name"
 msgstr "追加提交名称"
 
-#: builtin/revert.c:121
+#: builtin/revert.c:122
 msgid "preserve initially empty commits"
 msgstr "保留初始化的空提交"
 
-#: builtin/revert.c:122
+#: builtin/revert.c:123
 msgid "allow commits with empty messages"
 msgstr "允许提交说明为空"
 
-#: builtin/revert.c:123
+#: builtin/revert.c:124
 msgid "keep redundant, empty commits"
 msgstr "保持多余的、空的提交"
 
-#: builtin/revert.c:211
+#: builtin/revert.c:212
 msgid "revert failed"
 msgstr "还原失败"
 
-#: builtin/revert.c:224
+#: builtin/revert.c:225
 msgid "cherry-pick failed"
 msgstr "拣选失败"
 
-#: builtin/rm.c:17
+#: builtin/rm.c:18
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<选项>] [--] <文件>..."
 
-#: builtin/rm.c:205
+#: builtin/rm.c:206
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -12569,7 +12687,7 @@ msgid_plural ""
 msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样："
 msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样："
 
-#: builtin/rm.c:210
+#: builtin/rm.c:211
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -12577,13 +12695,13 @@ msgstr ""
 "\n"
 "（使用 -f 强制删除）"
 
-#: builtin/rm.c:214
+#: builtin/rm.c:215
 msgid "the following file has changes staged in the index:"
 msgid_plural "the following files have changes staged in the index:"
 msgstr[0] "下列文件索引中有变更"
 msgstr[1] "下列文件索引中有变更"
 
-#: builtin/rm.c:218 builtin/rm.c:227
+#: builtin/rm.c:219 builtin/rm.c:228
 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
@@ -12591,29 +12709,29 @@ msgstr ""
 "\n"
 "（使用 --cached 保留本地文件，或用 -f 强制删除）"
 
-#: builtin/rm.c:224
+#: builtin/rm.c:225
 msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] "如下文件有本地修改："
 msgstr[1] "如下文件有本地修改："
 
-#: builtin/rm.c:242
+#: builtin/rm.c:243
 msgid "do not list removed files"
 msgstr "不列出删除的文件"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:244
 msgid "only remove from the index"
 msgstr "只从索引区删除"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "override the up-to-date check"
 msgstr "忽略文件更新状态检查"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "allow recursive removal"
 msgstr "允许递归删除"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "exit with a zero status even if nothing matched"
 msgstr "即使没有匹配，也以零状态退出"
 
@@ -12632,7 +12750,7 @@ msgstr "git rm：不能删除 %s"
 msgid "could not remove '%s'"
 msgstr "无法删除 '%s'"
 
-#: builtin/send-pack.c:18
+#: builtin/send-pack.c:19
 msgid ""
 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
 "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
@@ -12643,51 +12761,51 @@ msgstr ""
 "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
 "  --all 和明确的 <引用> 互斥。"
 
-#: builtin/send-pack.c:161
+#: builtin/send-pack.c:162
 msgid "remote name"
 msgstr "远程名称"
 
-#: builtin/send-pack.c:175
+#: builtin/send-pack.c:176
 msgid "use stateless RPC protocol"
 msgstr "使用无状态的 RPC 协议"
 
-#: builtin/send-pack.c:176
+#: builtin/send-pack.c:177
 msgid "read refs from stdin"
 msgstr "从标准输入读取引用"
 
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:178
 msgid "print status from remote helper"
 msgstr "打印来自远程 helper 的状态"
 
-#: builtin/shortlog.c:13
+#: builtin/shortlog.c:14
 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
 msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
 
-#: builtin/shortlog.c:248
+#: builtin/shortlog.c:249
 msgid "Group by committer rather than author"
 msgstr "按照提交者分组而不是作者"
 
-#: builtin/shortlog.c:250
+#: builtin/shortlog.c:251
 msgid "sort output according to the number of commits per author"
 msgstr "根据每个作者的提交数量排序"
 
-#: builtin/shortlog.c:252
+#: builtin/shortlog.c:253
 msgid "Suppress commit descriptions, only provides commit count"
 msgstr "隐藏提交说明，只提供提交数量"
 
-#: builtin/shortlog.c:254
+#: builtin/shortlog.c:255
 msgid "Show the email address of each author"
 msgstr "显示每个作者的电子邮件地址"
 
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:256
 msgid "w[,i1[,i2]]"
 msgstr "w[,i1[,i2]]"
 
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:257
 msgid "Linewrap output"
 msgstr "折行输出"
 
-#: builtin/show-branch.c:10
+#: builtin/show-branch.c:12
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -12699,124 +12817,124 @@ msgstr ""
 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
 "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
 
-#: builtin/show-branch.c:14
+#: builtin/show-branch.c:16
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
 msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
 
-#: builtin/show-branch.c:374
+#: builtin/show-branch.c:376
 #, c-format
 msgid "ignoring %s; cannot handle more than %d ref"
 msgid_plural "ignoring %s; cannot handle more than %d refs"
 msgstr[0] "忽略 %s，无法处理 %d 个以上的引用"
 msgstr[1] "忽略 %s，无法处理 %d 个以上的引用"
 
-#: builtin/show-branch.c:536
+#: builtin/show-branch.c:530
 #, c-format
 msgid "no matching refs with %s"
 msgstr "没有和 %s 匹配的引用"
 
-#: builtin/show-branch.c:632
+#: builtin/show-branch.c:626
 msgid "show remote-tracking and local branches"
 msgstr "显示远程跟踪的和本地的分支"
 
-#: builtin/show-branch.c:634
+#: builtin/show-branch.c:628
 msgid "show remote-tracking branches"
 msgstr "显示远程跟踪的分支"
 
-#: builtin/show-branch.c:636
+#: builtin/show-branch.c:630
 msgid "color '*!+-' corresponding to the branch"
 msgstr "着色 '*!+-' 到相应的分支"
 
-#: builtin/show-branch.c:638
+#: builtin/show-branch.c:632
 msgid "show <n> more commits after the common ancestor"
 msgstr "显示共同祖先后的 <n> 个提交"
 
-#: builtin/show-branch.c:640
+#: builtin/show-branch.c:634
 msgid "synonym to more=-1"
 msgstr "和 more=-1 同义"
 
-#: builtin/show-branch.c:641
+#: builtin/show-branch.c:635
 msgid "suppress naming strings"
 msgstr "不显示字符串命名"
 
-#: builtin/show-branch.c:643
+#: builtin/show-branch.c:637
 msgid "include the current branch"
 msgstr "包括当前分支"
 
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:639
 msgid "name commits with their object names"
 msgstr "以对象名字命名提交"
 
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:641
 msgid "show possible merge bases"
 msgstr "显示可能合并的基线"
 
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:643
 msgid "show refs unreachable from any other ref"
 msgstr "显示没有任何引用的的引用"
 
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:645
 msgid "show commits in topological order"
 msgstr "以拓扑顺序显示提交"
 
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:648
 msgid "show only commits not on the first branch"
 msgstr "只显示不在第一个分支上的提交"
 
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:650
 msgid "show merges reachable from only one tip"
 msgstr "显示仅一个分支可访问的合并提交"
 
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:652
 msgid "topologically sort, maintaining date order where possible"
 msgstr "拓扑方式排序，并尽可能地保持日期顺序"
 
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:655
 msgid "<n>[,<base>]"
 msgstr "<n>[,<base>]"
 
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:656
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
 
-#: builtin/show-branch.c:696
+#: builtin/show-branch.c:690
 msgid ""
 "--reflog is incompatible with --all, --remotes, --independent or --merge-base"
 msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
 
-#: builtin/show-branch.c:720
+#: builtin/show-branch.c:714
 msgid "no branches given, and HEAD is not valid"
 msgstr "未提供分支，且 HEAD 无效"
 
-#: builtin/show-branch.c:723
+#: builtin/show-branch.c:717
 msgid "--reflog option needs one branch name"
 msgstr "选项 --reflog 需要一个分支名"
 
-#: builtin/show-branch.c:726
+#: builtin/show-branch.c:720
 #, c-format
 msgid "only %d entry can be shown at one time."
 msgid_plural "only %d entries can be shown at one time."
 msgstr[0] "一次只能显示 %d 个条目。"
 msgstr[1] "一次只能显示 %d 个条目。"
 
-#: builtin/show-branch.c:730
+#: builtin/show-branch.c:724
 #, c-format
 msgid "no such ref %s"
 msgstr "无此引用 %s"
 
-#: builtin/show-branch.c:814
+#: builtin/show-branch.c:808
 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
 msgstr[0] "不能处理 %d 个以上的版本。"
 msgstr[1] "不能处理 %d 个以上的版本。"
 
-#: builtin/show-branch.c:818
+#: builtin/show-branch.c:812
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "'%s' 不是一个有效的引用。"
 
-#: builtin/show-branch.c:821
+#: builtin/show-branch.c:815
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "不能找到提交 %s（%s）"
@@ -12865,33 +12983,33 @@ msgstr "不打印结果到标准输出（例如与 --verify 参数共用）"
 msgid "show refs from stdin that aren't in local repository"
 msgstr "显示从标准输入中读入的不在本地仓库中的引用"
 
-#: builtin/stripspace.c:17
+#: builtin/stripspace.c:18
 msgid "git stripspace [-s | --strip-comments]"
 msgstr "git stripspace [-s | --strip-comments]"
 
-#: builtin/stripspace.c:18
+#: builtin/stripspace.c:19
 msgid "git stripspace [-c | --comment-lines]"
 msgstr "git stripspace [-c | --comment-lines]"
 
-#: builtin/stripspace.c:35
+#: builtin/stripspace.c:36
 msgid "skip and remove all lines starting with comment character"
 msgstr "跳过和移除所有的注释行"
 
-#: builtin/stripspace.c:38
+#: builtin/stripspace.c:39
 msgid "prepend comment character and space to each line"
 msgstr "为每一行的行首添加注释符和空格"
 
-#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
 #, c-format
 msgid "No such ref: %s"
 msgstr "没有这样的引用：%s"
 
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "期望一个完整的引用名称，却得到 %s"
 
-#: builtin/submodule--helper.c:71
+#: builtin/submodule--helper.c:72
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "无法从 url '%s' 剥离一个组件"
@@ -13087,60 +13205,56 @@ msgstr "在子模组中递归"
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper embed-git-dir [<路径>...]"
 
-#: builtin/submodule--helper.c:1226
-msgid "submodule--helper subcommand must be called with a subcommand"
-msgstr "submodule-helper 子命令必须由另外的子命令调用"
-
-#: builtin/submodule--helper.c:1233
+#: builtin/submodule--helper.c:1232
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s 不支持 --super-prefix"
 
-#: builtin/submodule--helper.c:1239
+#: builtin/submodule--helper.c:1238
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
 
-#: builtin/symbolic-ref.c:7
+#: builtin/symbolic-ref.c:8
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
 msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
 
-#: builtin/symbolic-ref.c:8
+#: builtin/symbolic-ref.c:9
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <名称>"
 
-#: builtin/symbolic-ref.c:40
+#: builtin/symbolic-ref.c:41
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr "不显示非符号（分离的）引用的错误信息"
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:42
 msgid "delete symbolic ref"
 msgstr "删除符号引用"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:43
 msgid "shorten ref output"
 msgstr "简短的引用输出"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
 msgid "reason"
 msgstr "原因"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
 msgid "reason of the update"
 msgstr "更新的原因"
 
-#: builtin/tag.c:23
+#: builtin/tag.c:24
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
 "[<head>]"
 msgstr ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
 
-#: builtin/tag.c:24
+#: builtin/tag.c:25
 msgid "git tag -d <tagname>..."
 msgstr "git tag -d <标签名>..."
 
-#: builtin/tag.c:25
+#: builtin/tag.c:26
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
@@ -13150,21 +13264,21 @@ msgstr ""
 "at <对象>]\n"
 "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
 
-#: builtin/tag.c:27
+#: builtin/tag.c:28
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<格式>] <标签名>..."
 
-#: builtin/tag.c:83
+#: builtin/tag.c:84
 #, c-format
 msgid "tag '%s' not found."
 msgstr "未发现标签 '%s'。"
 
-#: builtin/tag.c:99
+#: builtin/tag.c:100
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "已删除标签 '%s'（曾为 %s）\n"
 
-#: builtin/tag.c:128
+#: builtin/tag.c:129
 #, c-format
 msgid ""
 "\n"
@@ -13177,7 +13291,7 @@ msgstr ""
 "  %s\n"
 "以 '%c' 开头的行将被忽略。\n"
 
-#: builtin/tag.c:132
+#: builtin/tag.c:133
 #, c-format
 msgid ""
 "\n"
@@ -13191,343 +13305,343 @@ msgstr ""
 "  %s\n"
 "以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n"
 
-#: builtin/tag.c:210
+#: builtin/tag.c:211
 msgid "unable to sign the tag"
 msgstr "无法签署标签"
 
-#: builtin/tag.c:212
+#: builtin/tag.c:213
 msgid "unable to write tag file"
 msgstr "无法写标签文件"
 
-#: builtin/tag.c:236
+#: builtin/tag.c:237
 msgid "bad object type."
 msgstr "坏的对象类型。"
 
-#: builtin/tag.c:282
+#: builtin/tag.c:283
 msgid "no tag message?"
 msgstr "无标签说明？"
 
-#: builtin/tag.c:289
+#: builtin/tag.c:290
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "标签说明被保留在 %s\n"
 
-#: builtin/tag.c:397
+#: builtin/tag.c:398
 msgid "list tag names"
 msgstr "列出标签名称"
 
-#: builtin/tag.c:399
+#: builtin/tag.c:400
 msgid "print <n> lines of each tag message"
 msgstr "每个标签信息打印 <n> 行"
 
-#: builtin/tag.c:401
+#: builtin/tag.c:402
 msgid "delete tags"
 msgstr "删除标签"
 
-#: builtin/tag.c:402
+#: builtin/tag.c:403
 msgid "verify tags"
 msgstr "验证标签"
 
-#: builtin/tag.c:404
+#: builtin/tag.c:405
 msgid "Tag creation options"
 msgstr "标签创建选项"
 
-#: builtin/tag.c:406
+#: builtin/tag.c:407
 msgid "annotated tag, needs a message"
 msgstr "附注标签，需要一个说明"
 
-#: builtin/tag.c:408
+#: builtin/tag.c:409
 msgid "tag message"
 msgstr "标签说明"
 
-#: builtin/tag.c:410
+#: builtin/tag.c:411
 msgid "annotated and GPG-signed tag"
 msgstr "附注并附加 GPG 签名的标签"
 
-#: builtin/tag.c:414
+#: builtin/tag.c:415
 msgid "use another key to sign the tag"
 msgstr "使用另外的私钥签名该标签"
 
-#: builtin/tag.c:415
+#: builtin/tag.c:416
 msgid "replace the tag if exists"
 msgstr "如果存在，替换现有的标签"
 
-#: builtin/tag.c:416 builtin/update-ref.c:368
+#: builtin/tag.c:417 builtin/update-ref.c:369
 msgid "create a reflog"
 msgstr "创建引用日志"
 
-#: builtin/tag.c:418
+#: builtin/tag.c:419
 msgid "Tag listing options"
 msgstr "标签列表选项"
 
-#: builtin/tag.c:419
+#: builtin/tag.c:420
 msgid "show tag list in columns"
 msgstr "以列的方式显示标签列表"
 
-#: builtin/tag.c:420 builtin/tag.c:422
+#: builtin/tag.c:421 builtin/tag.c:423
 msgid "print only tags that contain the commit"
 msgstr "只打印包含该提交的标签"
 
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:422 builtin/tag.c:424
 msgid "print only tags that don't contain the commit"
 msgstr "只打印不包含该提交的标签"
 
-#: builtin/tag.c:424
+#: builtin/tag.c:425
 msgid "print only tags that are merged"
 msgstr "只打印已经合并的标签"
 
-#: builtin/tag.c:425
+#: builtin/tag.c:426
 msgid "print only tags that are not merged"
 msgstr "只打印尚未合并的标签"
 
-#: builtin/tag.c:430
+#: builtin/tag.c:431
 msgid "print only tags of the object"
 msgstr "只打印指向该对象的标签"
 
-#: builtin/tag.c:469
+#: builtin/tag.c:470
 msgid "--column and -n are incompatible"
 msgstr "--column 和 -n 不兼容"
 
-#: builtin/tag.c:491
+#: builtin/tag.c:492
 msgid "-n option is only allowed in list mode"
 msgstr "-n 选项只允许用在列表显示模式"
 
-#: builtin/tag.c:493
+#: builtin/tag.c:494
 msgid "--contains option is only allowed in list mode"
 msgstr "--contains 选项只允许用在列表显示模式"
 
-#: builtin/tag.c:495
+#: builtin/tag.c:496
 msgid "--no-contains option is only allowed in list mode"
 msgstr "--no-contains 选项只允许用在列表显示模式"
 
-#: builtin/tag.c:497
+#: builtin/tag.c:498
 msgid "--points-at option is only allowed in list mode"
 msgstr "--points-at 选项只允许用在列表显示模式"
 
-#: builtin/tag.c:499
+#: builtin/tag.c:500
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
 
-#: builtin/tag.c:510
+#: builtin/tag.c:511
 msgid "only one -F or -m option is allowed."
 msgstr "只允许一个 -F 或 -m 选项。"
 
-#: builtin/tag.c:529
+#: builtin/tag.c:530
 msgid "too many params"
 msgstr "太多参数"
 
-#: builtin/tag.c:535
+#: builtin/tag.c:536
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' 不是一个有效的标签名称。"
 
-#: builtin/tag.c:540
+#: builtin/tag.c:541
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "标签 '%s' 已存在"
 
-#: builtin/tag.c:570
+#: builtin/tag.c:571
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "已更新标签 '%s'（曾为 %s）\n"
 
-#: builtin/unpack-objects.c:493
+#: builtin/unpack-objects.c:494
 msgid "Unpacking objects"
 msgstr "展开对象中"
 
-#: builtin/update-index.c:79
+#: builtin/update-index.c:80
 #, c-format
 msgid "failed to create directory %s"
 msgstr "无法创建目录 %s"
 
-#: builtin/update-index.c:85
+#: builtin/update-index.c:86
 #, c-format
 msgid "failed to stat %s"
 msgstr "对 %s 调用 stat 失败"
 
-#: builtin/update-index.c:95
+#: builtin/update-index.c:96
 #, c-format
 msgid "failed to create file %s"
 msgstr "无法创建文件 %s"
 
-#: builtin/update-index.c:103
+#: builtin/update-index.c:104
 #, c-format
 msgid "failed to delete file %s"
 msgstr "无法删除文件 %s"
 
-#: builtin/update-index.c:110 builtin/update-index.c:216
+#: builtin/update-index.c:111 builtin/update-index.c:217
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "无法删除目录 %s"
 
-#: builtin/update-index.c:135
+#: builtin/update-index.c:136
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "在 '%s' 中测试 mtime "
 
-#: builtin/update-index.c:149
+#: builtin/update-index.c:150
 msgid "directory stat info does not change after adding a new file"
 msgstr "添加一个新文件后，目录的状态信息未改变"
 
-#: builtin/update-index.c:162
+#: builtin/update-index.c:163
 msgid "directory stat info does not change after adding a new directory"
 msgstr "添加一个新目录后，目录的状态信息未改变"
 
-#: builtin/update-index.c:175
+#: builtin/update-index.c:176
 msgid "directory stat info changes after updating a file"
 msgstr "更新一个文件后，目录的状态信息被修改"
 
-#: builtin/update-index.c:186
+#: builtin/update-index.c:187
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr "在子目录中添加文件后，目录的状态信息被修改"
 
-#: builtin/update-index.c:197
+#: builtin/update-index.c:198
 msgid "directory stat info does not change after deleting a file"
 msgstr "删除一个文件后，目录的状态信息未改变"
 
-#: builtin/update-index.c:210
+#: builtin/update-index.c:211
 msgid "directory stat info does not change after deleting a directory"
 msgstr "删除一个目录后，目录的状态信息未改变"
 
-#: builtin/update-index.c:217
+#: builtin/update-index.c:218
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:568
+#: builtin/update-index.c:569
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<选项>] [--] [<文件>...]"
 
-#: builtin/update-index.c:923
+#: builtin/update-index.c:924
 msgid "continue refresh even when index needs update"
 msgstr "当索引需要更新时继续刷新"
 
-#: builtin/update-index.c:926
+#: builtin/update-index.c:927
 msgid "refresh: ignore submodules"
 msgstr "刷新：忽略子模组"
 
-#: builtin/update-index.c:929
+#: builtin/update-index.c:930
 msgid "do not ignore new files"
 msgstr "不忽略新的文件"
 
-#: builtin/update-index.c:931
+#: builtin/update-index.c:932
 msgid "let files replace directories and vice-versa"
 msgstr "让文件替换目录（反之亦然）"
 
-#: builtin/update-index.c:933
+#: builtin/update-index.c:934
 msgid "notice files missing from worktree"
 msgstr "通知文件从工作区丢失"
 
-#: builtin/update-index.c:935
+#: builtin/update-index.c:936
 msgid "refresh even if index contains unmerged entries"
 msgstr "即使索引区包含未合并的条目也执行刷新"
 
-#: builtin/update-index.c:938
+#: builtin/update-index.c:939
 msgid "refresh stat information"
 msgstr "刷新统计信息"
 
-#: builtin/update-index.c:942
+#: builtin/update-index.c:943
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置"
 
-#: builtin/update-index.c:946
+#: builtin/update-index.c:947
 msgid "<mode>,<object>,<path>"
 msgstr "<存取模式>,<对象>,<路径>"
 
-#: builtin/update-index.c:947
+#: builtin/update-index.c:948
 msgid "add the specified entry to the index"
 msgstr "添加指定的条目到索引区"
 
-#: builtin/update-index.c:956
+#: builtin/update-index.c:957
 msgid "mark files as \"not changing\""
 msgstr "把文件标记为 \"没有变更\""
 
-#: builtin/update-index.c:959
+#: builtin/update-index.c:960
 msgid "clear assumed-unchanged bit"
 msgstr "清除 assumed-unchanged 位"
 
-#: builtin/update-index.c:962
+#: builtin/update-index.c:963
 msgid "mark files as \"index-only\""
 msgstr "把文件标记为 \"仅索引\""
 
-#: builtin/update-index.c:965
+#: builtin/update-index.c:966
 msgid "clear skip-worktree bit"
 msgstr "清除 skip-worktree 位"
 
-#: builtin/update-index.c:968
+#: builtin/update-index.c:969
 msgid "add to index only; do not add content to object database"
 msgstr "只添加到索引区；不添加对象到对象库"
 
-#: builtin/update-index.c:970
+#: builtin/update-index.c:971
 msgid "remove named paths even if present in worktree"
 msgstr "即使存在工作区里，也删除路径"
 
-#: builtin/update-index.c:972
+#: builtin/update-index.c:973
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "携带 --stdin：输入的行以 null 字符终止"
 
-#: builtin/update-index.c:974
+#: builtin/update-index.c:975
 msgid "read list of paths to be updated from standard input"
 msgstr "从标准输入中读取需要更新的路径列表"
 
-#: builtin/update-index.c:978
+#: builtin/update-index.c:979
 msgid "add entries from standard input to the index"
 msgstr "从标准输入添加条目到索引区"
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:983
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "为指定文件重新生成第2和第3暂存区"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:987
 msgid "only update entries that differ from HEAD"
 msgstr "只更新与 HEAD 不同的条目"
 
-#: builtin/update-index.c:990
+#: builtin/update-index.c:991
 msgid "ignore files missing from worktree"
 msgstr "忽略工作区丢失的文件"
 
-#: builtin/update-index.c:993
+#: builtin/update-index.c:994
 msgid "report actions to standard output"
 msgstr "在标准输出显示操作"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:996
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(for porcelains) 忘记保存的未解决的冲突"
 
-#: builtin/update-index.c:999
+#: builtin/update-index.c:1000
 msgid "write index in this format"
 msgstr "以这种格式写入索引区"
 
-#: builtin/update-index.c:1001
+#: builtin/update-index.c:1002
 msgid "enable or disable split index"
 msgstr "启用或禁用索引拆分"
 
-#: builtin/update-index.c:1003
+#: builtin/update-index.c:1004
 msgid "enable/disable untracked cache"
 msgstr "启用/禁用对未跟踪文件的缓存"
 
-#: builtin/update-index.c:1005
+#: builtin/update-index.c:1006
 msgid "test if the filesystem supports untracked cache"
 msgstr "测试文件系统是否支持未跟踪文件缓存"
 
-#: builtin/update-index.c:1007
+#: builtin/update-index.c:1008
 msgid "enable untracked cache without testing the filesystem"
 msgstr "无需检测文件系统，启用对未跟踪文件的缓存"
 
-#: builtin/update-index.c:1107
+#: builtin/update-index.c:1108
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
 msgstr ""
 "core.splitIndex 被设置为 false。如果您确实要启用索引拆分，请删除或修改它。"
 
-#: builtin/update-index.c:1116
+#: builtin/update-index.c:1117
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
 msgstr ""
 "core.splitIndex 被设置为 true。如果您确实要禁用索引拆分，请删除或修改它。"
 
-#: builtin/update-index.c:1127
+#: builtin/update-index.c:1128
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -13535,11 +13649,11 @@ msgstr ""
 "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存，请删除或修"
 "改它。"
 
-#: builtin/update-index.c:1131
+#: builtin/update-index.c:1132
 msgid "Untracked cache disabled"
 msgstr "缓存未跟踪文件被禁用"
 
-#: builtin/update-index.c:1139
+#: builtin/update-index.c:1140
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -13547,236 +13661,236 @@ msgstr ""
 "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存，请删除或"
 "修改它。"
 
-#: builtin/update-index.c:1143
+#: builtin/update-index.c:1144
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "缓存未跟踪文件在 '%s' 启用"
 
-#: builtin/update-ref.c:9
+#: builtin/update-ref.c:10
 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
 msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
 
-#: builtin/update-ref.c:10
+#: builtin/update-ref.c:11
 msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
 msgstr "git update-ref [<选项>]    <引用名> <新值> [<旧值>]"
 
-#: builtin/update-ref.c:11
+#: builtin/update-ref.c:12
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<选项>] --stdin [-z]"
 
-#: builtin/update-ref.c:363
+#: builtin/update-ref.c:364
 msgid "delete the reference"
 msgstr "删除引用"
 
-#: builtin/update-ref.c:365
+#: builtin/update-ref.c:366
 msgid "update <refname> not the one it points to"
 msgstr "更新 <引用名> 本身而不是它指向的引用"
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:367
 msgid "stdin has NUL-terminated arguments"
 msgstr "标准输入有以 NUL 字符终止的参数"
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:368
 msgid "read updates from stdin"
 msgstr "从标准输入读取更新"
 
-#: builtin/update-server-info.c:6
+#: builtin/update-server-info.c:7
 msgid "git update-server-info [--force]"
 msgstr "git update-server-info [--force]"
 
-#: builtin/update-server-info.c:14
+#: builtin/update-server-info.c:15
 msgid "update the info files from scratch"
 msgstr "从头开始更新文件信息"
 
-#: builtin/verify-commit.c:17
+#: builtin/verify-commit.c:18
 msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr "git verify-commit [-v | --verbose] <提交>..."
 
-#: builtin/verify-commit.c:72
+#: builtin/verify-commit.c:73
 msgid "print commit contents"
 msgstr "打印提交内容"
 
-#: builtin/verify-commit.c:73 builtin/verify-tag.c:37
+#: builtin/verify-commit.c:74 builtin/verify-tag.c:38
 msgid "print raw gpg status output"
 msgstr "打印原始 gpg 状态输出"
 
-#: builtin/verify-pack.c:54
+#: builtin/verify-pack.c:55
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
 
-#: builtin/verify-pack.c:64
+#: builtin/verify-pack.c:65
 msgid "verbose"
 msgstr "冗长输出"
 
-#: builtin/verify-pack.c:66
+#: builtin/verify-pack.c:67
 msgid "show statistics only"
 msgstr "只显示统计"
 
-#: builtin/verify-tag.c:18
+#: builtin/verify-tag.c:19
 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
 msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
 
-#: builtin/verify-tag.c:36
+#: builtin/verify-tag.c:37
 msgid "print tag contents"
 msgstr "打印标签内容"
 
-#: builtin/worktree.c:15
+#: builtin/worktree.c:16
 msgid "git worktree add [<options>] <path> [<branch>]"
 msgstr "git worktree add [<选项>] <路径> [<分支>]"
 
-#: builtin/worktree.c:16
+#: builtin/worktree.c:17
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<选项>]"
 
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<选项>] <路径>"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<选项>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <路径>"
 
-#: builtin/worktree.c:43
+#: builtin/worktree.c:44
 #, c-format
 msgid "Removing worktrees/%s: not a valid directory"
 msgstr "删除工作区/%s：不是一个有效的目录"
 
-#: builtin/worktree.c:49
+#: builtin/worktree.c:50
 #, c-format
 msgid "Removing worktrees/%s: gitdir file does not exist"
 msgstr "删除 worktrees/%s：gitdir 文件不存在"
 
-#: builtin/worktree.c:54
+#: builtin/worktree.c:55
 #, c-format
 msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
 msgstr "删除 worktrees/%s：无法读取 gitdir 文件 (%s)"
 
-#: builtin/worktree.c:65
+#: builtin/worktree.c:66
 #, c-format
 msgid "Removing worktrees/%s: invalid gitdir file"
 msgstr "删除 worktrees/%s：无效的 gitdir 文件"
 
-#: builtin/worktree.c:81
+#: builtin/worktree.c:82
 #, c-format
 msgid "Removing worktrees/%s: gitdir file points to non-existent location"
 msgstr "删除 worktrees/%s：gitdir 文件的指向不存在"
 
-#: builtin/worktree.c:128
+#: builtin/worktree.c:129
 msgid "report pruned working trees"
 msgstr "报告清除的工作区"
 
-#: builtin/worktree.c:130
+#: builtin/worktree.c:131
 msgid "expire working trees older than <time>"
 msgstr "将早于 <time> 的工作区过期"
 
-#: builtin/worktree.c:204
+#: builtin/worktree.c:205
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' 已经存在"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:236
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "不能创建目录 '%s'"
 
-#: builtin/worktree.c:274
+#: builtin/worktree.c:275
 #, c-format
 msgid "Preparing %s (identifier %s)"
 msgstr "准备 %s（标识符 %s）"
 
-#: builtin/worktree.c:328
+#: builtin/worktree.c:327
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
 
-#: builtin/worktree.c:330
+#: builtin/worktree.c:329
 msgid "create a new branch"
 msgstr "创建一个新分支"
 
-#: builtin/worktree.c:332
+#: builtin/worktree.c:331
 msgid "create or reset a branch"
 msgstr "创建或重置一个分支"
 
-#: builtin/worktree.c:334
+#: builtin/worktree.c:333
 msgid "populate the new working tree"
 msgstr "生成新的工作区"
 
-#: builtin/worktree.c:335
+#: builtin/worktree.c:334
 msgid "keep the new working tree locked"
 msgstr "锁定新工作区"
 
-#: builtin/worktree.c:343
+#: builtin/worktree.c:342
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b、-B 和 --detach 是互斥的"
 
-#: builtin/worktree.c:478
+#: builtin/worktree.c:479
 msgid "reason for locking"
 msgstr "锁定原因"
 
-#: builtin/worktree.c:490 builtin/worktree.c:523
+#: builtin/worktree.c:491 builtin/worktree.c:524
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' 不是一个工作区"
 
-#: builtin/worktree.c:492 builtin/worktree.c:525
+#: builtin/worktree.c:493 builtin/worktree.c:526
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "主工作区无法被加锁或解锁"
 
-#: builtin/worktree.c:497
+#: builtin/worktree.c:498
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' 已被锁定，原因：%s"
 
-#: builtin/worktree.c:499
+#: builtin/worktree.c:500
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' 已被锁定"
 
-#: builtin/worktree.c:527
+#: builtin/worktree.c:528
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' 未被锁定"
 
-#: builtin/write-tree.c:13
+#: builtin/write-tree.c:14
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
 
-#: builtin/write-tree.c:26
+#: builtin/write-tree.c:27
 msgid "<prefix>/"
 msgstr "<前缀>/"
 
-#: builtin/write-tree.c:27
+#: builtin/write-tree.c:28
 msgid "write tree object for a subdirectory <prefix>"
 msgstr "将 <前缀> 子目录内容写到一个树对象"
 
-#: builtin/write-tree.c:30
+#: builtin/write-tree.c:31
 msgid "only useful for debugging"
 msgstr "只对调试有用"
 
-#: upload-pack.c:22
+#: upload-pack.c:23
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<选项>] <目录>"
 
-#: upload-pack.c:1040
+#: upload-pack.c:1041
 msgid "quit after a single request/response exchange"
 msgstr "在一次单独的请求/响应（request/response）交换后退出"
 
-#: upload-pack.c:1042
+#: upload-pack.c:1043
 msgid "exit immediately after initial ref advertisement"
 msgstr "在初始的引用广告后立即退出"
 
-#: upload-pack.c:1044
+#: upload-pack.c:1045
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录"
 
-#: upload-pack.c:1046
+#: upload-pack.c:1047
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "不活动 <n> 秒钟后终止传输"
 
-#: credential-cache--daemon.c:223
+#: credential-cache--daemon.c:224
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -13789,11 +13903,11 @@ msgstr ""
 "\n"
 "\tchmod 0700 %s"
 
-#: credential-cache--daemon.c:271
+#: credential-cache--daemon.c:272
 msgid "print debugging messages to stderr"
 msgstr "调试信息输出到标准错误"
 
-#: git.c:14
+#: git.c:15
 msgid ""
 "'git help -a' and 'git help -g' list available subcommands and some\n"
 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
@@ -13803,20 +13917,20 @@ msgstr ""
 "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
 "帮助。"
 
-#: http.c:336
+#: http.c:337
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "http.postbuffer 为负值，默认为 %d"
 
-#: http.c:357
+#: http.c:358
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "当 cURL < 7.22.0 时，不支持委托控制"
 
-#: http.c:366
+#: http.c:367
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "不支持公钥文件锁定，因为 cURL < 7.44.0"
 
-#: http.c:1766
+#: http.c:1764
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -13827,7 +13941,7 @@ msgstr ""
 "     请求：%s\n"
 "   重定向：%s"
 
-#: remote-curl.c:323
+#: remote-curl.c:324
 #, c-format
 msgid "redirecting to %s"
 msgstr "重定向到 %s"
@@ -14211,6 +14325,10 @@ msgstr ""
 msgid "Could not move back to $head_name"
 msgstr "无法移回 $head_name"
 
+#: git-rebase.sh:169
+msgid "Applied autostash."
+msgstr "成功应用 autostash。"
+
 #: git-rebase.sh:172
 #, sh-format
 msgid "Cannot store $stash_sha1"
@@ -14299,7 +14417,7 @@ msgstr "创建了 autostash: $stash_abbrev"
 
 #: git-rebase.sh:571
 msgid "Please commit or stash them."
-msgstr "请提交或为它们保存进度。"
+msgstr "请提交或贮藏修改。"
 
 #: git-rebase.sh:591
 #, sh-format
@@ -14325,39 +14443,39 @@ msgstr "首先，回退分支以便在上面重放您的工作..."
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "快进 $branch_name 至 $onto_name。"
 
-#: git-stash.sh:53
+#: git-stash.sh:54
 msgid "git stash clear with parameters is unimplemented"
 msgstr "git stash clear 不支持参数"
 
-#: git-stash.sh:94
+#: git-stash.sh:95
 msgid "You do not have the initial commit yet"
 msgstr "您尚未建立初始提交"
 
-#: git-stash.sh:109
+#: git-stash.sh:110
 msgid "Cannot save the current index state"
 msgstr "无法保存当前索引状态"
 
-#: git-stash.sh:124
+#: git-stash.sh:125
 msgid "Cannot save the untracked files"
 msgstr "无法保存未跟踪文件"
 
-#: git-stash.sh:144 git-stash.sh:157
+#: git-stash.sh:145 git-stash.sh:158
 msgid "Cannot save the current worktree state"
 msgstr "无法保存当前工作区状态"
 
-#: git-stash.sh:161
+#: git-stash.sh:162
 msgid "No changes selected"
 msgstr "没有选择变更"
 
-#: git-stash.sh:164
+#: git-stash.sh:165
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "无法删除临时索引（不应发生）"
 
-#: git-stash.sh:177
+#: git-stash.sh:178
 msgid "Cannot record working tree state"
 msgstr "不能记录工作区状态"
 
-#: git-stash.sh:209
+#: git-stash.sh:210
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr "无法用 $w_commit 更新 $ref_stash"
@@ -14372,7 +14490,7 @@ msgstr "无法用 $w_commit 更新 $ref_stash"
 #. $ git stash save --blah-blah 2>&1 | head -n 2
 #. error: unknown option for 'stash save': --blah-blah
 #. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:265
+#: git-stash.sh:266
 #, sh-format
 msgid ""
 "error: unknown option for 'stash save': $option\n"
@@ -14381,107 +14499,107 @@ msgstr ""
 "错误：'stash save' 的未知选项：$option\n"
 "      要提供一个描述信息，使用 git stash save -- '$option'"
 
-#: git-stash.sh:278
+#: git-stash.sh:281
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
 
-#: git-stash.sh:286
+#: git-stash.sh:289
 msgid "No local changes to save"
 msgstr "没有要保存的本地修改"
 
-#: git-stash.sh:291
+#: git-stash.sh:294
 msgid "Cannot initialize stash"
-msgstr "无法初始化 stash"
+msgstr "无法初始化贮藏"
 
-#: git-stash.sh:295
+#: git-stash.sh:298
 msgid "Cannot save the current status"
 msgstr "无法保存当前状态"
 
-#: git-stash.sh:296
+#: git-stash.sh:299
 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr "保存工作目录和索引状态 $stash_msg"
 
-#: git-stash.sh:323
+#: git-stash.sh:326
 msgid "Cannot remove worktree changes"
 msgstr "无法删除工作区变更"
 
-#: git-stash.sh:471
+#: git-stash.sh:474
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "未知选项: $opt"
 
-#: git-stash.sh:484
-msgid "No stash found."
-msgstr "未发现 stash。"
+#: git-stash.sh:487
+msgid "No stash entries found."
+msgstr "未发现贮藏条目。"
 
-#: git-stash.sh:491
+#: git-stash.sh:494
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "指定了太多的版本：$REV"
 
-#: git-stash.sh:506
+#: git-stash.sh:509
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference 不是一个有效的引用"
 
-#: git-stash.sh:534
+#: git-stash.sh:537
 #, sh-format
 msgid "'$args' is not a stash-like commit"
-msgstr "'$args' 不是 stash 样提交"
+msgstr "'$args' 不是贮藏式提交"
 
-#: git-stash.sh:545
+#: git-stash.sh:548
 #, sh-format
 msgid "'$args' is not a stash reference"
-msgstr "'$args' 不是一个 stash 引用"
+msgstr "'$args' 不是一个贮藏引用"
 
-#: git-stash.sh:553
+#: git-stash.sh:556
 msgid "unable to refresh index"
 msgstr "无法刷新索引"
 
-#: git-stash.sh:557
+#: git-stash.sh:560
 msgid "Cannot apply a stash in the middle of a merge"
-msgstr "无法在合并过程中恢复进度"
+msgstr "无法在合并过程应用贮藏"
 
-#: git-stash.sh:565
+#: git-stash.sh:568
 msgid "Conflicts in index. Try without --index."
 msgstr "索引中有冲突。尝试不使用 --index。"
 
-#: git-stash.sh:567
+#: git-stash.sh:570
 msgid "Could not save index tree"
 msgstr "不能保存索引树"
 
-#: git-stash.sh:576
-msgid "Could not restore untracked files from stash"
-msgstr "无法从进度保存中恢复未跟踪文件"
+#: git-stash.sh:579
+msgid "Could not restore untracked files from stash entry"
+msgstr "无法从贮藏条目中恢复未跟踪文件"
 
-#: git-stash.sh:601
+#: git-stash.sh:604
 msgid "Cannot unstage modified files"
 msgstr "无法将修改的文件取消暂存"
 
-#: git-stash.sh:616
+#: git-stash.sh:619
 msgid "Index was not unstashed."
-msgstr "索引的进度没有被恢复。"
+msgstr "索引未从贮藏中恢复。"
 
-#: git-stash.sh:630
-msgid "The stash is kept in case you need it again."
-msgstr "暂存被保留以备您再次需要。"
+#: git-stash.sh:633
+msgid "The stash entry is kept in case you need it again."
+msgstr "贮藏条目被保留以备您再次需要。"
 
-#: git-stash.sh:639
+#: git-stash.sh:642
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "丢弃了 ${REV} ($s)"
 
-#: git-stash.sh:640
+#: git-stash.sh:643
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}：不能丢弃进度条目"
+msgstr "${REV}：无法丢弃贮藏条目"
 
-#: git-stash.sh:648
+#: git-stash.sh:651
 msgid "No branch name specified"
 msgstr "未指定分支名"
 
-#: git-stash.sh:727
+#: git-stash.sh:730
 msgid "(To restore them type \"git stash apply\")"
 msgstr "（为恢复数据输入 \"git stash apply\"）"
 
@@ -14504,7 +14622,7 @@ msgstr "'$sm_path' 已经存在于索引中"
 msgid "'$sm_path' already exists in the index and is not a submodule"
 msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
 
-#: git-submodule.sh:218
+#: git-submodule.sh:219
 #, sh-format
 msgid ""
 "The following path is ignored by one of your .gitignore files:\n"
@@ -14515,22 +14633,22 @@ msgstr ""
 "$sm_path\n"
 "如果您确实想添加它，使用 -f 参数。"
 
-#: git-submodule.sh:236
+#: git-submodule.sh:237
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "添加位于 '$sm_path' 的现存仓库到索引"
 
-#: git-submodule.sh:238
+#: git-submodule.sh:239
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
 
-#: git-submodule.sh:246
+#: git-submodule.sh:247
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程仓库："
 
-#: git-submodule.sh:248
+#: git-submodule.sh:249
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -14545,47 +14663,47 @@ msgstr ""
 "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
 "或者您不确定这里的含义，使用 '--name' 选项选择另外的名称。"
 
-#: git-submodule.sh:254
+#: git-submodule.sh:255
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
 
-#: git-submodule.sh:266
+#: git-submodule.sh:267
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "不能检出子模组 '$sm_path'"
 
-#: git-submodule.sh:271
+#: git-submodule.sh:272
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "无法添加子模组 '$sm_path'"
 
-#: git-submodule.sh:280
+#: git-submodule.sh:281
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "无法注册子模组 '$sm_path'"
 
-#: git-submodule.sh:341
+#: git-submodule.sh:342
 #, sh-format
 msgid "Entering '$displaypath'"
 msgstr "正在进入 '$displaypath'"
 
-#: git-submodule.sh:361
+#: git-submodule.sh:362
 #, sh-format
 msgid "Stopping at '$displaypath'; script returned non-zero status."
 msgstr "停止于 '$displaypath'；脚本返回非零值。"
 
-#: git-submodule.sh:432
+#: git-submodule.sh:433
 #, sh-format
 msgid "pathspec and --all are incompatible"
 msgstr "pathspec 和 --all 不兼容"
 
-#: git-submodule.sh:437
+#: git-submodule.sh:438
 #, sh-format
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "如果您确实想要对所有子模组执行取消初始化，请使用 '--all'"
 
-#: git-submodule.sh:457
+#: git-submodule.sh:458
 #, sh-format
 msgid ""
 "Submodule work tree '$displaypath' contains a .git directory\n"
@@ -14594,56 +14712,56 @@ msgstr ""
 "子模组工作区 '$displaypath' 包含一个 .git 目录\n"
 "（如果您真的想删除它及其全部历史，使用 'rm -rf' 命令）"
 
-#: git-submodule.sh:465
+#: git-submodule.sh:466
 #, sh-format
 msgid ""
 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "
 "discard them"
 msgstr "子模组工作区 '$displaypath' 包含本地修改；使用 '-f' 丢弃它们"
 
-#: git-submodule.sh:468
+#: git-submodule.sh:469
 #, sh-format
 msgid "Cleared directory '$displaypath'"
 msgstr "已清除目录 '$displaypath'"
 
-#: git-submodule.sh:469
+#: git-submodule.sh:470
 #, sh-format
 msgid "Could not remove submodule work tree '$displaypath'"
 msgstr "无法移除子模组工作区 '$displaypath'"
 
-#: git-submodule.sh:472
+#: git-submodule.sh:473
 #, sh-format
 msgid "Could not create empty submodule directory '$displaypath'"
 msgstr "不能创建空的子模组目录 '$displaypath'"
 
-#: git-submodule.sh:481
+#: git-submodule.sh:482
 #, sh-format
 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
 
-#: git-submodule.sh:637
+#: git-submodule.sh:638
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
 
-#: git-submodule.sh:647
+#: git-submodule.sh:648
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "无法在子模组路径 '$sm_path' 中获取"
 
-#: git-submodule.sh:652
+#: git-submodule.sh:653
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
 "'$sm_path'"
 msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
 
-#: git-submodule.sh:670
+#: git-submodule.sh:671
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "无法在子模组路径 '$displaypath' 中获取"
 
-#: git-submodule.sh:676
+#: git-submodule.sh:677
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -14651,84 +14769,84 @@ msgid ""
 msgstr ""
 "获取了子模组路径 '$displaypath'，但是它没有包含 $sha1。直接获取该提交失败。"
 
-#: git-submodule.sh:683
+#: git-submodule.sh:684
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
 
-#: git-submodule.sh:684
+#: git-submodule.sh:685
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "子模组路径 '$displaypath'：检出 '$sha1'"
 
-#: git-submodule.sh:688
+#: git-submodule.sh:689
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
 
-#: git-submodule.sh:689
+#: git-submodule.sh:690
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "子模组路径 '$displaypath'：变基至 '$sha1'"
 
-#: git-submodule.sh:694
+#: git-submodule.sh:695
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
 
-#: git-submodule.sh:695
+#: git-submodule.sh:696
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'"
 
-#: git-submodule.sh:700
+#: git-submodule.sh:701
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
 
-#: git-submodule.sh:701
+#: git-submodule.sh:702
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "子模组 '$displaypath'：'$command $sha1'"
 
-#: git-submodule.sh:732
+#: git-submodule.sh:733
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "无法递归进子模组路径 '$displaypath'"
 
-#: git-submodule.sh:840
+#: git-submodule.sh:841
 msgid "The --cached option cannot be used with the --files option"
 msgstr "选项 --cached 不能和选项 --files 同时使用"
 
-#: git-submodule.sh:892
+#: git-submodule.sh:893
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "意外的模式 $mod_dst"
 
 #  译者：注意保持前导空格
-#: git-submodule.sh:912
+#: git-submodule.sh:913
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  警告：$display_name 未包含提交 $sha1_src"
 
 #  译者：注意保持前导空格
-#: git-submodule.sh:915
+#: git-submodule.sh:916
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  警告：$display_name 未包含提交 $sha1_dst"
 
 #  译者：注意保持前导空格
-#: git-submodule.sh:918
+#: git-submodule.sh:919
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr "  警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst"
 
-#: git-submodule.sh:1064
+#: git-submodule.sh:1065
 #, sh-format
 msgid "Failed to recurse into submodule path '$sm_path'"
 msgstr "无法递归进子模组路径 '$sm_path'"
 
-#: git-submodule.sh:1136
+#: git-submodule.sh:1137
 #, sh-format
 msgid "Synchronizing submodule url for '$displaypath'"
 msgstr "为 '$displaypath' 同步子模组 url"
@@ -14940,7 +15058,7 @@ msgid ""
 "\tgit rebase --continue"
 msgstr ""
 "执行成功：$rest\n"
-"但是在索引和/或工作区中存在变更。提交或暂存修改，然后运行\n"
+"但是在索引和/或工作区中存在变更。提交或贮藏修改，然后运行\n"
 "\n"
 "\tgit rebase --continue"
 
@@ -15188,120 +15306,120 @@ msgid "Unable to determine absolute path of git directory"
 msgstr "不能确定 git 目录的绝对路径"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:238
+#: git-add--interactive.perl:196
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %12s %s"
 
-#: git-add--interactive.perl:239
+#: git-add--interactive.perl:197
 msgid "staged"
 msgstr "缓存"
 
-#: git-add--interactive.perl:239
+#: git-add--interactive.perl:197
 msgid "unstaged"
 msgstr "未缓存"
 
-#: git-add--interactive.perl:288 git-add--interactive.perl:313
+#: git-add--interactive.perl:246 git-add--interactive.perl:271
 msgid "binary"
 msgstr "二进制"
 
-#: git-add--interactive.perl:297 git-add--interactive.perl:351
+#: git-add--interactive.perl:255 git-add--interactive.perl:309
 msgid "nothing"
 msgstr "无"
 
-#: git-add--interactive.perl:333 git-add--interactive.perl:348
+#: git-add--interactive.perl:291 git-add--interactive.perl:306
 msgid "unchanged"
 msgstr "没有修改"
 
-#: git-add--interactive.perl:644
+#: git-add--interactive.perl:602
 #, perl-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
 msgstr[0] "增加了 %d 个路径\n"
 msgstr[1] "增加了 %d 个路径\n"
 
-#: git-add--interactive.perl:647
+#: git-add--interactive.perl:605
 #, perl-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
 msgstr[0] "更新了 %d 个路径\n"
 msgstr[1] "更新了 %d 个路径\n"
 
-#: git-add--interactive.perl:650
+#: git-add--interactive.perl:608
 #, perl-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
 msgstr[0] "还原了 %d 个路径\n"
 msgstr[1] "还原了 %d 个路径\n"
 
-#: git-add--interactive.perl:653
+#: git-add--interactive.perl:611
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "触碰了 %d 个路径\n"
 msgstr[1] "触碰了 %d 个路径\n"
 
-#: git-add--interactive.perl:662
+#: git-add--interactive.perl:620
 msgid "Update"
 msgstr "更新"
 
-#: git-add--interactive.perl:674
+#: git-add--interactive.perl:632
 msgid "Revert"
 msgstr "还原"
 
-#: git-add--interactive.perl:697
+#: git-add--interactive.perl:655
 #, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr "说明：%s 现已成为未跟踪的。\n"
 
-#: git-add--interactive.perl:708
+#: git-add--interactive.perl:666
 msgid "Add untracked"
 msgstr "添加未跟踪的"
 
-#: git-add--interactive.perl:714
+#: git-add--interactive.perl:672
 msgid "No untracked files.\n"
 msgstr "没有未跟踪的文件。\n"
 
-#: git-add--interactive.perl:1030
+#: git-add--interactive.perl:985
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
 msgstr "如果补丁能干净地应用，编辑块将立即标记为暂存。"
 
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:988
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
-msgstr "如果补丁能干净地应用，编辑块将立即标记为保存进度。"
+msgstr "如果补丁能干净地应用，编辑块将立即标记为贮藏。"
 
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:991
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
 msgstr "如果补丁能干净地应用，编辑块将立即标记为未暂存。"
 
-#: git-add--interactive.perl:1039 git-add--interactive.perl:1048
+#: git-add--interactive.perl:994 git-add--interactive.perl:1003
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
 msgstr "如果补丁能干净地应用，编辑块将立即标记为应用。"
 
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1045
+#: git-add--interactive.perl:997 git-add--interactive.perl:1000
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
 msgstr "如果补丁能干净地应用，编辑块将立即标记为丢弃。"
 
-#: git-add--interactive.perl:1058
+#: git-add--interactive.perl:1013
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "无法写入块编辑文件：%s"
 
-#: git-add--interactive.perl:1059
+#: git-add--interactive.perl:1014
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
 
-#: git-add--interactive.perl:1065
+#: git-add--interactive.perl:1020
 #, perl-format
 msgid ""
 "---\n"
@@ -15315,7 +15433,7 @@ msgstr ""
 "以 %s 开始的行将被删除。\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1073
+#: git-add--interactive.perl:1028
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
@@ -15324,7 +15442,7 @@ msgstr ""
 "如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n"
 "此次编辑被终止，该块不会被修改。\n"
 
-#: git-add--interactive.perl:1087
+#: git-add--interactive.perl:1042
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "无法读取块编辑文件：%s"
@@ -15335,12 +15453,12 @@ msgstr "无法读取块编辑文件：%s"
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: git-add--interactive.perl:1178
+#: git-add--interactive.perl:1134
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? "
 
-#: git-add--interactive.perl:1187
+#: git-add--interactive.perl:1143
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -15354,7 +15472,7 @@ msgstr ""
 "a - 暂存该块和本文件中后面的全部块\n"
 "d - 不暂存该块和本文件中后面的全部块"
 
-#: git-add--interactive.perl:1193
+#: git-add--interactive.perl:1149
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -15368,7 +15486,7 @@ msgstr ""
 "a - 贮藏该块和本文件中后面的全部块\n"
 "d - 不贮藏该块和本文件中后面的全部块"
 
-#: git-add--interactive.perl:1199
+#: git-add--interactive.perl:1155
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -15382,7 +15500,7 @@ msgstr ""
 "a - 不暂存该块和本文件中后面的全部块\n"
 "d - 不要不暂存该块和本文件中后面的全部块"
 
-#: git-add--interactive.perl:1205
+#: git-add--interactive.perl:1161
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -15396,7 +15514,7 @@ msgstr ""
 "a - 应用该块和本文件中后面的全部块\n"
 "d - 不要应用该块和本文件中后面的全部块"
 
-#: git-add--interactive.perl:1211
+#: git-add--interactive.perl:1167
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -15410,7 +15528,7 @@ msgstr ""
 "a - 丢弃该块和本文件中后面的全部块\n"
 "d - 不要丢弃该块和本文件中后面的全部块"
 
-#: git-add--interactive.perl:1217
+#: git-add--interactive.perl:1173
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -15424,7 +15542,7 @@ msgstr ""
 "a - 丢弃该块和本文件中后面的全部块\n"
 "d - 不要丢弃该块和本文件中后面的全部块"
 
-#: git-add--interactive.perl:1223
+#: git-add--interactive.perl:1179
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -15438,7 +15556,7 @@ msgstr ""
 "a - 应用该块和本文件中后面的全部块\n"
 "d - 不要应用该块和本文件中后面的全部块"
 
-#: git-add--interactive.perl:1232
+#: git-add--interactive.perl:1188
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -15460,195 +15578,195 @@ msgstr ""
 "e - 手动编辑当前块\n"
 "? - 显示帮助\n"
 
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1219
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "选中的块不能应用到索引！\n"
 
-#: git-add--interactive.perl:1264
+#: git-add--interactive.perl:1220
 msgid "Apply them to the worktree anyway? "
 msgstr "无论如何都要应用到工作区么？"
 
-#: git-add--interactive.perl:1267
+#: git-add--interactive.perl:1223
 msgid "Nothing was applied.\n"
 msgstr "未应用。\n"
 
-#: git-add--interactive.perl:1278
+#: git-add--interactive.perl:1234
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "忽略未合入的：%s\n"
 
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1243
 msgid "Only binary files changed.\n"
 msgstr "只有二进制文件被修改。\n"
 
-#: git-add--interactive.perl:1289
+#: git-add--interactive.perl:1245
 msgid "No changes.\n"
 msgstr "没有修改。\n"
 
-#: git-add--interactive.perl:1297
+#: git-add--interactive.perl:1253
 msgid "Patch update"
 msgstr "补丁更新"
 
-#: git-add--interactive.perl:1349
+#: git-add--interactive.perl:1305
 #, perl-format
 msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
 msgstr "暂存状态修改 [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1350
+#: git-add--interactive.perl:1306
 #, perl-format
 msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
 msgstr "暂存状态删除 [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1351
+#: git-add--interactive.perl:1307
 #, perl-format
 msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
 msgstr "暂存该块 [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1354
+#: git-add--interactive.perl:1310
 #, perl-format
 msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
 msgstr "贮藏状态修改 [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1311
 #, perl-format
 msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
 msgstr "贮藏状态删除 [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1356
+#: git-add--interactive.perl:1312
 #, perl-format
 msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
 msgstr "贮藏该块 [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1359
+#: git-add--interactive.perl:1315
 #, perl-format
 msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
 msgstr "未暂存状态修改 [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1316
 #, perl-format
 msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
 msgstr "未暂存状态删除 [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1361
+#: git-add--interactive.perl:1317
 #, perl-format
 msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
 msgstr "不暂存该块 [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1364
+#: git-add--interactive.perl:1320
 #, perl-format
 msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
 msgstr "修改索引中的应用状态 [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1365
+#: git-add--interactive.perl:1321
 #, perl-format
 msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
 msgstr "从索引中删除应用状态 [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1366
+#: git-add--interactive.perl:1322
 #, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
 msgstr "将此块应用到索引 [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1369
+#: git-add--interactive.perl:1325
 #, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
 msgstr "修改工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1370
+#: git-add--interactive.perl:1326
 #, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
 msgstr "从工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1371
+#: git-add--interactive.perl:1327
 #, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
 msgstr "从工作区中丢弃该块 [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1374
+#: git-add--interactive.perl:1330
 #, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr "修改索引和工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1375
+#: git-add--interactive.perl:1331
 #, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr "从索引和工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1376
+#: git-add--interactive.perl:1332
 #, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1379
+#: git-add--interactive.perl:1335
 #, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr "修改索引和工作区中的应用状态 [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1380
+#: git-add--interactive.perl:1336
 #, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr "从索引和工作区中删除应用状态 [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1381
+#: git-add--interactive.perl:1337
 #, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
 msgstr "在索引和工作区中应用该块 [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1484
+#: git-add--interactive.perl:1440
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "跳转到哪个块（<回车> 查看更多）？ "
 
-#: git-add--interactive.perl:1486
+#: git-add--interactive.perl:1442
 msgid "go to which hunk? "
 msgstr "跳转到哪个块？"
 
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1451
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "无效数字：'%s'\n"
 
-#: git-add--interactive.perl:1500
+#: git-add--interactive.perl:1456
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "对不起，只有 %d 个可用块。\n"
 msgstr[1] "对不起，只有 %d 个可用块。\n"
 
-#: git-add--interactive.perl:1526
+#: git-add--interactive.perl:1482
 msgid "search for regex? "
 msgstr "使用正则表达式搜索？"
 
-#: git-add--interactive.perl:1539
+#: git-add--interactive.perl:1495
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "错误的正则表达式 %s：%s\n"
 
-#: git-add--interactive.perl:1549
+#: git-add--interactive.perl:1505
 msgid "No hunk matches the given pattern\n"
 msgstr "没有和给定模式相匹配的快\n"
 
-#: git-add--interactive.perl:1561 git-add--interactive.perl:1583
+#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
 msgid "No previous hunk\n"
 msgstr "没有前一个块\n"
 
-#: git-add--interactive.perl:1570 git-add--interactive.perl:1589
+#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
 msgid "No next hunk\n"
 msgstr "没有下一个块\n"
 
-#: git-add--interactive.perl:1597
+#: git-add--interactive.perl:1553
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "拆分为 %d 块。\n"
 msgstr[1] "拆分为 %d 块。\n"
 
-#: git-add--interactive.perl:1649
+#: git-add--interactive.perl:1605
 msgid "Review diff"
 msgstr "检视 diff"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1668
+#: git-add--interactive.perl:1624
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -15665,84 +15783,84 @@ msgstr ""
 "diff          - 显示 HEAD 和索引间差异\n"
 "add untracked - 添加未跟踪文件的内容至暂存列表\n"
 
-#: git-add--interactive.perl:1685 git-add--interactive.perl:1690
-#: git-add--interactive.perl:1693 git-add--interactive.perl:1700
-#: git-add--interactive.perl:1704 git-add--interactive.perl:1710
+#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
+#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
+#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
 msgid "missing --"
 msgstr "缺失 --"
 
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1662
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "未知的 --patch 模式：%s"
 
-#: git-add--interactive.perl:1712 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "无效的参数 %s，期望是 --"
 
-#: git-send-email.perl:121
+#: git-send-email.perl:126
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "本地时间和 GMT 有不到一分钟间隔\n"
 
-#: git-send-email.perl:128 git-send-email.perl:134
+#: git-send-email.perl:133 git-send-email.perl:139
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "本地时间偏移量大于等于 24 小时\n"
 
-#: git-send-email.perl:202 git-send-email.perl:208
+#: git-send-email.perl:208 git-send-email.perl:214
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "编辑器非正常退出，终止所有操作"
 
-#: git-send-email.perl:282
+#: git-send-email.perl:291
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
 
-#: git-send-email.perl:287
+#: git-send-email.perl:296
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' 包含编辑的邮件。\n"
 
-#: git-send-email.perl:305
+#: git-send-email.perl:314
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases 和其它选项不兼容\n"
 
-#: git-send-email.perl:368 git-send-email.perl:623
+#: git-send-email.perl:379 git-send-email.perl:634
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "不能在仓库之外运行 git format-patch\n"
 
-#: git-send-email.perl:437
+#: git-send-email.perl:448
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "未知的 --suppress-cc 字段：'%s'\n"
 
-#: git-send-email.perl:466
+#: git-send-email.perl:477
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "未知的 --confirm 设置：'%s'\n"
 
-#: git-send-email.perl:498
+#: git-send-email.perl:509
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "警告：不支持带引号的 sendmail 别名：%s\n"
 
-#: git-send-email.perl:500
+#: git-send-email.perl:511
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "警告：不支持 `:include:`：%s\n"
 
-#: git-send-email.perl:502
+#: git-send-email.perl:513
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "警告：不支持 `/file` 或 `|pipe` 重定向：%s\n"
 
-#: git-send-email.perl:507
+#: git-send-email.perl:518
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "警告：不能识别的 sendmail 行：%s\n"
 
-#: git-send-email.perl:589
+#: git-send-email.perl:600
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -15757,12 +15875,12 @@ msgstr ""
 "    * 如果含义为一个文件，使用 \"./%s\"，或者\n"
 "    * 如果含义为一个范围，使用 --format-patch 选项。\n"
 
-#: git-send-email.perl:610
+#: git-send-email.perl:621
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "无法打开目录 %s: %s"
 
-#: git-send-email.perl:634
+#: git-send-email.perl:645
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
@@ -15771,7 +15889,7 @@ msgstr ""
 "严重：%s：%s\n"
 "警告：补丁未能发送\n"
 
-#: git-send-email.perl:645
+#: git-send-email.perl:656
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -15781,17 +15899,17 @@ msgstr ""
 "未指定补丁文件！\n"
 "\n"
 
-#: git-send-email.perl:658
+#: git-send-email.perl:669
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "在 %s 中没有标题行？"
 
-#: git-send-email.perl:668
+#: git-send-email.perl:679
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "无法写入 %s: %s"
 
-#: git-send-email.perl:678
+#: git-send-email.perl:689
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -15804,41 +15922,41 @@ msgstr ""
 "\n"
 "如果您不想发送摘要，清除内容。\n"
 
-#: git-send-email.perl:701
+#: git-send-email.perl:712
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "无法打开 %s.final: %s"
 
-#: git-send-email.perl:704
+#: git-send-email.perl:715
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "无法打开 %s: %s"
 
-#: git-send-email.perl:739
+#: git-send-email.perl:750
 msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
 msgstr "To/Cc/Bcc 字段不解析，它们被忽略\n"
 
-#: git-send-email.perl:748
+#: git-send-email.perl:759
 msgid "Summary email is empty, skipping it\n"
 msgstr "摘要邮件为空，跳过\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:780
+#: git-send-email.perl:791
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "您确认要使用 <%s> [y/N]？"
 
-#: git-send-email.perl:809
+#: git-send-email.perl:820
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
 msgstr "如下文件含 8bit 内容，但没有声明一个 Content-Transfer-Encoding。\n"
 
-#: git-send-email.perl:814
+#: git-send-email.perl:825
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]？"
 
-#: git-send-email.perl:822
+#: git-send-email.perl:833
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -15850,20 +15968,20 @@ msgstr ""
 "\t%s\n"
 "包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送，使用参数 --force。\n"
 
-#: git-send-email.perl:841
+#: git-send-email.perl:852
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "邮件将要发送给谁？"
 
-#: git-send-email.perl:859
+#: git-send-email.perl:870
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "严重：别名 '%s' 扩展为它自己\n"
 
-#: git-send-email.perl:871
+#: git-send-email.perl:882
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ？"
 
-#: git-send-email.perl:921 git-send-email.perl:929
+#: git-send-email.perl:932 git-send-email.perl:940
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "错误：不能从 %s 中提取一个有效的邮件地址\n"
@@ -15871,16 +15989,16 @@ msgstr "错误：不能从 %s 中提取一个有效的邮件地址\n"
 #. TRANSLATORS: Make sure to include [q] [d] [e] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:933
+#: git-send-email.perl:944
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "如何处理这个地址？([q]uit|[d]rop|[e]dit)："
 
-#: git-send-email.perl:1234
+#: git-send-email.perl:1245
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "CA 路径 \"%s\" 不存在"
 
-#: git-send-email.perl:1309
+#: git-send-email.perl:1320
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -15905,263 +16023,128 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1324
+#: git-send-email.perl:1335
 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
 msgstr "发送邮件？([y]es|[n]o|[q]uit|[a]ll)："
 
-#: git-send-email.perl:1327
+#: git-send-email.perl:1338
 msgid "Send this email reply required"
 msgstr "发送要求的邮件回复"
 
-#: git-send-email.perl:1353
+#: git-send-email.perl:1364
 msgid "The required SMTP server is not properly defined."
 msgstr "要求的 SMTP 服务器未被正确定义。"
 
-#: git-send-email.perl:1397
+#: git-send-email.perl:1411
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "服务器不支持 STARTTLS！%s"
 
-#: git-send-email.perl:1403
+#: git-send-email.perl:1416 git-send-email.perl:1420
+#, perl-format
+msgid "STARTTLS failed! %s"
+msgstr "STARTTLS 失败！%s"
+
+#: git-send-email.perl:1430
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
 
-#: git-send-email.perl:1421
+#: git-send-email.perl:1448
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "无法发送 %s\n"
 
-#: git-send-email.perl:1424
+#: git-send-email.perl:1451
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "演习发送 %s\n"
 
-#: git-send-email.perl:1424
+#: git-send-email.perl:1451
 #, perl-format
 msgid "Sent %s\n"
 msgstr "正发送 %s\n"
 
-#: git-send-email.perl:1426
+#: git-send-email.perl:1453
 msgid "Dry-OK. Log says:\n"
 msgstr "演习成功。日志说：\n"
 
-#: git-send-email.perl:1426
+#: git-send-email.perl:1453
 msgid "OK. Log says:\n"
 msgstr "OK。日志说：\n"
 
-#: git-send-email.perl:1438
+#: git-send-email.perl:1465
 msgid "Result: "
 msgstr "结果："
 
-#: git-send-email.perl:1441
+#: git-send-email.perl:1468
 msgid "Result: OK\n"
 msgstr "结果：OK\n"
 
-#: git-send-email.perl:1454
+#: git-send-email.perl:1481
 #, perl-format
 msgid "can't open file %s"
 msgstr "无法打开文件 %s"
 
-#: git-send-email.perl:1501 git-send-email.perl:1521
+#: git-send-email.perl:1528 git-send-email.perl:1548
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) 添加 cc：%s 自行 '%s'\n"
 
-#: git-send-email.perl:1507
+#: git-send-email.perl:1534
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) 添加 to：%s 自行 '%s'\n"
 
-#: git-send-email.perl:1555
+#: git-send-email.perl:1582
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) 添加 cc：%s 自行 '%s'\n"
 
-#: git-send-email.perl:1578
+#: git-send-email.perl:1605
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) 添加 cc: %s 自行 '%s'\n"
 
-#: git-send-email.perl:1676
+#: git-send-email.perl:1711
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) 不能执行 '%s'"
 
-#: git-send-email.perl:1683
+#: git-send-email.perl:1718
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) 添加 %s: %s 自：'%s'\n"
 
-#: git-send-email.perl:1687
+#: git-send-email.perl:1722
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) 无法关闭管道至 '%s'"
 
-#: git-send-email.perl:1714
+#: git-send-email.perl:1749
 msgid "cannot send message as 7bit"
 msgstr "不能以 7bit 形式发送信息"
 
-#: git-send-email.perl:1722
+#: git-send-email.perl:1757
 msgid "invalid transfer encoding"
 msgstr "无效的传送编码"
 
-#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802
+#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "不能打开 %s：%s\n"
 
-#: git-send-email.perl:1744
+#: git-send-email.perl:1798
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr "%s：补丁包含一个超过 998 字符的行"
 
-#: git-send-email.perl:1760
+#: git-send-email.perl:1814
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr "略过 %s 含备份后缀 '%s'。\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1764
+#: git-send-email.perl:1818
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "您真的要发送 %s？[y|N]："
-
-#~ msgid "tag: tagging "
-#~ msgstr "tag: tagging "
-
-#~ msgid "object of unknown type"
-#~ msgstr "未知类型的对象"
-
-#~ msgid "commit object"
-#~ msgstr "提交对象"
-
-#~ msgid "tree object"
-#~ msgstr "树对象"
-
-#~ msgid "blob object"
-#~ msgstr "数据对象"
-
-#~ msgid "other tag object"
-#~ msgstr "其它标签对象"
-
-#~ msgid ""
-#~ "There is nothing to exclude from by :(exclude) patterns.\n"
-#~ "Perhaps you forgot to add either ':/' or '.' ?"
-#~ msgstr ""
-#~ "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
-#~ "添加 ':/' 或 '.' ？"
-
-#~ msgid "unrecognized format: %%(%s)"
-#~ msgstr "未能识别的格式：%%(%s)"
-
-#~ msgid ":strip= requires a positive integer argument"
-#~ msgstr ":strip= 需要一个正整型参数"
-
-#~ msgid "ref '%s' does not have %ld components to :strip"
-#~ msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件"
-
-#~ msgid "unknown %.*s format %s"
-#~ msgstr "未知的 %.*s 格式 %s"
-
-#~ msgid "[%s: gone]"
-#~ msgstr "[%s: 丢失]"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "[%s: behind %d]"
-#~ msgstr "[%s：落后 %d]"
-
-#~ msgid "[%s: ahead %d]"
-#~ msgstr "[%s：领先 %d]"
-
-#~ msgid "[%s: ahead %d, behind %d]"
-#~ msgstr "[%s：领先 %d，落后 %d]"
-
-#~ msgid " **** invalid ref ****"
-#~ msgstr " **** 无效引用 ****"
-
-#~ msgid "insanely long object directory %.*s"
-#~ msgstr "不正常的长对象目录 %.*s"
-
-#~ msgid "git merge [<options>] <msg> HEAD <commit>"
-#~ msgstr "git merge [<选项>] <说明> HEAD <提交>"
-
-#~ msgid "'%s' is not a commit"
-#~ msgstr "'%s' 不是一个提交"
-
-#~ msgid "cannot open file '%s'"
-#~ msgstr "无法打开文件 '%s'"
-
-#~ msgid "could not close file %s"
-#~ msgstr "无法关闭文件 %s"
-
-#~ msgid "tag name too long: %.*s..."
-#~ msgstr "标签名称太长：%.*s..."
-
-#~ msgid "tag header too big."
-#~ msgstr "标签头信息太大。"
-
-#~ msgid ""
-#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
-#~ "marked for discarding"
-#~ msgstr "如果补丁能干净地应用，编辑块将立即标记为丢弃"
-
-#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
-#~ msgstr "使用一个试验性的基于空行的启发式算法改进差异显示"
-
-#~ msgid "Clever... amending the last one with dirty index."
-#~ msgstr "聪明... 用脏索引修补最后一个提交。"
-
-#~ msgid ""
-#~ "the following submodule (or one of its nested submodules)\n"
-#~ "uses a .git directory:"
-#~ msgid_plural ""
-#~ "the following submodules (or one of their nested submodules)\n"
-#~ "use a .git directory:"
-#~ msgstr[0] "以下子模组（或一个其嵌套子模组）使用了一个 .git 目录："
-#~ msgstr[1] "以下子模组（或一个其嵌套子模组）使用了一个 .git 目录："
-
-#~ msgid ""
-#~ "\n"
-#~ "(use 'rm -rf' if you really want to remove it including all of its "
-#~ "history)"
-#~ msgstr ""
-#~ "\n"
-#~ "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）"
-
-#~ msgid "Could not write to %s"
-#~ msgstr "不能写入 %s"
-
-#~ msgid "Error wrapping up %s."
-#~ msgstr "错误收尾 %s。"
-
-#~ msgid "Your local changes would be overwritten by cherry-pick."
-#~ msgstr "您的本地修改将被拣选操作覆盖。"
-
-#~ msgid "Cannot revert during another revert."
-#~ msgstr "不能在回退中执行另一回退。"
-
-#~ msgid "Cannot cherry-pick during another cherry-pick."
-#~ msgstr "不能在拣选过程中执行另一拣选。"
-
-#~ msgid "Could not parse line %d."
-#~ msgstr "不能解析第 %d 行。"
-
-#~ msgid "Could not open %s"
-#~ msgstr "不能打开 %s"
-
-#~ msgid "Could not read %s."
-#~ msgstr "不能读取 %s。"
-
-#~ msgid "Could not format %s."
-#~ msgstr "不能格式化 %s。"
-
-#~ msgid "%s: %s"
-#~ msgstr "%s：%s"
-
-#~ msgid "cannot open %s: %s"
-#~ msgstr "不能打开 %s：%s"
-
-#~ msgid "You need to set your committer info first"
-#~ msgstr "您需要先设置您的提交者信息"